piggybak 0.4.29 → 0.4.30

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.
Files changed (4) hide show
  1. data/VERSION +1 -1
  2. data/app/models/piggybak/order.rb +9 -4
  3. data/piggybak.gemspec +1 -1
  4. metadata +42 -42
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.29
1
+ 0.4.30
data/app/models/piggybak/order.rb CHANGED
@@ -68,6 +68,7 @@ module Piggybak
68
68
 
69
69
  def process_payments
70
70
  has_errors = false
71
+
71
72
  self.payments.each do |payment|
72
73
  if(!payment.process)
73
74
  has_errors = true
@@ -81,10 +82,12 @@ module Piggybak
81
82
  end
82
83
  end
83
84
 
85
+ payments_total = self.payments.inject(0) { |s, payment| s + payment.total }
86
+
84
87
  if adjustment_total > 0
85
- self.total_due = (self.total + adjustment_total - payments.sum(:total)).round(2)
88
+ self.total_due = (self.total + adjustment_total - payments_total).round(2)
86
89
  else
87
- self.total_due = (self.total - (adjustment_total + payments.sum(:total))).round(2)
90
+ self.total_due = (self.total - (adjustment_total + payments_total)).round(2)
88
91
  end
89
92
 
90
93
  !has_errors
@@ -162,10 +165,12 @@ module Piggybak
162
165
  end
163
166
  end
164
167
 
168
+ payments_total = self.payments.inject(0) { |s, payment| s + payment.total }
169
+
165
170
  if adjustment_total > 0
166
- self.total_due = (self.total + adjustment_total - payments.sum(:total)).round(2)
171
+ self.total_due = (self.total + adjustment_total - payments_total).round(2)
167
172
  else
168
- self.total_due = (self.total - (adjustment_total + payments.sum(:total))).round(2)
173
+ self.total_due = (self.total - (adjustment_total + payments_total)).round(2)
169
174
  end
170
175
  end
171
176
 
data/piggybak.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "piggybak"
8
- s.version = "0.4.29"
8
+ s.version = "0.4.30"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Steph Skardal", "Brian Buchalter"]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: piggybak
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.29
4
+ version: 0.4.30
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -14,7 +14,7 @@ date: 2012-08-10 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: countries
17
- requirement: &13573800 !ruby/object:Gem::Requirement
17
+ requirement: &20786020 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: '0'
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *13573800
25
+ version_requirements: *20786020
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: bundler
28
- requirement: &13573000 !ruby/object:Gem::Requirement
28
+ requirement: &20785460 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: 1.0.0
34
34
  type: :development
35
35
  prerelease: false
36
- version_requirements: *13573000
36
+ version_requirements: *20785460
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: jeweler
39
- requirement: &13571640 !ruby/object:Gem::Requirement
39
+ requirement: &20784380 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ~>
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: 1.6.4
45
45
  type: :development
46
46
  prerelease: false
47
- version_requirements: *13571640
47
+ version_requirements: *20784380
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: rspec
50
- requirement: &13569920 !ruby/object:Gem::Requirement
50
+ requirement: &20861900 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: '0'
56
56
  type: :development
57
57
  prerelease: false
58
- version_requirements: *13569920
58
+ version_requirements: *20861900
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: rspec-rails
61
- requirement: &13569240 !ruby/object:Gem::Requirement
61
+ requirement: &20861240 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ~>
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: 2.7.0
67
67
  type: :development
68
68
  prerelease: false
69
- version_requirements: *13569240
69
+ version_requirements: *20861240
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: factory_girl
72
- requirement: &13488640 !ruby/object:Gem::Requirement
72
+ requirement: &20860560 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: '0'
78
78
  type: :development
79
79
  prerelease: false
80
- version_requirements: *13488640
80
+ version_requirements: *20860560
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: diff-lcs
83
- requirement: &13487640 !ruby/object:Gem::Requirement
83
+ requirement: &20859980 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
88
88
  version: '0'
89
89
  type: :development
90
90
  prerelease: false
91
- version_requirements: *13487640
91
+ version_requirements: *20859980
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: shoulda
94
- requirement: &13486800 !ruby/object:Gem::Requirement
94
+ requirement: &20857540 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
99
99
  version: '0'
100
100
  type: :development
101
101
  prerelease: false
102
- version_requirements: *13486800
102
+ version_requirements: *20857540
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: simplecov
105
- requirement: &13486080 !ruby/object:Gem::Requirement
105
+ requirement: &20854340 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
110
110
  version: '0'
111
111
  type: :development
112
112
  prerelease: false
113
- version_requirements: *13486080
113
+ version_requirements: *20854340
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: tzinfo
116
- requirement: &13485460 !ruby/object:Gem::Requirement
116
+ requirement: &20165480 !ruby/object:Gem::Requirement
117
117
  none: false
118
118
  requirements:
119
119
  - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
