Charge only, when it is relevant

isimluk · Nov 18, 2016 · 4588c62 · 4588c62
1 parent d714d67
commit 4588c62
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/app/models/chargeback_rate_detail.rb b/app/models/chargeback_rate_detail.rb
@@ -22,14 +22,13 @@ class ChargebackRateDetail < ApplicationRecord
   attr_accessor :hours_in_interval
 
   def charge(relevant_fields, chargeback_fields_present, metric_rollup_records, hours_in_interval)
-    if !chargeback_fields_present && fixed?
-      cost = 0
-    else
-      metric_value, cost = metric_and_cost_by(metric_rollup_records, hours_in_interval)
-    end
-
     result = {}
     if (relevant_fields & [metric_keys[0], cost_keys[0]]).present?
+      if !chargeback_fields_present && fixed?
+        cost = 0
+      else
+        metric_value, cost = metric_and_cost_by(metric_rollup_records, hours_in_interval)
+      end
       metric_keys.each { |field| result[field] = metric_value }
       cost_keys.each   { |field| result[field] = cost }
     end