spree_core 3.6.6 → 3.7.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (218) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree.js +60 -0
  3. data/app/finders/spree/countries/find.rb +31 -0
  4. data/app/finders/spree/credit_cards/find.rb +12 -0
  5. data/app/finders/spree/line_items/find_by_variant.rb +13 -0
  6. data/app/finders/spree/orders/find_current.rb +34 -0
  7. data/app/finders/spree/products/find.rb +93 -0
  8. data/app/finders/spree/taxons/find.rb +79 -0
  9. data/app/helpers/spree/base_helper.rb +7 -3
  10. data/app/helpers/spree/products_helper.rb +2 -1
  11. data/app/models/concerns/spree/adjustment_source.rb +11 -6
  12. data/app/models/concerns/spree/user_address.rb +2 -2
  13. data/app/models/concerns/spree/vat_price_calculation.rb +2 -1
  14. data/app/models/spree/ability.rb +2 -2
  15. data/app/models/spree/address.rb +23 -14
  16. data/app/models/spree/adjustable/adjustments_updater.rb +1 -1
  17. data/app/models/spree/adjustable/promotion_accumulator.rb +2 -1
  18. data/app/models/spree/adjustment.rb +18 -3
  19. data/app/models/spree/asset/support/active_storage.rb +1 -1
  20. data/app/models/spree/calculator.rb +1 -4
  21. data/app/models/spree/calculator/flexi_rate.rb +8 -11
  22. data/app/models/spree/calculator/returns/default_refund_amount.rb +3 -1
  23. data/app/models/spree/calculator/shipping/flexi_rate.rb +13 -13
  24. data/app/models/spree/country.rb +4 -0
  25. data/app/models/spree/credit_card.rb +8 -2
  26. data/app/models/spree/customer_return.rb +1 -0
  27. data/app/models/spree/fulfilment_changer.rb +117 -0
  28. data/app/models/spree/gateway.rb +1 -0
  29. data/app/models/spree/gateway/bogus.rb +3 -2
  30. data/app/models/spree/image.rb +13 -0
  31. data/app/models/spree/image/configuration/active_storage.rb +3 -3
  32. data/app/models/spree/inventory_unit.rb +1 -1
  33. data/app/models/spree/line_item.rb +3 -2
  34. data/app/models/spree/order.rb +72 -28
  35. data/app/models/spree/order/checkout.rb +10 -0
  36. data/app/models/spree/order/store_credit.rb +14 -35
  37. data/app/models/spree/order_contents.rb +22 -118
  38. data/app/models/spree/order_inventory.rb +6 -2
  39. data/app/models/spree/order_merger.rb +1 -3
  40. data/app/models/spree/order_promotion.rb +10 -0
  41. data/app/models/spree/order_updater.rb +11 -8
  42. data/app/models/spree/payment.rb +9 -3
  43. data/app/models/spree/payment/processing.rb +4 -4
  44. data/app/models/spree/preferences/store.rb +3 -3
  45. data/app/models/spree/product.rb +32 -0
  46. data/app/models/spree/product/scopes.rb +13 -34
  47. data/app/models/spree/product_property.rb +1 -1
  48. data/app/models/spree/promotion.rb +2 -0
  49. data/app/models/spree/promotion/actions/create_adjustment.rb +6 -1
  50. data/app/models/spree/promotion/actions/create_item_adjustments.rb +10 -2
  51. data/app/models/spree/promotion/actions/create_line_items.rb +3 -2
  52. data/app/models/spree/promotion/actions/free_shipping.rb +1 -0
  53. data/app/models/spree/promotion/rules/item_total.rb +2 -2
  54. data/app/models/spree/promotion_handler/coupon.rb +10 -6
  55. data/app/models/spree/promotion_handler/page.rb +1 -1
  56. data/app/models/spree/promotion_handler/promotion_duplicator.rb +4 -4
  57. data/app/models/spree/refund.rb +1 -1
  58. data/app/models/spree/reimbursement/reimbursement_type_engine.rb +1 -0
  59. data/app/models/spree/reimbursement_tax_calculator.rb +2 -2
  60. data/app/models/spree/return_item.rb +7 -4
  61. data/app/models/spree/return_item/eligibility_validator/default.rb +6 -6
  62. data/app/models/spree/return_item/exchange_variant_eligibility/same_product.rb +1 -1
  63. data/app/models/spree/shipment.rb +27 -34
  64. data/app/models/spree/shipping_method.rb +2 -0
  65. data/app/models/spree/shipping_rate.rb +31 -16
  66. data/app/models/spree/stock/adjuster.rb +1 -0
  67. data/app/models/spree/stock/estimator.rb +2 -0
  68. data/app/models/spree/stock/inventory_unit_builder.rb +5 -5
  69. data/app/models/spree/stock/packer.rb +1 -0
  70. data/app/models/spree/stock/quantifier.rb +16 -4
  71. data/app/models/spree/stock_item.rb +1 -0
  72. data/app/models/spree/stock_location.rb +1 -1
  73. data/app/models/spree/stock_movement.rb +1 -0
  74. data/app/models/spree/stock_transfer.rb +1 -1
  75. data/app/models/spree/store_credit.rb +5 -10
  76. data/app/models/spree/tax_rate.rb +3 -0
  77. data/app/models/spree/taxon.rb +2 -2
  78. data/app/models/spree/taxon_image.rb +18 -0
  79. data/app/models/spree/{taxon_icon → taxon_image}/configuration/active_storage.rb +2 -2
  80. data/app/models/spree/{taxon_icon → taxon_image}/configuration/paperclip.rb +1 -1
  81. data/app/models/spree/variant.rb +28 -2
  82. data/app/models/spree/zone.rb +5 -5
  83. data/app/paginators/spree/shared/paginate.rb +19 -0
  84. data/app/services/spree/cart/add_item.rb +43 -0
  85. data/app/services/spree/cart/create.rb +21 -0
  86. data/app/services/spree/cart/recalculate.rb +32 -0
  87. data/app/services/spree/cart/remove_item.rb +37 -0
  88. data/app/services/spree/cart/remove_line_item.rb +16 -0
  89. data/app/services/spree/cart/set_quantity.rb +22 -0
  90. data/app/services/spree/cart/update.rb +37 -0
  91. data/app/services/spree/checkout/add_store_credit.rb +51 -0
  92. data/app/services/spree/checkout/advance.rb +18 -0
  93. data/app/services/spree/checkout/complete.rb +23 -0
  94. data/app/services/spree/checkout/get_shipping_rates.rb +48 -0
  95. data/app/services/spree/checkout/next.rb +13 -0
  96. data/app/services/spree/checkout/remove_store_credit.rb +17 -0
  97. data/app/services/spree/checkout/update.rb +13 -0
  98. data/app/services/spree/compare_line_items.rb +21 -0
  99. data/app/services/spree/generate_token.rb +20 -0
  100. data/app/sorters/spree/products/sort.rb +58 -0
  101. data/config/locales/en.yml +20 -1
  102. data/db/default/spree/countries.rb +1 -1
  103. data/db/default/spree/default_reimbursement_type.rb +1 -1
  104. data/db/default/spree/roles.rb +2 -2
  105. data/db/default/spree/states.rb +2 -1
  106. data/db/default/spree/stores.rb +1 -1
  107. data/db/default/spree/zones.rb +5 -6
  108. data/db/migrate/20120831092320_spree_one_two.rb +36 -36
  109. data/db/migrate/20120831092359_spree_promo_one_two.rb +1 -1
  110. data/db/migrate/20130211190146_create_spree_stock_items.rb +1 -1
  111. data/db/migrate/20130211191120_create_spree_stock_locations.rb +1 -1
  112. data/db/migrate/20130301162924_create_shipping_method_categories.rb +1 -1
  113. data/db/migrate/20130304162240_create_spree_shipping_rates.rb +1 -1
  114. data/db/migrate/20130305143310_create_stock_movements.rb +1 -1
  115. data/db/migrate/20130418125341_create_spree_stock_transfers.rb +1 -1
  116. data/db/migrate/20140205120320_create_spree_payment_capture_events.rb +1 -1
  117. data/db/migrate/20140309023735_migrate_old_preferences.rb +5 -1
  118. data/db/migrate/20140309024355_create_spree_stores.rb +1 -1
  119. data/db/migrate/20140625214618_create_spree_refunds.rb +1 -1
  120. data/db/migrate/20140702140656_create_spree_return_authorization_inventory_unit.rb +1 -1
  121. data/db/migrate/20140713140455_create_spree_return_authorization_reasons.rb +1 -1
  122. data/db/migrate/20140713140527_create_spree_refund_reasons.rb +1 -1
  123. data/db/migrate/20140715182625_create_spree_promotion_categories.rb +1 -1
  124. data/db/migrate/20140718133010_create_spree_customer_returns.rb +1 -1
  125. data/db/migrate/20140725131539_create_spree_reimbursements.rb +1 -1
  126. data/db/migrate/20140731150017_create_spree_reimbursement_types.rb +1 -1
  127. data/db/migrate/20150118210639_create_spree_store_credits.rb +1 -1
  128. data/db/migrate/20150118211500_create_spree_store_credit_categories.rb +1 -1
  129. data/db/migrate/20150118212051_create_spree_store_credit_events.rb +1 -1
  130. data/db/migrate/20150118212101_create_spree_store_credit_types.rb +1 -1
  131. data/db/migrate/20150309161154_ensure_payments_have_numbers.rb +6 -2
  132. data/db/migrate/20180613080857_rename_guest_token_to_token_in_orders.rb +5 -0
  133. data/db/migrate/20180915160001_add_timestamps_to_spree_prices.rb +12 -0
  134. data/db/migrate/20181024100754_add_deleted_at_to_spree_credit_cards.rb +6 -0
  135. data/lib/generators/spree/custom_user/custom_user_generator.rb +1 -3
  136. data/lib/generators/spree/dummy/dummy_generator.rb +30 -33
  137. data/lib/generators/spree/dummy/templates/rails/database.yml +6 -1
  138. data/lib/generators/spree/dummy/templates/rails/test.rb +2 -0
  139. data/lib/generators/spree/dummy_model/dummy_model_generator.rb +1 -1
  140. data/lib/generators/spree/install/install_generator.rb +2 -1
  141. data/lib/spree/core.rb +2 -4
  142. data/lib/spree/core/controller_helpers/auth.rb +15 -5
  143. data/lib/spree/core/controller_helpers/common.rb +0 -11
  144. data/lib/spree/core/controller_helpers/order.rb +6 -6
  145. data/lib/spree/core/controller_helpers/respond_with.rb +3 -1
  146. data/lib/spree/core/controller_helpers/strong_parameters.rb +1 -0
  147. data/lib/spree/core/engine.rb +9 -3
  148. data/lib/spree/core/importer/order.rb +8 -12
  149. data/lib/spree/core/product_duplicator.rb +6 -1
  150. data/lib/spree/core/product_filters.rb +15 -14
  151. data/lib/spree/core/query_filters.rb +11 -0
  152. data/lib/spree/core/query_filters/comparable.rb +46 -0
  153. data/lib/spree/core/query_filters/date.rb +8 -0
  154. data/lib/spree/core/query_filters/number.rb +8 -0
  155. data/lib/spree/core/query_filters/text.rb +32 -0
  156. data/lib/spree/core/token_generator.rb +2 -2
  157. data/lib/spree/core/version.rb +1 -1
  158. data/lib/spree/i18n.rb +1 -1
  159. data/lib/spree/migrations.rb +2 -0
  160. data/lib/spree/money.rb +12 -12
  161. data/lib/spree/permitted_attributes.rb +11 -6
  162. data/lib/spree/service_module.rb +98 -0
  163. data/lib/spree/testing_support/capybara_config.rb +20 -0
  164. data/lib/spree/testing_support/capybara_ext.rb +6 -3
  165. data/lib/spree/testing_support/factories.rb +1 -1
  166. data/lib/spree/testing_support/factories/address_factory.rb +10 -9
  167. data/lib/spree/testing_support/factories/adjustment_factory.rb +8 -6
  168. data/lib/spree/testing_support/factories/country_factory.rb +4 -4
  169. data/lib/spree/testing_support/factories/credit_card_factory.rb +7 -5
  170. data/lib/spree/testing_support/factories/customer_return_factory.rb +1 -1
  171. data/lib/spree/testing_support/factories/image_factory.rb +7 -1
  172. data/lib/spree/testing_support/factories/inventory_unit_factory.rb +5 -4
  173. data/lib/spree/testing_support/factories/line_item_factory.rb +3 -2
  174. data/lib/spree/testing_support/factories/options_factory.rb +2 -3
  175. data/lib/spree/testing_support/factories/order_factory.rb +16 -12
  176. data/lib/spree/testing_support/factories/order_promotion_factory.rb +6 -0
  177. data/lib/spree/testing_support/factories/payment_factory.rb +9 -7
  178. data/lib/spree/testing_support/factories/payment_method_factory.rb +8 -8
  179. data/lib/spree/testing_support/factories/price_factory.rb +2 -2
  180. data/lib/spree/testing_support/factories/product_factory.rb +10 -10
  181. data/lib/spree/testing_support/factories/promotion_category_factory.rb +1 -1
  182. data/lib/spree/testing_support/factories/promotion_factory.rb +14 -4
  183. data/lib/spree/testing_support/factories/property_factory.rb +2 -2
  184. data/lib/spree/testing_support/factories/prototype_factory.rb +3 -3
  185. data/lib/spree/testing_support/factories/refund_factory.rb +6 -6
  186. data/lib/spree/testing_support/factories/reimbursement_factory.rb +1 -1
  187. data/lib/spree/testing_support/factories/reimbursement_type_factory.rb +2 -2
  188. data/lib/spree/testing_support/factories/return_authorization_factory.rb +4 -3
  189. data/lib/spree/testing_support/factories/role_factory.rb +1 -1
  190. data/lib/spree/testing_support/factories/shipment_factory.rb +3 -3
  191. data/lib/spree/testing_support/factories/shipping_method_factory.rb +4 -4
  192. data/lib/spree/testing_support/factories/state_factory.rb +2 -5
  193. data/lib/spree/testing_support/factories/stock_factory.rb +3 -3
  194. data/lib/spree/testing_support/factories/stock_item_factory.rb +1 -1
  195. data/lib/spree/testing_support/factories/stock_location_factory.rb +7 -7
  196. data/lib/spree/testing_support/factories/stock_movement_factory.rb +3 -3
  197. data/lib/spree/testing_support/factories/store_credit_category_factory.rb +2 -2
  198. data/lib/spree/testing_support/factories/store_credit_type_factory.rb +1 -1
  199. data/lib/spree/testing_support/factories/store_factory.rb +5 -4
  200. data/lib/spree/testing_support/factories/tax_rate_factory.rb +2 -1
  201. data/lib/spree/testing_support/factories/user_factory.rb +4 -4
  202. data/lib/spree/testing_support/factories/variant_factory.rb +15 -15
  203. data/lib/spree/testing_support/factories/zone_factory.rb +3 -3
  204. data/lib/spree/testing_support/image_helpers.rb +19 -0
  205. data/lib/tasks/core.rake +21 -4
  206. data/lib/tasks/exchanges.rake +4 -4
  207. data/spree_core.gemspec +3 -3
  208. data/vendor/assets/javascripts/fetch.umd.js +531 -0
  209. data/vendor/assets/javascripts/polyfill.min.js +1 -0
  210. metadata +50 -17
  211. data/app/assets/javascripts/spree.js.coffee +0 -59
  212. data/app/models/spree/taxon_icon.rb +0 -5
  213. data/lib/generators/spree/dummy/templates/initializers/custom_user.rb +0 -1
  214. data/lib/spree/core/environment.rb +0 -15
  215. data/lib/spree/core/environment/calculators.rb +0 -11
  216. data/lib/spree/core/environment_extension.rb +0 -28
  217. data/lib/spree/core/validators/email.rb +0 -8
  218. data/lib/spree/promo/environment.rb +0 -9
