piggybak 0.4.5 → 0.4.6
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.
- data/VERSION +1 -1
- data/app/models/piggybak/order.rb +6 -6
- data/app/models/piggybak/payment.rb +0 -3
- data/app/views/rails_admin/main/_order_details.html.erb +2 -2
- data/lib/piggybak.rb +14 -9
- data/piggybak.gemspec +2 -3
- metadata +43 -44
- data/app/views/rails_admin/main/_form_nested_no_destroy.html.haml +0 -15
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.4.
|
|
1
|
+
0.4.6
|
|
@@ -128,22 +128,22 @@ module Piggybak
|
|
|
128
128
|
return if self.status == "cancelled" # do nothing
|
|
129
129
|
|
|
130
130
|
if self.total_due > 0.00
|
|
131
|
-
self.status = "
|
|
131
|
+
self.status = "payment_owed"
|
|
132
132
|
elsif self.total_due < 0.00
|
|
133
133
|
self.status = "credit_owed"
|
|
134
134
|
else
|
|
135
|
-
if self.
|
|
136
|
-
self.status = "new"
|
|
137
|
-
elsif self.shipments.any? && self.shipments.all? { |s| s.status == "shipped" }
|
|
135
|
+
if self.shipments.any? && self.shipments.all? { |s| s.status == "shipped" }
|
|
138
136
|
self.status = "shipped"
|
|
137
|
+
elsif self.shipments.any? && self.shipments.all? { |s| s.status == "processing" }
|
|
138
|
+
self.status = "processing"
|
|
139
139
|
else
|
|
140
|
-
self.status = "
|
|
140
|
+
self.status = "new"
|
|
141
141
|
end
|
|
142
142
|
end
|
|
143
143
|
end
|
|
144
144
|
|
|
145
145
|
def status_enum
|
|
146
|
-
["
|
|
146
|
+
["new", "processing", "shipped"]
|
|
147
147
|
end
|
|
148
148
|
|
|
149
149
|
def avs_address
|
|
@@ -83,9 +83,6 @@ module Piggybak
|
|
|
83
83
|
def admin_label
|
|
84
84
|
if !self.new_record?
|
|
85
85
|
return "Payment ##{self.id} (#{self.created_at.strftime("%m-%d-%Y")})<br />" +
|
|
86
|
-
"Payment Method: #{self.payment_method.description}<br />" +
|
|
87
|
-
"Status: #{self.status}<br />" +
|
|
88
|
-
"Transaction ID: #{self.transaction_id}<br />" +
|
|
89
86
|
"$#{"%.2f" % self.total}"
|
|
90
87
|
else
|
|
91
88
|
return ""
|
|
@@ -34,9 +34,9 @@ N/A
|
|
|
34
34
|
<td>Actions</td>
|
|
35
35
|
<td>
|
|
36
36
|
<ul>
|
|
37
|
-
<li><%= link_to "Send Email Confirmation", piggybak.email_order_url(form.object.id) %></li>
|
|
37
|
+
<li><%= link_to "Send or Resend Email Confirmation", piggybak.email_order_url(form.object.id) %></li>
|
|
38
38
|
<li><%= link_to "View as Text", piggybak.download_order_url(form.object.id) %></li>
|
|
39
|
-
<li><%= link_to "Cancel Order", piggybak.cancel_order_url(form.object.id) %> (marks payments as refunded, marks order as cancelled)</li>
|
|
39
|
+
<li><%= link_to "Cancel Order", piggybak.cancel_order_url(form.object.id) %> (This does not mark the payment gateway payments. This marks payments tied to ths order in this database as refunded, and marks the order as cancelled.)</li>
|
|
40
40
|
</ul>
|
|
41
41
|
</td>
|
|
42
42
|
</tr>
|
data/lib/piggybak.rb
CHANGED
|
@@ -99,7 +99,7 @@ module Piggybak
|
|
|
99
99
|
field :line_items
|
|
100
100
|
field :shipments
|
|
101
101
|
field :payments do
|
|
102
|
-
|
|
102
|
+
active true
|
|
103
103
|
end
|
|
104
104
|
end
|
|
105
105
|
end
|
|
@@ -175,8 +175,15 @@ module Piggybak
|
|
|
175
175
|
end
|
|
176
176
|
end
|
|
177
177
|
field :number do
|
|
178
|
-
|
|
179
|
-
|
|
178
|
+
help "Required"
|
|
179
|
+
visible do
|
|
180
|
+
bindings[:object].new_record?
|
|
181
|
+
end
|
|
182
|
+
end
|
|
183
|
+
field :verification_value do
|
|
184
|
+
help "Required"
|
|
185
|
+
visible do
|
|
186
|
+
bindings[:object].new_record?
|
|
180
187
|
end
|
|
181
188
|
end
|
|
182
189
|
field :month do
|
|
@@ -191,11 +198,6 @@ module Piggybak
|
|
|
191
198
|
!bindings[:object].new_record?
|
|
192
199
|
end
|
|
193
200
|
end
|
|
194
|
-
field :verification_value do
|
|
195
|
-
read_only do
|
|
196
|
-
!bindings[:object].new_record?
|
|
197
|
-
end
|
|
198
|
-
end
|
|
199
201
|
field :total do
|
|
200
202
|
read_only true
|
|
201
203
|
formatted_value do
|
|
@@ -204,8 +206,11 @@ module Piggybak
|
|
|
204
206
|
help "This will automatically be calculated at the time of processing."
|
|
205
207
|
end
|
|
206
208
|
field :actions do
|
|
209
|
+
visible do
|
|
210
|
+
!bindings[:object].new_record?
|
|
211
|
+
end
|
|
207
212
|
partial "payment_refund"
|
|
208
|
-
help "
|
|
213
|
+
help "This does not mark the payment gateway payment as refunded. This only marks this local payment as refunded."
|
|
209
214
|
end
|
|
210
215
|
end
|
|
211
216
|
end
|
data/piggybak.gemspec
CHANGED
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = "piggybak"
|
|
8
|
-
s.version = "0.4.
|
|
8
|
+
s.version = "0.4.6"
|
|
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"]
|
|
12
|
-
s.date = "2012-07-
|
|
12
|
+
s.date = "2012-07-10"
|
|
13
13
|
s.description = "Mountable ecommerce"
|
|
14
14
|
s.email = "steph@endpoint.com"
|
|
15
15
|
s.extra_rdoc_files = [
|
|
@@ -65,7 +65,6 @@ Gem::Specification.new do |s|
|
|
|
65
65
|
"app/views/piggybak/orders/no_access.text.erb",
|
|
66
66
|
"app/views/piggybak/orders/receipt.html.erb",
|
|
67
67
|
"app/views/piggybak/orders/submit.html.erb",
|
|
68
|
-
"app/views/rails_admin/main/_form_nested_no_destroy.html.haml",
|
|
69
68
|
"app/views/rails_admin/main/_location_select.html.haml",
|
|
70
69
|
"app/views/rails_admin/main/_no_edit_form_filtering_select.html.haml",
|
|
71
70
|
"app/views/rails_admin/main/_order_details.html.erb",
|
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.
|
|
4
|
+
version: 0.4.6
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -10,11 +10,11 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2012-07-
|
|
13
|
+
date: 2012-07-10 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: countries
|
|
17
|
-
requirement: &
|
|
17
|
+
requirement: &18516240 !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: *
|
|
25
|
+
version_requirements: *18516240
|
|
26
26
|
- !ruby/object:Gem::Dependency
|
|
27
27
|
name: bundler
|
|
28
|
-
requirement: &
|
|
28
|
+
requirement: &18531600 !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: *
|
|
36
|
+
version_requirements: *18531600
|
|
37
37
|
- !ruby/object:Gem::Dependency
|
|
38
38
|
name: jeweler
|
|
39
|
-
requirement: &
|
|
39
|
+
requirement: &18528980 !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: *
|
|
47
|
+
version_requirements: *18528980
|
|
48
48
|
- !ruby/object:Gem::Dependency
|
|
49
49
|
name: rspec
|
|
50
|
-
requirement: &
|
|
50
|
+
requirement: &18528100 !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: *
|
|
58
|
+
version_requirements: *18528100
|
|
59
59
|
- !ruby/object:Gem::Dependency
|
|
60
60
|
name: rspec-rails
|
|
61
|
-
requirement: &
|
|
61
|
+
requirement: &18526400 !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: *
|
|
69
|
+
version_requirements: *18526400
|
|
70
70
|
- !ruby/object:Gem::Dependency
|
|
71
71
|
name: factory_girl
|
|
72
|
-
requirement: &
|
|
72
|
+
requirement: &18524560 !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: *
|
|
80
|
+
version_requirements: *18524560
|
|
81
81
|
- !ruby/object:Gem::Dependency
|
|
82
82
|
name: diff-lcs
|
|
83
|
-
requirement: &
|
|
83
|
+
requirement: &18539260 !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: *
|
|
91
|
+
version_requirements: *18539260
|
|
92
92
|
- !ruby/object:Gem::Dependency
|
|
93
93
|
name: shoulda
|
|
94
|
-
requirement: &
|
|
94
|
+
requirement: &18537580 !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: *
|
|
102
|
+
version_requirements: *18537580
|
|
103
103
|
- !ruby/object:Gem::Dependency
|
|
104
104
|
name: simplecov
|
|
105
|
-
requirement: &
|
|
105
|
+
requirement: &18535840 !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: *
|
|
113
|
+
version_requirements: *18535840
|
|
114
114
|
- !ruby/object:Gem::Dependency
|
|
115
115
|
name: tzinfo
|
|
116
|
-
requirement: &
|
|
116
|
+
requirement: &18535300 !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: *
|
|
124
|
+
version_requirements: *18535300
|
|
125
125
|
- !ruby/object:Gem::Dependency
|
|
126
126
|
name: devise
|
|
127
|
-
requirement: &
|
|
127
|
+
requirement: &18533940 !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: *
|
|
135
|
+
version_requirements: *18533940
|
|
136
136
|
- !ruby/object:Gem::Dependency
|
|
137
137
|
name: rails_admin
|
|
138
|
-
requirement: &
|
|
138
|
+
requirement: &18532340 !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: *
|
|
146
|
+
version_requirements: *18532340
|
|
147
147
|
- !ruby/object:Gem::Dependency
|
|
148
148
|
name: devise
|
|
149
|
-
requirement: &
|
|
149
|
+
requirement: &18547780 !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: *
|
|
157
|
+
version_requirements: *18547780
|
|
158
158
|
- !ruby/object:Gem::Dependency
|
|
159
159
|
name: activemerchant
|
|
160
|
-
requirement: &
|
|
160
|
+
requirement: &18546980 !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: *
|
|
168
|
+
version_requirements: *18546980
|
|
169
169
|
- !ruby/object:Gem::Dependency
|
|
170
170
|
name: countries
|
|
171
|
-
requirement: &
|
|
171
|
+
requirement: &18546240 !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: *
|
|
179
|
+
version_requirements: *18546240
|
|
180
180
|
- !ruby/object:Gem::Dependency
|
|
181
181
|
name: rspec
|
|
182
|
-
requirement: &
|
|
182
|
+
requirement: &18545380 !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: *
|
|
190
|
+
version_requirements: *18545380
|
|
191
191
|
- !ruby/object:Gem::Dependency
|
|
192
192
|
name: rspec-rails
|
|
193
|
-
requirement: &
|
|
193
|
+
requirement: &18544560 !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: *
|
|
201
|
+
version_requirements: *18544560
|
|
202
202
|
- !ruby/object:Gem::Dependency
|
|
203
203
|
name: diff-lcs
|
|
204
|
-
requirement: &
|
|
204
|
+
requirement: &18543980 !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: *
|
|
212
|
+
version_requirements: *18543980
|
|
213
213
|
- !ruby/object:Gem::Dependency
|
|
214
214
|
name: factory_girl
|
|
215
|
-
requirement: &
|
|
215
|
+
requirement: &18543320 !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: *
|
|
223
|
+
version_requirements: *18543320
|
|
224
224
|
- !ruby/object:Gem::Dependency
|
|
225
225
|
name: shoulda
|
|
226
|
-
requirement: &
|
|
226
|
+
requirement: &18542760 !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: *
|
|
234
|
+
version_requirements: *18542760
|
|
235
235
|
description: Mountable ecommerce
|
|
236
236
|
email: steph@endpoint.com
|
|
237
237
|
executables: []
|
|
@@ -288,7 +288,6 @@ files:
|
|
|
288
288
|
- app/views/piggybak/orders/no_access.text.erb
|
|
289
289
|
- app/views/piggybak/orders/receipt.html.erb
|
|
290
290
|
- app/views/piggybak/orders/submit.html.erb
|
|
291
|
-
- app/views/rails_admin/main/_form_nested_no_destroy.html.haml
|
|
292
291
|
- app/views/rails_admin/main/_location_select.html.haml
|
|
293
292
|
- app/views/rails_admin/main/_no_edit_form_filtering_select.html.haml
|
|
294
293
|
- app/views/rails_admin/main/_order_details.html.erb
|
|
@@ -391,7 +390,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
391
390
|
version: '0'
|
|
392
391
|
segments:
|
|
393
392
|
- 0
|
|
394
|
-
hash: -
|
|
393
|
+
hash: -1493470679873479469
|
|
395
394
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
396
395
|
none: false
|
|
397
396
|
requirements:
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
= form.fields_for field.name do |nested_form|
|
|
2
|
-
%blockquote
|
|
3
|
-
- if nested_form.object.new_record?
|
|
4
|
-
= nested_form.link_to_remove "cancel", :class => 'label notice', :id => "payments_cancel"
|
|
5
|
-
= nested_form.generate({:action => :create, :model_config => field.associated_model_config, :nested_in => field.name })
|
|
6
|
-
%hr
|
|
7
|
-
= form.link_to_add t("admin.index.add_new"), field.name, :class => 'label notice', :id => "payments_add"
|
|
8
|
-
|
|
9
|
-
:javascript
|
|
10
|
-
$('#payments_add').live('click', function() {
|
|
11
|
-
$(this).hide();
|
|
12
|
-
});
|
|
13
|
-
$('#payments_cancel').live('click', function() {
|
|
14
|
-
$('#payments_add').show();
|
|
15
|
-
});
|