piggybak 0.4.3 → 0.4.4
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/line_item.rb +2 -0
- data/app/models/piggybak/order.rb +1 -0
- data/app/views/piggybak/orders/_details.html.erb +2 -2
- data/app/views/piggybak/orders/_google_analytics.html.erb +2 -2
- data/app/views/piggybak/orders/download.text.erb +1 -1
- data/db/migrate/20120627173754_add_description_to_line_item.rb +13 -0
- data/piggybak.gemspec +2 -1
- metadata +43 -42
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.4.
|
|
1
|
+
0.4.4
|
|
@@ -5,6 +5,8 @@ module Piggybak
|
|
|
5
5
|
|
|
6
6
|
validates_presence_of :variant_id
|
|
7
7
|
validates_presence_of :total
|
|
8
|
+
validates_presence_of :price
|
|
9
|
+
validates_presence_of :description
|
|
8
10
|
validates_presence_of :quantity
|
|
9
11
|
validates_numericality_of :quantity, :only_integer => true, :greater_than_or_equal_to => 0
|
|
10
12
|
|
|
@@ -71,6 +71,7 @@ module Piggybak
|
|
|
71
71
|
line_item = Piggybak::LineItem.new({ :variant_id => item[:variant].id,
|
|
72
72
|
:price => item[:variant].price,
|
|
73
73
|
:total => item[:variant].price*item[:quantity],
|
|
74
|
+
:description => item[:variant].description,
|
|
74
75
|
:quantity => item[:quantity] })
|
|
75
76
|
self.line_items << line_item
|
|
76
77
|
end
|
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
</tr>
|
|
8
8
|
<% order.line_items.each do |line_item| %>
|
|
9
9
|
<tr>
|
|
10
|
-
<td><%= line_item.
|
|
11
|
-
<td><%= line_item.price %></td>
|
|
10
|
+
<td><%= line_item.description %></td>
|
|
11
|
+
<td><%= number_to_currency line_item.price %></td>
|
|
12
12
|
<td><%= line_item.quantity %></td>
|
|
13
13
|
<td><%= number_to_currency line_item.total %></td>
|
|
14
14
|
</tr>
|
|
@@ -13,8 +13,8 @@ _gaq.push(['_addTrans',
|
|
|
13
13
|
<% @order.line_items.each do |line_item| -%>
|
|
14
14
|
_gaq.push(['_addItem',
|
|
15
15
|
'<%= @order.id %>',
|
|
16
|
-
'<%= line_item.variant.sku %>',
|
|
17
|
-
'<%= line_item.
|
|
16
|
+
'<%= line_item.variant.try(:sku) %>',
|
|
17
|
+
'<%= line_item.description %>',
|
|
18
18
|
'', // category or variation
|
|
19
19
|
'<%= line_item.price %>', //unit price
|
|
20
20
|
'<%= line_item.quantity %>'
|
|
@@ -4,7 +4,7 @@ Email: <%= @order.email %>
|
|
|
4
4
|
Phone: <%= @order.phone %>
|
|
5
5
|
|
|
6
6
|
<% @order.line_items.each do |line_item| %>
|
|
7
|
-
<%= line_item.quantity %> x <%= raw line_item.
|
|
7
|
+
<%= line_item.quantity %> x <%= raw line_item.description %> (<%= number_to_currency line_item.total %>)
|
|
8
8
|
<% end -%>
|
|
9
9
|
|
|
10
10
|
Subtotal: <%= number_to_currency @order.line_items.inject(0) { |subtotal, li| subtotal + li.total } %>
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
class AddDescriptionToLineItem < ActiveRecord::Migration
|
|
2
|
+
def up
|
|
3
|
+
add_column :line_items, :description, :string, :null => false, :default => ''
|
|
4
|
+
|
|
5
|
+
Piggybak::LineItem.all.each do |line_item|
|
|
6
|
+
line_item.update_attribute(:description, line_item.variant.description)
|
|
7
|
+
end
|
|
8
|
+
end
|
|
9
|
+
|
|
10
|
+
def down
|
|
11
|
+
remove_column :line_items, :description
|
|
12
|
+
end
|
|
13
|
+
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.
|
|
8
|
+
s.version = "0.4.4"
|
|
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/20120107135459_add_active_to_countries.rb",
|
|
91
91
|
"db/migrate/20120111195534_drop_cc_fields.rb",
|
|
92
92
|
"db/migrate/20120627144001_add_price_to_line_item.rb",
|
|
93
|
+
"db/migrate/20120627173754_add_description_to_line_item.rb",
|
|
93
94
|
"lib/acts_as_orderer/base.rb",
|
|
94
95
|
"lib/acts_as_variant/base.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.
|
|
4
|
+
version: 0.4.4
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -14,7 +14,7 @@ date: 2012-06-27 00:00:00.000000000 Z
|
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: countries
|
|
17
|
-
requirement: &
|
|
17
|
+
requirement: &24213280 !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: *24213280
|
|
26
26
|
- !ruby/object:Gem::Dependency
|
|
27
27
|
name: bundler
|
|
28
|
-
requirement: &
|
|
28
|
+
requirement: &24212800 !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: *24212800
|
|
37
37
|
- !ruby/object:Gem::Dependency
|
|
38
38
|
name: jeweler
|
|
39
|
-
requirement: &
|
|
39
|
+
requirement: &24212140 !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: *24212140
|
|
48
48
|
- !ruby/object:Gem::Dependency
|
|
49
49
|
name: rspec
|
|
50
|
-
requirement: &
|
|
50
|
+
requirement: &24211440 !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: *24211440
|
|
59
59
|
- !ruby/object:Gem::Dependency
|
|
60
60
|
name: rspec-rails
|
|
61
|
-
requirement: &
|
|
61
|
+
requirement: &24210660 !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: *24210660
|
|
70
70
|
- !ruby/object:Gem::Dependency
|
|
71
71
|
name: factory_girl
|
|
72
|
-
requirement: &
|
|
72
|
+
requirement: &24226200 !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: *24226200
|
|
81
81
|
- !ruby/object:Gem::Dependency
|
|
82
82
|
name: diff-lcs
|
|
83
|
-
requirement: &
|
|
83
|
+
requirement: &24225600 !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: *24225600
|
|
92
92
|
- !ruby/object:Gem::Dependency
|
|
93
93
|
name: shoulda
|
|
94
|
-
requirement: &
|
|
94
|
+
requirement: &24224900 !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: *24224900
|
|
103
103
|
- !ruby/object:Gem::Dependency
|
|
104
104
|
name: simplecov
|
|
105
|
-
requirement: &
|
|
105
|
+
requirement: &24224080 !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: *24224080
|
|
114
114
|
- !ruby/object:Gem::Dependency
|
|
115
115
|
name: tzinfo
|
|
116
|
-
requirement: &
|
|
116
|
+
requirement: &24223360 !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: *24223360
|
|
125
125
|
- !ruby/object:Gem::Dependency
|
|
126
126
|
name: devise
|
|
127
|
-
requirement: &
|
|
127
|
+
requirement: &24222840 !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: *24222840
|
|
136
136
|
- !ruby/object:Gem::Dependency
|
|
137
137
|
name: rails_admin
|
|
138
|
-
requirement: &
|
|
138
|
+
requirement: &24222200 !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: *24222200
|
|
147
147
|
- !ruby/object:Gem::Dependency
|
|
148
148
|
name: devise
|
|
149
|
-
requirement: &
|
|
149
|
+
requirement: &24221460 !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: *24221460
|
|
158
158
|
- !ruby/object:Gem::Dependency
|
|
159
159
|
name: activemerchant
|
|
160
|
-
requirement: &
|
|
160
|
+
requirement: &24220960 !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: *24220960
|
|
169
169
|
- !ruby/object:Gem::Dependency
|
|
170
170
|
name: countries
|
|
171
|
-
requirement: &
|
|
171
|
+
requirement: &24220440 !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: *24220440
|
|
180
180
|
- !ruby/object:Gem::Dependency
|
|
181
181
|
name: rspec
|
|
182
|
-
requirement: &
|
|
182
|
+
requirement: &24219860 !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: *24219860
|
|
191
191
|
- !ruby/object:Gem::Dependency
|
|
192
192
|
name: rspec-rails
|
|
193
|
-
requirement: &
|
|
193
|
+
requirement: &24219160 !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: *24219160
|
|
202
202
|
- !ruby/object:Gem::Dependency
|
|
203
203
|
name: diff-lcs
|
|
204
|
-
requirement: &
|
|
204
|
+
requirement: &24218540 !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: *24218540
|
|
213
213
|
- !ruby/object:Gem::Dependency
|
|
214
214
|
name: factory_girl
|
|
215
|
-
requirement: &
|
|
215
|
+
requirement: &24233780 !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: *24233780
|
|
224
224
|
- !ruby/object:Gem::Dependency
|
|
225
225
|
name: shoulda
|
|
226
|
-
requirement: &
|
|
226
|
+
requirement: &24232980 !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: *24232980
|
|
235
235
|
description: Mountable ecommerce
|
|
236
236
|
email: steph@endpoint.com
|
|
237
237
|
executables: []
|
|
@@ -313,6 +313,7 @@ files:
|
|
|
313
313
|
- db/migrate/20120107135459_add_active_to_countries.rb
|
|
314
314
|
- db/migrate/20120111195534_drop_cc_fields.rb
|
|
315
315
|
- db/migrate/20120627144001_add_price_to_line_item.rb
|
|
316
|
+
- db/migrate/20120627173754_add_description_to_line_item.rb
|
|
316
317
|
- lib/acts_as_orderer/base.rb
|
|
317
318
|
- lib/acts_as_variant/base.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: -
|
|
394
|
+
hash: -3201553479829606141
|
|
394
395
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
395
396
|
none: false
|
|
396
397
|
requirements:
|