spree_core 2.0.3 → 2.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (100) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/logo/spree_50.png +0 -0
  3. data/app/assets/images/noimage/large.png +0 -0
  4. data/app/assets/images/noimage/mini.png +0 -0
  5. data/app/assets/images/noimage/product.png +0 -0
  6. data/app/assets/images/noimage/small.png +0 -0
  7. data/app/controllers/spree/base_controller.rb +3 -0
  8. data/app/helpers/spree/base_helper.rb +15 -11
  9. data/app/models/spree/adjustment.rb +5 -0
  10. data/app/models/spree/app_configuration.rb +3 -3
  11. data/app/models/spree/calculator/default_tax.rb +2 -2
  12. data/app/models/spree/calculator/percent_per_item.rb +9 -5
  13. data/app/models/spree/calculator.rb +1 -1
  14. data/app/models/spree/credit_card.rb +25 -0
  15. data/app/models/spree/line_item.rb +9 -0
  16. data/app/models/spree/new_adjustment.rb +4 -0
  17. data/app/models/spree/order/checkout.rb +4 -5
  18. data/app/models/spree/order.rb +52 -25
  19. data/app/models/spree/order_contents.rb +8 -7
  20. data/app/models/spree/order_inventory.rb +13 -13
  21. data/app/models/spree/order_populator.rb +4 -14
  22. data/app/models/spree/order_updater.rb +1 -1
  23. data/app/models/spree/payment/processing.rb +5 -0
  24. data/app/models/spree/payment.rb +12 -1
  25. data/app/models/spree/payment_method.rb +1 -4
  26. data/app/models/spree/product.rb +44 -17
  27. data/app/models/spree/promotion/actions/create_adjustment.rb +1 -1
  28. data/app/models/spree/promotion/actions/create_line_items.rb +32 -2
  29. data/app/models/spree/promotion.rb +2 -1
  30. data/app/models/spree/shipment.rb +5 -5
  31. data/app/models/spree/shipping_adjustment.rb +4 -0
  32. data/app/models/spree/shipping_method.rb +6 -0
  33. data/app/models/spree/shipping_rate.rb +1 -0
  34. data/app/models/spree/stock/availability_validator.rb +5 -3
  35. data/app/models/spree/stock/coordinator.rb +16 -4
  36. data/app/models/spree/stock/estimator.rb +16 -6
  37. data/app/models/spree/stock/packer.rb +2 -1
  38. data/app/models/spree/stock_location.rb +16 -6
  39. data/app/models/spree/tax_category.rb +1 -7
  40. data/app/models/spree/tax_rate.rb +1 -0
  41. data/app/models/spree/variant.rb +16 -3
  42. data/app/models/spree/zone.rb +1 -1
  43. data/config/initializers/user_class_extensions.rb +1 -1
  44. data/config/locales/en.yml +15 -1
  45. data/db/migrate/20130228210442_create_shipping_method_zone.rb +6 -1
  46. data/db/migrate/20130306181701_add_address_fields_to_stock_location.rb +4 -1
  47. data/db/migrate/20130515180736_add_backorderable_default_to_spree_stock_location.rb +5 -0
  48. data/db/migrate/20130516151222_add_propage_all_variants_to_spree_stock_location.rb +5 -0
  49. data/db/migrate/20130626232741_add_cvv_result_code_and_cvv_result_message_to_spree_payments.rb +6 -0
  50. data/db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb +5 -0
  51. data/db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb +7 -0
  52. data/db/migrate/20130708052307_add_deleted_at_to_spree_tax_rates.rb +5 -0
  53. data/db/migrate/20130711200933_remove_lock_version_from_inventory_units.rb +6 -0
  54. data/db/migrate/20130718042445_add_cost_price_to_line_item.rb +5 -0
  55. data/db/migrate/20130718233855_set_backorderable_to_default_to_false.rb +6 -0
  56. data/db/migrate/20130725031716_add_created_by_id_to_spree_orders.rb +5 -0
  57. data/db/migrate/20130729214043_index_completed_at_on_spree_orders.rb +5 -0
  58. data/db/migrate/20130802014537_add_tax_category_id_to_spree_line_items.rb +5 -0
  59. data/db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb +9 -0
  60. data/db/migrate/20130805043440_create_spree_new_adjustments.rb +8 -0
  61. data/lib/generators/spree/dummy/templates/rails/database.yml +8 -7
  62. data/lib/generators/spree/install/install_generator.rb +1 -1
  63. data/lib/spree/core/calculated_adjustments.rb +12 -1
  64. data/lib/spree/core/controller_helpers/order.rb +5 -3
  65. data/lib/spree/core/controller_helpers/search.rb +14 -0
  66. data/lib/spree/core/permalinks.rb +13 -13
  67. data/lib/spree/core/s3_support.rb +1 -1
  68. data/lib/spree/core/version.rb +1 -1
  69. data/lib/spree/core.rb +7 -5
  70. data/lib/spree/i18n/base.rb +17 -0
  71. data/lib/spree/i18n/initializer.rb +1 -0
  72. data/lib/spree/i18n.rb +28 -7
  73. data/lib/spree/money.rb +2 -0
  74. data/lib/spree/testing_support/authorization_helpers.rb +6 -15
  75. data/lib/spree/testing_support/capybara_ext.rb +20 -11
  76. data/lib/spree/testing_support/common_rake.rb +13 -0
  77. data/lib/spree/testing_support/factories/country_factory.rb +1 -1
  78. data/lib/spree/testing_support/factories/order_factory.rb +0 -2
  79. data/lib/spree/testing_support/factories/payment_method_factory.rb +1 -1
  80. data/lib/spree/testing_support/factories/product_factory.rb +8 -18
  81. data/lib/spree/testing_support/factories/return_authorization_factory.rb +4 -0
  82. data/lib/spree/testing_support/factories/shipment_factory.rb +1 -1
  83. data/lib/spree/testing_support/factories/stock_item_factory.rb +2 -1
  84. data/lib/spree/testing_support/factories/stock_location_factory.rb +5 -2
  85. data/lib/spree/testing_support/factories/variant_factory.rb +1 -1
  86. data/lib/spree/testing_support/order_walkthrough.rb +14 -1
  87. data/vendor/assets/javascripts/jquery.validate/localization/messages_et.js +23 -0
  88. data/vendor/assets/javascripts/jquery.validate/localization/messages_eu.js +25 -0
  89. data/vendor/assets/javascripts/jquery.validate/localization/messages_hr.js +25 -0
  90. data/vendor/assets/javascripts/jquery.validate/localization/messages_ka.js +25 -0
  91. data/vendor/assets/javascripts/jquery.validate/localization/messages_ko.js +25 -0
  92. data/vendor/assets/javascripts/jquery.validate/localization/messages_my.js +25 -0
  93. data/vendor/assets/javascripts/jquery.validate/localization/messages_pt_BR.js +26 -0
  94. data/vendor/assets/javascripts/jquery.validate/localization/messages_pt_PT.js +26 -0
  95. data/vendor/assets/javascripts/jquery.validate/localization/messages_sl.js +25 -0
  96. data/vendor/assets/javascripts/jquery.validate/localization/messages_sv.js +23 -0
  97. data/vendor/assets/javascripts/jquery.validate/localization/messages_uk.js +25 -0
  98. data/vendor/assets/javascripts/jquery.validate/localization/messages_zh.js +25 -0
  99. data/vendor/assets/javascripts/jquery.validate/localization/messages_zh_TW.js +26 -0
  100. metadata +118 -67
metadata CHANGED
@@ -1,29 +1,29 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.3
4
+ version: 2.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-06-13 00:00:00.000000000 Z
11
+ date: 2013-08-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: highline
14
+ name: activemerchant
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '='
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
- version: 1.6.18
19
+ version: '1.34'
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.6.18
26
+ version: '1.34'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: acts_as_list
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -53,221 +53,240 @@ dependencies:
53
53
  - !ruby/object:Gem::Version
54
54
  version: 2.1.5
55
55
  - !ruby/object:Gem::Dependency
56
- name: kaminari
56
+ name: aws-sdk
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '='
59
+ - - ~>
60
60
  - !ruby/object:Gem::Version
61
- version: 0.13.0
61
+ version: 1.3.4
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: 0.13.0
68
+ version: 1.3.4
69
69
  - !ruby/object:Gem::Dependency
70
- name: state_machine
70
+ name: cancan
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '='
73
+ - - ~>
74
74
  - !ruby/object:Gem::Version
75
- version: 1.2.0
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
- version: 1.2.0
82
+ version: 1.6.10
83
+ - !ruby/object:Gem::Dependency
84
+ name: deface
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - '>='
88
+ - !ruby/object:Gem::Version
89
+ version: 0.9.1
90
+ type: :runtime
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - '>='
95
+ - !ruby/object:Gem::Version
96
+ version: 0.9.1
83
97
  - !ruby/object:Gem::Dependency
