piggybak 0.4.27 → 0.4.28

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.27
1
+ 0.4.28
@@ -78,15 +78,11 @@ module Piggybak
78
78
 
79
79
  adjustments.each do |adjustment|
80
80
  if !adjustment._destroy
81
- self.total_due += adjustment.total
81
+ self.total_due -= adjustment.total
82
82
  end
83
83
  end
84
84
 
85
- payments_total = payments.inject(0) do |payments_total, payment|
86
- payments_total += payment.total
87
- payments_total
88
- end
89
- self.total_due -= payments_total
85
+ self.total_due -= payments.sum(:total)
90
86
 
91
87
  !has_errors
92
88
  end
@@ -148,25 +144,23 @@ module Piggybak
148
144
  self.total += self.tax_charge
149
145
 
150
146
  shipments.each do |shipment|
151
- if !shipment._destroy && (shipment.new_record? || shipment.status != "shipped") && shipment.shipping_method
147
+ if !shipment._destroy && shipment.new_record? && shipment.shipping_method
152
148
  calculator = shipment.shipping_method.klass.constantize
153
149
  shipment.total = calculator.rate(shipment.shipping_method, self)
154
- shipping_cast = ((shipment.total*100).to_i).to_f/100
155
- self.total += shipping_cast
156
150
  end
151
+ shipping_cast = ((shipment.total*100).to_i).to_f/100
152
+ self.total += shipping_cast
157
153
  end
158
154
 
159
155
  self.total_due = self.total
160
156
 
161
157
  adjustments.each do |adjustment|
162
158
  if !adjustment._destroy
163
- self.total_due += adjustment.total.to_f
159
+ self.total_due -= adjustment.total.to_f
164
160
  end
165
161
  end
166
162
 
167
- payments.each do |payment|
168
- self.total_due -= payment.total
169
- end
163
+ self.total_due -= payments.sum(:total)
170
164
  end
171
165
 
172
166
  def update_status
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "piggybak"
8
- s.version = "0.4.27"
8
+ s.version = "0.4.28"
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.27
4
+ version: 0.4.28
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: &10549060 !ruby/object:Gem::Requirement
17
+ requirement: &20528960 !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: *10549060
25
+ version_requirements: *20528960
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: bundler
28
- requirement: &10546300 !ruby/object:Gem::Requirement
28
+ requirement: &20528160 !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: *10546300
36
+ version_requirements: *20528160
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: jeweler
39
- requirement: &10899280 !ruby/object:Gem::Requirement
39
+ requirement: &20599940 !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: *10899280
47
+ version_requirements: *20599940
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: rspec
50
- requirement: &10897760 !ruby/object:Gem::Requirement
50
+ requirement: &20598860 !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: *10897760
58
+ version_requirements: *20598860
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: rspec-rails
61
- requirement: &10896580 !ruby/object:Gem::Requirement
61
+ requirement: &20598000 !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: *10896580
69
+ version_requirements: *20598000
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: factory_girl
72
- requirement: &10894860 !ruby/object:Gem::Requirement
72
+ requirement: &20595620 !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: *10894860
80
+ version_requirements: *20595620
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: diff-lcs
83
- requirement: &10893000 !ruby/object:Gem::Requirement
83
+ requirement: &20593980 !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: *10893000
91
+ version_requirements: *20593980
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: shoulda
94
- requirement: &10873780 !ruby/object:Gem::Requirement
94
+ requirement: &20608320 !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: *10873780
102
+ version_requirements: *20608320
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: simplecov
105
- requirement: &10883400 !ruby/object:Gem::Requirement
105
+ requirement: &20607340 !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: *10883400
113
+ version_requirements: *20607340
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: tzinfo
116
- requirement: &10880660 !ruby/object:Gem::Requirement
116
+ requirement: &20606260 !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: *10880660
124
+ version_requirements: *20606260
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: devise
127
- requirement: &10580300 !ruby/object:Gem::Requirement
127
+ requirement: &20605340 !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: *10580300
135
+ version_requirements: *20605340
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: rails_admin
138
- requirement: &10579180 !ruby/object:Gem::Requirement
138
+ requirement: &20604600 !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: *10579180
146
+ version_requirements: *20604600
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: devise
149
- requirement: &10576840 !ruby/object:Gem::Requirement
149
+ requirement: &20603780 !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: *10576840
157
+ version_requirements: *20603780
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: activemerchant
160
- requirement: &10587540 !ruby/object:Gem::Requirement
160
+ requirement: &20602920 !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: *10587540
168
+ version_requirements: *20602920
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: countries
171
- requirement: &10591440 !ruby/object:Gem::Requirement
171
+ requirement: &20602180 !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: *10591440
179
+ version_requirements: *20602180
180
180
  - !ruby/object:Gem::Dependency
181
181
  name: rspec
182
- requirement: &10610600 !ruby/object:Gem::Requirement
182
+ requirement: &21274380 !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: *10610600
190
+ version_requirements: *21274380
191
191
  - !ruby/object:Gem::Dependency
192
192
  name: rspec-rails
193
- requirement: &10644820 !ruby/object:Gem::Requirement
193
+ requirement: &21272200 !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: *10644820
201
+ version_requirements: *21272200
202
202
  - !ruby/object:Gem::Dependency
203
203
  name: diff-lcs
204
- requirement: &10672420 !ruby/object:Gem::Requirement
204
+ requirement: &21269660 !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: *10672420
212
+ version_requirements: *21269660
213
213
  - !ruby/object:Gem::Dependency
214
214
  name: factory_girl
215
- requirement: &11087420 !ruby/object:Gem::Requirement
215
+ requirement: &21283920 !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: *11087420
223
+ version_requirements: *21283920
224
224
  - !ruby/object:Gem::Dependency
225
225
  name: shoulda
226
- requirement: &11084200 !ruby/object:Gem::Requirement
226
+ requirement: &21282500 !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: *11084200
234
+ version_requirements: *21282500
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: -207423252475420412
403
+ hash: -1406403027406831156
404
404
  required_rubygems_version: !ruby/object:Gem::Requirement
405
405
  none: false
406
406
  requirements: