spree_emails 6.0.0.beta2 → 6.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cfd401a89825dc6638e8fb859dea1153ccb105d9338422bfd31f38c33b620bc
-  data.tar.gz: 803a387e672ea1ea39a878b180048e6714ae15b0077fa87cfc0821e8d654a8dd
+  metadata.gz: 4e39192d17144a4963b3c0fb926d656cc639f165927b8fa78956aa230c58bfc6
+  data.tar.gz: '0878e0210c83640d6c35b063c2e7dc89f427a6e58f178838b562dadc8bd2ac20'
 SHA512:
-  metadata.gz: 5a0267600233c8d924c4bd4dda0be05854d04c35b4962b44d6e5e002ea5e1678fc7d01631de306cce52d05cb77236f3cde0673895f10f353b7af463f03ee0d56
-  data.tar.gz: 269b7edd362f3d124deb9288abe348927fe6580ef54b5fbe9bd200890ee1724712e91a94abd100620fb88f97d7f5c25e5f1b77dccfee931f6ea45b880e523028
+  metadata.gz: 24d2af93481b95787c95ff9b442b7a723e1564fbecf89cf87b61320cd9240f172111b0be599ab12f1d334df99594702af1ee7ab405ab02ae6f2a438f31103546
+  data.tar.gz: c686e22de2d14aa715ee81593c649333fff0c2f2bfdf45336fd0b3a6e125244be88cbc892e168f130156baefdb8dec06bf4fe382d5ae8e93b9ba45901c530f73

data/app/mailers/spree/order_group_mailer.rb

@@ -0,0 +1,51 @@
+module Spree
+  # The purchase a customer made, when it produced more than one order.
+  #
+  # A checkout spanning several sellers divides into one order per seller, and
+  # no one of them is the purchase — each holds a single seller's items,
+  # delivery and total. So the confirmation is sent from the group: one email
+  # naming the number the customer saw at checkout, every item they bought, the
+  # total they actually paid, and the parcels it will arrive in.
+  #
+  # Kept separate from +Spree::OrderMailer+ rather than folded into it: a
+  # checkout that does not split is still one order and still sends that
+  # email unchanged, and a storefront replacing one document should not have to
+  # inherit the other.
+  class OrderGroupMailer < BaseMailer
+    helper Spree::MailHelper
+
+    # @param order_group [Spree::OrderGroup, Integer, String] record or id
+    # @param resend [Boolean] prefixes the subject, for an admin re-send
+    def confirm_email(order_group, resend = false)
+      @order_group = find_order_group(order_group)
+      # Assigned rather than left to BaseMailer#current_store, which memoizes
+      # off @order and would otherwise fall back to the default store — the
+      # wrong store's name, logo and footer on a multi-store install.
+      @current_store = @order_group.store
+
+      with_store_locale(@current_store, @order_group.locale) do
+        subject = order_email_subject(
+          @current_store, Spree.t('order_group_mailer.confirm_email.subject'), @order_group.number, resend: resend
+        )
+        mail(to: @order_group.email, subject: subject, store_url: @current_store.storefront_url)
+      end
+    end
+
+    def store_owner_notification_email(order_group)
+      @order_group = find_order_group(order_group)
+      @current_store = @order_group.store
+
+      with_store_locale(@current_store) do
+        subject = Spree.t('order_group_mailer.store_owner_notification_email.subject', store_name: @current_store.name)
+        mail(to: @current_store.new_order_notifications_email, subject: subject,
+             store_url: @current_store.storefront_url)
+      end
+    end
+
+    private
+
+    def find_order_group(order_group)
+      order_group.respond_to?(:id) ? order_group : Spree::OrderGroup.find(order_group)
+    end
+  end
+end

data/app/subscribers/spree/order_email_subscriber.rb

@@ -13,26 +13,33 @@ module Spree
     def send_confirmation_email(event)
       order = find_order(event)
       return unless order
+
+      send_customer_confirmation(order, event)
+      send_store_owner_notification(order)
+    end
+
+    def send_customer_confirmation(order, event)
       return if order.confirmation_delivered?
       return if event.payload['notify_customer'] == false
-
-      store = order.store
-      return unless store.prefers_send_consumer_transactional_emails?
+      return unless order.store.prefers_send_consumer_transactional_emails?
 
       OrderMailer.confirm_email(order.id).deliver_later
       order.update_column(:confirmation_delivered, true)
-
-      send_store_owner_notification(order) if should_notify_store_owner?(order)
     end
 
+    # An admin resends from an order, because an order is what they are looking
+    # at. On a split checkout the document to send is still the purchase's —
+    # sending this child's would put back the partial confirmation the group
+    # email exists to replace.
     def resend_confirmation_email(event)
       order = find_order(event)
       return unless order
+      return order.order_group.publish_event('order_group.resend_confirmation_email') if order.grouped?
 
       store = order.store
       return unless store.prefers_send_consumer_transactional_emails?
 
-      OrderMailer.confirm_email(order.id).deliver_later
+      OrderMailer.confirm_email(order.id, true).deliver_later
       order.update_column(:confirmation_delivered, true)
     end
 
@@ -48,6 +55,9 @@ module Spree
     end
 
     def send_store_owner_notification(order)
+      # A divided checkout tells the store about the purchase once, from the
+      # group, rather than once per seller order.
+      return if order.grouped?
       return if order.store_owner_notification_delivered?
       return if order.store.new_order_notifications_email.blank?
 
@@ -55,11 +65,6 @@ module Spree
       order.update_column(:store_owner_notification_delivered, true)
     end
 
-    def should_notify_store_owner?(order)
-      order.store.new_order_notifications_email.present? &&
-        !order.store_owner_notification_delivered?
-    end
-
     def find_order(event)
       order_id = event.payload['id']
       Spree::Order.find_by_prefix_id(order_id)

data/app/subscribers/spree/order_group_email_subscriber.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Spree
+  # The confirmation for a checkout that produced more than one order.
+  #
+  # Its child orders place silently (+Spree::Carts::Complete#complete_orders+),
+  # because none of them is the purchase — this is what tells the customer what
+  # they bought, what they paid and how it arrives.
+  class OrderGroupEmailSubscriber < Spree::Subscriber
+    subscribes_to 'order_group.completed', 'order_group.resend_confirmation_email'
+
+    on 'order_group.completed', :send_confirmation_email
+    on 'order_group.resend_confirmation_email', :resend_confirmation_email
+
+    private
+
+    def send_confirmation_email(event)
+      order_group = find_order_group(event)
+      return unless order_group
+
+      send_customer_confirmation(order_group, event)
+      send_store_owner_notification(order_group)
+    end
+
+    # The operator is a different audience: silencing the customer, or turning
+    # their receipts off, says nothing about whether the store wants to hear
+    # about the sale.
+    def send_customer_confirmation(order_group, event)
+      return if order_group.confirmation_delivered?
+      return if event.payload['notify_customer'] == false
+      return unless order_group.store.prefers_send_consumer_transactional_emails?
+
+      OrderGroupMailer.confirm_email(order_group.id).deliver_later
+      order_group.update_column(:confirmation_delivered, true)
+    end
+
+    def resend_confirmation_email(event)
+      order_group = find_order_group(event)
+      return unless order_group
+      return unless order_group.store.prefers_send_consumer_transactional_emails?
+
+      OrderGroupMailer.confirm_email(order_group.id, true).deliver_later
+      order_group.update_column(:confirmation_delivered, true)
+    end
+
+    # One notification per purchase, like the customer's. Told about the
+    # checkout rather than about each seller's share of it, because that is
+    # what happened.
+    def send_store_owner_notification(order_group)
+      return if order_group.store_owner_notification_delivered?
+      return if order_group.store.new_order_notifications_email.blank?
+
+      OrderGroupMailer.store_owner_notification_email(order_group.id).deliver_later
+      order_group.update_column(:store_owner_notification_delivered, true)
+    end
+
+    def find_order_group(event)
+      Spree::OrderGroup.find_by_prefix_id(event.payload['id'])
+    end
+  end
+end

data/app/views/spree/order_group_mailer/confirm_email.html.erb

@@ -0,0 +1,38 @@
+<%= render 'spree/shared/purchased_items_styles' %>
+
+<% fulfillment_groups = @order_group.fulfillment_groups %>
+<% unfulfilled_line_items = @order_group.unfulfilled_line_items(fulfillment_groups) %>
+
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('order_group_mailer.confirm_email.subject') %></h1>
+  <p class="greeting"><%= Spree.t('order_group_mailer.confirm_email.dear_customer', name: name_for(@order_group)) %></p>
+  <p><%= Spree.t('order_group_mailer.confirm_email.instructions', number: @order_group.number) %></p>
+  <%# What the customer most needs and least expects: this arrives in more
+      than one delivery. Counted from the parcels, never from the orders the
+      checkout divided into — several sellers shipping out of one warehouse
+      send one box. %>
+  <% if fulfillment_groups.many? %>
+    <p><%= Spree.t('order_group_mailer.confirm_email.arriving_separately', count: fulfillment_groups.size) %></p>
+  <% end %>
+<% end %>
+
+<% if @order_group.po_number.present? %>
+  <p class="f-fallback"><%= Spree.t('order_mailer.po_number', number: @order_group.po_number) %></p>
+<% end %>
+
+<% fulfillment_groups.each_with_index do |fulfillment_group, index| %>
+  <%= render 'spree/shared/fulfillment_group_section',
+             fulfillment_group: fulfillment_group,
+             position: index + 1,
+             count: fulfillment_groups.size %>
+<% end %>
+
+<% if unfulfilled_line_items.any? %>
+  <%= render 'spree/shared/order_summary_section',
+             heading: Spree.t('order_group_mailer.nothing_to_ship'),
+             line_items: unfulfilled_line_items,
+             order: @order_group,
+             totals: false %>
+<% end %>
+
+<%= render 'spree/shared/purchase_totals', order_group: @order_group %>

data/app/views/spree/order_group_mailer/confirm_email.text.erb

@@ -0,0 +1,26 @@
+<% fulfillment_groups = @order_group.fulfillment_groups %>
+<% unfulfilled_line_items = @order_group.unfulfilled_line_items(fulfillment_groups) %>
+<%= Spree.t('order_group_mailer.confirm_email.dear_customer', name: name_for(@order_group)) %>
+
+<%= Spree.t('order_group_mailer.confirm_email.instructions', number: @order_group.number) %>
+<% if fulfillment_groups.many? %>
+<%= Spree.t('order_group_mailer.confirm_email.arriving_separately', count: fulfillment_groups.size) %>
+<% end %>
+<%= render 'spree/shared/po_number', order: @order_group %>
+<% fulfillment_groups.each_with_index do |fulfillment_group, index| %>
+============================================================
+<%= render 'spree/shared/fulfillment_group_section',
+           fulfillment_group: fulfillment_group,
+           position: index + 1,
+           count: fulfillment_groups.size %>
+<% end %>
+<% if unfulfilled_line_items.any? %>
+============================================================
+<%= Spree.t('order_group_mailer.nothing_to_ship') %>
+<% unfulfilled_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 %>
+<% end %>
+<%= render 'spree/shared/purchase_totals', order_group: @order_group %>
+<%= Spree.t('order_group_mailer.confirm_email.thanks') %>
+<%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>

data/app/views/spree/order_group_mailer/store_owner_notification_email.html.erb

@@ -0,0 +1,14 @@
+<%= render 'spree/shared/purchased_items_styles' %>
+
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('order_group_mailer.store_owner_notification_email.heading') %></h1>
+  <p><%= Spree.t('order_group_mailer.store_owner_notification_email.instructions', count: @order_group.orders.size) %></p>
+<% end %>
+
+<%= render 'spree/shared/order_summary_section',
+           heading: Spree.t('order_group_mailer.store_owner_notification_email.purchase_summary', number: @order_group.number),
+           line_items: @order_group.line_items,
+           order: @order_group,
+           totals: false %>
+
+<%= render 'spree/shared/purchase_totals', order_group: @order_group %>

data/app/views/spree/order_group_mailer/store_owner_notification_email.text.erb

@@ -0,0 +1,11 @@
+<%= Spree.t('order_group_mailer.store_owner_notification_email.instructions', count: @order_group.orders.size) %>
+
+============================================================
+<%= Spree.t('order_group_mailer.store_owner_notification_email.purchase_summary', number: @order_group.number) %>
+============================================================
+<%= render 'spree/shared/po_number', order: @order_group %>
+<% @order_group.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 %>
+<%= render 'spree/shared/purchase_totals', order_group: @order_group %>
+<%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>

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

@@ -0,0 +1,37 @@
+<%# One real parcel of a purchase, with the goods it carries and what it cost
+    to deliver. Locals: fulfillment_group, position, count.
+
+    A purchase arriving in one parcel is not numbered — "Delivery 1 of 1"
+    tells the customer nothing they did not already assume.
+
+    Rendered from the parcel's manifest rather than its line items: a line
+    packed from two warehouses travels in two parcels, and its own quantity
+    describes the whole order rather than this box. %>
+<table class="section" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+  <tr>
+    <td>
+      <h3 class="f-fallback">
+        <% if count > 1 %>
+          <%= Spree.t('order_group_mailer.delivery_numbered', position: position, count: count) %>
+        <% else %>
+          <%= Spree.t('order_group_mailer.delivery') %>
+        <% end %>
+      </h3>
+      <% if fulfillment_group.sellers.any? %>
+        <p class="f-fallback sub"><%= Spree.t('order_group_mailer.sold_by', sellers: fulfillment_group.sellers.map(&:name).to_sentence) %></p>
+      <% end %>
+      <% fulfillment_group.manifest.each do |item| %>
+        <%= render 'spree/shared/purchased_items_table/line_item',
+                   line_item: item.line_item,
+                   quantity: item.quantity,
+                   amount: Spree::Money.new(item.line_item.price * item.quantity, currency: item.line_item.currency) %>
+      <% end %>
+      <table class="summary purchase_content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+        <%= render 'spree/shared/purchased_items_table/summary_row',
+                   label: Spree.t(:shipping),
+                   sub: fulfillment_group.name,
+                   value: fulfillment_group.display_cost %>
+      </table>
+    </td>
+  </tr>
+</table>

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

@@ -0,0 +1,12 @@
+<% if count > 1 %>
+<%= Spree.t('order_group_mailer.delivery_numbered', position: position, count: count) %>
+<% else %>
+<%= Spree.t('order_group_mailer.delivery') %>
+<% end %>
+<% if fulfillment_group.sellers.any? %>
+<%= Spree.t('order_group_mailer.sold_by', sellers: fulfillment_group.sellers.map(&:name).to_sentence) %>
+<% end %>
+<% fulfillment_group.manifest.each do |item| %>
+  <%= item.variant.sku %> <%= item.variant.product.name %> <%= item.variant.options_text -%> (<%= item.quantity %>) <%= Spree.t('at_symbol') %> <%= item.line_item.single_money %> = <%= Spree::Money.new(item.line_item.price * item.quantity, currency: item.line_item.currency) %>
+<% end %>
+  <%= Spree.t(:shipping) %>: <%= fulfillment_group.name %> <%= fulfillment_group.display_cost %>

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

@@ -0,0 +1,62 @@
+<%# 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

@@ -0,0 +1,24 @@
+============================================================
+<%= 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

@@ -13,7 +13,7 @@
     <%= render 'spree/shared/purchased_items_table/summary_row',
                label: Spree.t(:shipping),
                sub: name,
-               value: Spree::Money.new(shipments.sum(&:discounted_cost), currency: order.currency) %>
+               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',

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

@@ -8,7 +8,7 @@
 <% 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(&:discounted_cost), currency: order.currency) %>
+  <%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:cost), currency: order.currency) %>
 <% end %>
 
 <% if order.additional_tax_total != 0 %>

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

@@ -1,3 +1,8 @@
+<%# 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">
@@ -12,8 +17,8 @@
       <% end %>
     </td>
     <td class="item_amount" align="right" valign="middle">
-      <p class="item_qty f-fallback"><%= line_item.quantity %> x <%= line_item.single_money %></p>
-      <p class="item_price f-fallback"><%= line_item.display_amount %></p>
+      <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/config/i18n-tasks.yml

@@ -0,0 +1,22 @@
+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}']] %>

data/config/locales/en.yml

@@ -0,0 +1,141 @@
+---
+en:
+  spree:
+    company_mailer:
+      invitation_email:
+        action: Accept invitation
+        expiry_notice: This invitation link will expire in 30 days.
+        greeting: Hi,
+        ignore_notice: If you were not expecting this invitation, you can safely ignore this email.
+        instructions: You have been invited to join %{company} on %{store}. Accept the invitation to start purchasing on the company's behalf.
+        subject: invitation to join %{company}
+        title: Join %{company}
+    customer_mailer:
+      data_export_email:
+        action: Download Your Data
+        expiry_notice: This download link expires on %{date}.
+        greeting: Hello,
+        ignore_notice: If you did not request a copy of your data, please contact us.
+        instructions: Your copy of the personal data we hold about you is ready. Use the button below to download it.
+        subject: Your Data Is Ready to Download
+      password_reset_email:
+        action: Reset Password
+        expiry_notice: This password reset link will expire shortly. If you did not request this, no action is needed.
+        greeting: Hi %{name},
+        ignore_notice: If you did not request a password reset, you can safely ignore this email. Your password will not be changed.
+        instructions: We received a request to reset your password. Click the button below to choose a new password.
+        subject: Password Reset Instructions
+    digital_asset_mailer:
+      files_ready_email:
+        available_until: Available until %{date}
+        dear_customer: Dear %{name},
+        instructions: The files from your order %{number} are ready to download.
+        store_team: "%{store_name} Team"
+        subject: Your files are ready
+        thanks: Thank you for your business.
+    fulfillment_mailer:
+      fulfilled_email:
+        dear_customer: Dear %{name},
+        delivery_method: 'Delivery method: %{delivery_method}'
+        fulfillment_summary: Fulfillment summary for order
+        instructions: Your order %{number} has been fulfilled
+        store_team: "%{store_name} Team"
+        subject: Fulfillment Notification
+        thanks: Thank you for your business.
+        track_information: 'Tracking Information: %{tracking}'
+        track_link: 'Tracking Link: %{url}'
+    newsletter_mailer:
+      email_confirmation:
+        dear_customer: Hey,
+        ignore_disclaimer: If you didn't request this, please ignore this email.
+        instructions: Please click the button below to verify your email address.
+        message_copy_link: 'If the button doesn''t work please copy and paste the following link to your browser:'
+        store_team: "%{store_name} Team"
+        subject: Verify your email address
+        thanks: Thank you
+        verify_email_address_link: Verify email address
+    order_group_mailer:
+      confirm_email:
+        arriving_separately:
+          one: Your order is arriving in one delivery.
+          other: Your order is arriving in %{count} separate deliveries.
+        dear_customer: Hey %{name},
+        instructions: Please review and retain the following information about order %{number} for your records.
+        subject: Order Confirmation
+        thanks: Thank you
+      delivery: Delivery
+      delivery_numbered: Delivery %{position} of %{count}
+      nothing_to_ship: Nothing to ship
+      sold_by: Sold by %{sellers}
+      store_owner_notification_email:
+        heading: New Order Received
+        instructions:
+          one: You have received a new order.
+          other: You have received a new order, split across %{count} seller orders.
+        purchase_summary: Order %{number} Summary
+        subject: "%{store_name} received a new order"
+    order_mailer:
+      cancel_email:
+        dear_customer: Hey %{name},
+        instructions: Your order has been CANCELED.  Please retain this cancellation information for your records.
+        order_summary_canceled: Order %{number} Summary [CANCELED]
+        subject: Cancellation of Order
+        thanks: Thank you for
+      confirm_email:
+        dear_customer: Hey %{name},
+        instructions: Please review and retain the following order information for your records.
+        order_summary: Order %{number} Summary
+        subject: Order Confirmation
+        thanks: Thank you
+      payment_link_email:
+        message: Please click the button below to pay for your order.
+        message_copy_link: 'If the button doesn''t work please copy and paste the following link to your browser:'
+        pay_for_order: Pay for order
+        subject: 'Payment link for order #%{number}'
+      po_number: 'PO Number: %{number}'
+      store_owner_notification_email:
+        heading: New Order Received
+        instructions: You have received a new order.
+        order_summary: Order %{number} Summary
+        subject: "%{store_name} received a new order"
+        thanks: Thank you
+      store_team: "%{store_name} Team"
+      subtotal: 'Subtotal:'
+      total: 'Order Total:'
+    return_mailer:
+      refunded_email:
+        dear_customer: Dear %{name},
+        instructions: Your return for order %{number} has been refunded.
+        refund_summary: Refund Summary
+        returned_items: Returned Items
+        store_team: "%{store_name} Team"
+        subject: Return Refunded
+        thanks: Thank you for your business.
+        total_refunded: 'Total refunded: %{total}'
+    seller_mailer:
+      approved_email:
+        action: Go to your dashboard
+        heading: You're approved
+        message: Your application to sell on %{store_name} has been approved. You can now list products and start taking orders.
+        subject: You're approved to sell on %{store_name}
+      get_in_touch: If you think this is a mistake, reply to this email or contact us at %{store_email}.
+      greeting: Hi %{seller_name},
+      rejected_email:
+        heading: About your application
+        message: Your application to sell on %{store_name} has not been accepted.
+        subject: Your application to sell on %{store_name}
+      suspended_email:
+        heading: Your account has been suspended
+        message: Selling on %{store_name} has been paused for your account. Your products and order history are unaffected.
+        subject: Your %{store_name} account has been suspended
+    shipment_mailer:
+      shipped_email:
+        dear_customer: Dear %{name},
+        instructions: Your order %{number} has been shipped
+        shipment_summary: Shipment Summary for order
+        shipping_method: 'Shipping method: %{shipping_method}'
+        store_team: "%{store_name} Team"
+        subject: Shipment Notification
+        thanks: Thank you for your business.
+        track_information: 'Tracking Information: %{tracking}'
+        track_link: 'Tracking Link: %{url}'

data/lib/spree/emails/engine.rb

@@ -21,6 +21,7 @@ module Spree
       config.after_initialize do
         Spree.subscribers.concat [
           Spree::OrderEmailSubscriber,
+          Spree::OrderGroupEmailSubscriber,
           Spree::FulfillmentEmailSubscriber,
           Spree::ReturnEmailSubscriber,
           Spree::NewsletterSubscriberEmailSubscriber,

data/lib/spree/emails/previews/order_group_preview.rb

@@ -0,0 +1,30 @@
+require 'spree/core/previews/preview_data'
+
+# Preview the purchase confirmation for a split checkout at
+# /rails/mailers/spree/order_group
+class Spree::OrderGroupPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def confirm_email
+    Spree::OrderGroupMailer.confirm_email(order_group)
+  end
+
+  def store_owner_notification_email
+    Spree::OrderGroupMailer.store_owner_notification_email(order_group)
+  end
+
+  private
+
+  # The most recent split checkout. Nothing to preview until a store has one —
+  # a group only exists where a basket spanned several sellers.
+  #
+  # The locale the preview toolbar asks for is applied to the children in
+  # memory (never saved), because a group reads its locale from them.
+  def order_group
+    group = Spree::OrderGroup.last
+    return group if group.nil? || locale.blank?
+
+    group.orders.load.each { |order| order.locale = locale }
+    group
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_emails
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta2
+  version: 6.0.0.beta3
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-17 00:00:00.000000000 Z
+date: 2026-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta2
+        version: 6.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta2
+        version: 6.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,7 @@ files:
 - app/mailers/spree/digital_asset_mailer.rb
 - app/mailers/spree/fulfillment_mailer.rb
 - app/mailers/spree/newsletter_mailer.rb
+- app/mailers/spree/order_group_mailer.rb
 - app/mailers/spree/order_mailer.rb
 - app/mailers/spree/return_mailer.rb
 - app/mailers/spree/seller_mailer.rb
@@ -70,6 +71,7 @@ files:
 - app/subscribers/spree/fulfillment_email_subscriber.rb
 - app/subscribers/spree/newsletter_subscriber_email_subscriber.rb
 - app/subscribers/spree/order_email_subscriber.rb
+- app/subscribers/spree/order_group_email_subscriber.rb
 - app/subscribers/spree/return_email_subscriber.rb
 - app/subscribers/spree/seller_email_subscriber.rb
 - app/views/spree/company_mailer/invitation_email.html.erb
@@ -84,6 +86,10 @@ files:
 - app/views/spree/fulfillment_mailer/fulfilled_email.text.erb
 - app/views/spree/newsletter_mailer/email_confirmation.html.erb
 - app/views/spree/newsletter_mailer/email_confirmation.text.erb
+- app/views/spree/order_group_mailer/confirm_email.html.erb
+- app/views/spree/order_group_mailer/confirm_email.text.erb
+- app/views/spree/order_group_mailer/store_owner_notification_email.html.erb
+- app/views/spree/order_group_mailer/store_owner_notification_email.text.erb
 - app/views/spree/order_mailer/cancel_email.html.erb
 - app/views/spree/order_mailer/cancel_email.text.erb
 - app/views/spree/order_mailer/confirm_email.html.erb
@@ -99,21 +105,28 @@ files:
 - app/views/spree/seller_mailer/rejected_email.text.erb
 - app/views/spree/seller_mailer/suspended_email.html.erb
 - app/views/spree/seller_mailer/suspended_email.text.erb
+- app/views/spree/shared/_fulfillment_group_section.html.erb
+- app/views/spree/shared/_fulfillment_group_section.text.erb
 - app/views/spree/shared/_item_thumbnail_link.html.erb
 - app/views/spree/shared/_order_summary_section.html.erb
 - app/views/spree/shared/_po_number.text.erb
+- app/views/spree/shared/_purchase_totals.html.erb
+- app/views/spree/shared/_purchase_totals.text.erb
 - app/views/spree/shared/_purchased_items_table.html.erb
 - app/views/spree/shared/_purchased_items_table.text.erb
 - app/views/spree/shared/purchased_items_table/_line_item.html.erb
 - app/views/spree/shared/purchased_items_table/_subtotal.html.erb
 - app/views/spree/shared/purchased_items_table/_summary_row.html.erb
 - app/views/spree/shared/purchased_items_table/_total.html.erb
+- config/i18n-tasks.yml
+- config/locales/en.yml
 - lib/generators/spree/emails/install/install_generator.rb
 - lib/spree/emails.rb
 - lib/spree/emails/engine.rb
 - lib/spree/emails/previews/customer_preview.rb
 - lib/spree/emails/previews/fulfillment_preview.rb
 - lib/spree/emails/previews/newsletter_preview.rb
+- lib/spree/emails/previews/order_group_preview.rb
 - lib/spree/emails/previews/order_preview.rb
 - lib/spree/emails/previews/return_preview.rb
 - lib/spree_emails.rb
@@ -122,9 +135,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.0.beta2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.0.beta3
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v6.0.0.beta2
+  source_code_uri: https://github.com/spree/spree/tree/v6.0.0.beta3
 post_install_message:
 rdoc_options: []
 require_paths: