spree_core 2.0.13 → 2.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (149) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/base_controller.rb +3 -0
  3. data/app/helpers/spree/base_helper.rb +6 -16
  4. data/app/helpers/spree/products_helper.rb +3 -8
  5. data/app/helpers/spree/taxons_helper.rb +1 -1
  6. data/app/mailers/spree/base_mailer.rb +0 -5
  7. data/app/models/spree/ability.rb +10 -7
  8. data/app/models/spree/address.rb +7 -17
  9. data/app/models/spree/adjustment.rb +15 -11
  10. data/app/models/spree/app_configuration.rb +0 -5
  11. data/app/models/spree/billing_integration.rb +0 -1
  12. data/app/models/spree/calculator/flat_percent_item_total.rb +1 -3
  13. data/app/models/spree/calculator/flat_rate.rb +2 -4
  14. data/app/models/spree/calculator/flexi_rate.rb +6 -9
  15. data/app/models/spree/calculator/per_item.rb +2 -4
  16. data/app/models/spree/calculator/percent_per_item.rb +1 -3
  17. data/app/models/spree/calculator/price_sack.rb +4 -9
  18. data/app/models/spree/calculator/shipping/flat_percent_item_total.rb +1 -2
  19. data/app/models/spree/calculator/shipping/flat_rate.rb +2 -4
  20. data/app/models/spree/calculator/shipping/flexi_rate.rb +4 -9
  21. data/app/models/spree/calculator/shipping/per_item.rb +2 -3
  22. data/app/models/spree/calculator/shipping/price_sack.rb +4 -9
  23. data/app/models/spree/classification.rb +0 -3
  24. data/app/models/spree/country.rb +1 -3
  25. data/app/models/spree/credit_card.rb +37 -38
  26. data/app/models/spree/gateway/bogus_simple.rb +0 -8
  27. data/app/models/spree/gateway.rb +1 -3
  28. data/app/models/spree/image.rb +1 -3
  29. data/app/models/spree/inventory_unit.rb +5 -8
  30. data/app/models/spree/legacy_user.rb +0 -4
  31. data/app/models/spree/line_item.rb +2 -15
  32. data/app/models/spree/option_type.rb +2 -5
  33. data/app/models/spree/option_value.rb +1 -3
  34. data/app/models/spree/order/checkout.rb +4 -13
  35. data/app/models/spree/order.rb +47 -99
  36. data/app/models/spree/order_contents.rb +4 -7
  37. data/app/models/spree/order_inventory.rb +4 -8
  38. data/app/models/spree/order_updater.rb +13 -12
  39. data/app/models/spree/payment/processing.rb +12 -19
  40. data/app/models/spree/payment.rb +17 -30
  41. data/app/models/spree/payment_method.rb +2 -3
  42. data/app/models/spree/preference.rb +1 -1
  43. data/app/models/spree/preferences/configuration.rb +1 -1
  44. data/app/models/spree/preferences/preferable.rb +1 -1
  45. data/app/models/spree/preferences/store.rb +1 -1
  46. data/app/models/spree/price.rb +0 -7
  47. data/app/models/spree/product/scopes.rb +16 -17
  48. data/app/models/spree/product.rb +27 -62
  49. data/app/models/spree/product_property.rb +3 -5
  50. data/app/models/spree/promotion/actions/create_adjustment.rb +9 -8
  51. data/app/models/spree/promotion/actions/create_line_items.rb +1 -2
  52. data/app/models/spree/promotion/rules/first_order.rb +1 -1
  53. data/app/models/spree/promotion/rules/item_total.rb +2 -4
  54. data/app/models/spree/promotion/rules/product.rb +2 -2
  55. data/app/models/spree/promotion/rules/user.rb +1 -3
  56. data/app/models/spree/promotion.rb +23 -24
  57. data/app/models/spree/promotion_action.rb +0 -2
  58. data/app/models/spree/promotion_action_line_item.rb +1 -3
  59. data/app/models/spree/promotion_rule.rb +0 -2
  60. data/app/models/spree/property.rb +2 -4
  61. data/app/models/spree/prototype.rb +0 -2
  62. data/app/models/spree/return_authorization.rb +6 -9
  63. data/app/models/spree/role.rb +0 -2
  64. data/app/models/spree/shipment.rb +19 -25
  65. data/app/models/spree/shipping_calculator.rb +0 -2
  66. data/app/models/spree/shipping_category.rb +0 -2
  67. data/app/models/spree/shipping_method.rb +6 -20
  68. data/app/models/spree/shipping_rate.rb +12 -10
  69. data/app/models/spree/state.rb +2 -4
  70. data/app/models/spree/stock/availability_validator.rb +2 -2
  71. data/app/models/spree/stock/estimator.rb +6 -20
  72. data/app/models/spree/stock/packer.rb +1 -1
  73. data/app/models/spree/stock/quantifier.rb +2 -3
  74. data/app/models/spree/stock/splitter/base.rb +1 -1
  75. data/app/models/spree/stock_item.rb +8 -18
  76. data/app/models/spree/stock_location.rb +2 -11
  77. data/app/models/spree/stock_movement.rb +2 -5
  78. data/app/models/spree/stock_transfer.rb +0 -2
  79. data/app/models/spree/tax_category.rb +0 -2
  80. data/app/models/spree/tax_rate.rb +12 -12
  81. data/app/models/spree/taxon.rb +1 -13
  82. data/app/models/spree/taxonomy.rb +3 -6
  83. data/app/models/spree/tracker.rb +0 -2
  84. data/app/models/spree/variant/scopes.rb +2 -2
  85. data/app/models/spree/variant.rb +13 -31
  86. data/app/models/spree/zone.rb +2 -7
  87. data/app/models/spree/zone_member.rb +0 -2
  88. data/app/views/spree/payments/_payment.html.erb +1 -3
  89. data/config/locales/en.yml +11 -26
  90. data/db/default/spree/countries.rb +230 -229
  91. data/db/default/spree/states.rb +57 -56
  92. data/db/default/spree/zones.rb +5 -5
  93. data/db/migrate/20130213191427_create_default_stock.rb +4 -7
  94. data/db/migrate/20130417120035_update_adjustment_states.rb +2 -2
  95. data/db/migrate/20130417123427_add_shipping_rates_to_shipments.rb +1 -1
  96. data/db/migrate/20130509115210_add_number_to_stock_transfer.rb +1 -1
  97. data/db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb +0 -5
  98. data/db/migrate/20130611185927_add_user_id_index_to_spree_orders.rb +5 -0
  99. data/db/migrate/20130618041418_add_updated_at_to_spree_countries.rb +9 -0
  100. data/db/migrate/20130619012236_add_updated_at_to_spree_states.rb +9 -0
  101. data/db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb +4 -5
  102. data/db/migrate/20130806145853_set_default_stock_location_on_shipments.rb +1 -1
  103. data/lib/generators/spree/dummy/dummy_generator.rb +3 -14
  104. data/lib/generators/spree/dummy/templates/rails/database.yml +0 -10
  105. data/lib/generators/spree/dummy/templates/rails/test.rb +2 -7
  106. data/lib/generators/spree/install/install_generator.rb +11 -8
  107. data/lib/spree/core/calculated_adjustments.rb +9 -8
  108. data/lib/spree/core/controller_helpers/auth.rb +2 -3
  109. data/lib/spree/core/controller_helpers/order.rb +8 -13
  110. data/lib/spree/core/controller_helpers/ssl.rb +13 -22
  111. data/lib/spree/core/controller_helpers/strong_parameters.rb +36 -0
  112. data/lib/spree/core/delegate_belongs_to.rb +0 -2
  113. data/lib/spree/core/engine.rb +1 -5
  114. data/lib/spree/core/ext/active_record.rb +2 -9
  115. data/lib/spree/core/permalinks.rb +1 -5
  116. data/lib/spree/core/product_duplicator.rb +2 -16
  117. data/lib/spree/core/product_filters.rb +37 -33
  118. data/lib/spree/core/search/base.rb +1 -1
  119. data/lib/spree/core/version.rb +1 -1
  120. data/lib/spree/core.rb +3 -31
  121. data/lib/spree/i18n.rb +0 -1
  122. data/lib/spree/money.rb +2 -177
  123. data/lib/spree/permitted_attributes.rb +95 -0
  124. data/lib/spree/promo/coupon_applicator.rb +4 -12
  125. data/lib/spree/testing_support/capybara_ext.rb +13 -17
  126. data/lib/spree/testing_support/common_rake.rb +1 -1
  127. data/lib/spree/testing_support/controller_requests.rb +3 -3
  128. data/lib/spree/testing_support/factories/credit_card_factory.rb +1 -1
  129. data/lib/spree/testing_support/factories/product_factory.rb +0 -4
  130. data/lib/spree/testing_support/factories/shipping_method_factory.rb +1 -3
  131. data/lib/spree/testing_support/factories/user_factory.rb +1 -1
  132. data/lib/spree/testing_support/factories/variant_factory.rb +0 -15
  133. data/lib/spree/testing_support/factories.rb +1 -1
  134. data/lib/spree/testing_support/order_walkthrough.rb +1 -1
  135. data/lib/tasks/core.rake +2 -2
  136. data/vendor/assets/javascripts/jquery.payment.js +497 -0
  137. metadata +166 -172
  138. data/app/views/spree/admin/shared/_report_order_criteria.html.erb +0 -17
  139. data/db/migrate/20130417120034_add_index_to_source_columns_on_adjustments.rb +0 -5
  140. data/db/migrate/20130830001033_add_shipping_category_to_shipping_methods_and_products.rb +0 -15
  141. data/db/migrate/20130830001159_migrate_old_shipping_calculators.rb +0 -19
  142. data/db/migrate/20130909115621_change_states_required_for_countries.rb +0 -9
  143. data/db/migrate/20131001013410_remove_unused_credit_card_fields.rb +0 -12
  144. data/db/migrate/20131026154747_add_track_inventory_to_variant.rb +0 -5
  145. data/db/migrate/20131113035136_add_channel_to_spree_orders.rb +0 -5
  146. data/db/migrate/20140120160805_add_index_to_variant_id_and_currency_on_prices.rb +0 -5
  147. data/db/migrate/20140205181631_default_variant_weight_to_zero.rb +0 -11
  148. data/db/migrate/20140415041315_add_user_id_created_by_id_index_to_order.rb +0 -5
  149. data/lib/spree/core/preference_rescue.rb +0 -25
