spree_emails 6.0.0.beta4 → 6.0.0.rc2

data/app/views/spree/shared/_purchase_totals.html.erb

@@ -1,62 +0,0 @@
-<%# Every figure of the whole purchase, once. Locals: order_group.
-
-    Deliberately not the order summary's own totals block: that one reaches
-    into one order's fulfillments and money rows, and a purchase has neither
-    of its own. These read the group's roll-up of what each child independently
-    computed. Delivery is one line here and broken down per parcel above. %>
-<table class="section" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-  <tr>
-    <td>
-      <h3 class="f-fallback"><%= Spree.t(:order_summary) %></h3>
-      <table class="summary purchase_content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-        <%= render 'spree/shared/purchased_items_table/summary_row',
-                   label: Spree.t('order_mailer.subtotal'),
-                   value: order_group.display_item_total %>
-
-        <% order_group.discounts.promotion.to_a.group_by(&:label).each do |label, discounts| %>
-          <%= render 'spree/shared/purchased_items_table/summary_row',
-                     label: Spree.t(:promotion),
-                     sub: label,
-                     value: Spree::Money.new(discounts.sum(&:amount), currency: order_group.currency) %>
-        <% end %>
-
-        <% if order_group.delivery_total != 0 %>
-          <%= render 'spree/shared/purchased_items_table/summary_row',
-                     label: Spree.t(:shipping),
-                     value: order_group.display_delivery_total %>
-        <% end %>
-
-        <% if order_group.additional_tax_total != 0 %>
-          <%= render 'spree/shared/purchased_items_table/summary_row',
-                     label: Spree.t(:tax),
-                     value: order_group.display_additional_tax_total %>
-        <% end %>
-
-        <% if order_group.gift_card_total.positive? %>
-          <%= render 'spree/shared/purchased_items_table/summary_row',
-                     label: Spree.t(:gift_card),
-                     value: safe_join(['-', order_group.display_gift_card_total.to_html]) %>
-        <% end %>
-
-        <% order_group.discounts.manual.to_a.group_by(&:label).each do |label, discounts| %>
-          <%= render 'spree/shared/purchased_items_table/summary_row',
-                     label: label,
-                     value: Spree::Money.new(discounts.sum(&:amount), currency: order_group.currency) %>
-        <% end %>
-
-        <% order_group.fees.to_a.group_by(&:label).each do |label, fees| %>
-          <% amount = fees.sum(&:amount) %>
-          <% next if amount.zero? %>
-          <%= render 'spree/shared/purchased_items_table/summary_row',
-                     label: label,
-                     value: Spree::Money.new(amount, currency: order_group.currency) %>
-        <% end %>
-
-        <%= render 'spree/shared/purchased_items_table/summary_row',
-                   row_class: 'summary_total',
-                   label: Spree.t('order_mailer.total'),
-                   value: order_group.display_total_minus_store_credits %>
-      </table>
-    </td>
-  </tr>
-</table>

data/app/views/spree/shared/_purchase_totals.text.erb

@@ -1,24 +0,0 @@
-============================================================
-<%= Spree.t('order_mailer.subtotal') %> <%= order_group.display_item_total %>
-<% order_group.discounts.promotion.to_a.group_by(&:label).each do |label, discounts| %>
-  <%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(discounts.sum(&:amount), currency: order_group.currency) %>
-<% end %>
-<% if order_group.delivery_total != 0 %>
-  <%= Spree.t(:shipping) %>: <%= order_group.display_delivery_total %>
-<% end %>
-<% if order_group.additional_tax_total != 0 %>
-  <%= Spree.t(:tax) %>: <%= order_group.display_additional_tax_total %>
-<% end %>
-<% if order_group.gift_card_total.positive? %>
-  <%= Spree.t(:gift_card) %>: -<%= order_group.display_gift_card_total %>
-<% end %>
-<% order_group.discounts.manual.to_a.group_by(&:label).each do |label, discounts| %>
-  <%= label %> <%= Spree::Money.new(discounts.sum(&:amount), currency: order_group.currency) %>
-<% end %>
-<% order_group.fees.to_a.group_by(&:label).each do |label, fees| %>
-  <% amount = fees.sum(&:amount) %>
-  <% next if amount.zero? %>
-  <%= label %> <%= Spree::Money.new(amount, currency: order_group.currency) %>
-<% end %>
-============================================================
-<%= Spree.t('order_mailer.total') %> <%= order_group.display_total_minus_store_credits %>

data/app/views/spree/shared/_purchased_items_table.html.erb

@@ -1,41 +0,0 @@
-<%= render collection: line_items, partial: 'spree/shared/purchased_items_table/line_item', as: :line_item %>
-
-<% if local_assigns.fetch(:totals, true) %>
-<table class="summary purchase_content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-  <%= render 'spree/shared/purchased_items_table/subtotal', order: order %>
-  <% order.discounts.promotion.to_a.group_by(&:label).each do |label, discounts| %>
-    <%= render 'spree/shared/purchased_items_table/summary_row',
-               label: Spree.t(:promotion),
-               sub: label,
-               value: Spree::Money.new(discounts.sum(&:amount), currency: order.currency) %>
-  <% end %>
-  <% order.fulfillments.group_by { |f| f.selected_delivery_rate&.name }.each do |name, shipments| %>
-    <%= render 'spree/shared/purchased_items_table/summary_row',
-               label: Spree.t(:shipping),
-               sub: name,
-               value: Spree::Money.new(shipments.sum(&:cost), currency: order.currency) %>
-  <% end %>
-  <% if order.additional_tax_total != 0 %>
-    <%= render 'spree/shared/purchased_items_table/summary_row',
-               label: Spree.t(:tax),
-               value: order.display_additional_tax_total %>
-  <% end %>
-  <% if order.gift_card_total.positive? %>
-    <%= render 'spree/shared/purchased_items_table/summary_row',
-               label: Spree.t(:gift_card),
-               value: safe_join(['-', order.display_gift_card_total.to_html]) %>
-  <% end %>
-  <% order.discounts.manual.to_a.group_by(&:label).each do |label, discounts| %>
-    <%= render 'spree/shared/purchased_items_table/summary_row',
-               label: label,
-               value: Spree::Money.new(discounts.sum(&:amount), currency: order.currency) %>
-  <% end %>
-  <% order.fees.each do |fee| %>
-    <% next if fee.amount == 0 %>
-    <%= render 'spree/shared/purchased_items_table/summary_row',
-               label: fee.label,
-               value: Spree::Money.new(fee.amount, currency: order.currency) %>
-  <% end %>
-  <%= render 'spree/shared/purchased_items_table/total', order: order %>
-</table>
-<% end %>

data/app/views/spree/shared/_purchased_items_table.text.erb

@@ -1,28 +0,0 @@
-<% line_items.each do |item| %>
-  <%= item.variant.sku %> <%= item.variant.product.name %> <%= item.variant.options_text -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %>
-<% end %>
-============================================================
-<%= Spree.t('order_mailer.subtotal') %> <%= order.display_item_total %>
-<% order.discounts.promotion.to_a.group_by(&:label).each do |label, discounts| %>
-  <%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(discounts.sum(&:amount), currency: order.currency) %>
-<% end %>
-
-<% order.fulfillments.group_by { |f| f.selected_delivery_rate.try(:name) }.each do |name, shipments| %>
-  <%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:cost), currency: order.currency) %>
-<% end %>
-
-<% if order.additional_tax_total != 0 %>
-  <%= Spree.t(:tax) %>: <%= order.display_additional_tax_total.to_html %>
-<% end %>
-
-<% if order.gift_card_total.positive? %>
-  <%= Spree.t(:gift_card) %>: -<%= order.display_gift_card_total.to_html %>
-<% end %>
-
-<% order.discounts.manual.to_a.group_by(&:label).each do |label, discounts| %>
-  <%= label %> <%= Spree::Money.new(discounts.sum(&:amount), currency: order.currency) %>
-<% end %>
-<% order.fees.each do |fee| %>
-  <% next if fee.amount == 0 %>
-  <%= fee.label %> <%= fee.display_amount %>
-<% end %>

data/app/views/spree/shared/purchased_items_table/_line_item.html.erb

@@ -1,24 +0,0 @@
-<%# One purchased line. Locals: line_item, and optionally quantity + amount
-    for a view showing part of a line — a parcel carrying two of the three
-    ordered, say — where the line's own figures describe more than is there. %>
-<% quantity = local_assigns.fetch(:quantity, line_item.quantity) %>
-<% amount = local_assigns.fetch(:amount, line_item.display_amount) %>
-<table class="item" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-  <tr>
-    <td class="item_image" width="96" valign="middle">
-      <% image = line_item.variant.primary_media || line_item.product.primary_media %>
-      <% product_url = spree_storefront_resource_url(line_item.product) %>
-      <%= render 'spree/shared/item_thumbnail_link', image: image, product_url: product_url, alt: line_item.name %>
-    </td>
-    <td class="item_info" valign="middle">
-      <%= link_to line_item.name, product_url, class: 'f-fallback item_name' %>
-      <% if line_item.variant.options_text.present? %>
-        <p class="item_meta"><%= line_item.variant.options_text %></p>
-      <% end %>
-    </td>
-    <td class="item_amount" align="right" valign="middle">
-      <p class="item_qty f-fallback"><%= quantity %> x <%= line_item.single_money %></p>
-      <p class="item_price f-fallback"><%= amount %></p>
-    </td>
-  </tr>
-</table>

data/app/views/spree/shared/purchased_items_table/_subtotal.html.erb

@@ -1,3 +0,0 @@
-<%= render 'spree/shared/purchased_items_table/summary_row',
-           label: Spree.t('order_mailer.subtotal'),
-           value: order.display_item_total %>

data/app/views/spree/shared/purchased_items_table/_summary_row.html.erb

@@ -1,14 +0,0 @@
-<%# One label/value row of the order summary. Locals: label, value,
-    optional sub (secondary line under the label, e.g. the shipping rate name),
-    optional row_class ('summary_total' for the emphasized final row). %>
-<tr class="<%= local_assigns[:row_class] %>">
-  <td valign="top">
-    <span class="f-fallback"><%= label %></span>
-    <% if local_assigns[:sub].present? %>
-      <span class="f-fallback summary_sub"><%= sub %></span>
-    <% end %>
-  </td>
-  <td class="summary_value" align="right" valign="top">
-    <span class="f-fallback"><%= value.respond_to?(:to_html) ? value.to_html : value %></span>
-  </td>
-</tr>

data/app/views/spree/shared/purchased_items_table/_total.html.erb

@@ -1,4 +0,0 @@
-<%= render 'spree/shared/purchased_items_table/summary_row',
-           row_class: 'summary_total',
-           label: Spree.t('order_mailer.total'),
-           value: order.display_total_minus_store_credits %>

data/config/i18n-tasks.yml

@@ -1,22 +0,0 @@
-base_locale: en
-
-data:
-  yaml:
-    write:
-      # do not wrap lines at 80 characters
-      line_width: -1
-
-  # Core's keys are read but never written here: the mailers and their
-  # templates share the vocabulary every Spree surface uses (shipping, tax,
-  # promotion) and only own the copy of the emails themselves.
-  external:
-    - "<%= File.expand_path('../core/config/locales', Dir.pwd) %>/%{locale}.yml"
-
-# Find translate calls
-search:
-  paths:
-    - 'app'
-    - 'lib'
-
-# The PatternMapper for Spree.t
-<% I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper', patterns: [['\bSpree\.t[( ]\s*%{key}', 'spree.%{key}']] %>