spree_core 4.1.12 → 4.2.0.rc3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (151) 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 +2 -6
  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 +11 -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/address_book.rb +7 -20
  32. data/app/models/spree/order/payments.rb +10 -2
  33. data/app/models/spree/payment.rb +18 -4
  34. data/app/models/spree/payment/processing.rb +2 -2
  35. data/app/models/spree/payment_method.rb +3 -3
  36. data/app/models/spree/preferences/store.rb +1 -1
  37. data/app/models/spree/price.rb +25 -6
  38. data/app/models/spree/product.rb +29 -9
  39. data/app/models/spree/promotion.rb +10 -15
  40. data/app/models/spree/promotion/rules/product.rb +2 -1
  41. data/app/models/spree/promotion/rules/user.rb +2 -1
  42. data/app/models/spree/promotion_handler/coupon.rb +2 -3
  43. data/app/models/spree/promotion_handler/promotion_duplicator.rb +9 -3
  44. data/app/models/spree/refund.rb +2 -2
  45. data/app/models/spree/reimbursement.rb +2 -0
  46. data/app/models/spree/return_item/eligibility_validator/default.rb +0 -2
  47. data/app/models/spree/return_item/eligibility_validator/{r_m_a_required.rb → rma_required.rb} +0 -0
  48. data/app/models/spree/shipment.rb +3 -6
  49. data/app/models/spree/shipping_method.rb +1 -5
  50. data/app/models/spree/shipping_rate.rb +2 -11
  51. data/app/models/spree/stock/availability_validator.rb +3 -4
  52. data/app/models/spree/stock_item.rb +1 -5
  53. data/app/models/spree/stock_location.rb +13 -2
  54. data/app/models/spree/store.rb +51 -2
  55. data/app/models/spree/store_credit.rb +1 -1
  56. data/app/models/spree/variant.rb +16 -10
  57. data/app/models/spree/zone.rb +17 -4
  58. data/app/presenters/spree/variant_presenter.rb +9 -1
  59. data/app/presenters/spree/variants/option_types_presenter.rb +1 -0
  60. data/app/services/spree/account/addresses/create.rb +6 -1
  61. data/app/services/spree/account/addresses/{base.rb → helper.rb} +1 -3
  62. data/app/services/spree/account/addresses/update.rb +6 -1
  63. data/app/services/spree/compare_line_items.rb +4 -2
  64. data/app/sorters/spree/base_sorter.rb +35 -0
  65. data/app/sorters/spree/orders/sort.rb +1 -37
  66. data/app/sorters/spree/products/sort.rb +9 -32
  67. data/app/validators/email_validator.rb +1 -1
  68. data/app/views/layouts/spree/base_mailer.html.erb +45 -40
  69. data/app/views/spree/order_mailer/cancel_email.html.erb +19 -25
  70. data/app/views/spree/order_mailer/cancel_email.text.erb +24 -2
  71. data/app/views/spree/order_mailer/confirm_email.html.erb +18 -65
  72. data/app/views/spree/order_mailer/confirm_email.text.erb +2 -1
  73. data/app/views/spree/order_mailer/store_owner_notification_email.html.erb +23 -0
  74. data/app/views/spree/order_mailer/store_owner_notification_email.text.erb +38 -0
  75. data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb +53 -58
  76. data/app/views/spree/reimbursement_mailer/reimbursement_email.text.erb +3 -1
  77. data/app/views/spree/shared/_base_mailer_footer.html.erb +6 -14
  78. data/app/views/spree/shared/_base_mailer_header.html.erb +12 -32
  79. data/app/views/spree/shared/_base_mailer_stylesheets.html.erb +293 -625
  80. data/app/views/spree/shared/_purchased_items_table.html.erb +60 -0
  81. data/app/views/spree/shared/purchased_items_table/_adjustment.html.erb +13 -0
  82. data/app/views/spree/shared/purchased_items_table/_line_item.html.erb +27 -0
  83. data/app/views/spree/shared/purchased_items_table/_subtotal.html.erb +13 -0
  84. data/app/views/spree/shared/purchased_items_table/_total.html.erb +13 -0
  85. data/app/views/spree/shipment_mailer/shipped_email.html.erb +31 -36
  86. data/app/views/spree/shipment_mailer/shipped_email.text.erb +2 -1
  87. data/config/initializers/assets.rb +1 -0
  88. data/config/initializers/inflections.rb +3 -0
  89. data/config/initializers/rails61_fixes.rb +3 -0
  90. data/config/locales/en.yml +145 -19
  91. data/db/default/spree/countries.rb +10 -4
  92. data/db/default/spree/states.rb +42 -5
  93. data/db/default/spree/stores.rb +17 -12
  94. data/db/default/spree/zones.rb +1 -1
  95. data/db/migrate/20130326175857_add_stock_location_to_rma.rb +1 -1
  96. data/db/migrate/20140309033438_create_store_from_preferences.rb +1 -1
  97. data/db/migrate/20191017121054_add_supported_currencies_to_store.rb +10 -0
  98. data/db/migrate/20200102141311_add_social_to_spree_stores.rb +3 -0
  99. data/db/migrate/20200308210757_add_default_locale_to_spree_store.rb +7 -0
  100. data/db/migrate/20200310145140_add_customer_support_email_to_spree_store.rb +7 -0
  101. data/db/migrate/20200421095017_add_compare_at_amount_to_spree_prices.rb +7 -0
  102. data/db/migrate/20200423123001_add_default_country_id_to_spree_store.rb +9 -0
  103. data/db/migrate/20200430072209_add_footer_fields_to_spree_stores.rb +8 -0
  104. data/db/migrate/20200513154939_add_show_property_to_spree_product_properties.rb +5 -0
  105. data/db/migrate/20200607161221_add_store_owner_order_notification_delivered_to_spree_orders.rb +7 -0
  106. data/db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb +7 -0
  107. data/db/migrate/20200610113542_add_label_to_spree_addresses.rb +5 -0
  108. data/db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb +5 -0
  109. data/db/migrate/20201006110150_add_checkout_zone_field_to_store.rb +12 -0
  110. data/db/migrate/20201012091259_add_filterable_column_to_spree_option_types.rb +6 -0
  111. data/db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb +5 -0
  112. data/db/migrate/20201127084048_add_default_country_kind_to_spree_zones.rb +5 -0
  113. data/db/migrate/20210112193440_remove_contact_email_from_spree_stores.rb +5 -0
  114. data/db/migrate/20210114182625_create_spree_payment_methods_stores.rb +10 -0
  115. data/db/migrate/20210114220232_migrate_data_payment_methods_stores.rb +15 -0
  116. data/db/migrate/20210117112551_remove_store_id_from_spree_payment_methods.rb +5 -0
  117. data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js +0 -2
  118. data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js +0 -2
  119. data/lib/generators/spree/mailers_preview/mailers_preview_generator.rb +23 -0
  120. data/lib/generators/spree/mailers_preview/templates/mailers/previews/order_preview.rb +13 -0
  121. data/lib/generators/spree/mailers_preview/templates/mailers/previews/reimbursement_preview.rb +5 -0
  122. data/lib/generators/spree/mailers_preview/templates/mailers/previews/shipment_preview.rb +5 -0
  123. data/lib/generators/spree/mailers_preview/templates/mailers/previews/user_preview.rb +11 -0
  124. data/lib/spree/core.rb +2 -0
  125. data/lib/spree/core/controller_helpers/common.rb +1 -0
  126. data/lib/spree/core/controller_helpers/currency_helpers.rb +15 -0
  127. data/lib/spree/core/controller_helpers/order.rb +9 -4
  128. data/lib/spree/core/controller_helpers/store.rb +12 -1
  129. data/lib/spree/core/importer/order.rb +9 -9
  130. data/lib/spree/core/product_filters.rb +3 -3
  131. data/lib/spree/core/version.rb +1 -1
  132. data/lib/spree/i18n.rb +7 -21
  133. data/lib/spree/permitted_attributes.rb +8 -5
  134. data/lib/spree/service_module.rb +6 -2
  135. data/lib/spree/testing_support/authorization_helpers.rb +7 -4
  136. data/lib/spree/testing_support/capybara_config.rb +1 -1
  137. data/lib/spree/testing_support/factories/promotion_factory.rb +29 -17
  138. data/lib/spree/testing_support/factories/shipment_factory.rb +7 -9
  139. data/lib/spree/testing_support/factories/store_factory.rb +11 -8
  140. data/lib/spree/testing_support/factories/zone_factory.rb +16 -13
  141. data/lib/spree/testing_support/i18n.rb +1 -1
  142. data/lib/spree/testing_support/order_walkthrough.rb +8 -3
  143. data/lib/spree/testing_support/rspec_retry_config.rb +10 -0
  144. data/spree_core.gemspec +10 -8
  145. data/vendor/assets/javascripts/cleave.js +1669 -0
  146. metadata +105 -30
  147. data/app/views/spree/order_mailer/_adjustment.html.erb +0 -8
  148. data/app/views/spree/order_mailer/_subtotal.html.erb +0 -8
  149. data/app/views/spree/order_mailer/_total.html.erb +0 -8
  150. data/lib/spree/i18n/base.rb +0 -17
  151. data/lib/spree/i18n/initializer.rb +0 -1
data/app/sorters/spree/products/sort.rb CHANGED
@@ -1,53 +1,30 @@
1
1
  module Spree
2
2
  module Products
3
- class Sort
4
- def initialize(scope, params, current_currency)
5
- @scope = scope
6
- @sort = params[:sort]
3
+ class Sort < ::Spree::BaseSorter
4
+ def initialize(scope, current_currency, params = {}, allowed_sort_attributes = [])
5
+ super(scope, params, allowed_sort_attributes)
7
6
  @currency = params[:currency] || current_currency
8
7
  end
9
8
 
10
9
  def call
11
- products = updated_at(scope)
12
- products = price(products)
10
+ products = by_param_attribute(scope)
11
+ products = by_price(products)
13
12
 
14
13
  products.distinct
15
14
  end
16
15
 
17
16
  private
18
17
 
19
- attr_reader :sort, :scope, :currency
20
-
21
- def desc_order
22
- @desc_order ||= String(sort)[0] == '-'
23
- end
24
-
25
- def sort_field
26
- @sort_field ||= desc_order ? sort[1..-1] : sort
27
- end
28
-
29
- def updated_at?
30
- sort_field == 'updated_at'
31
- end
18
+ attr_reader :sort, :scope, :currency, :allowed_sort_attributes
32
19
 
33
20
  def price?
34
21
  sort_field == 'price'
35
22
  end
36
23
 
37
- def order_direction
38
- desc_order ? :desc : :asc
39
- end
40
-
41
- def updated_at(products)
42
- return products unless updated_at?
43
-
44
- products.order(updated_at: order_direction)
45
- end
46
-
47
- def price(products)
48
- return products unless price?
24
+ def by_price(scope)
25
+ return scope unless price?
49
26
 
50
- products.joins(master: :prices).
27
+ scope.joins(master: :prices).
51
28
  select("#{Spree::Product.table_name}.*, #{Spree::Price.table_name}.amount").
52
29
  distinct.
53
30
  where(spree_prices: { currency: currency }).
data/app/validators/email_validator.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  class EmailValidator < ActiveModel::EachValidator
2
2
  def validate_each(record, attribute, value)
3
3
  unless value =~ /\A[^@\s]+@[^@\s]+\z/
4
- record.errors.add(attribute, :invalid, { value: value }.merge!(options))
4
+ record.errors.add(attribute, :invalid, **{ value: value }.merge!(options))
5
5
  end
6
6
  end
7
7
  end
data/app/views/layouts/spree/base_mailer.html.erb CHANGED
@@ -1,41 +1,46 @@
1
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2
- <html xmlns="http://www.w3.org/1999/xhtml">
3
- <head>
4
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5
- <meta name="viewport" content="width=device-width"/>
6
- <%= render partial: 'spree/shared/base_mailer_stylesheets' %>
7
- </head>
8
- <body>
9
- <table class="body">
10
- <tr>
11
- <td class="center" align="center" valign="top">
12
- <center>
13
- <%= render partial: 'spree/shared/base_mailer_header' %>
14
- <table class="container">
15
- <tr>
16
- <td>
17
- <table class="row">
18
- <tr>
19
- <td class="wrapper last">
20
- <table class="twelve columns">
21
- <tr>
22
- <td>
23
- <%= yield %>
24
- </td>
25
- <td class="expander"></td>
26
- </tr>
27
- </table>
28
- </td>
29
- </tr>
30
- </table>
31
- <%= render partial: 'spree/shared/base_mailer_footer' %>
32
- <!-- container end below -->
33
- </td>
34
- </tr>
35
- </table>
36
- </center>
37
- </td>
38
- </tr>
39
- </table>
40
- </body>
1
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2
+ <html>
3
+ <head>
4
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
5
+ <meta name="x-apple-disable-message-reformatting"/>
6
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
7
+
8
+ <%= render partial: 'spree/shared/base_mailer_stylesheets' %>
9
+ </head>
10
+ <body>
11
+ <table class="email-wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
12
+ <tr>
13
+ <td align="center">
14
+ <table class="email-content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
15
+ <%= render partial: 'spree/shared/base_mailer_header' %>
16
+ <!-- Email Body -->
17
+ <tr>
18
+ <td class="email-body" width="570" cellpadding="0" cellspacing="0">
19
+ <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
20
+ <!-- Body content -->
21
+ <tbody>
22
+ <tr>
23
+ <td class="content-cell">
24
+ <div class="f-fallback">
25
+ <%= yield %>
26
+ </div>
27
+ </td>
28
+ </tr>
29
+ </tbody>
30
+ </table>
31
+ </td>
32
+ </tr>
33
+ <tr>
34
+ <td>
35
+ <%= render partial: 'spree/shared/base_mailer_footer' %>
36
+ </td>
37
+ </tr>
38
+ </table>
39
+ </td>
40
+ </tr>
41
+ <tr>
42
+ <td height="60px">&nbsp;</td>
43
+ </tr>
44
+ </table>
45
+ </body>
41
46
  </html>
data/app/views/spree/order_mailer/cancel_email.html.erb CHANGED
@@ -1,30 +1,24 @@
1
- <table class="row header">
1
+ <h1>
2
+ <%= Spree.t('order_mailer.cancel_email.dear_customer', name: name_for(@order)) %>
3
+ </h1>
4
+ <p>
5
+ <%= Spree.t('order_mailer.cancel_email.instructions') %>
6
+ </p>
7
+
8
+ <table class="purchase" role="presentation">
2
9
  <tr>
3
10
  <td>
4
- <p class="lede">
5
- <%= Spree.t('order_mailer.cancel_email.dear_customer') %>
6
- </p>
7
- <p>
8
- <%= Spree.t('order_mailer.cancel_email.instructions') %>
9
- </p>
10
- <p>
11
- <%= Spree.t('order_mailer.cancel_email.order_summary_canceled', number: @order.number) %>
12
- </p>
13
- <table class="container">
14
- <tr>
15
- <td class="wrapper last">
16
- <table class="twelve columns">
17
- <%= render collection: @order.line_items, partial: 'spree/shared/mailer_line_item', as: :line_item %>
18
- <%= render 'spree/order_mailer/subtotal', order: @order %>
19
- <% @order.adjustments.eligible.each do |adjustment| %>
20
- <%= render 'spree/order_mailer/adjustment', adjustment: adjustment %>
21
- <% end %>
22
- <%= render 'spree/order_mailer/total', order: @order %>
23
- </table>
24
- </td>
25
- </tr>
26
- </table>
11
+ <h3> <%= Spree.t('order_mailer.cancel_email.order_summary_canceled', number: @order.number) %></h3>
12
+ </td>
13
+ </tr>
14
+ <tr>
15
+ <td colspan="2">
16
+ <%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>
27
17
  </td>
28
- <td class="expander"></td>
29
18
  </tr>
30
19
  </table>
20
+ <p>
21
+ <%= Spree.t('order_mailer.cancel_email.thanks') %>
22
+ <br />
23
+ <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
24
+ </p>
data/app/views/spree/order_mailer/cancel_email.text.erb CHANGED
@@ -1,4 +1,4 @@
1
- <%= Spree.t('order_mailer.cancel_email.dear_customer') %>
1
+ <%= Spree.t('order_mailer.cancel_email.dear_customer', name: name_for(@order)) %>
2
2
 
3
3
  <%= Spree.t('order_mailer.cancel_email.instructions') %>
4
4
 
@@ -10,7 +10,29 @@
10
10
  <% end %>
11
11
  ============================================================
12
12
  <%= Spree.t('order_mailer.subtotal') %> <%= @order.display_item_total %>
13
+ <% if @order.line_item_adjustments.exists? %>
14
+ <% if @order.all_adjustments.promotion.eligible.exists? %>
15
+ <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
16
+ <%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
17
+ <% end %>
18
+ <% end %>
19
+ <% end %>
20
+
21
+ <% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
22
+ <%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %>
23
+ <% end %>
24
+
25
+ <% if @order.all_adjustments.eligible.tax.exists? %>
26
+ <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
27
+ <%= Spree.t(:tax) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
28
+ <% end %>
29
+ <% end %>
30
+
13
31
  <% @order.adjustments.eligible.each do |adjustment| %>
14
- <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
32
+ <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
33
+ <%= adjustment.label %> <%= adjustment.display_amount %>
15
34
  <% end %>
35
+ ============================================================
16
36
  <%= Spree.t('order_mailer.total') %> <%= @order.display_total %>
37
+ <%= Spree.t('order_mailer.cancel_email.thanks') %>
38
+ <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
data/app/views/spree/order_mailer/confirm_email.html.erb CHANGED
@@ -1,70 +1,23 @@
1
- <table class="row header">
1
+ <h1>
2
+ <%= Spree.t('order_mailer.confirm_email.dear_customer', name: name_for(@order)) %>
3
+ </h1>
4
+ <p>
5
+ <%= Spree.t('order_mailer.confirm_email.instructions') %>
6
+ </p>
7
+ <table class="purchase" role="presentation">
2
8
  <tr>
3
9
  <td>
4
- <p class="lede">
5
- <%= Spree.t('order_mailer.confirm_email.dear_customer') %>
6
- </p>
7
- <p>
8
- <%= Spree.t('order_mailer.confirm_email.instructions') %>
9
- </p>
10
- <p>
11
- <%= Spree.t('order_mailer.confirm_email.order_summary', number: @order.number) %>
12
- </p>
13
- <table class="container">
14
- <tr>
15
- <td class="wrapper last">
16
- <table class="twelve columns">
17
- <%= render collection: @order.line_items, partial: 'spree/shared/mailer_line_item', as: :line_item %>
18
- <%= render 'spree/order_mailer/subtotal', order: @order %>
19
- <% if @order.line_item_adjustments.exists? %>
20
- <% if @order.all_adjustments.promotion.eligible.exists? %>
21
- <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
22
- <tr>
23
- <td class="six sub-columns">
24
- <%= Spree.t(:promotion) %> <%= label %>:
25
- </td>
26
- <td class="six sub-columns last right">
27
- <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
28
- </td>
29
- </tr>
30
- <% end %>
31
- <% end %>
32
- <% end %>
33
- <% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
34
- <tr>
35
- <td class="six sub-columns">
36
- <%= Spree.t(:shipping) %> <%= name %>:
37
- </td>
38
- <td class="six sub-columns last right">
39
- <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %>
40
- </td>
41
- </tr>
42
- <% end %>
43
- <% if @order.all_adjustments.eligible.tax.exists? %>
44
- <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
45
- <tr>
46
- <td class="six sub-columns">
47
- <%= Spree.t(:tax) %> <%= label %>:
48
- </td>
49
- <td class="six sub-columns last right">
50
- <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
51
- </td>
52
- </tr>
53
- <% end %>
54
- <% end %>
55
- <% @order.adjustments.eligible.each do |adjustment| %>
56
- <% next if (adjustment.source_type == 'Spree::TaxRate') || (adjustment.amount == 0) %>
57
- <%= render 'spree/order_mailer/adjustment', adjustment: adjustment %>
58
- <% end %>
59
- <%= render 'spree/order_mailer/total', order: @order %>
60
- </table>
61
- </td>
62
- </tr>
63
- </table>
64
- <p>
65
- <%= Spree.t('order_mailer.confirm_email.thanks') %>
66
- </p>
10
+ <h3><%= Spree.t('order_mailer.confirm_email.order_summary', number: @order.number) %></h3>
11
+ </td>
12
+ </tr>
13
+ <tr>
14
+ <td colspan="2">
15
+ <%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>
67
16
  </td>
68
- <td class="expander"></td>
69
17
  </tr>
70
18
  </table>
19
+ <p>
20
+ <%= Spree.t('order_mailer.confirm_email.thanks') %>
21
+ <br />
22
+ <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
23
+ </p>
data/app/views/spree/order_mailer/confirm_email.text.erb CHANGED
@@ -1,4 +1,4 @@
1
- <%= Spree.t('order_mailer.confirm_email.dear_customer') %>
1
+ <%= Spree.t('order_mailer.confirm_email.dear_customer', name: name_for(@order)) %>
2
2
 
3
3
  <%= Spree.t('order_mailer.confirm_email.instructions') %>
4
4
 
@@ -36,3 +36,4 @@
36
36
  <%= Spree.t('order_mailer.total') %> <%= @order.display_total %>
37
37
 
38
38
  <%= Spree.t('order_mailer.confirm_email.thanks') %>
39
+ <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
data/app/views/spree/order_mailer/store_owner_notification_email.html.erb ADDED
@@ -0,0 +1,23 @@
1
+ <h1>
2
+ <%= Spree.t('order_mailer.store_owner_notification_email.heading') %>
3
+ </h1>
4
+ <p>
5
+ <%= Spree.t('order_mailer.store_owner_notification_email.instructions') %>
6
+ </p>
7
+ <table class="purchase" role="presentation">
8
+ <tr>
9
+ <td>
10
+ <h3><%= Spree.t('order_mailer.store_owner_notification_email.order_summary', number: @order.number) %></h3>
11
+ </td>
12
+ </tr>
13
+ <tr>
14
+ <td colspan="2">
15
+ <%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>
16
+ </td>
17
+ </tr>
18
+ </table>
19
+ <p>
20
+ <%= Spree.t('order_mailer.store_owner_notification_email.thanks') %>
21
+ <br />
22
+ <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
23
+ </p>
data/app/views/spree/order_mailer/store_owner_notification_email.text.erb ADDED
@@ -0,0 +1,38 @@
1
+ <%= Spree.t('order_mailer.store_owner_notification_email.heading') %>
2
+
3
+ <%= Spree.t('order_mailer.store_owner_notification_email.instructions') %>
4
+
5
+ ============================================================
6
+ <%= Spree.t('order_mailer.store_owner_notification_email.order_summary', number: @order.number) %>
7
+ ============================================================
8
+ <% @order.line_items.each do |item| %>
9
+ <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %>
10
+ <% end %>
11
+ ============================================================
12
+ <%= Spree.t('order_mailer.subtotal') %> <%= @order.display_item_total %>
13
+ <% if @order.line_item_adjustments.exists? %>
14
+ <% if @order.all_adjustments.promotion.eligible.exists? %>
15
+ <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
16
+ <%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
17
+ <% end %>
18
+ <% end %>
19
+ <% end %>
20
+
21
+ <% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
22
+ <%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %>
23
+ <% end %>
24
+
25
+ <% if @order.all_adjustments.eligible.tax.exists? %>
26
+ <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
27
+ <%= Spree.t(:tax) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
28
+ <% end %>
29
+ <% end %>
30
+
31
+ <% @order.adjustments.eligible.each do |adjustment| %>
32
+ <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
33
+ <%= adjustment.label %> <%= adjustment.display_amount %>
34
+ <% end %>
35
+ ============================================================
36
+ <%= Spree.t('order_mailer.total') %> <%= @order.display_total %>
37
+ <%= Spree.t('order_mailer.store_owner_notification_email.thanks') %>
38
+ <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb CHANGED
@@ -1,61 +1,56 @@
1
- <table class="row header">
2
- <tr>
3
- <td>
4
- <p class="lede">
5
- <%= Spree.t('reimbursement_mailer.reimbursement_email.dear_customer') %>
6
- </p>
7
- <p>
8
- <%= Spree.t('reimbursement_mailer.reimbursement_email.instructions') %>
9
- </p>
10
- <p>
11
- <%= Spree.t('reimbursement_mailer.reimbursement_email.refund_summary') %>
12
- </p>
13
- <p>
14
- <%= Spree.t('reimbursement_mailer.reimbursement_email.total_refunded', total: @reimbursement.display_total) %>
15
- </p>
1
+ <h1>
2
+ <%= Spree.t('reimbursement_mailer.reimbursement_email.dear_customer', name: name_for(@order)) %>
3
+ </h1>
4
+ <p>
5
+ <%= Spree.t('reimbursement_mailer.reimbursement_email.instructions') %>
6
+ </p>
7
+ <p>
8
+ <%= Spree.t('reimbursement_mailer.reimbursement_email.refund_summary') %>
9
+ </p>
10
+ <p>
11
+ <%= Spree.t('reimbursement_mailer.reimbursement_email.total_refunded', total: @reimbursement.display_total) %>
12
+ </p>
13
+ <% if @reimbursement.return_items.exchange_requested.present? %>
14
+ <p>
15
+ <%= Spree.t('reimbursement_mailer.reimbursement_email.exchange_summary') %>
16
+ </p>
16
17
 
17
- <% if @reimbursement.return_items.exchange_requested.present? %>
18
-
19
- <p>
20
- <%= Spree.t('reimbursement_mailer.reimbursement_email.exchange_summary') %>
21
- </p>
22
-
23
- <table class="container">
24
- <tr>
25
- <td class="wrapper last">
26
- <table class="twelve columns">
27
-
28
- <% @reimbursement.return_items.exchange_requested.each do |return_item| %>
29
- <tr>
30
- <td class="six sub-columns">
31
- <%= return_item.variant.sku %>
32
- </td>
33
- <td>
34
- <%= link_to raw(return_item.variant.product.name),
35
- spree.product_url(return_item.variant.product) %>
36
- </td>
37
- <td>
38
- <%= "(#{raw(return_item.exchange_variant.options_text)})" if return_item.exchange_variant.options_text.present? -%>
39
- </td>
40
- </tr>
41
- <% end %>
42
-
43
- </table>
44
- </td>
45
- </tr>
46
- </table>
47
-
48
-
49
- <% if @reimbursement.return_items.awaiting_return.present? && Spree::Config[:expedited_exchanges] %>
50
- <p>
51
- <%= Spree.t('reimbursement_mailer.reimbursement_email.days_to_send', days: Spree::Config[:expedited_exchanges_days_window]) %>
18
+ <table class="purchase_content">
19
+ <% @reimbursement.return_items.exchange_requested.each do |return_item| %>
20
+ <tr>
21
+ <td class="purchase_image">
22
+ <% if frontend_available? %>
23
+ <%= link_to(image_tag(variant_image_url(return_item.variant)), spree.product_url(return_item.variant.product)) %>
24
+ <% else %>
25
+ <%= image_tag(variant_image_url(return_item.variant)) %>
26
+ <% end %>
27
+ </td>
28
+ <td class="purchase_item">
29
+ <strong>
30
+ <span class="f-fallback">
31
+ <% if frontend_available? %>
32
+ <%= link_to raw(return_item.variant.name), spree.product_url(return_item.variant.product) %>
33
+ <% else %>
34
+ <%= raw(return_item.variant.name) %>
35
+ <% end %>
36
+ </span>
37
+ </strong>
38
+ <p class="purchase_item--additional">
39
+ <%= "(#{raw(return_item.exchange_variant.options_text)})" if return_item.exchange_variant.options_text.present? -%>
52
40
  </p>
53
- <% end %>
41
+ </td>
42
+ </tr>
43
+ <% end %>
44
+ </table>
45
+ <% if @reimbursement.return_items.awaiting_return.present? && Spree::Config[:expedited_exchanges] %>
46
+ <p>
47
+ <%= Spree.t('reimbursement_mailer.reimbursement_email.days_to_send', days: Spree::Config[:expedited_exchanges_days_window]) %>
48
+ </p>
49
+ <% end %>
50
+ <% end %>
54
51
 
55
- <% end %>
56
- <p>
57
- <%= Spree.t('reimbursement_mailer.reimbursement_email.thanks') %>
58
- </p>
59
- <td class="expander"></td>
60
- </tr>
61
- </table>
52
+ <p>
53
+ <%= Spree.t('reimbursement_mailer.reimbursement_email.thanks') %>
54
+ <br />
55
+ <%= Spree.t('reimbursement_mailer.reimbursement_email.store_team', store_name: current_store.name) %>
56
+ </p>