spree_core 4.1.13 → 4.2.0.rc4

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.
Files changed (150) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/base_controller.rb +1 -2
  3. data/app/finders/spree/addresses/find.rb +1 -12
  4. data/app/finders/spree/base_finder.rb +14 -0
  5. data/app/finders/spree/countries/find.rb +11 -3
  6. data/app/finders/spree/credit_cards/find.rb +2 -2
  7. data/app/finders/spree/orders/find_current.rb +1 -1
  8. data/app/helpers/spree/base_helper.rb +61 -20
  9. data/app/helpers/spree/mail_helper.rb +29 -0
  10. data/app/helpers/spree/products_helper.rb +2 -1
  11. data/app/mailers/spree/base_mailer.rb +19 -5
  12. data/app/mailers/spree/order_mailer.rb +13 -4
  13. data/app/mailers/spree/reimbursement_mailer.rb +4 -2
  14. data/app/mailers/spree/shipment_mailer.rb +4 -2
  15. data/app/models/concerns/spree/default_price.rb +3 -6
  16. data/app/models/concerns/spree/user_methods.rb +11 -5
  17. data/app/models/concerns/spree/user_payment_source.rb +1 -1
  18. data/app/models/spree/ability.rb +45 -34
  19. data/app/models/spree/address.rb +17 -1
  20. data/app/models/spree/adjustment.rb +1 -0
  21. data/app/models/spree/app_configuration.rb +4 -0
  22. data/app/models/spree/app_dependencies.rb +4 -2
  23. data/app/models/spree/base.rb +5 -0
  24. data/app/models/spree/credit_card.rb +5 -0
  25. data/app/models/spree/fulfilment_changer.rb +58 -16
  26. data/app/models/spree/inventory_unit.rb +2 -7
  27. data/app/models/spree/line_item.rb +8 -7
  28. data/app/models/spree/log_entry.rb +1 -1
  29. data/app/models/spree/option_type.rb +7 -1
  30. data/app/models/spree/order.rb +27 -5
  31. data/app/models/spree/order/payments.rb +10 -2
  32. data/app/models/spree/payment.rb +18 -4
  33. data/app/models/spree/payment/processing.rb +2 -2
  34. data/app/models/spree/payment_method.rb +3 -3
  35. data/app/models/spree/preferences/store.rb +1 -1
  36. data/app/models/spree/price.rb +25 -6
  37. data/app/models/spree/product.rb +29 -9
  38. data/app/models/spree/promotion.rb +10 -15
  39. data/app/models/spree/promotion/rules/product.rb +2 -1
  40. data/app/models/spree/promotion/rules/user.rb +2 -1
  41. data/app/models/spree/promotion_handler/coupon.rb +1 -1
  42. data/app/models/spree/promotion_handler/promotion_duplicator.rb +9 -3
  43. data/app/models/spree/refund.rb +2 -2
  44. data/app/models/spree/reimbursement.rb +2 -0
  45. data/app/models/spree/return_item/eligibility_validator/default.rb +0 -2
  46. data/app/models/spree/return_item/eligibility_validator/{r_m_a_required.rb → rma_required.rb} +0 -0
  47. data/app/models/spree/shipment.rb +3 -6
  48. data/app/models/spree/shipping_method.rb +1 -5
  49. data/app/models/spree/shipping_rate.rb +2 -11
  50. data/app/models/spree/stock/availability_validator.rb +3 -4
  51. data/app/models/spree/stock_item.rb +1 -5
  52. data/app/models/spree/stock_location.rb +13 -2
  53. data/app/models/spree/store.rb +51 -2
  54. data/app/models/spree/store_credit.rb +1 -1
  55. data/app/models/spree/variant.rb +16 -10
  56. data/app/models/spree/zone.rb +17 -4
  57. data/app/presenters/spree/variant_presenter.rb +9 -1
  58. data/app/presenters/spree/variants/option_types_presenter.rb +1 -0
  59. data/app/services/spree/account/addresses/create.rb +6 -1
  60. data/app/services/spree/account/addresses/{base.rb → helper.rb} +1 -3
  61. data/app/services/spree/account/addresses/update.rb +6 -1
  62. data/app/services/spree/compare_line_items.rb +4 -2
  63. data/app/sorters/spree/base_sorter.rb +35 -0
  64. data/app/sorters/spree/orders/sort.rb +1 -37
  65. data/app/sorters/spree/products/sort.rb +9 -32
  66. data/app/validators/email_validator.rb +1 -1
  67. data/app/views/layouts/spree/base_mailer.html.erb +45 -40
  68. data/app/views/spree/order_mailer/cancel_email.html.erb +19 -25
  69. data/app/views/spree/order_mailer/cancel_email.text.erb +24 -2
  70. data/app/views/spree/order_mailer/confirm_email.html.erb +18 -65
  71. data/app/views/spree/order_mailer/confirm_email.text.erb +2 -1
  72. data/app/views/spree/order_mailer/store_owner_notification_email.html.erb +23 -0
  73. data/app/views/spree/order_mailer/store_owner_notification_email.text.erb +38 -0
  74. data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb +53 -58
  75. data/app/views/spree/reimbursement_mailer/reimbursement_email.text.erb +3 -1
  76. data/app/views/spree/shared/_base_mailer_footer.html.erb +6 -14
  77. data/app/views/spree/shared/_base_mailer_header.html.erb +12 -32
  78. data/app/views/spree/shared/_base_mailer_stylesheets.html.erb +293 -625
  79. data/app/views/spree/shared/_purchased_items_table.html.erb +60 -0
  80. data/app/views/spree/shared/purchased_items_table/_adjustment.html.erb +13 -0
  81. data/app/views/spree/shared/purchased_items_table/_line_item.html.erb +27 -0
  82. data/app/views/spree/shared/purchased_items_table/_subtotal.html.erb +13 -0
  83. data/app/views/spree/shared/purchased_items_table/_total.html.erb +13 -0
  84. data/app/views/spree/shipment_mailer/shipped_email.html.erb +31 -36
  85. data/app/views/spree/shipment_mailer/shipped_email.text.erb +2 -1
  86. data/config/initializers/assets.rb +1 -0
  87. data/config/initializers/inflections.rb +3 -0
  88. data/config/initializers/rails61_fixes.rb +3 -0
  89. data/config/locales/en.yml +145 -19
  90. data/db/default/spree/countries.rb +10 -4
  91. data/db/default/spree/states.rb +42 -5
  92. data/db/default/spree/stores.rb +17 -12
  93. data/db/default/spree/zones.rb +5 -2
  94. data/db/migrate/20130326175857_add_stock_location_to_rma.rb +1 -1
  95. data/db/migrate/20140309033438_create_store_from_preferences.rb +1 -1
  96. data/db/migrate/20191017121054_add_supported_currencies_to_store.rb +10 -0
  97. data/db/migrate/20200102141311_add_social_to_spree_stores.rb +3 -0
  98. data/db/migrate/20200308210757_add_default_locale_to_spree_store.rb +7 -0
  99. data/db/migrate/20200310145140_add_customer_support_email_to_spree_store.rb +7 -0
  100. data/db/migrate/20200421095017_add_compare_at_amount_to_spree_prices.rb +7 -0
  101. data/db/migrate/20200423123001_add_default_country_id_to_spree_store.rb +9 -0
  102. data/db/migrate/20200430072209_add_footer_fields_to_spree_stores.rb +8 -0
  103. data/db/migrate/20200513154939_add_show_property_to_spree_product_properties.rb +5 -0
  104. data/db/migrate/20200607161221_add_store_owner_order_notification_delivered_to_spree_orders.rb +7 -0
  105. data/db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb +7 -0
  106. data/db/migrate/20200610113542_add_label_to_spree_addresses.rb +5 -0
  107. data/db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb +5 -0
  108. data/db/migrate/20201006110150_add_checkout_zone_field_to_store.rb +12 -0
  109. data/db/migrate/20201012091259_add_filterable_column_to_spree_option_types.rb +6 -0
  110. data/db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb +5 -0
  111. data/db/migrate/20201127084048_add_default_country_kind_to_spree_zones.rb +5 -0
  112. data/db/migrate/20210112193440_remove_contact_email_from_spree_stores.rb +5 -0
  113. data/db/migrate/20210114182625_create_spree_payment_methods_stores.rb +10 -0
  114. data/db/migrate/20210114220232_migrate_data_payment_methods_stores.rb +15 -0
  115. data/db/migrate/20210117112551_remove_store_id_from_spree_payment_methods.rb +5 -0
  116. data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js +0 -2
  117. data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js +0 -2
  118. data/lib/generators/spree/mailers_preview/mailers_preview_generator.rb +23 -0
  119. data/lib/generators/spree/mailers_preview/templates/mailers/previews/order_preview.rb +13 -0
  120. data/lib/generators/spree/mailers_preview/templates/mailers/previews/reimbursement_preview.rb +5 -0
  121. data/lib/generators/spree/mailers_preview/templates/mailers/previews/shipment_preview.rb +5 -0
  122. data/lib/generators/spree/mailers_preview/templates/mailers/previews/user_preview.rb +11 -0
  123. data/lib/spree/core.rb +2 -0
  124. data/lib/spree/core/controller_helpers/common.rb +1 -0
  125. data/lib/spree/core/controller_helpers/currency_helpers.rb +15 -0
  126. data/lib/spree/core/controller_helpers/order.rb +9 -4
  127. data/lib/spree/core/controller_helpers/store.rb +16 -1
  128. data/lib/spree/core/importer/order.rb +9 -9
  129. data/lib/spree/core/product_filters.rb +3 -3
  130. data/lib/spree/core/version.rb +1 -1
  131. data/lib/spree/i18n.rb +7 -21
  132. data/lib/spree/permitted_attributes.rb +8 -5
  133. data/lib/spree/service_module.rb +6 -2
  134. data/lib/spree/testing_support/authorization_helpers.rb +7 -4
  135. data/lib/spree/testing_support/capybara_config.rb +1 -1
  136. data/lib/spree/testing_support/factories/promotion_factory.rb +29 -17
  137. data/lib/spree/testing_support/factories/shipment_factory.rb +7 -9
  138. data/lib/spree/testing_support/factories/store_factory.rb +11 -8
  139. data/lib/spree/testing_support/factories/zone_factory.rb +16 -13
  140. data/lib/spree/testing_support/i18n.rb +1 -1
  141. data/lib/spree/testing_support/order_walkthrough.rb +8 -3
  142. data/lib/spree/testing_support/rspec_retry_config.rb +10 -0
  143. data/spree_core.gemspec +10 -8
  144. data/vendor/assets/javascripts/cleave.js +1669 -0
  145. metadata +105 -30
  146. data/app/views/spree/order_mailer/_adjustment.html.erb +0 -8
  147. data/app/views/spree/order_mailer/_subtotal.html.erb +0 -8
  148. data/app/views/spree/order_mailer/_total.html.erb +0 -8
  149. data/lib/spree/i18n/base.rb +0 -17
  150. data/lib/spree/i18n/initializer.rb +0 -1
metadata CHANGED
@@ -1,14 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.13
4
+ version: 4.2.0.rc4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
+ - Spark Solutions
8
9
  autorequire:
9
10
  bindir: bin
10
11
  cert_chain: []
11
- date: 2020-12-15 00:00:00.000000000 Z
12
+ date: 2021-01-20 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: activemerchant
@@ -44,20 +45,20 @@ dependencies:
44
45
  requirements:
45
46
  - - ">="
46
47
  - !ruby/object:Gem::Version
47
- version: 3.1.4
48
+ version: 3.3.1
48
49
  - - "<"
49
50
  - !ruby/object:Gem::Version
50
- version: 3.3.0
51
+ version: '4.0'
51
52
  type: :runtime
52
53
  prerelease: false
53
54
  version_requirements: !ruby/object:Gem::Requirement
54
55
  requirements:
55
56
  - - ">="
56
57
  - !ruby/object:Gem::Version
57
- version: 3.1.4
58
+ version: 3.3.1
58
59
  - - "<"
59
60
  - !ruby/object:Gem::Version
60
- version: 3.3.0
61
+ version: '4.0'
61
62
  - !ruby/object:Gem::Dependency
62
63
  name: carmen
63
64
  requirement: !ruby/object:Gem::Requirement
@@ -84,14 +85,14 @@ dependencies:
84
85
  requirements:
85
86
  - - "~>"
86
87
  - !ruby/object:Gem::Version
87
- version: '3.0'
88
+ version: '3.2'
88
89
  type: :runtime
89
90
  prerelease: false
90
91
  version_requirements: !ruby/object:Gem::Requirement
91
92
  requirements:
92
93
  - - "~>"
93
94
  - !ruby/object:Gem::Version
94
- version: '3.0'
95
+ version: '3.2'
95
96
  - !ruby/object:Gem::Dependency
96
97
  name: ffaker
97
98
  requirement: !ruby/object:Gem::Requirement
@@ -115,7 +116,7 @@ dependencies:
115
116
  version: 5.2.1
116
117
  - - "<"
117
118
  - !ruby/object:Gem::Version
118
- version: 5.4.0
119
+ version: 5.5.0
119
120
  type: :runtime
120
121
  prerelease: false
121
122
  version_requirements: !ruby/object:Gem::Requirement
@@ -125,7 +126,7 @@ dependencies:
125
126
  version: 5.2.1
126
127
  - - "<"
127
128
  - !ruby/object:Gem::Version
128
- version: 5.4.0
129
+ version: 5.5.0
129
130
  - !ruby/object:Gem::Dependency
130
131
  name: highline
131
132
  requirement: !ruby/object:Gem::Requirement
@@ -214,30 +215,42 @@ dependencies:
214
215
  name: rails
215
216
  requirement: !ruby/object:Gem::Requirement
216
217
  requirements:
217
- - - "~>"
218
+ - - ">="
218
219
  - !ruby/object:Gem::Version
219
- version: 6.0.0
220
+ version: '6.0'
221
+ - - "<"
222
+ - !ruby/object:Gem::Version
223
+ version: '6.2'
220
224
  type: :runtime
221
225
  prerelease: false
222
226
  version_requirements: !ruby/object:Gem::Requirement
223
227
  requirements:
224
- - - "~>"
228
+ - - ">="
229
+ - !ruby/object:Gem::Version
230
+ version: '6.0'
231
+ - - "<"
225
232
  - !ruby/object:Gem::Version
226
- version: 6.0.0
233
+ version: '6.2'
227
234
  - !ruby/object:Gem::Dependency
228
235
  name: ransack
229
236
  requirement: !ruby/object:Gem::Requirement
230
237
  requirements:
231
- - - "~>"
238
+ - - ">="
232
239
  - !ruby/object:Gem::Version
233
- version: 2.3.0
240
+ version: '2.3'
241
+ - - "<"
242
+ - !ruby/object:Gem::Version
243
+ version: '2.5'
234
244
  type: :runtime
235
245
  prerelease: false
236
246
  version_requirements: !ruby/object:Gem::Requirement
237
247
  requirements:
238
- - - "~>"
248
+ - - ">="
249
+ - !ruby/object:Gem::Version
250
+ version: '2.3'
251
+ - - "<"
239
252
  - !ruby/object:Gem::Version
240
- version: 2.3.0
253
+ version: '2.5'
241
254
  - !ruby/object:Gem::Dependency
242
255
  name: responders
243
256
  requirement: !ruby/object:Gem::Requirement
@@ -252,6 +265,20 @@ dependencies:
252
265
  - - ">="
253
266
  - !ruby/object:Gem::Version
254
267
  version: '0'
268
+ - !ruby/object:Gem::Dependency
269
+ name: rexml
270
+ requirement: !ruby/object:Gem::Requirement
271
+ requirements:
272
+ - - ">="
273
+ - !ruby/object:Gem::Version
274
+ version: '0'
275
+ type: :runtime
276
+ prerelease: false
277
+ version_requirements: !ruby/object:Gem::Requirement
278
+ requirements:
279
+ - - ">="
280
+ - !ruby/object:Gem::Version
281
+ version: '0'
255
282
  - !ruby/object:Gem::Dependency
256
283
  name: state_machines-activerecord
257
284
  requirement: !ruby/object:Gem::Requirement
@@ -376,6 +403,20 @@ dependencies:
376
403
  - - "~>"
377
404
  - !ruby/object:Gem::Version
378
405
  version: '1.2'
406
+ - !ruby/object:Gem::Dependency
407
+ name: active_storage_validations
408
+ requirement: !ruby/object:Gem::Requirement
409
+ requirements:
410
+ - - "~>"
411
+ - !ruby/object:Gem::Version
412
+ version: '0.9'
413
+ type: :runtime
414
+ prerelease: false
415
+ version_requirements: !ruby/object:Gem::Requirement
416
+ requirements:
417
+ - - "~>"
418
+ - !ruby/object:Gem::Version
419
+ version: '0.9'
379
420
  - !ruby/object:Gem::Dependency
380
421
  name: email_spec
381
422
  requirement: !ruby/object:Gem::Requirement
@@ -391,7 +432,7 @@ dependencies:
391
432
  - !ruby/object:Gem::Version
392
433
  version: '2.2'
393
434
  description: The bare bones necessary for Spree.
394
- email: sean@spreecommerce.com
435
+ email: hello@spreecommerce.org
395
436
  executables: []
396
437
  extensions: []
397
438
  extra_rdoc_files: []
@@ -407,6 +448,7 @@ files:
407
448
  - app/assets/javascripts/spree.js
408
449
  - app/controllers/spree/base_controller.rb
409
450
  - app/finders/spree/addresses/find.rb
451
+ - app/finders/spree/base_finder.rb
410
452
  - app/finders/spree/countries/find.rb
411
453
  - app/finders/spree/credit_cards/find.rb
412
454
  - app/finders/spree/line_items/find_by_variant.rb
@@ -417,6 +459,7 @@ files:
417
459
  - app/finders/spree/variants/option_types_finder.rb
418
460
  - app/finders/spree/variants/visible_finder.rb
419
461
  - app/helpers/spree/base_helper.rb
462
+ - app/helpers/spree/mail_helper.rb
420
463
  - app/helpers/spree/products_helper.rb
421
464
  - app/mailers/spree/base_mailer.rb
422
465
  - app/mailers/spree/order_mailer.rb
@@ -563,7 +606,7 @@ files:
563
606
  - app/models/spree/return_item/eligibility_validator/inventory_shipped.rb
564
607
  - app/models/spree/return_item/eligibility_validator/no_reimbursements.rb
565
608
  - app/models/spree/return_item/eligibility_validator/order_completed.rb
566
- - app/models/spree/return_item/eligibility_validator/r_m_a_required.rb
609
+ - app/models/spree/return_item/eligibility_validator/rma_required.rb
567
610
  - app/models/spree/return_item/eligibility_validator/time_since_purchase.rb
568
611
  - app/models/spree/return_item/exchange_variant_eligibility/same_option_value.rb
569
612
  - app/models/spree/return_item/exchange_variant_eligibility/same_product.rb
@@ -619,8 +662,8 @@ files:
619
662
  - app/presenters/spree/variant_presenter.rb
620
663
  - app/presenters/spree/variants/option_types_presenter.rb
621
664
  - app/presenters/spree/variants/options_presenter.rb
622
- - app/services/spree/account/addresses/base.rb
623
665
  - app/services/spree/account/addresses/create.rb
666
+ - app/services/spree/account/addresses/helper.rb
624
667
  - app/services/spree/account/addresses/update.rb
625
668
  - app/services/spree/cart/add_item.rb
626
669
  - app/services/spree/cart/create.rb
@@ -639,18 +682,18 @@ files:
639
682
  - app/services/spree/checkout/update.rb
640
683
  - app/services/spree/compare_line_items.rb
641
684
  - app/services/spree/generate_token.rb
685
+ - app/sorters/spree/base_sorter.rb
642
686
  - app/sorters/spree/orders/sort.rb
643
687
  - app/sorters/spree/products/sort.rb
644
688
  - app/validators/db_maximum_length_validator.rb
645
689
  - app/validators/email_validator.rb
646
690
  - app/views/layouts/spree/base_mailer.html.erb
647
- - app/views/spree/order_mailer/_adjustment.html.erb
648
- - app/views/spree/order_mailer/_subtotal.html.erb
649
- - app/views/spree/order_mailer/_total.html.erb
650
691
  - app/views/spree/order_mailer/cancel_email.html.erb
651
692
  - app/views/spree/order_mailer/cancel_email.text.erb
652
693
  - app/views/spree/order_mailer/confirm_email.html.erb
653
694
  - app/views/spree/order_mailer/confirm_email.text.erb
695
+ - app/views/spree/order_mailer/store_owner_notification_email.html.erb
696
+ - app/views/spree/order_mailer/store_owner_notification_email.text.erb
654
697
  - app/views/spree/reimbursement_mailer/reimbursement_email.html.erb
655
698
  - app/views/spree/reimbursement_mailer/reimbursement_email.text.erb
656
699
  - app/views/spree/shared/_base_mailer_footer.html.erb
@@ -659,6 +702,11 @@ files:
659
702
  - app/views/spree/shared/_error_messages.html.erb
660
703
  - app/views/spree/shared/_mailer_line_item.html.erb
661
704
  - app/views/spree/shared/_paths.html.erb
705
+ - app/views/spree/shared/_purchased_items_table.html.erb
706
+ - app/views/spree/shared/purchased_items_table/_adjustment.html.erb
707
+ - app/views/spree/shared/purchased_items_table/_line_item.html.erb
708
+ - app/views/spree/shared/purchased_items_table/_subtotal.html.erb
709
+ - app/views/spree/shared/purchased_items_table/_total.html.erb
662
710
  - app/views/spree/shipment_mailer/shipped_email.html.erb
663
711
  - app/views/spree/shipment_mailer/shipped_email.text.erb
664
712
  - app/views/spree/test_mailer/test_email.html.erb
@@ -666,8 +714,10 @@ files:
666
714
  - config/initializers/active_storage.rb
667
715
  - config/initializers/assets.rb
668
716
  - config/initializers/friendly_id.rb
717
+ - config/initializers/inflections.rb
669
718
  - config/initializers/premailer_assets.rb
670
719
  - config/initializers/premailer_rails.rb
720
+ - config/initializers/rails61_fixes.rb
671
721
  - config/initializers/state_machine.rb
672
722
  - config/locales/en.yml
673
723
  - config/routes.rb
@@ -943,8 +993,27 @@ files:
943
993
  - db/migrate/20190523092729_add_user_id_and_deleted_at_to_spree_addresses.rb
944
994
  - db/migrate/20191005121504_add_store_id_to_payment_methods.rb
945
995
  - db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb
996
+ - db/migrate/20191017121054_add_supported_currencies_to_store.rb
946
997
  - db/migrate/20200102141311_add_social_to_spree_stores.rb
947
998
  - db/migrate/20200212144523_add_hide_from_nav_to_taxons.rb
999
+ - db/migrate/20200308210757_add_default_locale_to_spree_store.rb
1000
+ - db/migrate/20200310145140_add_customer_support_email_to_spree_store.rb
1001
+ - db/migrate/20200421095017_add_compare_at_amount_to_spree_prices.rb
1002
+ - db/migrate/20200423123001_add_default_country_id_to_spree_store.rb
1003
+ - db/migrate/20200430072209_add_footer_fields_to_spree_stores.rb
1004
+ - db/migrate/20200513154939_add_show_property_to_spree_product_properties.rb
1005
+ - db/migrate/20200607161221_add_store_owner_order_notification_delivered_to_spree_orders.rb
1006
+ - db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb
1007
+ - db/migrate/20200610113542_add_label_to_spree_addresses.rb
1008
+ - db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb
1009
+ - db/migrate/20201006110150_add_checkout_zone_field_to_store.rb
1010
+ - db/migrate/20201012091259_add_filterable_column_to_spree_option_types.rb
1011
+ - db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb
1012
+ - db/migrate/20201127084048_add_default_country_kind_to_spree_zones.rb
1013
+ - db/migrate/20210112193440_remove_contact_email_from_spree_stores.rb
1014
+ - db/migrate/20210114182625_create_spree_payment_methods_stores.rb
1015
+ - db/migrate/20210114220232_migrate_data_payment_methods_stores.rb
1016
+ - db/migrate/20210117112551_remove_store_id_from_spree_payment_methods.rb
948
1017
  - db/seeds.rb
949
1018
  - lib/friendly_id/slug_rails5_patch.rb
950
1019
  - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -971,10 +1040,16 @@ files:
971
1040
  - lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js
972
1041
  - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
973
1042
  - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
1043
+ - lib/generators/spree/mailers_preview/mailers_preview_generator.rb
1044
+ - lib/generators/spree/mailers_preview/templates/mailers/previews/order_preview.rb
1045
+ - lib/generators/spree/mailers_preview/templates/mailers/previews/reimbursement_preview.rb
1046
+ - lib/generators/spree/mailers_preview/templates/mailers/previews/shipment_preview.rb
1047
+ - lib/generators/spree/mailers_preview/templates/mailers/previews/user_preview.rb
974
1048
  - lib/spree/core.rb
975
1049
  - lib/spree/core/components.rb
976
1050
  - lib/spree/core/controller_helpers/auth.rb
977
1051
  - lib/spree/core/controller_helpers/common.rb
1052
+ - lib/spree/core/controller_helpers/currency_helpers.rb
978
1053
  - lib/spree/core/controller_helpers/order.rb
979
1054
  - lib/spree/core/controller_helpers/search.rb
980
1055
  - lib/spree/core/controller_helpers/store.rb
@@ -998,8 +1073,6 @@ files:
998
1073
  - lib/spree/database_type_utilities.rb
999
1074
  - lib/spree/dependencies_helper.rb
1000
1075
  - lib/spree/i18n.rb
1001
- - lib/spree/i18n/base.rb
1002
- - lib/spree/i18n/initializer.rb
1003
1076
  - lib/spree/localized_number.rb
1004
1077
  - lib/spree/migrations.rb
1005
1078
  - lib/spree/money.rb
@@ -1071,6 +1144,7 @@ files:
1071
1144
  - lib/spree/testing_support/kernel.rb
1072
1145
  - lib/spree/testing_support/order_walkthrough.rb
1073
1146
  - lib/spree/testing_support/preferences.rb
1147
+ - lib/spree/testing_support/rspec_retry_config.rb
1074
1148
  - lib/spree/testing_support/url_helpers.rb
1075
1149
  - lib/spree_core.rb
1076
1150
  - lib/tasks/core.rake
@@ -1080,18 +1154,19 @@ files:
1080
1154
  - spec/fixtures/text-file.txt
1081
1155
  - spec/fixtures/thinking-cat.jpg
1082
1156
  - spree_core.gemspec
1157
+ - vendor/assets/javascripts/cleave.js
1083
1158
  - vendor/assets/javascripts/fetch.umd.js
1084
1159
  - vendor/assets/javascripts/jquery.payment.js
1085
1160
  - vendor/assets/javascripts/jsuri.js
1086
1161
  - vendor/assets/javascripts/polyfill.min.js
1087
- homepage: http://spreecommerce.org
1162
+ homepage: https://spreecommerce.org
1088
1163
  licenses:
1089
1164
  - BSD-3-Clause
1090
1165
  metadata:
1091
1166
  bug_tracker_uri: https://github.com/spree/spree/issues
1092
- changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.13
1167
+ changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc4
1093
1168
  documentation_uri: https://guides.spreecommerce.org/
1094
- source_code_uri: https://github.com/spree/spree/tree/v4.1.13
1169
+ source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc4
1095
1170
  post_install_message:
1096
1171
  rdoc_options: []
1097
1172
  require_paths:
@@ -1107,7 +1182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1107
1182
  - !ruby/object:Gem::Version
1108
1183
  version: 1.8.23
1109
1184
  requirements: []
1110
- rubygems_version: 3.1.2
1185
+ rubygems_version: 3.1.4
1111
1186
  signing_key:
1112
1187
  specification_version: 4
1113
1188
  summary: The bare bones necessary for Spree.
@@ -1,8 +0,0 @@
1
- <tr>
2
- <td class="six sub-columns">
3
- <%= raw(adjustment.label) %>:
4
- </td>
5
- <td class="six sub-columns last right">
6
- <%= adjustment.display_amount %>
7
- </td>
8
- </tr>
@@ -1,8 +0,0 @@
1
- <tr>
2
- <td class="six sub-columns">
3
- <%= Spree.t('order_mailer.subtotal') %>
4
- </td>
5
- <td class="six sub-columns last right">
6
- <%= order.display_item_total %>
7
- </td>
8
- </tr>
@@ -1,8 +0,0 @@
1
- <tr>
2
- <td class="six sub-columns">
3
- <strong><%= Spree.t('order_mailer.total') %></strong>
4
- </td>
5
- <td class="six sub-columns last right">
6
- <strong><%= order.display_total %></strong>
7
- </td>
8
- </tr>
@@ -1,17 +0,0 @@
1
- module Spree
2
- module ViewContext
3
- def self.context=(context)
4
- @context = context
5
- end
6
-
7
- def self.context
8
- @context
9
- end
10
-
11
- def view_context
12
- super.tap do |context|
13
- Spree::ViewContext.context = context
14
- end
15
- end
16
- end
17
- end
@@ -1 +0,0 @@
1
- Spree::BaseController.include Spree::ViewContext