metadata CHANGED
@@ -1,239 +1,239 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.13
4
+ version: 2.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-20 00:00:00.000000000 Z
11
+ date: 2013-09-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemerchant
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 1.43.1
19
+ version: 1.34.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 1.43.1
26
+ version: 1.34.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: acts_as_list
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 0.3.0
33
+ version: 0.2.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 0.3.0
40
+ version: 0.2.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: awesome_nested_set
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '='
45
+ - - ~>
46
46
  - !ruby/object:Gem::Version
47
- version: 2.1.6
47
+ version: 3.0.0.rc.1
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '='
52
+ - - ~>
53
53
  - !ruby/object:Gem::Version
54
- version: 2.1.6
54
+ version: 3.0.0.rc.1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: aws-sdk
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: 1.31.3
61
+ version: 1.11.1
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - '='
67
67
  - !ruby/object:Gem::Version
68
- version: 1.31.3
68
+ version: 1.11.1
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: cancan
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ~>
74
74
  - !ruby/object:Gem::Version
75
75
  version: 1.6.10
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - ~>
81
81
  - !ruby/object:Gem::Version
82
82
  version: 1.6.10
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: deface
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - '='
87
+ - - '>='
88
88
  - !ruby/object:Gem::Version
89
- version: 1.0.0
89
+ version: 1.0.0.rc3
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - '='
94
+ - - '>='
95
95
  - !ruby/object:Gem::Version
96
- version: 1.0.0
96
+ version: 1.0.0.rc3
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: ffaker
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - "~>"
101
+ - - ~>
102
102
  - !ruby/object:Gem::Version
103
- version: 1.22.0
103
+ version: '1.16'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - "~>"
108
+ - - ~>
109
109
  - !ruby/object:Gem::Version
110
- version: 1.22.0
110
+ version: '1.16'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: highline
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - "~>"
115
+ - - '='
116
116
  - !ruby/object:Gem::Version
117
117
  version: 1.6.18
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - "~>"
122
+ - - '='
123
123
  - !ruby/object:Gem::Version
124
124
  version: 1.6.18
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: httparty
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - "~>"
129
+ - - ~>
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0.11'
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - "~>"
136
+ - - ~>
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0.11'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: json
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - "~>"
143
+ - - '>='
144
144
  - !ruby/object:Gem::Version
145
- version: '1.7'
145
+ version: 1.7.7
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - "~>"
150
+ - - '>='
151
151
  - !ruby/object:Gem::Version
152
- version: '1.7'
152
+ version: 1.7.7
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: kaminari
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - "~>"
157
+ - - ~>
158
158
  - !ruby/object:Gem::Version
159
- version: 0.15.0
159
+ version: 0.14.1
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - "~>"
164
+ - - ~>
165
165
  - !ruby/object:Gem::Version
166
- version: 0.15.0
166
+ version: 0.14.1
167
167
  - !ruby/object:Gem::Dependency
168
- name: monetize
168
+ name: money
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ">="
171
+ - - '='
172
172
  - !ruby/object:Gem::Version
173
- version: '0'
173
+ version: 5.1.1
174
174
  type: :runtime
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ">="
178
+ - - '='
179
179
  - !ruby/object:Gem::Version
180
- version: '0'
180
+ version: 5.1.1
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: paperclip
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - "~>"
185
+ - - ~>
186
186
  - !ruby/object:Gem::Version
187
187
  version: 3.4.1
188
188
  type: :runtime
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - "~>"
192
+ - - ~>
193
193
  - !ruby/object:Gem::Version
194
194
  version: 3.4.1
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: paranoia
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - "~>"
199
+ - - ~>
200
200
  - !ruby/object:Gem::Version
201
- version: '1.3'
201
+ version: '2.0'
202
202
  type: :runtime
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - "~>"
206
+ - - ~>
207
207
  - !ruby/object:Gem::Version
208
- version: '1.3'
208
+ version: '2.0'
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: rails
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - "~>"
213
+ - - ~>
214
214
  - !ruby/object:Gem::Version
215
- version: 3.2.21
215
+ version: 4.0.0
216
216
  type: :runtime
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - "~>"
220
+ - - ~>
221
221
  - !ruby/object:Gem::Version
222
- version: 3.2.21
222
+ version: 4.0.0
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: ransack
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  requirements:
227
- - - "~>"
227
+ - - '='
228
228
  - !ruby/object:Gem::Version
229
- version: 1.1.0
229
+ version: 1.0.0
230
230
  type: :runtime
231
231
  prerelease: false
232
232
  version_requirements: !ruby/object:Gem::Requirement
233
233
  requirements:
234
- - - "~>"
234
+ - - '='
235
235
  - !ruby/object:Gem::Version