@@ -0,0 +1 @@
1
+ !function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n():"function"==typeof define&&define.amd?define(n):n()}(0,function(){"use strict";function e(e){var n=this.constructor;return this.then(function(t){return n.resolve(e()).then(function(){return t})},function(t){return n.resolve(e()).then(function(){return n.reject(t)})})}function n(){}function t(e){if(!(this instanceof t))throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=undefined,this._deferreds=[],u(e,this)}function o(e,n){for(;3===e._state;)e=e._value;0!==e._state?(e._handled=!0,t._immediateFn(function(){var t=1===e._state?n.onFulfilled:n.onRejected;if(null!==t){var o;try{o=t(e._value)}catch(f){return void i(n.promise,f)}r(n.promise,o)}else(1===e._state?r:i)(n.promise,e._value)})):e._deferreds.push(n)}function r(e,n){try{if(n===e)throw new TypeError("A promise cannot be resolved with itself.");if(n&&("object"==typeof n||"function"==typeof n)){var o=n.then;if(n instanceof t)return e._state=3,e._value=n,void f(e);if("function"==typeof o)return void u(function(e,n){return function(){e.apply(n,arguments)}}(o,n),e)}e._state=1,e._value=n,f(e)}catch(r){i(e,r)}}function i(e,n){e._state=2,e._value=n,f(e)}function f(e){2===e._state&&0===e._deferreds.length&&t._immediateFn(function(){e._handled||t._unhandledRejectionFn(e._value)});for(var n=0,r=e._deferreds.length;r>n;n++)o(e,e._deferreds[n]);e._deferreds=null}function u(e,n){var t=!1;try{e(function(e){t||(t=!0,r(n,e))},function(e){t||(t=!0,i(n,e))})}catch(o){if(t)return;t=!0,i(n,o)}}var c=setTimeout;t.prototype["catch"]=function(e){return this.then(null,e)},t.prototype.then=function(e,t){var r=new this.constructor(n);return o(this,new function(e,n,t){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof n?n:null,this.promise=t}(e,t,r)),r},t.prototype["finally"]=e,t.all=function(e){return new t(function(n,t){function o(e,f){try{if(f&&("object"==typeof f||"function"==typeof f)){var u=f.then;if("function"==typeof u)return void u.call(f,function(n){o(e,n)},t)}r[e]=f,0==--i&&n(r)}catch(c){t(c)}}if(!e||"undefined"==typeof e.length)throw new TypeError("Promise.all accepts an array");var r=Array.prototype.slice.call(e);if(0===r.length)return n([]);for(var i=r.length,f=0;r.length>f;f++)o(f,r[f])})},t.resolve=function(e){return e&&"object"==typeof e&&e.constructor===t?e:new t(function(n){n(e)})},t.reject=function(e){return new t(function(n,t){t(e)})},t.race=function(e){return new t(function(n,t){for(var o=0,r=e.length;r>o;o++)e[o].then(n,t)})},t._immediateFn="function"==typeof setImmediate&&function(e){setImmediate(e)}||function(e){c(e,0)},t._unhandledRejectionFn=function(e){void 0!==console&&console&&console.warn("Possible Unhandled Promise Rejection:",e)};var l=function(){if("undefined"!=typeof self)return self;if("undefined"!=typeof window)return window;if("undefined"!=typeof global)return global;throw Error("unable to locate global object")}();"Promise"in l?l.Promise.prototype["finally"]||(l.Promise.prototype["finally"]=e):l.Promise=t});
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.6.6
4
+ version: 3.7.0.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-12-06 00:00:00.000000000 Z
11
+ date: 2019-01-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemerchant
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.6.18
131
+ version: 2.0.0
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
- version: 1.6.18
138
+ version: 2.0.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: kaminari
141
141
  requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
184
184
  requirements:
185
185
  - - "~>"
186
186
  - !ruby/object:Gem::Version
187
- version: 6.0.0
187
+ version: 6.1.0
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
- version: 6.0.0
194
+ version: 6.1.0
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: paranoia
197
197
  requirement: !ruby/object:Gem::Requirement
@@ -380,8 +380,14 @@ files:
380
380
  - app/assets/images/noimage/mini.png
381
381
  - app/assets/images/noimage/product.png
382
382
  - app/assets/images/noimage/small.png
383
- - app/assets/javascripts/spree.js.coffee
383
+ - app/assets/javascripts/spree.js
384
384
  - app/controllers/spree/base_controller.rb
385
+ - app/finders/spree/countries/find.rb
386
+ - app/finders/spree/credit_cards/find.rb
387
+ - app/finders/spree/line_items/find_by_variant.rb
388
+ - app/finders/spree/orders/find_current.rb
389
+ - app/finders/spree/products/find.rb
390
+ - app/finders/spree/taxons/find.rb
385
391
  - app/helpers/spree/base_helper.rb
386
392
  - app/helpers/spree/products_helper.rb
387
393
  - app/mailers/spree/base_mailer.rb
@@ -435,6 +441,7 @@ files:
435
441
  - app/models/spree/credit_card.rb
436
442
  - app/models/spree/customer_return.rb
437
443
  - app/models/spree/exchange.rb
444
+ - app/models/spree/fulfilment_changer.rb
438
445
  - app/models/spree/gateway.rb
439
446
  - app/models/spree/gateway/bogus.rb
440
447
  - app/models/spree/gateway/bogus_simple.rb
@@ -574,14 +581,32 @@ files:
574
581
  - app/models/spree/tax_category.rb
575
582
  - app/models/spree/tax_rate.rb
576
583
  - app/models/spree/taxon.rb
577
- - app/models/spree/taxon_icon.rb
578
- - app/models/spree/taxon_icon/configuration/active_storage.rb
579
- - app/models/spree/taxon_icon/configuration/paperclip.rb
584
+ - app/models/spree/taxon_image.rb
585
+ - app/models/spree/taxon_image/configuration/active_storage.rb
586
+ - app/models/spree/taxon_image/configuration/paperclip.rb
580
587
  - app/models/spree/taxonomy.rb
581
588
  - app/models/spree/validations/db_maximum_length_validator.rb
582
589
  - app/models/spree/variant.rb
583
590
  - app/models/spree/zone.rb
584
591
  - app/models/spree/zone_member.rb
592
+ - app/paginators/spree/shared/paginate.rb
593
+ - app/services/spree/cart/add_item.rb
594
+ - app/services/spree/cart/create.rb
595
+ - app/services/spree/cart/recalculate.rb
596
+ - app/services/spree/cart/remove_item.rb
597
+ - app/services/spree/cart/remove_line_item.rb
598
+ - app/services/spree/cart/set_quantity.rb
599
+ - app/services/spree/cart/update.rb
600
+ - app/services/spree/checkout/add_store_credit.rb
601
+ - app/services/spree/checkout/advance.rb
602
+ - app/services/spree/checkout/complete.rb
603
+ - app/services/spree/checkout/get_shipping_rates.rb
604
+ - app/services/spree/checkout/next.rb
605
+ - app/services/spree/checkout/remove_store_credit.rb
606
+ - app/services/spree/checkout/update.rb
607
+ - app/services/spree/compare_line_items.rb
608
+ - app/services/spree/generate_token.rb
609
+ - app/sorters/spree/products/sort.rb
585
610
  - app/validators/db_maximum_length_validator.rb