84
98
  name: ffaker
85
99
  requirement: !ruby/object:Gem::Requirement
86
100
  requirements:
87
101
  - - ~>
88
102
  - !ruby/object:Gem::Version
89
- version: 1.16.1
103
+ version: '1.16'
90
104
  type: :runtime
91
105
  prerelease: false
92
106
  version_requirements: !ruby/object:Gem::Requirement
93
107
  requirements:
94
108
  - - ~>
95
109
  - !ruby/object:Gem::Version
96
- version: 1.16.1
110
+ version: '1.16'
97
111
  - !ruby/object:Gem::Dependency
98
- name: paperclip
112
+ name: highline
99
113
  requirement: !ruby/object:Gem::Requirement
100
114
  requirements:
101
- - - ~>
115
+ - - '='
102
116
  - !ruby/object:Gem::Version
103
- version: 3.4.1
117
+ version: 1.6.18
104
118
  type: :runtime
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
107
121
  requirements:
108
- - - ~>
122
+ - - '='
109
123
  - !ruby/object:Gem::Version
110
- version: 3.4.1
124
+ version: 1.6.18
111
125
  - !ruby/object:Gem::Dependency
112
- name: aws-sdk
126
+ name: httparty
113
127
  requirement: !ruby/object:Gem::Requirement
114
128
  requirements:
115
129
  - - ~>
116
130
  - !ruby/object:Gem::Version
117
- version: 1.3.4
131
+ version: '0.11'
118
132
  type: :runtime
119
133
  prerelease: false
120
134
  version_requirements: !ruby/object:Gem::Requirement
121
135
  requirements:
122
136
  - - ~>
123
137
  - !ruby/object:Gem::Version
124
- version: 1.3.4
138
+ version: '0.11'
125
139
  - !ruby/object:Gem::Dependency
126
- name: ransack
140
+ name: json
127
141
  requirement: !ruby/object:Gem::Requirement
128
142
  requirements:
129
- - - '='
143
+ - - '>='
130
144
  - !ruby/object:Gem::Version
131
- version: 0.7.2
145
+ version: 1.7.7
132
146
  type: :runtime
133
147
  prerelease: false
134
148
  version_requirements: !ruby/object:Gem::Requirement
135
149
  requirements:
136
- - - '='
150
+ - - '>='
137
151
  - !ruby/object:Gem::Version
138
- version: 0.7.2
152
+ version: 1.7.7
139
153
  - !ruby/object:Gem::Dependency
140
- name: activemerchant
154
+ name: kaminari
141
155
  requirement: !ruby/object:Gem::Requirement
142
156
  requirements:
143
157
  - - ~>
144
158
  - !ruby/object:Gem::Version
145
- version: '1.31'
159
+ version: 0.14.1
146
160
  type: :runtime
147
161
  prerelease: false
148
162
  version_requirements: !ruby/object:Gem::Requirement
149
163
  requirements:
150
164
  - - ~>
151
165
  - !ruby/object:Gem::Version
152
- version: '1.31'
166
+ version: 0.14.1
153
167
  - !ruby/object:Gem::Dependency
154
- name: json
168
+ name: money
155
169
  requirement: !ruby/object:Gem::Requirement
156
170
  requirements:
157
- - - '>='
171
+ - - '='
158
172
  - !ruby/object:Gem::Version
159
- version: 1.7.7
173
+ version: 5.1.1
160
174
  type: :runtime
161
175
  prerelease: false
162
176
  version_requirements: !ruby/object:Gem::Requirement
163
177
  requirements:
164
- - - '>='
178
+ - - '='
165
179
  - !ruby/object:Gem::Version
166
- version: 1.7.7
180
+ version: 5.1.1
167
181
  - !ruby/object:Gem::Dependency
168
- name: rails
182
+ name: paperclip
169
183
  requirement: !ruby/object:Gem::Requirement
170
184
  requirements:
171
185
  - - ~>
172
186
  - !ruby/object:Gem::Version
173
- version: 3.2.13
187
+ version: 3.4.1
174
188
  type: :runtime
175
189
  prerelease: false
176
190
  version_requirements: !ruby/object:Gem::Requirement
177
191
  requirements:
178
192
  - - ~>
179
193
  - !ruby/object:Gem::Version
180
- version: 3.2.13
194
+ version: 3.4.1
181
195
  - !ruby/object:Gem::Dependency
182
- name: deface
196
+ name: paranoia
183
197
  requirement: !ruby/object:Gem::Requirement
184
198
  requirements:
185
- - - '>='
199
+ - - ~>
186
200
  - !ruby/object:Gem::Version
187
- version: 0.9.0
201
+ version: '1.3'
188
202
  type: :runtime
189
203
  prerelease: false
190
204
  version_requirements: !ruby/object:Gem::Requirement
191
205
  requirements:
192
- - - '>='
206
+ - - ~>
193
207
  - !ruby/object:Gem::Version
194
- version: 0.9.0
208
+ version: '1.3'
195
209
  - !ruby/object:Gem::Dependency
196
- name: stringex
210
+ name: rails
197
211
  requirement: !ruby/object:Gem::Requirement
198
212
  requirements:
199
213
  - - ~>
200
214
  - !ruby/object:Gem::Version
201
- version: 1.5.1
215
+ version: 3.2.14
202
216
  type: :runtime
203
217
  prerelease: false
204
218
  version_requirements: !ruby/object:Gem::Requirement
205
219
  requirements:
206
220
  - - ~>
207
221
  - !ruby/object:Gem::Version
208
- version: 1.5.1
222
+ version: 3.2.14
209
223
  - !ruby/object:Gem::Dependency
210
- name: cancan
224
+ name: ransack
211
225
  requirement: !ruby/object:Gem::Requirement
212
226
  requirements:
213
227
  - - '='
214
228
  - !ruby/object:Gem::Version
215
- version: 1.6.8
229
+ version: 0.7.2
216
230
  type: :runtime
217
231
  prerelease: false
218
232
  version_requirements: !ruby/object:Gem::Requirement
219
233
  requirements:
220
234
  - - '='
221
235
  - !ruby/object:Gem::Version
222
- version: 1.6.8
236
+ version: 0.7.2
223
237
  - !ruby/object:Gem::Dependency
224
- name: truncate_html
238
+ name: state_machine
225
239
  requirement: !ruby/object:Gem::Requirement
226
240
  requirements:
227
241
  - - '='
228
242
  - !ruby/object:Gem::Version
229
- version: 0.9.2
243
+ version: 1.2.0
230
244
  type: :runtime
231
245
  prerelease: false
232
246
  version_requirements: !ruby/object:Gem::Requirement
233
247
  requirements:
234
248
  - - '='
235
249
  - !ruby/object:Gem::Version
236
- version: 0.9.2
250
+ version: 1.2.0
237
251
  - !ruby/object:Gem::Dependency
238
- name: money
252
+ name: stringex
239
253
  requirement: !ruby/object:Gem::Requirement
240
254
  requirements:
241
- - - '='
255
+ - - ~>
242
256
  - !ruby/object:Gem::Version
243
- version: 5.1.1
257
+ version: 1.5.1
244
258
  type: :runtime
245
259
  prerelease: false
246
260
  version_requirements: !ruby/object:Gem::Requirement
247
261
  requirements:
248
- - - '='
262
+ - - ~>
249
263
  - !ruby/object:Gem::Version
250
- version: 5.1.1
264
+ version: 1.5.1
251
265
  - !ruby/object:Gem::Dependency
252
- name: httparty
266
+ name: truncate_html
253
267
  requirement: !ruby/object:Gem::Requirement
254
268
  requirements:
255
- - - ~>
269
+ - - '='
256
270
  - !ruby/object:Gem::Version
257
- version: '0.11'
271
+ version: 0.9.2
258
272
  type: :runtime
259
273
  prerelease: false
260
274
  version_requirements: !ruby/object:Gem::Requirement
261
275
  requirements:
262
- - - ~>
276
+ - - '='
263
277
  - !ruby/object:Gem::Version
264
- version: '0.11'
278
+ version: 0.9.2
265
279
  description: The bare bones necessary for Spree.
266
280
  email: sean@spreecommerce.com
267
281
  executables: []
268
282
  extensions: []
269
283
  extra_rdoc_files: []
270
284
  files:
285
+ - app/assets/images/logo/spree_50.png
286
+ - app/assets/images/noimage/large.png
287
+ - app/assets/images/noimage/mini.png
288
+ - app/assets/images/noimage/product.png
289
+ - app/assets/images/noimage/small.png
271
290
  - app/assets/javascripts/admin/handlebar_extensions.js
272
291
  - app/assets/javascripts/spree.js.coffee
273
292
  - app/controllers/spree/base_controller.rb
@@ -318,6 +337,7 @@ files:
318
337
  - app/models/spree/legacy_user.rb
319
338
  - app/models/spree/line_item.rb
320
339
  - app/models/spree/log_entry.rb
340
+ - app/models/spree/new_adjustment.rb
321
341
  - app/models/spree/option_type.rb
322
342
  - app/models/spree/option_value.rb
323
343
  - app/models/spree/order/checkout.rb
@@ -357,6 +377,7 @@ files:
357
377
  - app/models/spree/return_authorization.rb
358
378
  - app/models/spree/role.rb
359
379
  - app/models/spree/shipment.rb
380
+ - app/models/spree/shipping_adjustment.rb
360
381
  - app/models/spree/shipping_calculator.rb
361
382
  - app/models/spree/shipping_category.rb
362
383
  - app/models/spree/shipping_method.rb
@@ -426,6 +447,7 @@ files:
426
447
  - lib/spree/core/controller_helpers/common.rb
427
448
  - lib/spree/core/controller_helpers/order.rb
428
449
  - lib/spree/core/controller_helpers/respond_with.rb
450
+ - lib/spree/core/controller_helpers/search.rb
429
451
  - lib/spree/core/controller_helpers/ssl.rb
430
452
  - lib/spree/core/controller_helpers.rb
431
453
  - lib/spree/core/delegate_belongs_to.rb
@@ -447,6 +469,8 @@ files:
447
469
  - lib/spree/core/validators/email.rb
448
470
  - lib/spree/core/version.rb
449
471
  - lib/spree/core.rb
472
+ - lib/spree/i18n/base.rb
473
+ - lib/spree/i18n/initializer.rb
450
474
  - lib/spree/i18n.rb
451
475
  - lib/spree/money.rb
452
476
  - lib/spree/promo/coupon_applicator.rb
@@ -570,9 +594,36 @@ files:
570
594
  - db/migrate/20130423223847_set_default_shipping_rate_cost.rb
571
595
  - db/migrate/20130509115210_add_number_to_stock_transfer.rb
572
596
  - db/migrate/20130514151929_add_sku_index_to_spree_variants.rb
597
+ - db/migrate/20130515180736_add_backorderable_default_to_spree_stock_location.rb
598
+ - db/migrate/20130516151222_add_propage_all_variants_to_spree_stock_location.rb
573
599
  - db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb
600
+ - db/migrate/20130626232741_add_cvv_result_code_and_cvv_result_message_to_spree_payments.rb
601
+ - db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb
602
+ - db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb
603
+ - db/migrate/20130708052307_add_deleted_at_to_spree_tax_rates.rb
604
+ - db/migrate/20130711200933_remove_lock_version_from_inventory_units.rb
605
+ - db/migrate/20130718042445_add_cost_price_to_line_item.rb
606
+ - db/migrate/20130718233855_set_backorderable_to_default_to_false.rb
607
+ - db/migrate/20130725031716_add_created_by_id_to_spree_orders.rb
608
+ - db/migrate/20130729214043_index_completed_at_on_spree_orders.rb
609
+ - db/migrate/20130802014537_add_tax_category_id_to_spree_line_items.rb
610
+ - db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb
611
+ - db/migrate/20130805043440_create_spree_new_adjustments.rb
574
612
  - db/seeds.rb
575
613
  - vendor/assets/javascripts/jquery-migrate-1.0.0.js
614
+ - vendor/assets/javascripts/jquery.validate/localization/messages_et.js
615
+ - vendor/assets/javascripts/jquery.validate/localization/messages_eu.js
616
+ - vendor/assets/javascripts/jquery.validate/localization/messages_hr.js
617
+ - vendor/assets/javascripts/jquery.validate/localization/messages_ka.js
618
+ - vendor/assets/javascripts/jquery.validate/localization/messages_ko.js
619
+ - vendor/assets/javascripts/jquery.validate/localization/messages_my.js
620
+ - vendor/assets/javascripts/jquery.validate/localization/messages_pt_BR.js
621
+ - vendor/assets/javascripts/jquery.validate/localization/messages_pt_PT.js
622
+ - vendor/assets/javascripts/jquery.validate/localization/messages_sl.js
623
+ - vendor/assets/javascripts/jquery.validate/localization/messages_sv.js
624
+ - vendor/assets/javascripts/jquery.validate/localization/messages_uk.js
625
+ - vendor/assets/javascripts/jquery.validate/localization/messages_zh.js
626
+ - vendor/assets/javascripts/jquery.validate/localization/messages_zh_TW.js
576
627
  - vendor/assets/javascripts/jsuri.js
577
628
  - vendor/assets/stylesheets/normalize.css
578
629
  - vendor/assets/stylesheets/skeleton.css