236
- version: 1.1.0
236
+ version: 1.0.0
237
237
  - !ruby/object:Gem::Dependency
238
238
  name: state_machine
239
239
  requirement: !ruby/object:Gem::Requirement
@@ -252,14 +252,14 @@ dependencies:
252
252
  name: stringex
253
253
  requirement: !ruby/object:Gem::Requirement
254
254
  requirements:
255
- - - "~>"
255
+ - - ~>
256
256
  - !ruby/object:Gem::Version
257
257
  version: 1.5.1
258
258
  type: :runtime
259
259
  prerelease: false
260
260
  version_requirements: !ruby/object:Gem::Requirement
261
261
  requirements:
262
- - - "~>"
262
+ - - ~>
263
263
  - !ruby/object:Gem::Version
264
264
  version: 1.5.1
265
265
  - !ruby/object:Gem::Dependency
@@ -311,7 +311,6 @@ files:
311
311
  - app/models/spree/app_configuration.rb
312
312
  - app/models/spree/asset.rb
313
313
  - app/models/spree/billing_integration.rb
314
- - app/models/spree/calculator.rb
315
314
  - app/models/spree/calculator/default_tax.rb
316
315
  - app/models/spree/calculator/flat_percent_item_total.rb
317
316
  - app/models/spree/calculator/flat_rate.rb
@@ -325,13 +324,14 @@ files:
325
324
  - app/models/spree/calculator/shipping/flexi_rate.rb
326
325
  - app/models/spree/calculator/shipping/per_item.rb
327
326
  - app/models/spree/calculator/shipping/price_sack.rb
327
+ - app/models/spree/calculator.rb
328
328
  - app/models/spree/classification.rb
329
329
  - app/models/spree/configuration.rb
330
330
  - app/models/spree/country.rb
331
331
  - app/models/spree/credit_card.rb
332
- - app/models/spree/gateway.rb
333
332
  - app/models/spree/gateway/bogus.rb
334
333
  - app/models/spree/gateway/bogus_simple.rb
334
+ - app/models/spree/gateway.rb
335
335
  - app/models/spree/image.rb
336
336
  - app/models/spree/inventory_unit.rb
337
337
  - app/models/spree/legacy_user.rb
@@ -339,28 +339,27 @@ files:
339
339
  - app/models/spree/log_entry.rb
340
340
  - app/models/spree/option_type.rb
341
341
  - app/models/spree/option_value.rb
342
- - app/models/spree/order.rb
343
342
  - app/models/spree/order/checkout.rb
343
+ - app/models/spree/order.rb
344
344
  - app/models/spree/order_contents.rb
345
345
  - app/models/spree/order_inventory.rb
346
346
  - app/models/spree/order_populator.rb
347
347
  - app/models/spree/order_updater.rb
348
- - app/models/spree/payment.rb
349
348
  - app/models/spree/payment/processing.rb
350
- - app/models/spree/payment_method.rb
349
+ - app/models/spree/payment.rb
351
350
  - app/models/spree/payment_method/check.rb
351
+ - app/models/spree/payment_method.rb
352
352
  - app/models/spree/preference.rb
353
353
  - app/models/spree/preferences/configuration.rb
354
354
  - app/models/spree/preferences/preferable.rb
355
355
  - app/models/spree/preferences/preferable_class_methods.rb
356
356
  - app/models/spree/preferences/store.rb
357
357
  - app/models/spree/price.rb
358
- - app/models/spree/product.rb
359
358
  - app/models/spree/product/scopes.rb
359
+ - app/models/spree/product.rb
360
360
  - app/models/spree/product_option_type.rb
361
361
  - app/models/spree/product_property.rb
362
362
  - app/models/spree/product_scope/scopes.rb
363
- - app/models/spree/promotion.rb
364
363
  - app/models/spree/promotion/actions/create_adjustment.rb
365
364
  - app/models/spree/promotion/actions/create_line_items.rb
366
365
  - app/models/spree/promotion/rules/first_order.rb
@@ -368,6 +367,7 @@ files:
368
367
  - app/models/spree/promotion/rules/product.rb
369
368
  - app/models/spree/promotion/rules/user.rb
370
369
  - app/models/spree/promotion/rules/user_logged_in.rb
370
+ - app/models/spree/promotion.rb
371
371
  - app/models/spree/promotion_action.rb
372
372
  - app/models/spree/promotion_action_line_item.rb
373
373
  - app/models/spree/promotion_rule.rb
@@ -408,12 +408,11 @@ files:
408
408
  - app/models/spree/taxonomy.rb
409
409
  - app/models/spree/tokenized_permission.rb
410
410
  - app/models/spree/tracker.rb
411
- - app/models/spree/variant.rb
412
411
  - app/models/spree/variant/scopes.rb
412
+ - app/models/spree/variant.rb
413
413
  - app/models/spree/zone.rb
414
414
  - app/models/spree/zone_member.rb
415
415
  - app/views/spree/admin/orders/customer_details/_autocomplete.js.erb
416
- - app/views/spree/admin/shared/_report_order_criteria.html.erb
417
416
  - app/views/spree/order_mailer/cancel_email.text.erb