586
611
  - app/validators/email_validator.rb
587
612
  - app/views/layouts/spree/base_mailer.html.erb
@@ -880,6 +905,9 @@ files:
880
905
  - db/migrate/20170727103056_rename_tracker_kind_field.rb
881
906
  - db/migrate/20171004223836_remove_icon_from_taxons.rb
882
907
  - db/migrate/20180222133746_add_unique_index_on_spree_promotions_code.rb
908
+ - db/migrate/20180613080857_rename_guest_token_to_token_in_orders.rb
909
+ - db/migrate/20180915160001_add_timestamps_to_spree_prices.rb
910
+ - db/migrate/20181024100754_add_deleted_at_to_spree_credit_cards.rb
883
911
  - db/seeds.rb
884
912
  - lib/friendly_id/slug_rails5_patch.rb
885
913
  - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -887,7 +915,6 @@ files:
887
915
  - lib/generators/spree/custom_user/templates/initializer.rb.tt
888
916
  - lib/generators/spree/custom_user/templates/migration.rb.tt
889
917
  - lib/generators/spree/dummy/dummy_generator.rb
890
- - lib/generators/spree/dummy/templates/initializers/custom_user.rb
891
918
  - lib/generators/spree/dummy/templates/initializers/devise.rb
892
919
  - lib/generators/spree/dummy/templates/rails/application.rb
893
920
  - lib/generators/spree/dummy/templates/rails/boot.rb
@@ -914,19 +941,20 @@ files:
914
941
  - lib/spree/core/controller_helpers/store.rb
915
942
  - lib/spree/core/controller_helpers/strong_parameters.rb
916
943
  - lib/spree/core/engine.rb
917
- - lib/spree/core/environment.rb
918
- - lib/spree/core/environment/calculators.rb
919
- - lib/spree/core/environment_extension.rb
920
944
  - lib/spree/core/importer.rb
921
945
  - lib/spree/core/importer/order.rb
922
946
  - lib/spree/core/importer/product.rb
923
947
  - lib/spree/core/number_generator.rb
924
948
  - lib/spree/core/product_duplicator.rb
925
949
  - lib/spree/core/product_filters.rb
950
+ - lib/spree/core/query_filters.rb
951
+ - lib/spree/core/query_filters/comparable.rb
952
+ - lib/spree/core/query_filters/date.rb
953
+ - lib/spree/core/query_filters/number.rb
954
+ - lib/spree/core/query_filters/text.rb
926
955
  - lib/spree/core/routes.rb
927
956
  - lib/spree/core/search/base.rb
928
957
  - lib/spree/core/token_generator.rb
929
- - lib/spree/core/validators/email.rb
930
958
  - lib/spree/core/version.rb
931
959
  - lib/spree/i18n.rb
932
960
  - lib/spree/i18n/base.rb
@@ -935,12 +963,13 @@ files:
935
963
  - lib/spree/migrations.rb
936
964
  - lib/spree/money.rb
937
965
  - lib/spree/permitted_attributes.rb
938
- - lib/spree/promo/environment.rb
939
966
  - lib/spree/responder.rb
967
+ - lib/spree/service_module.rb
940
968
  - lib/spree/testing_support/ability_helpers.rb
941
969
  - lib/spree/testing_support/authorization_helpers.rb
942
970
  - lib/spree/testing_support/bar_ability.rb
943
971
  - lib/spree/testing_support/caching.rb
972
+ - lib/spree/testing_support/capybara_config.rb
944
973
  - lib/spree/testing_support/capybara_ext.rb
945
974
  - lib/spree/testing_support/common_rake.rb
946
975
  - lib/spree/testing_support/controller_requests.rb
@@ -957,6 +986,7 @@ files:
957
986
  - lib/spree/testing_support/factories/line_item_factory.rb
958
987
  - lib/spree/testing_support/factories/options_factory.rb
959
988
  - lib/spree/testing_support/factories/order_factory.rb
989
+ - lib/spree/testing_support/factories/order_promotion_factory.rb
960
990
  - lib/spree/testing_support/factories/payment_factory.rb
961
991
  - lib/spree/testing_support/factories/payment_method_factory.rb
962
992
  - lib/spree/testing_support/factories/price_factory.rb
@@ -998,6 +1028,7 @@ files:
998
1028
  - lib/spree/testing_support/factories/zone_member_factory.rb
999
1029
  - lib/spree/testing_support/flash.rb
1000
1030
  - lib/spree/testing_support/i18n.rb
1031
+ - lib/spree/testing_support/image_helpers.rb
1001
1032
  - lib/spree/testing_support/kernel.rb
1002
1033
  - lib/spree/testing_support/order_walkthrough.rb
1003
1034
  - lib/spree/testing_support/preferences.rb
@@ -1010,8 +1041,10 @@ files:
1010
1041
  - spec/fixtures/text-file.txt
1011
1042
  - spec/fixtures/thinking-cat.jpg
1012
1043
  - spree_core.gemspec
1044
+ - vendor/assets/javascripts/fetch.umd.js
1013
1045
  - vendor/assets/javascripts/jquery.payment.js
1014
1046
  - vendor/assets/javascripts/jsuri.js
1047
+ - vendor/assets/javascripts/polyfill.min.js
1015
1048
  homepage: http://spreecommerce.org
1016
1049
  licenses:
1017
1050
  - BSD-3-Clause
@@ -1024,7 +1057,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
1024
1057
  requirements:
1025
1058
  - - ">="
1026
1059
  - !ruby/object:Gem::Version
1027
- version: 2.2.7
1060
+ version: 2.3.0
1028
1061
  required_rubygems_version: !ruby/object:Gem::Requirement
1029
1062
  requirements:
1030
1063
  - - ">="
@@ -1,59 +0,0 @@
1
- #= require jsuri
2
- class window.Spree
3
- @ready: (callback) ->
4
- jQuery(document).ready(callback)
5
-
6
- # fire ready callbacks also on turbolinks page change event
7
- jQuery(document).on 'page:load turbolinks:load', ->
8
- callback(jQuery)
9
-
10
- @mountedAt: ->
11
- window.SpreePaths.mounted_at
12
-
13
- @adminPath: ->
14
- window.SpreePaths.admin
15
-
16
- @pathFor: (path) ->
17
- locationOrigin = "#{window.location.protocol}//#{window.location.hostname}" + (if window.location.port then ":#{window.location.port}" else "")
18
- @url("#{locationOrigin}#{@mountedAt()}#{path}", @url_params).toString()
19
-
20
- @adminPathFor: (path) ->
21
- @pathFor("#{@adminPath()}#{path}")
22
-
23
- # Helper function to take a URL and add query parameters to it
24
- # Uses the JSUri library from here: https://github.com/derek-watson/jsUri
25
- # Thanks to Jake Moffat for the suggestion: https://twitter.com/jakeonrails/statuses/321776992221544449
26
- @url: (uri, query) ->
27
- if uri.path == undefined
28
- uri = new Uri(uri)
29
- if query
30
- $.each query, (key, value) ->
31
- uri.addQueryParam(key, value)
32
- return uri
33
-
34
- # This function automatically appends the API token
35
- # for the user to the end of any URL.
36
- # Immediately after, this string is then passed to jQuery.ajax.
37
- #
38
- # ajax works in two ways in jQuery:
39
- #
40
- # $.ajax("url", {settings: 'go here'})
41
- # or:
42
- # $.ajax({url: "url", settings: 'go here'})
43
- #
44
- # This function will support both of these calls.
45
- @ajax: (url_or_settings, settings) ->
46
- if (typeof(url_or_settings) == "string")
47
- $.ajax(Spree.url(url_or_settings).toString(), settings)
48
- else
49
- url = url_or_settings['url']
50
- delete url_or_settings['url']
51
- $.ajax(Spree.url(url).toString(), url_or_settings)
52
-
53
- @routes:
54
- states_search: @pathFor('api/v1/states')
55
- apply_coupon_code: (order_id) ->
56
- Spree.pathFor("api/v1/orders/#{order_id}/apply_coupon_code")
57
-
58
- @url_params:
59
- {}
@@ -1,5 +0,0 @@
1
- module Spree
2
- class TaxonIcon < Asset
3
- include Rails.application.config.use_paperclip ? Configuration::Paperclip : Configuration::ActiveStorage
4
- end
5
- end
@@ -1 +0,0 @@
1
- # Spree.user_class = "User"
@@ -1,15 +0,0 @@
1
- module Spree
2
- module Core
3
- class Environment
4
- include EnvironmentExtension
5
-
6
- attr_accessor :calculators, :payment_methods, :preferences,
7
- :adjusters, :stock_splitters
8
-
9
- def initialize
10
- @calculators = Calculators.new
11
- @preferences = Spree::AppConfiguration.new
12
- end
13
- end
14
- end
15
- end
@@ -1,11 +0,0 @@
1
- module Spree
2
- module Core
3
- class Environment
4
- class Calculators
5
- include EnvironmentExtension
6
-
7
- attr_accessor :shipping_methods, :tax_rates
8
- end
9
- end
10
- end
11
- end
@@ -1,28 +0,0 @@
1
- module Spree
2
- module Core
3
- module EnvironmentExtension
4
- extend ActiveSupport::Concern
5
-
6
- def add_class(name)
7
- ActiveSupport::Deprecation.warn(<<-EOS, caller)
8
- EnvironmentExtension module is deprecated and will be removed in Spree 3.6
9
- EOS
10
- instance_variable_set "@#{name}", Set.new
11
-
12
- create_method("#{name}=".to_sym) do |val|
13
- instance_variable_set('@' + name, val)
14
- end
15
-
16
- create_method(name.to_sym) do
17
- instance_variable_get('@' + name)
18
- end
19
- end
20
-
21
- private
22
-
23
- def create_method(name, &block)
24
- self.class.send(:define_method, name, &block)
25
- end
26
- end
27
- end
28
- end
@@ -1,8 +0,0 @@
1
- class EmailValidator < ActiveModel::EachValidator
2
- def validate_each(record, attribute, value)
3
- warn "`EmailValidator` in 'lib/spree/core' is deprecated. Use `EmailValidator` in 'app/validators' instead."
4
- unless value =~ /\A[^@\s]+@[^@\s]+\z/
5
- record.errors.add(attribute, :invalid, { value: value }.merge!(options))
6
- end
7
- end
8
- end
@@ -1,9 +0,0 @@
1
- module Spree
2
- module Promo
3
- class Environment
4
- include Core::EnvironmentExtension
5
-
6
- attr_accessor :rules, :actions
7
- end
8
- end
9
- end