billing 0.0.7c → 0.0.7d

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f56c9b0367a2f52896f8d42c487b3cf31f9b00e1
-  data.tar.gz: 64959b01058842409f1246620166c579c575e036
+  metadata.gz: df6ed94ea74139a373d3e01686d5fe39b934df80
+  data.tar.gz: 43ba07baf2e1023652042622e64916a48793be47
 SHA512:
-  metadata.gz: 461b7674cfbc98e4c44a7c688a6bfdf40938fab42c568e298b694b327840dfe9f2ab5123cb19a97b80cea325e23fc46453d2db5933c2759aafa62d6c9e21fe4c
-  data.tar.gz: 405f85fc3cb7f6b69f1708d3bac31a869a9d3605a2d1636daaf30ec71510d35f48157b7f1db8bb6e3f7be4d4e52cfbb3f9fe25a87cca3529107102e4c33218f5
+  metadata.gz: f0d7508d635546326628c78ca0613940fa1ae7b9b0c62679121d7af2f329ff672321356c6dc166c81e6f05a4f28e9fcf416d8fe3da372007f5e6b845c41b6487
+  data.tar.gz: e50375f961de3e1c1ee0209de85f95ee17db09d0bdc2131f8ee3eb27630d742a474884b842ef22aca94b9de828eb3f17d66d7887bacaa470597ce742a58ef82d

data/app/models/billing/bill.rb

@@ -94,12 +94,13 @@ module Billing
     end
     
     def global_modifier_value
-      if global_modifiers = modifiers.select{ |m| m.charge.nil? }
-        Money.new(0).tap() do |value|
-          global_modifiers.each do |global_modifier|
-            value += global_modifier.percent_ratio.nil? ? global_modifier.fixed_value : (charges_a.sum(&:value).to_money * global_modifier.percent_ratio)
-          end
-        end if global_modifiers.any?
+      global_modifiers = modifiers.select{ |m| m.charge.nil? }
+      if global_modifiers.any?
+        gvalue = Money.new(0)
+        global_modifiers.each do |global_modifier|
+          gvalue += global_modifier.percent_ratio.nil? ? global_modifier.fixed_value : (charges_a.sum(&:value).to_money * global_modifier.percent_ratio)
+        end
+        return gvalue
       end
     end
     

data/lib/billing/version.rb

@@ -1,3 +1,3 @@
 module Billing
-  VERSION = "0.0.7c"
+  VERSION = "0.0.7d"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billing
 version: !ruby/object:Gem::Version
-  version: 0.0.7c
+  version: 0.0.7d
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails