Fix bugs that led to broken pages (#1339)

app/controllers/property_instructions_controller.rb

@@ -6,9 +6,10 @@ class PropertyInstructionsController < ApplicationController
 
   def set_property
     @property = if authorized_user.can_admin_system?
-      Property.find(params[:property_id])
+      Property.find_by(id: params[:property_id])
     else
-      current_user.properties.find(params[:property_id])
+      current_user.properties.find_by(id: params[:property_id])
     end
+    render_not_found unless @property
   end
 end

app/helpers/campaigns_helper.rb

@@ -1,15 +1,21 @@
 module CampaignsHelper
   def campaign_tabs(campaign)
-    [
+    tabs = [
       {name: "Overview", path: campaign_path(campaign), active: :exact},
       {name: "Daily Stats", path: campaign_dailies_path(campaign)},
       {name: "Creatives", path: campaign_creatives_path(campaign)},
       {name: "Properties", path: campaign_properties_path(campaign)},
       {name: "Countries", path: campaign_countries_path(campaign)},
       {name: "Comments", path: campaign_comments_path(campaign), validation: authorized_user.can_view_comments?},
-      {name: "Settings", path: edit_campaign_path(campaign)},
-      {name: "Estimate", path: campaign_estimate_path(campaign), validation: authorized_user.can_admin_system? && campaign.campaign_bundle}
+      {name: "Settings", path: edit_campaign_path(campaign)}
     ]
+    if authorized_user.can_admin_system? && campaign.campaign_bundle
+      tabs << {
+        name: "Estimate",
+        path: campaign_estimate_path(id: campaign.id)
+      }
+    end
+    tabs
   end
 
   def campaign_reports_email_error_message(campaign)

app/models/concerns/properties/reportable.rb

@@ -23,7 +23,7 @@ def earnings(start = nil, stop = nil)
     # Returns the average RPM (revenue per mille)
     def average_rpm(start = nil, stop = nil)
       s = summary(start, stop)
-      s.property_revenue / (s.impressions_count / 1000.to_f)
+      s.property_revenue.to_i / (s.impressions_count.to_i / 1000.to_f)
     rescue => e
       Rollbar.error e
       Money.new 0