piggybak 0.4.11 → 0.4.12

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 (8) hide show
  1. data/VERSION +1 -1
  2. data/app/controllers/piggybak/orders_controller.rb +2 -0
  3. data/app/models/piggybak/order.rb +8 -9
  4. data/app/views/rails_admin/main/_order_details.html.erb +3 -7
  5. data/db/migrate/20120716195806_order_debugging.rb +11 -0
  6. data/lib/piggybak.rb +21 -5
  7. data/piggybak.gemspec +2 -1
  8. metadata +43 -42
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.11
1
+ 0.4.12
data/app/controllers/piggybak/orders_controller.rb CHANGED
@@ -10,6 +10,8 @@ module Piggybak
10
10
  @order = Piggybak::Order.new(params[:piggybak_order])
11
11
  @order.initialize_user(current_user, true)
12
12
 
13
+ @order.ip_address = request.remote_ip
14
+ @order.user_agent = request.user_agent
13
15
  @order.add_line_items(@cart)
14
16
 
15
17
  if @order.save
data/app/models/piggybak/order.rb CHANGED
@@ -15,15 +15,9 @@ module Piggybak
15
15
  accepts_nested_attributes_for :line_items, :allow_destroy => true
16
16
  accepts_nested_attributes_for :payments
17
17
 
18
- validates_presence_of :status
19
- validates_presence_of :email
20
- validates_presence_of :phone
21
- validates_presence_of :total
22
- validates_presence_of :total_due
23
- validates_presence_of :tax_charge
24
- validates_presence_of :created_at
25
-
26
- after_initialize :initialize_nested
18
+ validates_presence_of :status, :email, :phone, :total, :total_due, :tax_charge, :created_at, :ip_address, :user_agent
19
+
20
+ after_initialize :initialize_nested, :initialize_request
27
21
  before_validation :set_defaults
28
22
  after_validation :update_totals
29
23
  before_save :process_payments, :update_status
@@ -40,6 +34,11 @@ module Piggybak
40
34
  end
41
35
  end
42
36
 
37
+ def initialize_request
38
+ self.ip_address ||= 'admin'
39
+ self.user_agent ||= 'admin'
40
+ end
41
+
43
42
  def initialize_user(user, on_post)
44
43
  if user
45
44
  self.user = user
data/app/views/rails_admin/main/_order_details.html.erb CHANGED
@@ -3,11 +3,7 @@ N/A
3
3
  <% else -%>
4
4
  <table cellpadding="5" cellspacing="0">
5
5
  <tr>
6
- <td>Status</td>
7
- <td><%= form.object.status %></td>
8
- </tr>
9
- <tr>
10
- <td>Subtotal</td>
6
+ <td width="150">Subtotal</td>
11
7
  <td>$<%= "%.2f" % form.object.line_items.inject(0) { |subtotal, li| subtotal + li.total } %></td>
12
8
  </tr>
13
9
  <tr>
@@ -27,11 +23,11 @@ N/A
27
23
  <td>$<%= "%.2f" % form.object.total_due %></td>
28
24
  </tr>
29
25
  <tr>
30
- <td>Created At</td>
26
+ <td>Created at</td>
31
27
  <td><%= form.object.created_at.strftime("%m-%d-%Y") %></td>
32
28
  </tr>
33
29
  <tr>
34
- <td>Actions</td>
30
+ <td valign="top">Actions</td>
35
31
  <td>
36
32
  <ul>
37
33
  <li><%= link_to "Send or Resend Email Confirmation", piggybak.email_order_url(form.object.id) %></li>
data/db/migrate/20120716195806_order_debugging.rb ADDED
@@ -0,0 +1,11 @@
1
+ class OrderDebugging < ActiveRecord::Migration
2
+ def up
3
+ add_column :orders, :ip_address, :string, :nil => false
4
+ add_column :orders, :user_agent, :string, :nil => false
5
+ end
6
+
7
+ def down
8
+ remove_column :orders, :ip_address
9
+ remove_column :orders, :user_agent
10
+ end
11
+ end
data/lib/piggybak.rb CHANGED
@@ -85,6 +85,15 @@ module Piggybak
85
85
  field :status
86
86
  end
87
87
  edit do
88
+ field :status do
89
+ visible do
90
+ !bindings[:object].new_record?
91
+ end
92
+ read_only do
93
+ !bindings[:object].new_record?
94
+ end
95
+ end
96
+
88
97
  field :details do
89
98
  partial "order_details"
90
99
  help ""
@@ -92,13 +101,20 @@ module Piggybak
92
101
  !bindings[:object].new_record?
93
102
  end
94
103
  end
95
- field :user do
96
- read_only do
97
- !bindings[:object].new_record?
98
- end
99
- end
104
+
105
+ field :user
100
106
  field :email
101
107
  field :phone
108
+ field :ip_address do
109
+ read_only do
110
+ !bindings[:object].new_record?
111
+ end
112
+ end
113
+ field :user_agent do
114
+ read_only do
115
+ !bindings[:object].new_record?
116
+ end
117
+ end
102
118
  field :billing_address do
103
119
  help "Required"
104
120
  end
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.11"
8
+ s.version = "0.4.12"
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"]
@@ -90,6 +90,7 @@ Gem::Specification.new do |s|
90
90
  "db/migrate/20120627144001_add_price_to_line_item.rb",
