spree_core 0.70.RC1 → 0.70.0.rc2
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/README.md +10 -4
- data/app/assets/javascripts/admin/admin.js.erb +1 -1
- data/app/assets/javascripts/admin/orders/edit_form.js +3 -1
- data/app/assets/stylesheets/admin/admin-form.css.erb +1 -3
- data/app/assets/stylesheets/admin/admin-tables.css.erb +1 -1
- data/app/assets/stylesheets/admin/admin.css.erb +2 -2
- data/app/assets/stylesheets/admin/spree_core.css +0 -1
- data/app/controllers/admin/line_items_controller.rb +3 -1
- data/app/controllers/checkout_controller.rb +6 -0
- data/app/helpers/spree/base_helper.rb +21 -10
- data/app/models/creditcard.rb +15 -1
- data/app/models/inventory_unit.rb +6 -10
- data/app/models/line_item.rb +17 -2
- data/app/models/order.rb +5 -3
- data/app/models/product.rb +33 -21
- data/app/models/taxonomy.rb +1 -1
- data/app/views/admin/mail_methods/_form.html.erb +3 -3
- data/app/views/admin/orders/_line_item.html.erb +3 -1
- data/app/views/admin/orders/index.html.erb +3 -3
- data/app/views/admin/payments/source_views/_gateway.html.erb +1 -1
- data/app/views/admin/products/_form.html.erb +3 -3
- data/app/views/admin/products/new.html.erb +3 -3
- data/app/views/admin/shared/_report_criteria.html.erb +3 -3
- data/app/views/admin/variants/_form.html.erb +3 -3
- data/app/views/admin/variants/index.html.erb +1 -1
- data/app/views/layouts/admin.html.erb +1 -1
- data/app/views/order_mailer/confirm_email.text.erb +1 -1
- data/app/views/orders/_line_item.html.erb +7 -2
- data/config/initializers/rails_3_1.rb +12 -0
- data/config/locales/en.yml +2 -0
- data/lib/generators/spree/dummy/dummy_generator.rb +1 -0
- data/lib/generators/spree/site/site_generator.rb +7 -7
- data/lib/scopes/product.rb +6 -6
- data/lib/spree_base.rb +5 -6
- data/lib/spree_core/railtie.rb +1 -1
- data/lib/spree_core/version.rb +1 -1
- metadata +70 -68
- data/app/assets/stylesheets/admin/grids.css +0 -314
- data/config/initializers/disable_paperclip_log.rb +0 -2
|
@@ -1,314 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
Copyright (c) 2009, Yahoo! Inc. All rights reserved.
|
|
3
|
-
Code licensed under the BSD License:
|
|
4
|
-
http://developer.yahoo.net/yui/license.txt
|
|
5
|
-
version: 2.7.0
|
|
6
|
-
*/
|
|
7
|
-
/**
|
|
8
|
-
* YUI Grids
|
|
9
|
-
* @module grids
|
|
10
|
-
* @namespace yui-
|
|
11
|
-
* @requires reset, fonts
|
|
12
|
-
*/
|
|
13
|
-
|
|
14
|
-
/**
|
|
15
|
-
* Note: Throughout this file, the *property (star-property) filter is used
|
|
16
|
-
* to give a value to IE that other browsers do not see. _property is only seen
|
|
17
|
-
* by IE7, so the combo of *prop and _prop can target between IE6 and IE7.
|
|
18
|
-
*
|
|
19
|
-
* More information on these filters and related validation errors:
|
|
20
|
-
* http://tech.groups.yahoo.com/group/ydn-javascript/message/40059
|
|
21
|
-
*/
|
|
22
|
-
|
|
23
|
-
/**
|
|
24
|
-
* Section: General Rules
|
|
25
|
-
*/
|
|
26
|
-
|
|
27
|
-
/**
|
|
28
|
-
* Section: Page Width Rules (#doc, #doc2, #doc3, #doc4)
|
|
29
|
-
*/
|
|
30
|
-
|
|
31
|
-
.yui-g .yui-u .yui-g {
|
|
32
|
-
width: 100%;
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
/**
|
|
36
|
-
* Section: Grids and Nesting Grids
|
|
37
|
-
*/
|
|
38
|
-
|
|
39
|
-
/* Children generally take half the available space */
|
|
40
|
-
.yui-gb .yui-u,
|
|
41
|
-
.yui-g .yui-gb .yui-u,
|
|
42
|
-
.yui-gb .yui-g,
|
|
43
|
-
.yui-gb .yui-gb,
|
|
44
|
-
.yui-gb .yui-gc,
|
|
45
|
-
.yui-gb .yui-gd,
|
|
46
|
-
.yui-gb .yui-ge,
|
|
47
|
-
.yui-gb .yui-gf,
|
|
48
|
-
.yui-gc .yui-u,
|
|
49
|
-
.yui-gc .yui-g,
|
|
50
|
-
.yui-gd .yui-u {
|
|
51
|
-
float: left;
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
/* Float units (and sub grids) to the right */
|
|
55
|
-
.yui-g .yui-u,
|
|
56
|
-
.yui-g .yui-g,
|
|
57
|
-
.yui-g .yui-gb,
|
|
58
|
-
.yui-g .yui-gc,
|
|
59
|
-
.yui-g .yui-gd,
|
|
60
|
-
.yui-g .yui-ge,
|
|
61
|
-
.yui-g .yui-gf,
|
|
62
|
-
.yui-gc .yui-u,
|
|
63
|
-
.yui-gd .yui-g,
|
|
64
|
-
.yui-g .yui-gc .yui-u,
|
|
65
|
-
.yui-ge .yui-u,
|
|
66
|
-
.yui-ge .yui-g,
|
|
67
|
-
.yui-gf .yui-g,
|
|
68
|
-
.yui-gf .yui-u {
|
|
69
|
-
float: right;
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
/*Float units (and sub grids) to the left */
|
|
73
|
-
.yui-g div.first,
|
|
74
|
-
.yui-gb div.first,
|
|
75
|
-
.yui-gc div.first,
|
|
76
|
-
.yui-gd div.first,
|
|
77
|
-
.yui-ge div.first,
|
|
78
|
-
.yui-gf div.first,
|
|
79
|
-
.yui-g .yui-gc div.first,
|
|
80
|
-
.yui-g .yui-ge div.first,
|
|
81
|
-
.yui-gc div.first div.first {
|
|
82
|
-
float: left;
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
.yui-g .yui-u,
|
|
86
|
-
.yui-g .yui-g,
|
|
87
|
-
.yui-g .yui-gb,
|
|
88
|
-
.yui-g .yui-gc,
|
|
89
|
-
.yui-g .yui-gd,
|
|
90
|
-
.yui-g .yui-ge,
|
|
91
|
-
.yui-g .yui-gf {
|
|
92
|
-
width: 49.1%;
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
.yui-gb .yui-u,
|
|
96
|
-
.yui-g .yui-gb .yui-u,
|
|
97
|
-
.yui-gb .yui-g,
|
|
98
|
-
.yui-gb .yui-gb,
|
|
99
|
-
.yui-gb .yui-gc,
|
|
100
|
-
.yui-gb .yui-gd,
|
|
101
|
-
.yui-gb .yui-ge,
|
|
102
|
-
.yui-gb .yui-gf,
|
|
103
|
-
.yui-gc .yui-u,
|
|
104
|
-
.yui-gc .yui-g,
|
|
105
|
-
.yui-gd .yui-u {
|
|
106
|
-
width: 32%;
|
|
107
|
-
margin-left: 1.99%;
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
/* Give IE some extra breathing room for 1/3-based rounding issues */
|
|
111
|
-
.yui-gb .yui-u {
|
|
112
|
-
*margin-left: 1.9%;
|
|
113
|
-
*width: 31.9%;
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
.yui-gc div.first,
|
|
117
|
-
.yui-gd .yui-u {
|
|
118
|
-
width: 66%;
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
.yui-gd div.first {
|
|
122
|
-
width: 32%;
|
|
123
|
-
}
|
|
124
|
-
|
|
125
|
-
.yui-ge div.first,
|
|
126
|
-
.yui-gf .yui-u {
|
|
127
|
-
width: 74.2%;
|
|
128
|
-
}
|
|
129
|
-
|
|
130
|
-
.yui-ge .yui-u,
|
|
131
|
-
.yui-gf div.first {
|
|
132
|
-
width: 24%;
|
|
133
|
-
}
|
|
134
|
-
|
|
135
|
-
.yui-g .yui-gb div.first,
|
|
136
|
-
.yui-gb div.first,
|
|
137
|
-
.yui-gc div.first,
|
|
138
|
-
.yui-gd div.first {
|
|
139
|
-
margin-left: 0;
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
/**
|
|
143
|
-
* Section: Deep Nesting
|
|
144
|
-
*/
|
|
145
|
-
|
|
146
|
-
.yui-g .yui-g .yui-u,
|
|
147
|
-
.yui-gb .yui-g .yui-u,
|
|
148
|
-
.yui-gc .yui-g .yui-u,
|
|
149
|
-
.yui-gd .yui-g .yui-u,
|
|
150
|
-
.yui-ge .yui-g .yui-u,
|
|
151
|
-
.yui-gf .yui-g .yui-u {
|
|
152
|
-
width: 49%;
|
|
153
|
-
*width: 48.1%;
|
|
154
|
-
*margin-left: 0;
|
|
155
|
-
}
|
|
156
|
-
|
|
157
|
-
.yui-g .yui-g .yui-u {
|
|
158
|
-
width: 48.1%;
|
|
159
|
-
}
|
|
160
|
-
|
|
161
|
-
/*SF 1927599 from 1.14 to 2.6.0*/
|
|
162
|
-
.yui-g .yui-gb div.first,
|
|
163
|
-
.yui-gb .yui-gb div.first {
|
|
164
|
-
*margin-right: 0;
|
|
165
|
-
*width: 32%;
|
|
166
|
-
_width: 31.7%;
|
|
167
|
-
}
|
|
168
|
-
|
|
169
|
-
.yui-g .yui-gc div.first,
|
|
170
|
-
.yui-gd .yui-g {
|
|
171
|
-
width: 66%;
|
|
172
|
-
}
|
|
173
|
-
|
|
174
|
-
.yui-gb .yui-g div.first {
|
|
175
|
-
*margin-right: 4%;
|
|
176
|
-
_margin-right: 1.3%;
|
|
177
|
-
}
|
|
178
|
-
|
|
179
|
-
.yui-gb .yui-gc div.first,
|
|
180
|
-
.yui-gb .yui-gd div.first {
|
|
181
|
-
*margin-right: 0;
|
|
182
|
-
}
|
|
183
|
-
|
|
184
|
-
.yui-gb .yui-gb .yui-u,
|
|
185
|
-
.yui-gb .yui-gc .yui-u {
|
|
186
|
-
*margin-left: 1.8%;
|
|
187
|
-
_margin-left: 4%;
|
|
188
|
-
}
|
|
189
|
-
|
|
190
|
-
.yui-g .yui-gb .yui-u {
|
|
191
|
-
_margin-left: 1.0%;
|
|
192
|
-
}
|
|
193
|
-
|
|
194
|
-
.yui-gb .yui-gd .yui-u {
|
|
195
|
-
*width: 66%;
|
|
196
|
-
_width: 61.2%;
|
|
197
|
-
}
|
|
198
|
-
|
|
199
|
-
.yui-gb .yui-gd div.first {
|
|
200
|
-
*width: 31%;
|
|
201
|
-
_width: 29.5%;
|
|
202
|
-
}
|
|
203
|
-
|
|
204
|
-
.yui-g .yui-gc .yui-u,
|
|
205
|
-
.yui-gb .yui-gc .yui-u {
|
|
206
|
-
width: 32%;
|
|
207
|
-
_float: right;
|
|
208
|
-
margin-right: 0;
|
|
209
|
-
_margin-left: 0;
|
|
210
|
-
}
|
|
211
|
-
|
|
212
|
-
.yui-gb .yui-gc div.first {
|
|
213
|
-
width: 66%;
|
|
214
|
-
*float: left;
|
|
215
|
-
*margin-left: 0;
|
|
216
|
-
}
|
|
217
|
-
|
|
218
|
-
.yui-gb .yui-ge .yui-u,
|
|
219
|
-
.yui-gb .yui-gf .yui-u {
|
|
220
|
-
margin: 0;
|
|
221
|
-
}
|
|
222
|
-
|
|
223
|
-
.yui-gb .yui-gb .yui-u {
|
|
224
|
-
_margin-left: .7%;
|
|
225
|
-
}
|
|
226
|
-
|
|
227
|
-
.yui-gb .yui-g div.first,
|
|
228
|
-
.yui-gb .yui-gb div.first {
|
|
229
|
-
*margin-left: 0;
|
|
230
|
-
}
|
|
231
|
-
|
|
232
|
-
.yui-gc .yui-g .yui-u,
|
|
233
|
-
.yui-gd .yui-g .yui-u {
|
|
234
|
-
*width: 48.1%;
|
|
235
|
-
*margin-left: 0;
|
|
236
|
-
}
|
|
237
|
-
|
|
238
|
-
.yui-gb .yui-gd div.first {
|
|
239
|
-
width: 32%;
|
|
240
|
-
}
|
|
241
|
-
|
|
242
|
-
.yui-g .yui-gd div.first {
|
|
243
|
-
_width: 29.9%;
|
|
244
|
-
}
|
|
245
|
-
|
|
246
|
-
.yui-ge .yui-g {
|
|
247
|
-
width: 24%;
|
|
248
|
-
}
|
|
249
|
-
|
|
250
|
-
.yui-gf .yui-g {
|
|
251
|
-
width: 74.2%;
|
|
252
|
-
}
|
|
253
|
-
|
|
254
|
-
.yui-gb .yui-ge div.yui-u,
|
|
255
|
-
.yui-gb .yui-gf div.yui-u {
|
|
256
|
-
float: right;
|
|
257
|
-
}
|
|
258
|
-
|
|
259
|
-
.yui-gb .yui-ge div.first,
|
|
260
|
-
.yui-gb .yui-gf div.first {
|
|
261
|
-
float: left;
|
|
262
|
-
}
|
|
263
|
-
|
|
264
|
-
/* Width Accommodation for Nested Contexts */
|
|
265
|
-
.yui-gb .yui-ge .yui-u,
|
|
266
|
-
.yui-gb .yui-gf div.first {
|
|
267
|
-
*width: 24%;
|
|
268
|
-
_width: 20%;
|
|
269
|
-
}
|
|
270
|
-
|
|
271
|
-
/* Width Accommodation for Nested Contexts */
|
|
272
|
-
.yui-gb .yui-ge div.first,
|
|
273
|
-
.yui-gb .yui-gf .yui-u {
|
|
274
|
-
*width: 73.5%;
|
|
275
|
-
_width: 65.5%;
|
|
276
|
-
}
|
|
277
|
-
|
|
278
|
-
/* Patch for GD within GE */
|
|
279
|
-
.yui-ge div.first .yui-gd .yui-u {
|
|
280
|
-
width: 65%;
|
|
281
|
-
}
|
|
282
|
-
|
|
283
|
-
.yui-ge div.first .yui-gd div.first {
|
|
284
|
-
width: 32%;
|
|
285
|
-
}
|
|
286
|
-
|
|
287
|
-
/* @group Clearing */
|
|
288
|
-
#hd:after,
|
|
289
|
-
#bd:after,
|
|
290
|
-
#ft:after,
|
|
291
|
-
.yui-g:after,
|
|
292
|
-
.yui-gb:after,
|
|
293
|
-
.yui-gc:after,
|
|
294
|
-
.yui-gd:after,
|
|
295
|
-
.yui-ge:after,
|
|
296
|
-
.yui-gf:after {
|
|
297
|
-
content: ".";
|
|
298
|
-
display: block;
|
|
299
|
-
height: 0;
|
|
300
|
-
clear: both;
|
|
301
|
-
visibility: hidden;
|
|
302
|
-
}
|
|
303
|
-
|
|
304
|
-
#hd,
|
|
305
|
-
#bd,
|
|
306
|
-
#ft,
|
|
307
|
-
.yui-g,
|
|
308
|
-
.yui-gb,
|
|
309
|
-
.yui-gc,
|
|
310
|
-
.yui-gd,
|
|
311
|
-
.yui-ge,
|
|
312
|
-
.yui-gf {
|
|
313
|
-
zoom: 1;
|
|
314
|
-
}
|