Bug fixes (gitcoinco#1343)

andrewmcodes · Jun 25, 2020 · 1bc3c18 · 1bc3c18
1 parent 1ce635a
commit 1bc3c18
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/controllers/impressions_controller.rb b/app/controllers/impressions_controller.rb
@@ -41,7 +41,7 @@ def create_impression
       @virtual_impression[:ad_theme],
       @virtual_impression[:ip_address],
       @virtual_impression[:country_code],
-      request.user_agent.encode(Encoding::UTF_8, invalid: :replace),
+      request.user_agent.encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: ""),
       Time.current.iso8601
     )
   end

diff --git a/app/helpers/campaigns_helper.rb b/app/helpers/campaigns_helper.rb
@@ -12,7 +12,7 @@ def campaign_tabs(campaign)
     if authorized_user.can_admin_system? && campaign.campaign_bundle
       tabs << {
         name: "Estimate",
-        path: campaign_estimate_path(id: campaign.id)
+        path: campaign_estimate_path(id: campaign.id, campaign_id: campaign.id) # TODO Refactor
       }
     end
     tabs

diff --git a/app/models/concerns/properties/reportable.rb b/app/models/concerns/properties/reportable.rb
@@ -23,7 +23,11 @@ def earnings(start = nil, stop = nil)
     # Returns the average RPM (revenue per mille)
     def average_rpm(start = nil, stop = nil)
       s = summary(start, stop)
-      Money.new s.property_revenue.to_i / (s.impressions_count.to_i / 1000.to_f)
+      if s.impressions_count.to_i > 0
+        Money.new s.property_revenue.to_i / (s.impressions_count.to_i / 1000.to_f)
+      else
+        Money.new 0
+      end
     rescue => e
       Rollbar.error e
       Money.new 0