91
91
  "db/migrate/20120627173754_add_description_to_line_item.rb",
92
92
  "db/migrate/20120716191225_add_masked_credit_card_numbers.rb",
93
+ "db/migrate/20120716195806_order_debugging.rb",
93
94
  "lib/acts_as_orderer.rb",
94
95
  "lib/acts_as_variant.rb",
95
96
  "lib/currency.rb",
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.11
4
+ version: 0.4.12
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -14,7 +14,7 @@ date: 2012-07-16 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: countries
17
- requirement: &26335260 !ruby/object:Gem::Requirement
17
+ requirement: &21782180 !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: *26335260
25
+ version_requirements: *21782180
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: bundler
28
- requirement: &26334360 !ruby/object:Gem::Requirement
28
+ requirement: &21781680 !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: *26334360
36
+ version_requirements: *21781680
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: jeweler
39
- requirement: &26332760 !ruby/object:Gem::Requirement
39
+ requirement: &21780900 !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: *26332760
47
+ version_requirements: *21780900
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: rspec
50
- requirement: &26332060 !ruby/object:Gem::Requirement
50
+ requirement: &21779940 !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: *26332060
58
+ version_requirements: *21779940
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: rspec-rails
61
- requirement: &26331540 !ruby/object:Gem::Requirement
61
+ requirement: &21798680 !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: *26331540
69
+ version_requirements: *21798680
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: factory_girl
72
- requirement: &26330460 !ruby/object:Gem::Requirement
72
+ requirement: &21798060 !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: *26330460
80
+ version_requirements: *21798060
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: diff-lcs
83
- requirement: &26343900 !ruby/object:Gem::Requirement
83
+ requirement: &21797220 !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: *26343900
91
+ version_requirements: *21797220
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: shoulda
94
- requirement: &26342820 !ruby/object:Gem::Requirement
94
+ requirement: &21796400 !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: *26342820
102
+ version_requirements: *21796400
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: simplecov
105
- requirement: &26341260 !ruby/object:Gem::Requirement
105
+ requirement: &21795840 !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: *26341260
113
+ version_requirements: *21795840
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: tzinfo
116
- requirement: &26339200 !ruby/object:Gem::Requirement
116
+ requirement: &21795280 !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: *26339200
124
+ version_requirements: *21795280
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: devise
127
- requirement: &26338160 !ruby/object:Gem::Requirement
127
+ requirement: &21794700 !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: *26338160
135
+ version_requirements: *21794700
136
136
  - !ruby/object:Gem::Dependency
137
137
  name: rails_admin
138
- requirement: &26337580 !ruby/object:Gem::Requirement
138
+ requirement: &21794020 !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: *26337580
146
+ version_requirements: *21794020
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: devise
149
- requirement: &26352740 !ruby/object:Gem::Requirement
149
+ requirement: &21793380 !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: *26352740
157
+ version_requirements: *21793380
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: activemerchant
160
- requirement: &26352140 !ruby/object:Gem::Requirement
160
+ requirement: &21792720 !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: *26352140
168
+ version_requirements: *21792720
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: countries
171
- requirement: &26351600 !ruby/object:Gem::Requirement
171
+ requirement: &21792020 !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: *26351600
179
+ version_requirements: *21792020
180
180
  - !ruby/object:Gem::Dependency
181
181
  name: rspec
182
- requirement: &26350880 !ruby/object:Gem::Requirement
182
+ requirement: &21791360 !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: *26350880
190
+ version_requirements: *21791360
191
191
  - !ruby/object:Gem::Dependency
192
192
  name: rspec-rails
193
- requirement: &26350240 !ruby/object:Gem::Requirement
193
+ requirement: &21790720 !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: *26350240
201
+ version_requirements: *21790720
202
202
  - !ruby/object:Gem::Dependency
203
203
  name: diff-lcs
204
- requirement: &26349660 !ruby/object:Gem::Requirement
204
+ requirement: &21808120 !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: *26349660
212
+ version_requirements: *21808120
213
213
  - !ruby/object:Gem::Dependency
214
214
  name: factory_girl
215
- requirement: &26349160 !ruby/object:Gem::Requirement
215
+ requirement: &21807420 !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: *26349160
223
+ version_requirements: *21807420
224
224
  - !ruby/object:Gem::Dependency
225
225
  name: shoulda
226
- requirement: &26348480 !ruby/object:Gem::Requirement
226
+ requirement: &21806760 !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: *26348480
234
+ version_requirements: *21806760
235
235
  description: Mountable ecommerce
236
236
  email: steph@endpoint.com
237
237
  executables: []
@@ -313,6 +313,7 @@ files:
313
313
  - db/migrate/20120627144001_add_price_to_line_item.rb
314
314
  - db/migrate/20120627173754_add_description_to_line_item.rb
315
315
  - db/migrate/20120716191225_add_masked_credit_card_numbers.rb
316
+ - db/migrate/20120716195806_order_debugging.rb
316
317
  - lib/acts_as_orderer.rb
317
318
  - lib/acts_as_variant.rb
318
319
  - lib/currency.rb
@@ -390,7 +391,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
390
391
  version: '0'
391
392
  segments:
392
393
  - 0
393
- hash: 650660779448356910
394
+ hash: 1631007596627402074
394
395
  required_rubygems_version: !ruby/object:Gem::Requirement
395
396
  none: false
396
397
  requirements: