spree_core 4.1.8 → 4.2.0.rc1

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 (99) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/base_controller.rb +1 -0
  3. data/app/finders/spree/addresses/find.rb +17 -0
  4. data/app/helpers/spree/base_helper.rb +60 -13
  5. data/app/helpers/spree/mail_helper.rb +29 -0
  6. data/app/helpers/spree/products_helper.rb +2 -1
  7. data/app/mailers/spree/base_mailer.rb +17 -3
  8. data/app/mailers/spree/order_mailer.rb +11 -2
  9. data/app/mailers/spree/reimbursement_mailer.rb +4 -2
  10. data/app/mailers/spree/shipment_mailer.rb +4 -2
  11. data/app/models/concerns/spree/default_price.rb +2 -1
  12. data/app/models/concerns/spree/user_methods.rb +11 -5
  13. data/app/models/concerns/spree/user_payment_source.rb +1 -1
  14. data/app/models/spree/address.rb +13 -1
  15. data/app/models/spree/app_configuration.rb +5 -0
  16. data/app/models/spree/app_dependencies.rb +7 -1
  17. data/app/models/spree/credit_card.rb +5 -0
  18. data/app/models/spree/line_item.rb +12 -2
  19. data/app/models/spree/option_type.rb +5 -1
  20. data/app/models/spree/order.rb +33 -7
  21. data/app/models/spree/order/payments.rb +10 -2
  22. data/app/models/spree/preferences/store.rb +1 -1
  23. data/app/models/spree/price.rb +26 -2
  24. data/app/models/spree/product.rb +17 -7
  25. data/app/models/spree/promotion.rb +6 -0
  26. data/app/models/spree/promotion_handler/coupon.rb +1 -1
  27. data/app/models/spree/promotion_handler/promotion_duplicator.rb +9 -3
  28. data/app/models/spree/reimbursement.rb +2 -0
  29. data/app/models/spree/shipment.rb +2 -5
  30. data/app/models/spree/stock_location.rb +13 -2
  31. data/app/models/spree/store.rb +22 -2
  32. data/app/models/spree/variant.rb +20 -3
  33. data/app/presenters/spree/variant_presenter.rb +9 -1
  34. data/app/presenters/spree/variants/option_types_presenter.rb +1 -0
  35. data/app/services/spree/account/addresses/base.rb +39 -0
  36. data/app/services/spree/account/addresses/create.rb +18 -0
  37. data/app/services/spree/account/addresses/update.rb +18 -0
  38. data/app/services/spree/checkout/update.rb +13 -2
  39. data/app/views/layouts/spree/base_mailer.html.erb +45 -40
  40. data/app/views/spree/order_mailer/cancel_email.html.erb +19 -25
  41. data/app/views/spree/order_mailer/cancel_email.text.erb +24 -2
  42. data/app/views/spree/order_mailer/confirm_email.html.erb +18 -65
  43. data/app/views/spree/order_mailer/confirm_email.text.erb +2 -1
  44. data/app/views/spree/order_mailer/store_owner_notification_email.html.erb +23 -0
  45. data/app/views/spree/order_mailer/store_owner_notification_email.text.erb +38 -0
  46. data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb +53 -58
  47. data/app/views/spree/reimbursement_mailer/reimbursement_email.text.erb +3 -1
  48. data/app/views/spree/shared/_base_mailer_footer.html.erb +6 -14
  49. data/app/views/spree/shared/_base_mailer_header.html.erb +12 -32
  50. data/app/views/spree/shared/_base_mailer_stylesheets.html.erb +293 -625
  51. data/app/views/spree/shared/_purchased_items_table.html.erb +60 -0
  52. data/app/views/spree/shared/purchased_items_table/_adjustment.html.erb +13 -0
  53. data/app/views/spree/shared/purchased_items_table/_line_item.html.erb +27 -0
  54. data/app/views/spree/shared/purchased_items_table/_subtotal.html.erb +13 -0
  55. data/app/views/spree/shared/purchased_items_table/_total.html.erb +13 -0
  56. data/app/views/spree/shipment_mailer/shipped_email.html.erb +31 -36
  57. data/app/views/spree/shipment_mailer/shipped_email.text.erb +2 -1
  58. data/config/initializers/assets.rb +1 -0
  59. data/config/locales/en.yml +123 -16
  60. data/db/default/spree/countries.rb +10 -4
  61. data/db/default/spree/states.rb +42 -5
  62. data/db/default/spree/stores.rb +17 -12
  63. data/db/default/spree/zones.rb +1 -1
  64. data/db/migrate/20140309033438_create_store_from_preferences.rb +1 -1
  65. data/db/migrate/20191017121054_add_supported_currencies_to_store.rb +10 -0
  66. data/db/migrate/20200102141311_add_social_to_spree_stores.rb +3 -0
  67. data/db/migrate/20200308210757_add_default_locale_to_spree_store.rb +7 -0
  68. data/db/migrate/20200310145140_add_customer_support_email_to_spree_store.rb +7 -0
  69. data/db/migrate/20200421095017_add_compare_at_amount_to_spree_prices.rb +7 -0
  70. data/db/migrate/20200423123001_add_default_country_id_to_spree_store.rb +9 -0
  71. data/db/migrate/20200430072209_add_footer_fields_to_spree_stores.rb +8 -0
  72. data/db/migrate/20200513154939_add_show_property_to_spree_product_properties.rb +5 -0
  73. data/db/migrate/20200607161221_add_store_owner_order_notification_delivered_to_spree_orders.rb +7 -0
  74. data/db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb +7 -0
  75. data/db/migrate/20200610113542_add_label_to_spree_addresses.rb +5 -0
  76. data/db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb +5 -0
  77. data/db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb +5 -0
  78. data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js +0 -2
  79. data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js +0 -2
  80. data/lib/generators/spree/mailers_preview/mailers_preview_generator.rb +23 -0
  81. data/lib/generators/spree/mailers_preview/templates/mailers/previews/order_preview.rb +13 -0
  82. data/lib/generators/spree/mailers_preview/templates/mailers/previews/reimbursement_preview.rb +5 -0
  83. data/lib/generators/spree/mailers_preview/templates/mailers/previews/shipment_preview.rb +5 -0
  84. data/lib/generators/spree/mailers_preview/templates/mailers/previews/user_preview.rb +11 -0
  85. data/lib/spree/core.rb +2 -0
  86. data/lib/spree/core/controller_helpers/common.rb +1 -0
  87. data/lib/spree/core/controller_helpers/currency_helpers.rb +15 -0
  88. data/lib/spree/core/controller_helpers/order.rb +9 -4
  89. data/lib/spree/core/controller_helpers/store.rb +12 -1
  90. data/lib/spree/core/version.rb +1 -1
  91. data/lib/spree/permitted_attributes.rb +8 -5
  92. data/lib/spree/testing_support/authorization_helpers.rb +7 -4
  93. data/lib/spree/testing_support/factories/store_factory.rb +11 -8
  94. data/spree_core.gemspec +5 -4
  95. data/vendor/assets/javascripts/cleave.js +1669 -0
  96. metadata +55 -12
  97. data/app/views/spree/order_mailer/_adjustment.html.erb +0 -8
  98. data/app/views/spree/order_mailer/_subtotal.html.erb +0 -8
  99. data/app/views/spree/order_mailer/_total.html.erb +0 -8
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.8
4
+ version: 4.2.0.rc1
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-08-05 00:00:00.000000000 Z
12
+ date: 2020-10-15 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: activemerchant
@@ -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
@@ -376,6 +377,20 @@ dependencies:
376
377
  - - "~>"
377
378
  - !ruby/object:Gem::Version
378
379
  version: '1.2'
380
+ - !ruby/object:Gem::Dependency
381
+ name: active_storage_validations
382
+ requirement: !ruby/object:Gem::Requirement
383
+ requirements:
384
+ - - "~>"
385
+ - !ruby/object:Gem::Version
386
+ version: '0.9'
387
+ type: :runtime
388
+ prerelease: false
389
+ version_requirements: !ruby/object:Gem::Requirement
390
+ requirements:
391
+ - - "~>"
392
+ - !ruby/object:Gem::Version
393
+ version: '0.9'
379
394
  - !ruby/object:Gem::Dependency
380
395
  name: email_spec
381
396
  requirement: !ruby/object:Gem::Requirement
@@ -391,7 +406,7 @@ dependencies:
391
406
  - !ruby/object:Gem::Version
392
407
  version: '2.2'
393
408
  description: The bare bones necessary for Spree.
394
- email: sean@spreecommerce.com
409
+ email: hello@spreecommerce.org
395
410
  executables: []
396
411
  extensions: []
397
412
  extra_rdoc_files: []
@@ -406,6 +421,7 @@ files:
406
421
  - app/assets/images/noimage/small.png
407
422
  - app/assets/javascripts/spree.js
408
423
  - app/controllers/spree/base_controller.rb
424
+ - app/finders/spree/addresses/find.rb
409
425
  - app/finders/spree/countries/find.rb
410
426
  - app/finders/spree/credit_cards/find.rb
411
427
  - app/finders/spree/line_items/find_by_variant.rb
@@ -416,6 +432,7 @@ files:
416
432
  - app/finders/spree/variants/option_types_finder.rb
417
433
  - app/finders/spree/variants/visible_finder.rb
418
434
  - app/helpers/spree/base_helper.rb
435
+ - app/helpers/spree/mail_helper.rb
419
436
  - app/helpers/spree/products_helper.rb
420
437
  - app/mailers/spree/base_mailer.rb
421
438
  - app/mailers/spree/order_mailer.rb
@@ -618,6 +635,9 @@ files:
618
635
  - app/presenters/spree/variant_presenter.rb
619
636
  - app/presenters/spree/variants/option_types_presenter.rb
620
637
  - app/presenters/spree/variants/options_presenter.rb
638
+ - app/services/spree/account/addresses/base.rb
639
+ - app/services/spree/account/addresses/create.rb
640
+ - app/services/spree/account/addresses/update.rb
621
641
  - app/services/spree/cart/add_item.rb
622
642
  - app/services/spree/cart/create.rb
623
643
  - app/services/spree/cart/estimate_shipping_rates.rb
@@ -640,13 +660,12 @@ files:
640
660
  - app/validators/db_maximum_length_validator.rb
641
661
  - app/validators/email_validator.rb
642
662
  - app/views/layouts/spree/base_mailer.html.erb
643
- - app/views/spree/order_mailer/_adjustment.html.erb
644
- - app/views/spree/order_mailer/_subtotal.html.erb
645
- - app/views/spree/order_mailer/_total.html.erb
646
663
  - app/views/spree/order_mailer/cancel_email.html.erb
647
664
  - app/views/spree/order_mailer/cancel_email.text.erb
648
665
  - app/views/spree/order_mailer/confirm_email.html.erb
649
666
  - app/views/spree/order_mailer/confirm_email.text.erb
667
+ - app/views/spree/order_mailer/store_owner_notification_email.html.erb
668
+ - app/views/spree/order_mailer/store_owner_notification_email.text.erb
650
669
  - app/views/spree/reimbursement_mailer/reimbursement_email.html.erb
651
670
  - app/views/spree/reimbursement_mailer/reimbursement_email.text.erb
652
671
  - app/views/spree/shared/_base_mailer_footer.html.erb
@@ -655,6 +674,11 @@ files:
655
674
  - app/views/spree/shared/_error_messages.html.erb
656
675
  - app/views/spree/shared/_mailer_line_item.html.erb
657
676
  - app/views/spree/shared/_paths.html.erb
677
+ - app/views/spree/shared/_purchased_items_table.html.erb
678
+ - app/views/spree/shared/purchased_items_table/_adjustment.html.erb
679
+ - app/views/spree/shared/purchased_items_table/_line_item.html.erb
680
+ - app/views/spree/shared/purchased_items_table/_subtotal.html.erb
681
+ - app/views/spree/shared/purchased_items_table/_total.html.erb
658
682
  - app/views/spree/shipment_mailer/shipped_email.html.erb
659
683
  - app/views/spree/shipment_mailer/shipped_email.text.erb
660
684
  - app/views/spree/test_mailer/test_email.html.erb
@@ -939,8 +963,20 @@ files:
939
963
  - db/migrate/20190523092729_add_user_id_and_deleted_at_to_spree_addresses.rb
940
964
  - db/migrate/20191005121504_add_store_id_to_payment_methods.rb
941
965
  - db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb
966
+ - db/migrate/20191017121054_add_supported_currencies_to_store.rb
942
967
  - db/migrate/20200102141311_add_social_to_spree_stores.rb
943
968
  - db/migrate/20200212144523_add_hide_from_nav_to_taxons.rb
969
+ - db/migrate/20200308210757_add_default_locale_to_spree_store.rb
970
+ - db/migrate/20200310145140_add_customer_support_email_to_spree_store.rb
971
+ - db/migrate/20200421095017_add_compare_at_amount_to_spree_prices.rb
972
+ - db/migrate/20200423123001_add_default_country_id_to_spree_store.rb
973
+ - db/migrate/20200430072209_add_footer_fields_to_spree_stores.rb
974
+ - db/migrate/20200513154939_add_show_property_to_spree_product_properties.rb
975
+ - db/migrate/20200607161221_add_store_owner_order_notification_delivered_to_spree_orders.rb
976
+ - db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb
977
+ - db/migrate/20200610113542_add_label_to_spree_addresses.rb
978
+ - db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb
979
+ - db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb
944
980
  - db/seeds.rb
945
981
  - lib/friendly_id/slug_rails5_patch.rb
946
982
  - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -967,10 +1003,16 @@ files:
967
1003
  - lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js
968
1004
  - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
969
1005
  - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
1006
+ - lib/generators/spree/mailers_preview/mailers_preview_generator.rb
1007
+ - lib/generators/spree/mailers_preview/templates/mailers/previews/order_preview.rb
1008
+ - lib/generators/spree/mailers_preview/templates/mailers/previews/reimbursement_preview.rb
1009
+ - lib/generators/spree/mailers_preview/templates/mailers/previews/shipment_preview.rb
1010
+ - lib/generators/spree/mailers_preview/templates/mailers/previews/user_preview.rb
970
1011
  - lib/spree/core.rb
971
1012
  - lib/spree/core/components.rb
972
1013
  - lib/spree/core/controller_helpers/auth.rb
973
1014
  - lib/spree/core/controller_helpers/common.rb
1015
+ - lib/spree/core/controller_helpers/currency_helpers.rb
974
1016
  - lib/spree/core/controller_helpers/order.rb
975
1017
  - lib/spree/core/controller_helpers/search.rb
976
1018
  - lib/spree/core/controller_helpers/store.rb
@@ -1076,18 +1118,19 @@ files:
1076
1118
  - spec/fixtures/text-file.txt
1077
1119
  - spec/fixtures/thinking-cat.jpg
1078
1120
  - spree_core.gemspec
1121
+ - vendor/assets/javascripts/cleave.js
1079
1122
  - vendor/assets/javascripts/fetch.umd.js
1080
1123
  - vendor/assets/javascripts/jquery.payment.js
1081
1124
  - vendor/assets/javascripts/jsuri.js
1082
1125
  - vendor/assets/javascripts/polyfill.min.js
1083
- homepage: http://spreecommerce.org
1126
+ homepage: https://spreecommerce.org
1084
1127
  licenses:
1085
1128
  - BSD-3-Clause
1086
1129
  metadata:
1087
1130
  bug_tracker_uri: https://github.com/spree/spree/issues
1088
- changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.8
1131
+ changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc1
1089
1132
  documentation_uri: https://guides.spreecommerce.org/
1090
- source_code_uri: https://github.com/spree/spree/tree/v4.1.8
1133
+ source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc1
1091
1134
  post_install_message:
1092
1135
  rdoc_options: []
1093
1136
  require_paths:
@@ -1103,7 +1146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1103
1146
  - !ruby/object:Gem::Version
1104
1147
  version: 1.8.23
1105
1148
  requirements: []
1106
- rubygems_version: 3.1.2
1149
+ rubygems_version: 3.1.4
1107
1150
  signing_key:
1108
1151
  specification_version: 4
1109
1152
  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>