121
121
  version: '0'
122
122
  type: :development
123
123
  prerelease: false
124
- version_requirements: *13485460
124
+ version_requirements: *20165480
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: devise
127
- requirement: &13484320 !ruby/object:Gem::Requirement
127
+ requirement: &20163780 !ruby/object:Gem::Requirement
128
128
  none: false
129
129
  requirements:
130
130
  - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
132
132
  version: '0'
133
133
  type: :development
134
134
  prerelease: false
135
- version_requirements: *13484320
135
+ version_requirements: *20163780
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: rails_admin
138
- requirement: &13483460 !ruby/object:Gem::Requirement
138
+ requirement: &20162420 !ruby/object:Gem::Requirement
139
139
  none: false
140
140
  requirements:
141
141
  - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
143
143
  version: '0'
144
144
  type: :runtime
145
145
  prerelease: false
146
- version_requirements: *13483460
146
+ version_requirements: *20162420
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: devise
149
- requirement: &13482620 !ruby/object:Gem::Requirement
149
+ requirement: &20161360 !ruby/object:Gem::Requirement
150
150
  none: false
151
151
  requirements:
152
152
  - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
154
154
  version: '0'
155
155
  type: :runtime
156
156
  prerelease: false
157
- version_requirements: *13482620
157
+ version_requirements: *20161360
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: activemerchant
160
- requirement: &13481680 !ruby/object:Gem::Requirement
160
+ requirement: &20947240 !ruby/object:Gem::Requirement
161
161
  none: false
162
162
  requirements:
163
163
  - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
165
165
  version: '0'
166
166
  type: :runtime
167
167
  prerelease: false
168
- version_requirements: *13481680
168
+ version_requirements: *20947240
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: countries
171
- requirement: &13480980 !ruby/object:Gem::Requirement
171
+ requirement: &20945640 !ruby/object:Gem::Requirement
172
172
  none: false
173
173
  requirements:
174
174
  - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
176
176
  version: '0'
177
177
  type: :runtime
178
178
  prerelease: false
179
- version_requirements: *13480980
179
+ version_requirements: *20945640
180
180
  - !ruby/object:Gem::Dependency
181
181
  name: rspec
182
- requirement: &13498760 !ruby/object:Gem::Requirement
182
+ requirement: &20944600 !ruby/object:Gem::Requirement
183
183
  none: false
184
184
  requirements:
185
185
  - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
187
187
  version: '0'
188
188
  type: :development
189
189
  prerelease: false
190
- version_requirements: *13498760
190
+ version_requirements: *20944600
191
191
  - !ruby/object:Gem::Dependency
192
192
  name: rspec-rails
193
- requirement: &13496640 !ruby/object:Gem::Requirement
193
+ requirement: &20943180 !ruby/object:Gem::Requirement
194
194
  none: false
195
195
  requirements:
196
196
  - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
198
198
  version: '0'
199
199
  type: :development
200
200
  prerelease: false
201
- version_requirements: *13496640
201
+ version_requirements: *20943180
202
202
  - !ruby/object:Gem::Dependency
203
203
  name: diff-lcs
204
- requirement: &13494560 !ruby/object:Gem::Requirement
204
+ requirement: &20942020 !ruby/object:Gem::Requirement
205
205
  none: false
206
206
  requirements:
207
207
  - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
209
209
  version: '0'
210
210
  type: :development
211
211
  prerelease: false
212
- version_requirements: *13494560
212
+ version_requirements: *20942020
213
213
  - !ruby/object:Gem::Dependency
214
214
  name: factory_girl
215
- requirement: &13493040 !ruby/object:Gem::Requirement
215
+ requirement: &20940720 !ruby/object:Gem::Requirement
216
216
  none: false
217
217
  requirements:
218
218
  - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
220
220
  version: '0'
221
221
  type: :development
222
222
  prerelease: false
223
- version_requirements: *13493040
223
+ version_requirements: *20940720
224
224
  - !ruby/object:Gem::Dependency
225
225
  name: shoulda
226
- requirement: &13381560 !ruby/object:Gem::Requirement
226
+ requirement: &20939980 !ruby/object:Gem::Requirement
227
227
  none: false
228
228
  requirements:
229
229
  - - ! '>='
@@ -231,7 +231,7 @@ dependencies:
231
231
  version: '0'
232
232
  type: :development
233
233
  prerelease: false
234
- version_requirements: *13381560
234
+ version_requirements: *20939980
235
235
  description: Mountable ecommerce
236
236
  email: steph@endpoint.com
237
237
  executables: []
@@ -400,7 +400,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
400
400
  version: '0'
401
401
  segments:
402
402
  - 0
403
- hash: 4416925623003314743
403
+ hash: 2520099593681375365
404
404
  required_rubygems_version: !ruby/object:Gem::Requirement
405
405
  none: false
406
406
  requirements: