billing 0.0.7c → 0.0.7d
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/models/billing/bill.rb +7 -6
- data/lib/billing/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: df6ed94ea74139a373d3e01686d5fe39b934df80
|
|
4
|
+
data.tar.gz: 43ba07baf2e1023652042622e64916a48793be47
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f0d7508d635546326628c78ca0613940fa1ae7b9b0c62679121d7af2f329ff672321356c6dc166c81e6f05a4f28e9fcf416d8fe3da372007f5e6b845c41b6487
|
|
7
|
+
data.tar.gz: e50375f961de3e1c1ee0209de85f95ee17db09d0bdc2131f8ee3eb27630d742a474884b842ef22aca94b9de828eb3f17d66d7887bacaa470597ce742a58ef82d
|
data/app/models/billing/bill.rb
CHANGED
|
@@ -94,12 +94,13 @@ module Billing
|
|
|
94
94
|
end
|
|
95
95
|
|
|
96
96
|
def global_modifier_value
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
end
|
|
97
|
+
global_modifiers = modifiers.select{ |m| m.charge.nil? }
|
|
98
|
+
if global_modifiers.any?
|
|
99
|
+
gvalue = Money.new(0)
|
|
100
|
+
global_modifiers.each do |global_modifier|
|
|
101
|
+
gvalue += global_modifier.percent_ratio.nil? ? global_modifier.fixed_value : (charges_a.sum(&:value).to_money * global_modifier.percent_ratio)
|
|
102
|
+
end
|
|
103
|
+
return gvalue
|
|
103
104
|
end
|
|
104
105
|
end
|
|
105
106
|
|
data/lib/billing/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: billing
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.7d
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Alex Vangelov
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-
|
|
11
|
+
date: 2015-07-02 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|