spree_core 4.1.15 → 4.2.0.beta

Sign up to get free protection for your applications and to get access to all the features.
Files changed (92) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/base_controller.rb +1 -0
  3. data/app/helpers/spree/base_helper.rb +23 -2
  4. data/app/helpers/spree/mail_helper.rb +24 -0
  5. data/app/mailers/spree/base_mailer.rb +17 -3
  6. data/app/mailers/spree/order_mailer.rb +11 -2
  7. data/app/mailers/spree/reimbursement_mailer.rb +4 -2
  8. data/app/mailers/spree/shipment_mailer.rb +4 -2
  9. data/app/models/concerns/spree/default_price.rb +2 -1
  10. data/app/models/concerns/spree/user_methods.rb +11 -5
  11. data/app/models/spree/app_configuration.rb +5 -0
  12. data/app/models/spree/app_dependencies.rb +1 -7
  13. data/app/models/spree/line_item.rb +11 -3
  14. data/app/models/spree/option_type.rb +5 -1
  15. data/app/models/spree/order/address_book.rb +20 -7
  16. data/app/models/spree/order/store_credit.rb +0 -8
  17. data/app/models/spree/order.rb +28 -12
  18. data/app/models/spree/price.rb +26 -2
  19. data/app/models/spree/product.rb +17 -7
  20. data/app/models/spree/promotion_handler/coupon.rb +3 -2
  21. data/app/models/spree/reimbursement.rb +2 -0
  22. data/app/models/spree/shipment.rb +2 -5
  23. data/app/models/spree/stock_location.rb +13 -2
  24. data/app/models/spree/store.rb +19 -2
  25. data/app/models/spree/variant.rb +15 -2
  26. data/app/presenters/spree/variant_presenter.rb +7 -0
  27. data/app/presenters/spree/variants/option_types_presenter.rb +1 -0
  28. data/app/services/spree/checkout/update.rb +2 -13
  29. data/app/views/layouts/spree/base_mailer.html.erb +45 -40
  30. data/app/views/spree/order_mailer/cancel_email.html.erb +19 -25
  31. data/app/views/spree/order_mailer/cancel_email.text.erb +24 -2
  32. data/app/views/spree/order_mailer/confirm_email.html.erb +18 -65
  33. data/app/views/spree/order_mailer/confirm_email.text.erb +2 -1
  34. data/app/views/spree/order_mailer/store_owner_notification_email.html.erb +23 -0
  35. data/app/views/spree/order_mailer/store_owner_notification_email.text.erb +38 -0
  36. data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb +53 -58
  37. data/app/views/spree/reimbursement_mailer/reimbursement_email.text.erb +3 -1
  38. data/app/views/spree/shared/_base_mailer_footer.html.erb +6 -14
  39. data/app/views/spree/shared/_base_mailer_header.html.erb +12 -32
  40. data/app/views/spree/shared/_base_mailer_stylesheets.html.erb +293 -625
  41. data/app/views/spree/shared/_purchased_items_table.html.erb +60 -0
  42. data/app/views/spree/shared/purchased_items_table/_adjustment.html.erb +13 -0
  43. data/app/views/spree/shared/purchased_items_table/_line_item.html.erb +27 -0
  44. data/app/views/spree/shared/purchased_items_table/_subtotal.html.erb +13 -0
  45. data/app/views/spree/shared/purchased_items_table/_total.html.erb +13 -0
  46. data/app/views/spree/shipment_mailer/shipped_email.html.erb +31 -36
  47. data/app/views/spree/shipment_mailer/shipped_email.text.erb +2 -1
  48. data/config/initializers/assets.rb +1 -0
  49. data/config/locales/en.yml +113 -13
  50. data/db/default/spree/stores.rb +11 -10
  51. data/db/migrate/20140309033438_create_store_from_preferences.rb +1 -1
  52. data/db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb +1 -1
  53. data/db/migrate/20191017121054_add_supported_currencies_to_store.rb +10 -0
  54. data/db/migrate/20200102141311_add_social_to_spree_stores.rb +4 -1
  55. data/db/migrate/20200212144523_add_hide_from_nav_to_taxons.rb +1 -1
  56. data/db/migrate/20200308210757_add_default_locale_to_spree_store.rb +7 -0
  57. data/db/migrate/20200310145140_add_customer_support_email_to_spree_store.rb +7 -0
  58. data/db/migrate/20200421095017_add_compare_at_amount_to_spree_prices.rb +7 -0
  59. data/db/migrate/20200423123001_add_default_country_id_to_spree_store.rb +9 -0
  60. data/db/migrate/20200430072209_add_footer_fields_to_spree_stores.rb +8 -0
  61. data/db/migrate/20200513154939_add_show_property_to_spree_product_properties.rb +5 -0
  62. data/db/migrate/20200607161221_add_store_owner_order_notification_delivered_to_spree_orders.rb +7 -0
  63. data/db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb +7 -0
  64. data/db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb +5 -0
  65. data/lib/generators/spree/dummy/dummy_generator.rb +1 -0
  66. data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js +0 -2
  67. data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js +0 -2
  68. data/lib/generators/spree/mailers_preview/mailers_preview_generator.rb +23 -0
  69. data/lib/generators/spree/mailers_preview/templates/mailers/previews/order_preview.rb +13 -0
  70. data/lib/generators/spree/mailers_preview/templates/mailers/previews/reimbursement_preview.rb +5 -0
  71. data/lib/generators/spree/mailers_preview/templates/mailers/previews/shipment_preview.rb +5 -0
  72. data/lib/generators/spree/mailers_preview/templates/mailers/previews/user_preview.rb +11 -0
  73. data/lib/spree/core/controller_helpers/common.rb +1 -0
  74. data/lib/spree/core/controller_helpers/currency_helpers.rb +15 -0
  75. data/lib/spree/core/controller_helpers/store.rb +12 -1
  76. data/lib/spree/core/version.rb +1 -1
  77. data/lib/spree/core.rb +1 -0
  78. data/lib/spree/permitted_attributes.rb +7 -4
  79. data/lib/spree/testing_support/authorization_helpers.rb +7 -4
  80. data/lib/spree/testing_support/capybara_ext.rb +0 -7
  81. data/lib/spree/testing_support/factories/store_factory.rb +11 -8
  82. data/spree_core.gemspec +6 -6
  83. data/vendor/assets/javascripts/cleave.js +1669 -0
  84. metadata +44 -32
  85. data/app/finders/spree/addresses/find.rb +0 -17
  86. data/app/models/spree/order_contents.rb +0 -31
  87. data/app/services/spree/account/addresses/base.rb +0 -39
  88. data/app/services/spree/account/addresses/create.rb +0 -18
  89. data/app/services/spree/account/addresses/update.rb +0 -18
  90. data/app/views/spree/order_mailer/_adjustment.html.erb +0 -8
  91. data/app/views/spree/order_mailer/_subtotal.html.erb +0 -8
  92. data/app/views/spree/order_mailer/_total.html.erb +0 -8
data/app/views/spree/shared/_base_mailer_header.html.erb CHANGED
@@ -1,33 +1,13 @@
1
1
  <!-- You can override this template to design your own header. -->
2
- <table class="row header">
3
- <tr>
4
- <td class="center" align="center">
5
- <center>
6
-
7
- <table class="container">
8
- <tr>
9
- <td class="wrapper last">
10
-
11
- <table class="twelve columns">
12
- <tr>
13
- <td class="twelve sub-columns last">
14
- <% if frontend_available? %>
15
- <%= link_to spree.root_url, class: 'template-label' do %>
16
- <%= image_tag Spree::Config.logo, class: 'logo', alt: Spree::Store.current.name, title: Spree::Store.current.name %>
17
- <% end %>
18
- <% else %>
19
- <%= image_tag Spree::Config.logo, class: 'logo', alt: Spree::Store.current.name, title: Spree::Store.current.name %>
20
- <% end %>
21
- </td>
22
- <td class="expander"></td>
23
- </tr>
24
- </table>
25
-
26
- </td>
27
- </tr>
28
- </table>
29
-
30
- </center>
31
- </td>
32
- </tr>
33
- </table>
2
+ <% store_name = @order&.store&.name || current_store.name %>
3
+ <tr>
4
+ <td class="email-masthead">
5
+ <% if frontend_available? %>
6
+ <%= link_to spree.root_url, class: 'template-label' do %>
7
+ <%= image_tag logo_path, class: 'logo', alt: store_name, title: store_name %>
8
+ <% end %>
9
+ <% else %>
10
+ <%= image_tag logo_path, class: 'logo', alt: store_name, title: store_name %>
11
+ <% end %>
12
+ </td>
13
+ </tr>