418
417
  - app/views/spree/order_mailer/confirm_email.text.erb
419
418
  - app/views/spree/payments/_payment.html.erb
@@ -424,103 +423,6 @@ files:
424
423
  - app/views/spree/test_mailer/test_email.text.erb
425
424
  - config/initializers/user_class_extensions.rb
426
425
  - config/locales/en.yml
427
- - db/default/spree/countries.rb
428
- - db/default/spree/roles.rb
429
- - db/default/spree/states.rb
430
- - db/default/spree/zones.rb
431
- - db/migrate/20120831092320_spree_one_two.rb
432
- - db/migrate/20120831092359_spree_promo_one_two.rb
433
- - db/migrate/20120905145253_add_tax_rate_label.rb
434
- - db/migrate/20120905151823_add_toggle_tax_rate_display.rb
435
- - db/migrate/20120929093553_remove_unused_preference_columns.rb
436
- - db/migrate/20121009142519_add_lock_version_to_variant.rb
437
- - db/migrate/20121010142909_add_states_required_to_countries.rb
438
- - db/migrate/20121012071449_add_on_demand_to_product_and_variant.rb
439
- - db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb
440
- - db/migrate/20121031162139_split_prices_from_variants.rb
441
- - db/migrate/20121107003422_remove_not_null_from_spree_prices_amount.rb
442
- - db/migrate/20121107184631_add_currency_to_line_items.rb
443
- - db/migrate/20121107194006_add_currency_to_orders.rb
444
- - db/migrate/20121109173623_add_cost_currency_to_variants.rb
445
- - db/migrate/20121111231553_remove_display_on_from_payment_methods.rb
446
- - db/migrate/20121124203911_add_position_to_taxonomies.rb
447
- - db/migrate/20121126040517_add_last_ip_to_spree_orders.rb
448
- - db/migrate/20121213162028_add_state_to_spree_adjustments.rb
449
- - db/migrate/20130114053446_add_display_on_to_spree_payment_methods.rb
450
- - db/migrate/20130120201805_add_position_to_product_properties.spree.rb
451
- - db/migrate/20130203232234_add_identifier_to_spree_payments.rb
452
- - db/migrate/20130207155350_add_order_id_index_to_payments.rb
453
- - db/migrate/20130208032954_add_primary_to_spree_products_taxons.rb
454
- - db/migrate/20130211190146_create_spree_stock_items.rb
455
- - db/migrate/20130211191120_create_spree_stock_locations.rb
456
- - db/migrate/20130213191427_create_default_stock.rb
457
- - db/migrate/20130222032153_add_order_id_index_to_shipments.rb
458
- - db/migrate/20130226032817_change_meta_description_on_spree_products_to_text.rb
459
- - db/migrate/20130226191231_add_stock_location_id_to_spree_shipments.rb
460
- - db/migrate/20130227143905_add_pending_to_inventory_unit.rb
461
- - db/migrate/20130228164411_remove_on_demand_from_product_and_variant.rb
462
- - db/migrate/20130228210442_create_shipping_method_zone.rb
463
- - db/migrate/20130301162745_remove_shipping_category_id_from_shipping_method.rb
464
- - db/migrate/20130301162924_create_shipping_method_categories.rb
465
- - db/migrate/20130301205200_add_tracking_url_to_spree_shipping_methods.rb
466
- - db/migrate/20130304162240_create_spree_shipping_rates.rb
467
- - db/migrate/20130304192936_remove_category_match_attributes_from_shipping_method.rb
468
- - db/migrate/20130305143310_create_stock_movements.rb
469
- - db/migrate/20130306181701_add_address_fields_to_stock_location.rb
470
- - db/migrate/20130306191917_add_active_field_to_stock_locations.rb
471
- - db/migrate/20130306195650_add_backorderable_to_stock_item.rb
472
- - db/migrate/20130307161754_add_default_quantity_to_stock_movement.rb
473
- - db/migrate/20130318151756_add_source_and_destination_to_stock_movements.rb
474
- - db/migrate/20130319062004_change_orders_total_precision.rb
475
- - db/migrate/20130319063911_change_spree_payments_amount_precision.rb
476
- - db/migrate/20130319064308_change_spree_return_authorization_amount_precision.rb
477
- - db/migrate/20130319082943_change_adjustments_amount_precision.rb
478
- - db/migrate/20130319183250_add_originator_to_stock_movement.rb
479
- - db/migrate/20130319190507_drop_source_and_destination_from_stock_movement.rb
480
- - db/migrate/20130325163316_migrate_inventory_unit_sold_to_on_hand.rb
481
- - db/migrate/20130326175857_add_stock_location_to_rma.rb
482
- - db/migrate/20130328130308_update_shipment_state_for_canceled_orders.rb
483
- - db/migrate/20130328195253_add_seo_metas_to_taxons.rb
484
- - db/migrate/20130329134939_remove_stock_item_and_variant_lock.rb
485
- - db/migrate/20130417120034_add_index_to_source_columns_on_adjustments.rb
486
- - db/migrate/20130417120035_update_adjustment_states.rb
487
- - db/migrate/20130417123427_add_shipping_rates_to_shipments.rb
488
- - db/migrate/20130418125341_create_spree_stock_transfers.rb
489
- - db/migrate/20130423110707_drop_products_count_on_hand.rb
490
- - db/migrate/20130423223847_set_default_shipping_rate_cost.rb
491
- - db/migrate/20130509115210_add_number_to_stock_transfer.rb
492
- - db/migrate/20130514151929_add_sku_index_to_spree_variants.rb
493
- - db/migrate/20130515180736_add_backorderable_default_to_spree_stock_location.rb
494
- - db/migrate/20130516151222_add_propage_all_variants_to_spree_stock_location.rb
495
- - db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb
496
- - db/migrate/20130626232741_add_cvv_result_code_and_cvv_result_message_to_spree_payments.rb
497
- - db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb
498
- - db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb
499
- - db/migrate/20130708052307_add_deleted_at_to_spree_tax_rates.rb
500
- - db/migrate/20130711200933_remove_lock_version_from_inventory_units.rb
501
- - db/migrate/20130718042445_add_cost_price_to_line_item.rb
502
- - db/migrate/20130718233855_set_backorderable_to_default_to_false.rb
503
- - db/migrate/20130725031716_add_created_by_id_to_spree_orders.rb
504
- - db/migrate/20130729214043_index_completed_at_on_spree_orders.rb
505
- - db/migrate/20130802014537_add_tax_category_id_to_spree_line_items.rb
506
- - db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb
507
- - db/migrate/20130806022521_drop_spree_mail_methods.rb
508
- - db/migrate/20130806145853_set_default_stock_location_on_shipments.rb
509
- - db/migrate/20130809164245_add_admin_name_column_to_spree_shipping_methods.rb
510
- - db/migrate/20130809164330_add_admin_name_column_to_spree_stock_locations.rb
511
- - db/migrate/20130813140619_expand_order_number_size.rb
512
- - db/migrate/20130826062534_add_depth_to_spree_taxons.rb
513
- - db/migrate/20130830001033_add_shipping_category_to_shipping_methods_and_products.rb
514
- - db/migrate/20130830001159_migrate_old_shipping_calculators.rb
515
- - db/migrate/20130909115621_change_states_required_for_countries.rb
516
- - db/migrate/20130915032339_add_deleted_at_to_spree_stock_items.rb
517
- - db/migrate/20131001013410_remove_unused_credit_card_fields.rb
518
- - db/migrate/20131026154747_add_track_inventory_to_variant.rb
519
- - db/migrate/20131113035136_add_channel_to_spree_orders.rb
520
- - db/migrate/20140120160805_add_index_to_variant_id_and_currency_on_prices.rb
521
- - db/migrate/20140205181631_default_variant_weight_to_zero.rb
522
- - db/migrate/20140415041315_add_user_id_created_by_id_index_to_order.rb
523
- - db/seeds.rb
524
426
  - lib/generators/spree/custom_user/custom_user_generator.rb
525
427
  - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
526
428
  - lib/generators/spree/custom_user/templates/initializer.rb.tt
@@ -539,26 +441,25 @@ files:
539
441
  - lib/generators/spree/install/templates/app/assets/stylesheets/admin/all.css
540
442
  - lib/generators/spree/install/templates/app/assets/stylesheets/store/all.css
541
443
  - lib/generators/spree/install/templates/config/initializers/spree.rb
542
- - lib/spree/core.rb
543
444
  - lib/spree/core/calculated_adjustments.rb
544
- - lib/spree/core/controller_helpers.rb
545
445
  - lib/spree/core/controller_helpers/auth.rb
546
446
  - lib/spree/core/controller_helpers/common.rb
547
447
  - lib/spree/core/controller_helpers/order.rb
548
448
  - lib/spree/core/controller_helpers/respond_with.rb
549
449
  - lib/spree/core/controller_helpers/search.rb
550
450
  - lib/spree/core/controller_helpers/ssl.rb
451
+ - lib/spree/core/controller_helpers/strong_parameters.rb
452
+ - lib/spree/core/controller_helpers.rb
551
453
  - lib/spree/core/delegate_belongs_to.rb
552
454
  - lib/spree/core/engine.rb
553
- - lib/spree/core/environment.rb
554
455
  - lib/spree/core/environment/calculators.rb
456
+ - lib/spree/core/environment.rb
555
457
  - lib/spree/core/environment_extension.rb
556
458
  - lib/spree/core/ext/active_record.rb
557
459
  - lib/spree/core/gateway_error.rb
558
460
  - lib/spree/core/mail_interceptor.rb
559
461
  - lib/spree/core/mail_settings.rb
560
462
  - lib/spree/core/permalinks.rb
561
- - lib/spree/core/preference_rescue.rb
562
463
  - lib/spree/core/product_duplicator.rb
563
464
  - lib/spree/core/product_filters.rb
564
465
  - lib/spree/core/s3_support.rb
@@ -567,10 +468,12 @@ files:
567
468
  - lib/spree/core/user_banners.rb
568
469
  - lib/spree/core/validators/email.rb
569
470
  - lib/spree/core/version.rb
570
- - lib/spree/i18n.rb
471
+ - lib/spree/core.rb
571
472
  - lib/spree/i18n/base.rb
572
473
  - lib/spree/i18n/initializer.rb
474
+ - lib/spree/i18n.rb
573
475
  - lib/spree/money.rb
476
+ - lib/spree/permitted_attributes.rb
574
477
  - lib/spree/promo/coupon_applicator.rb
575
478
  - lib/spree/promo/environment.rb
576
479
  - lib/spree/responder.rb
@@ -581,7 +484,6 @@ files:
581
484
  - lib/spree/testing_support/common_rake.rb
582
485
  - lib/spree/testing_support/controller_requests.rb
583
486
  - lib/spree/testing_support/extension_rake.rb
584
- - lib/spree/testing_support/factories.rb
585
487
  - lib/spree/testing_support/factories/activator_factory.rb
586
488
  - lib/spree/testing_support/factories/address_factory.rb
587
489
  - lib/spree/testing_support/factories/adjustment_factory.rb
@@ -620,6 +522,7 @@ files:
620
522
  - lib/spree/testing_support/factories/user_factory.rb
621
523
  - lib/spree/testing_support/factories/variant_factory.rb
622
524
  - lib/spree/testing_support/factories/zone_factory.rb
525
+ - lib/spree/testing_support/factories.rb
623
526
  - lib/spree/testing_support/flash.rb
624
527
  - lib/spree/testing_support/i18n.rb
625
528
  - lib/spree/testing_support/order_walkthrough.rb
@@ -627,7 +530,98 @@ files:
627
530
  - lib/spree/testing_support/url_helpers.rb
628
531
  - lib/spree_core.rb
629
532
  - lib/tasks/core.rake
533
+ - db/default/spree/countries.rb
534
+ - db/default/spree/roles.rb
535
+ - db/default/spree/states.rb
536
+ - db/default/spree/zones.rb
537
+ - db/migrate/20120831092320_spree_one_two.rb
538
+ - db/migrate/20120831092359_spree_promo_one_two.rb
539
+ - db/migrate/20120905145253_add_tax_rate_label.rb
540
+ - db/migrate/20120905151823_add_toggle_tax_rate_display.rb
541
+ - db/migrate/20120929093553_remove_unused_preference_columns.rb
542
+ - db/migrate/20121009142519_add_lock_version_to_variant.rb
543
+ - db/migrate/20121010142909_add_states_required_to_countries.rb
544
+ - db/migrate/20121012071449_add_on_demand_to_product_and_variant.rb
545
+ - db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb
546
+ - db/migrate/20121031162139_split_prices_from_variants.rb
547
+ - db/migrate/20121107003422_remove_not_null_from_spree_prices_amount.rb
548
+ - db/migrate/20121107184631_add_currency_to_line_items.rb
549
+ - db/migrate/20121107194006_add_currency_to_orders.rb
550
+ - db/migrate/20121109173623_add_cost_currency_to_variants.rb
551
+ - db/migrate/20121111231553_remove_display_on_from_payment_methods.rb
552
+ - db/migrate/20121124203911_add_position_to_taxonomies.rb
553
+ - db/migrate/20121126040517_add_last_ip_to_spree_orders.rb
554
+ - db/migrate/20121213162028_add_state_to_spree_adjustments.rb
555
+ - db/migrate/20130114053446_add_display_on_to_spree_payment_methods.rb
556
+ - db/migrate/20130120201805_add_position_to_product_properties.spree.rb
557
+ - db/migrate/20130203232234_add_identifier_to_spree_payments.rb
558
+ - db/migrate/20130207155350_add_order_id_index_to_payments.rb
559
+ - db/migrate/20130208032954_add_primary_to_spree_products_taxons.rb
560
+ - db/migrate/20130211190146_create_spree_stock_items.rb
561
+ - db/migrate/20130211191120_create_spree_stock_locations.rb
562
+ - db/migrate/20130213191427_create_default_stock.rb
563
+ - db/migrate/20130222032153_add_order_id_index_to_shipments.rb
564
+ - db/migrate/20130226032817_change_meta_description_on_spree_products_to_text.rb
565
+ - db/migrate/20130226191231_add_stock_location_id_to_spree_shipments.rb
566
+ - db/migrate/20130227143905_add_pending_to_inventory_unit.rb
567
+ - db/migrate/20130228164411_remove_on_demand_from_product_and_variant.rb
568
+ - db/migrate/20130228210442_create_shipping_method_zone.rb
569
+ - db/migrate/20130301162745_remove_shipping_category_id_from_shipping_method.rb
570
+ - db/migrate/20130301162924_create_shipping_method_categories.rb
571
+ - db/migrate/20130301205200_add_tracking_url_to_spree_shipping_methods.rb
572
+ - db/migrate/20130304162240_create_spree_shipping_rates.rb
573
+ - db/migrate/20130304192936_remove_category_match_attributes_from_shipping_method.rb
574
+ - db/migrate/20130305143310_create_stock_movements.rb
575
+ - db/migrate/20130306181701_add_address_fields_to_stock_location.rb
576
+ - db/migrate/20130306191917_add_active_field_to_stock_locations.rb
577
+ - db/migrate/20130306195650_add_backorderable_to_stock_item.rb
578
+ - db/migrate/20130307161754_add_default_quantity_to_stock_movement.rb
579
+ - db/migrate/20130318151756_add_source_and_destination_to_stock_movements.rb
580
+ - db/migrate/20130319062004_change_orders_total_precision.rb
581
+ - db/migrate/20130319063911_change_spree_payments_amount_precision.rb
582
+ - db/migrate/20130319064308_change_spree_return_authorization_amount_precision.rb
583
+ - db/migrate/20130319082943_change_adjustments_amount_precision.rb
584
+ - db/migrate/20130319183250_add_originator_to_stock_movement.rb
585
+ - db/migrate/20130319190507_drop_source_and_destination_from_stock_movement.rb
586
+ - db/migrate/20130325163316_migrate_inventory_unit_sold_to_on_hand.rb
587
+ - db/migrate/20130326175857_add_stock_location_to_rma.rb
588
+ - db/migrate/20130328130308_update_shipment_state_for_canceled_orders.rb
589
+ - db/migrate/20130328195253_add_seo_metas_to_taxons.rb
590
+ - db/migrate/20130329134939_remove_stock_item_and_variant_lock.rb
591
+ - db/migrate/20130417120035_update_adjustment_states.rb
592
+ - db/migrate/20130417123427_add_shipping_rates_to_shipments.rb
593
+ - db/migrate/20130418125341_create_spree_stock_transfers.rb
594
+ - db/migrate/20130423110707_drop_products_count_on_hand.rb
595
+ - db/migrate/20130423223847_set_default_shipping_rate_cost.rb
596
+ - db/migrate/20130509115210_add_number_to_stock_transfer.rb
597
+ - db/migrate/20130514151929_add_sku_index_to_spree_variants.rb
598
+ - db/migrate/20130515180736_add_backorderable_default_to_spree_stock_location.rb
599
+ - db/migrate/20130516151222_add_propage_all_variants_to_spree_stock_location.rb
600
+ - db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb
601
+ - db/migrate/20130611185927_add_user_id_index_to_spree_orders.rb
602
+ - db/migrate/20130618041418_add_updated_at_to_spree_countries.rb
603
+ - db/migrate/20130619012236_add_updated_at_to_spree_states.rb
604
+ - db/migrate/20130626232741_add_cvv_result_code_and_cvv_result_message_to_spree_payments.rb
605
+ - db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb
606
+ - db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb
607
+ - db/migrate/20130708052307_add_deleted_at_to_spree_tax_rates.rb
608
+ - db/migrate/20130711200933_remove_lock_version_from_inventory_units.rb
609
+ - db/migrate/20130718042445_add_cost_price_to_line_item.rb
610
+ - db/migrate/20130718233855_set_backorderable_to_default_to_false.rb
611
+ - db/migrate/20130725031716_add_created_by_id_to_spree_orders.rb
612
+ - db/migrate/20130729214043_index_completed_at_on_spree_orders.rb
613
+ - db/migrate/20130802014537_add_tax_category_id_to_spree_line_items.rb
614
+ - db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb
615
+ - db/migrate/20130806022521_drop_spree_mail_methods.rb
616
+ - db/migrate/20130806145853_set_default_stock_location_on_shipments.rb
617
+ - db/migrate/20130809164245_add_admin_name_column_to_spree_shipping_methods.rb
618
+ - db/migrate/20130809164330_add_admin_name_column_to_spree_stock_locations.rb
619
+ - db/migrate/20130813140619_expand_order_number_size.rb
620
+ - db/migrate/20130826062534_add_depth_to_spree_taxons.rb
621
+ - db/migrate/20130915032339_add_deleted_at_to_spree_stock_items.rb
622
+ - db/seeds.rb
630
623
  - vendor/assets/javascripts/jquery-migrate-1.0.0.js
624
+ - vendor/assets/javascripts/jquery.payment.js
631
625
  - vendor/assets/javascripts/jquery.validate/localization/messages_et.js
632
626
  - vendor/assets/javascripts/jquery.validate/localization/messages_eu.js
633
627
  - vendor/assets/javascripts/jquery.validate/localization/messages_hr.js
@@ -654,17 +648,17 @@ require_paths:
654
648
  - lib
655
649
  required_ruby_version: !ruby/object:Gem::Requirement
656
650
  requirements:
657
- - - ">="
651
+ - - '>='
658
652
  - !ruby/object:Gem::Version
659
653
  version: 1.9.3
660
654
  required_rubygems_version: !ruby/object:Gem::Requirement
661
655
  requirements:
662
- - - ">="
656
+ - - '>='
663
657
  - !ruby/object:Gem::Version
664
658
  version: '0'
665
659
  requirements: []
666
660
  rubyforge_project:
667
- rubygems_version: 2.2.2
661
+ rubygems_version: 2.1.0
668
662
  signing_key:
669
663
  specification_version: 4
670
664
  summary: The bare bones necessary for Spree.