spree_emails 5.6.1 → 6.0.0.beta1

data/app/views/spree/customer_mailer/data_export_email.text.erb

@@ -0,0 +1,9 @@
+<%= Spree.t('customer_mailer.data_export_email.greeting') %>
+
+<%= Spree.t('customer_mailer.data_export_email.instructions') %>
+
+<% if @download_url %><%= @download_url %><% end %>
+
+<% if @expires_at %><%= Spree.t('customer_mailer.data_export_email.expiry_notice', date: I18n.l(@expires_at.to_date, format: :long)) %><% end %>
+
+<%= Spree.t('customer_mailer.data_export_email.ignore_notice') %>

data/app/views/spree/digital_asset_mailer/files_ready_email.html.erb

@@ -0,0 +1,20 @@
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('digital_asset_mailer.files_ready_email.subject') %></h1>
+  <p class="greeting"><%= Spree.t('digital_asset_mailer.files_ready_email.dear_customer', name: name_for(@order)) %></p>
+  <p><%= Spree.t('digital_asset_mailer.files_ready_email.instructions', number: @order.number) %></p>
+<% end %>
+
+<table width="100%" cellpadding="0" cellspacing="0" border="0">
+  <% @digital_links.each do |digital_link| %>
+    <tr>
+      <td style="padding: 8px 0;">
+        <a href="<%= digital_link_download_url(digital_link, @download_host) %>"><%= digital_link.filename %></a>
+        <% if digital_link.expires_at %>
+          <div style="font-size: 12px; color: #666;">
+            <%= Spree.t('digital_asset_mailer.files_ready_email.available_until', date: l(digital_link.expires_at.to_date, format: :long)) %>
+          </div>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+</table>

data/app/views/spree/digital_asset_mailer/files_ready_email.text.erb

@@ -0,0 +1,10 @@
+<%= Spree.t('digital_asset_mailer.files_ready_email.dear_customer', name: name_for(@order)) %>
+
+<%= Spree.t('digital_asset_mailer.files_ready_email.instructions', number: @order.number) %>
+
+<% @digital_links.each do |digital_link| %>
+<%= digital_link.filename %>
+<%= digital_link_download_url(digital_link, @download_host) %>
+<% if digital_link.expires_at %><%= Spree.t('digital_asset_mailer.files_ready_email.available_until', date: l(digital_link.expires_at.to_date, format: :long)) %>
+<% end %>
+<% end %>

data/app/views/spree/fulfillment_mailer/fulfilled_email.html.erb

@@ -0,0 +1,22 @@
+<%= render 'spree/shared/purchased_items_styles' %>
+
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('fulfillment_mailer.fulfilled_email.subject') %></h1>
+  <p class="greeting"><%= Spree.t('fulfillment_mailer.fulfilled_email.dear_customer', name: name_for(@fulfillment.order)) %></p>
+  <p><%= Spree.t('fulfillment_mailer.fulfilled_email.instructions', number: @fulfillment.order.number) %></p>
+  <% if @fulfillment.delivery_method %>
+    <p><%= Spree.t('fulfillment_mailer.fulfilled_email.delivery_method', delivery_method: @fulfillment.delivery_method.name) %></p>
+  <% end %>
+  <% if @fulfillment.tracking %>
+    <p><%= Spree.t('fulfillment_mailer.fulfilled_email.track_information', tracking: @fulfillment.tracking) %></p>
+  <% end %>
+  <% if @fulfillment.tracking_url %>
+    <p><%= Spree.t('fulfillment_mailer.fulfilled_email.track_link', url: fulfillment_tracking_link_to(fulfillment: @fulfillment)).html_safe %></p>
+  <% end %>
+<% end %>
+
+<%= render 'spree/shared/order_summary_section',
+           heading: Spree.t('fulfillment_mailer.fulfilled_email.fulfillment_summary'),
+           line_items: @fulfillment.manifest.map(&:line_item),
+           order: @fulfillment.order,
+           totals: false %>

data/app/views/spree/fulfillment_mailer/fulfilled_email.text.erb

@@ -0,0 +1,18 @@
+<%= Spree.t('fulfillment_mailer.fulfilled_email.dear_customer', name: name_for(@fulfillment.order)) %>
+
+<%= Spree.t('fulfillment_mailer.fulfilled_email.instructions', number: @fulfillment.order.number) %>
+
+============================================================
+<%= Spree.t('fulfillment_mailer.fulfilled_email.fulfillment_summary') %>
+============================================================
+<%= render 'spree/shared/po_number', order: @fulfillment.order %>
+<% @fulfillment.manifest.each do |item| %>
+  <%= item.variant.sku %> <%= item.variant.product.name %> <%= item.variant.options_text %>
+<% end %>
+============================================================
+
+<%= Spree.t('fulfillment_mailer.fulfilled_email.track_information', tracking: @fulfillment.tracking) if @fulfillment.tracking %>
+<%= Spree.t('fulfillment_mailer.fulfilled_email.track_link', url: @fulfillment.tracking_url) if @fulfillment.tracking_url %>
+
+<%= Spree.t('fulfillment_mailer.fulfilled_email.thanks') %>
+<%= Spree.t('fulfillment_mailer.fulfilled_email.store_team', store_name: current_store.name) %>

data/app/views/spree/order_mailer/cancel_email.text.erb

@@ -5,6 +5,7 @@
 ============================================================
 <%= Spree.t('order_mailer.cancel_email.order_summary_canceled', number: @order.number) %>
 ============================================================
+<%= render 'spree/shared/po_number', order: @order %>
 <%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>
 ============================================================
 <%= Spree.t('order_mailer.total') %> <%= @order.display_total %>

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

@@ -5,6 +5,7 @@
 ============================================================
 <%= Spree.t('order_mailer.confirm_email.order_summary', number: @order.number) %>
 ============================================================
+<%= render 'spree/shared/po_number', order: @order %>
 <%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>
 ============================================================
 <%= Spree.t('order_mailer.total') %> <%= @order.display_total %>

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

@@ -5,6 +5,7 @@
 ============================================================
 <%= Spree.t('order_mailer.store_owner_notification_email.order_summary', number: @order.number) %>
 ============================================================
+<%= render 'spree/shared/po_number', order: @order %>
 <%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>
 ============================================================
 <%= Spree.t('order_mailer.total') %> <%= @order.display_total %>

data/app/views/spree/return_mailer/refunded_email.html.erb

@@ -0,0 +1,22 @@
+<%= render 'spree/shared/purchased_items_styles' %>
+
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('return_mailer.refunded_email.subject') %></h1>
+  <p class="greeting"><%= Spree.t('return_mailer.refunded_email.dear_customer', name: name_for(@order)) %></p>
+  <p><%= Spree.t('return_mailer.refunded_email.instructions', number: @order.number) %></p>
+<% end %>
+
+<table class="section" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+  <tr>
+    <td>
+      <h3 class="f-fallback"><%= Spree.t('return_mailer.refunded_email.refund_summary') %></h3>
+      <p class="strong f-fallback"><%= Spree.t('return_mailer.refunded_email.total_refunded', total: @return.display_refunded_total) %></p>
+    </td>
+  </tr>
+</table>
+
+<%= render 'spree/shared/order_summary_section',
+           heading: Spree.t('return_mailer.refunded_email.returned_items'),
+           line_items: @return.return_line_items.map(&:line_item),
+           order: @order,
+           totals: false %>

data/app/views/spree/return_mailer/refunded_email.text.erb

@@ -0,0 +1,20 @@
+<%= Spree.t('return_mailer.refunded_email.dear_customer', name: name_for(@order)) %>
+
+<%= Spree.t('return_mailer.refunded_email.instructions', number: @order.number) %>
+
+============================================================
+<%= Spree.t('return_mailer.refunded_email.refund_summary') %>
+============================================================
+<%= render 'spree/shared/po_number', order: @order %>
+<%= Spree.t('return_mailer.refunded_email.total_refunded', total: @return.display_refunded_total) %>
+
+============================================================
+<%= Spree.t('return_mailer.refunded_email.returned_items') %>
+============================================================
+<% @return.return_line_items.each do |line| %>
+  <%= line.variant.sku %> <%= line.variant.product.name %> <%= line.variant.options_text %>
+<% end %>
+============================================================
+
+<%= Spree.t('return_mailer.refunded_email.thanks') %>
+<%= Spree.t('return_mailer.refunded_email.store_team', store_name: current_store.name) %>

data/app/views/spree/seller_mailer/approved_email.html.erb

@@ -0,0 +1,8 @@
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('seller_mailer.approved_email.heading') %></h1>
+  <p class="greeting"><%= Spree.t('seller_mailer.greeting', seller_name: @seller.name) %></p>
+  <p><%= Spree.t('seller_mailer.approved_email.message', store_name: current_store.name) %></p>
+  <% if @dashboard_url %>
+    <%= render 'spree/shared/mailer_button', url: @dashboard_url, label: Spree.t('seller_mailer.approved_email.action') %>
+  <% end %>
+<% end %>

data/app/views/spree/seller_mailer/approved_email.text.erb

@@ -0,0 +1,8 @@
+<%= Spree.t('seller_mailer.greeting', seller_name: @seller.name) %>
+
+<%= Spree.t('seller_mailer.approved_email.message', store_name: current_store.name) %>
+<% if @dashboard_url %>
+<%= Spree.t('seller_mailer.approved_email.action') %>: <%= @dashboard_url %>
+<% end %>
+
+<%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>

data/app/views/spree/seller_mailer/rejected_email.html.erb

@@ -0,0 +1,6 @@
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('seller_mailer.rejected_email.heading') %></h1>
+  <p class="greeting"><%= Spree.t('seller_mailer.greeting', seller_name: @seller.name) %></p>
+  <p><%= Spree.t('seller_mailer.rejected_email.message', store_name: current_store.name) %></p>
+  <p class="sub"><%= Spree.t('seller_mailer.get_in_touch', store_email: current_store.mail_from_address) %></p>
+<% end %>

data/app/views/spree/seller_mailer/rejected_email.text.erb

@@ -0,0 +1,7 @@
+<%= Spree.t('seller_mailer.greeting', seller_name: @seller.name) %>
+
+<%= Spree.t('seller_mailer.rejected_email.message', store_name: current_store.name) %>
+
+<%= Spree.t('seller_mailer.get_in_touch', store_email: current_store.mail_from_address) %>
+
+<%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>

data/app/views/spree/seller_mailer/suspended_email.html.erb

@@ -0,0 +1,6 @@
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('seller_mailer.suspended_email.heading') %></h1>
+  <p class="greeting"><%= Spree.t('seller_mailer.greeting', seller_name: @seller.name) %></p>
+  <p><%= Spree.t('seller_mailer.suspended_email.message', store_name: current_store.name) %></p>
+  <p class="sub"><%= Spree.t('seller_mailer.get_in_touch', store_email: current_store.mail_from_address) %></p>
+<% end %>

data/app/views/spree/seller_mailer/suspended_email.text.erb

@@ -0,0 +1,7 @@
+<%= Spree.t('seller_mailer.greeting', seller_name: @seller.name) %>
+
+<%= Spree.t('seller_mailer.suspended_email.message', store_name: current_store.name) %>
+
+<%= Spree.t('seller_mailer.get_in_touch', store_email: current_store.mail_from_address) %>
+
+<%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>

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

@@ -3,5 +3,16 @@
 <% if image.present? && image.attached? %>
   <%= link_to spree_image_tag(image, variant: :small, alt: alt, width: 80, class: 'item_thumb'), product_url %>
 <% else %>
-  <%= link_to image_tag('noimage/small.png', alt: alt, width: 80, class: 'item_thumb'), product_url %>
+  <%# Table + inline styles, not a styled div: Outlook collapses empty block
+      elements and ignores class-based height, and a div inside <a> is invalid
+      under the XHTML doctype the mailer layout declares. %>
+  <table class="item_thumb_placeholder" width="80" height="80" cellpadding="0" cellspacing="0" role="presentation"
+         style="width: 80px; height: 80px; background-color: #E4E4E4; border-radius: 12px;">
+    <tr>
+      <td width="80" height="80" style="width: 80px; height: 80px; line-height: 80px; font-size: 0;">
+        <%= link_to '&#160;'.html_safe, product_url, 'aria-label': alt,
+                    style: 'display: block; width: 80px; height: 80px; line-height: 80px; text-decoration: none;' %>
+      </td>
+    </tr>
+  </table>
 <% end %>

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

@@ -6,6 +6,11 @@
   <tr>
     <td>
       <h3 class="f-fallback"><%= heading %></h3>
+      <%# The buyer's own purchase-order reference, when they gave one — it is
+          how their accounting reconciles this order. %>
+      <% if order.po_number.present? %>
+        <p class="f-fallback"><%= Spree.t('order_mailer.po_number', number: order.po_number) %></p>
+      <% end %>
       <%= render 'spree/shared/purchased_items_table',
                  line_items: line_items,
                  order: order,

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

@@ -0,0 +1,6 @@
+<%# The buyer's own purchase-order reference, when they gave one. Rendered by
+    every order-facing document so their accounting can reconcile against it.
+    Locals: order. %>
+<% if order.po_number.present? %>
+<%= Spree.t('order_mailer.po_number', number: order.po_number) %>
+<% end %>

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

@@ -3,15 +3,13 @@
 <% 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 %>
-  <% if order.line_item_adjustments.exists? %>
-    <% order.all_adjustments.promotion.eligible.to_a.group_by(&:label).each do |label, adjustments| %>
-      <%= render 'spree/shared/purchased_items_table/summary_row',
-                 label: Spree.t(:promotion),
-                 sub: label,
-                 value: Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
-    <% end %>
+  <% 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.shipments.group_by { |s| s.selected_shipping_rate&.name }.each do |name, shipments| %>
+  <% 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,
@@ -27,9 +25,16 @@
                label: Spree.t(:gift_card),
                value: safe_join(['-', order.display_gift_card_total.to_html]) %>
   <% end %>
-  <% order.adjustments.eligible.each do |adjustment| %>
-    <% next if (adjustment.source_type == 'Spree::TaxRate') || (adjustment.amount == 0) %>
-    <%= render 'spree/shared/purchased_items_table/adjustment', adjustment: adjustment, order: order %>
+  <% 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>

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

@@ -3,15 +3,11 @@
 <% end %>
 ============================================================
 <%= Spree.t('order_mailer.subtotal') %> <%= order.display_item_total %>
-<% if order.line_item_adjustments.exists? %>
-  <% if order.all_adjustments.promotion.eligible.exists? %>
-    <% order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
-      <%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
-    <% end %>
-  <% end %>
+<% 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.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
+<% 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) %>
 <% end %>
 
@@ -23,7 +19,10 @@
   <%= Spree.t(:gift_card) %>: -<%= order.display_gift_card_total.to_html %>
 <% end %>
 
-<% order.adjustments.eligible.each do |adjustment| %>
-  <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
-  <%= adjustment.label %> <%= adjustment.display_amount %>
+<% 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/lib/spree/emails/engine.rb

@@ -21,10 +21,11 @@ module Spree
       config.after_initialize do
         Spree.subscribers.concat [
           Spree::OrderEmailSubscriber,
-          Spree::ShipmentEmailSubscriber,
-          Spree::ReimbursementEmailSubscriber,
+          Spree::FulfillmentEmailSubscriber,
+          Spree::ReturnEmailSubscriber,
           Spree::NewsletterSubscriberEmailSubscriber,
-          Spree::CustomerEmailSubscriber
+          Spree::CustomerEmailSubscriber,
+          Spree::SellerEmailSubscriber
         ]
       end
     end

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

@@ -0,0 +1,12 @@
+require 'spree/core/previews/preview_data'
+
+# Preview Spree fulfillment emails at /rails/mailers/spree/fulfillment
+class Spree::FulfillmentPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def fulfilled_email
+    fulfillment = Spree::Fulfillment.fulfilled.last
+    fulfillment.order.locale = locale if fulfillment && locale.present?
+    Spree::FulfillmentMailer.fulfilled_email(fulfillment)
+  end
+end

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

@@ -0,0 +1,12 @@
+require 'spree/core/previews/preview_data'
+
+# Preview Spree return emails at /rails/mailers/spree/return
+class Spree::ReturnPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def refunded_email
+    return_record = Spree::Return.refunded.last
+    return_record.order.locale = locale if return_record && locale.present?
+    Spree::ReturnMailer.refunded_email(return_record)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_emails
 version: !ruby/object:Gem::Version
-  version: 5.6.1
+  version: 6.0.0.beta1
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,22 +10,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-28 00:00:00.000000000 Z
+date: 2026-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 5.6.1
+        version: 6.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 5.6.1
+        version: 6.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
@@ -41,35 +41,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
 description: Optional transactional emails for Spree such as Order placed or Shipment
-  notification emails
+  notification emails. Fully responsive and mobile ready
 email: hello@spreecommerce.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - Rakefile
-- app/assets/config/spree_emails_manifest.js
-- app/assets/images/logo/spree_50.png
-- app/assets/images/noimage/mini.png
-- app/assets/images/noimage/noimage/large.png
-- app/assets/images/noimage/noimage/mini.png
-- app/assets/images/noimage/noimage/product.png
-- app/assets/images/noimage/noimage/small.png
-- app/assets/images/noimage/small.png
+- app/helpers/spree/base_helper.rb
+- app/helpers/spree/digital_asset_helper.rb
+- app/helpers/spree/fulfillment_helper.rb
 - app/helpers/spree/mail_helper.rb
+- app/mailers/spree/company_mailer.rb
 - app/mailers/spree/customer_mailer.rb
+- app/mailers/spree/digital_asset_mailer.rb
+- app/mailers/spree/fulfillment_mailer.rb
 - app/mailers/spree/newsletter_mailer.rb
 - app/mailers/spree/order_mailer.rb
-- app/mailers/spree/reimbursement_mailer.rb
+- app/mailers/spree/return_mailer.rb
+- app/mailers/spree/seller_mailer.rb
 - app/mailers/spree/shipment_mailer.rb
+- app/subscribers/spree/company_email_subscriber.rb
 - app/subscribers/spree/customer_email_subscriber.rb
+- app/subscribers/spree/data_request_email_subscriber.rb
+- app/subscribers/spree/digital_asset_email_subscriber.rb
+- 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/reimbursement_email_subscriber.rb
-- app/subscribers/spree/shipment_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
+- app/views/spree/company_mailer/invitation_email.text.erb
+- app/views/spree/customer_mailer/data_export_email.html.erb
+- app/views/spree/customer_mailer/data_export_email.text.erb
 - app/views/spree/customer_mailer/password_reset_email.html.erb
 - app/views/spree/customer_mailer/password_reset_email.text.erb
+- app/views/spree/digital_asset_mailer/files_ready_email.html.erb
+- app/views/spree/digital_asset_mailer/files_ready_email.text.erb
+- app/views/spree/fulfillment_mailer/fulfilled_email.html.erb
+- 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_mailer/cancel_email.html.erb
@@ -79,37 +91,40 @@ files:
 - app/views/spree/order_mailer/payment_link_email.html.erb
 - app/views/spree/order_mailer/store_owner_notification_email.html.erb
 - app/views/spree/order_mailer/store_owner_notification_email.text.erb
-- app/views/spree/reimbursement_mailer/reimbursement_email.html.erb
-- app/views/spree/reimbursement_mailer/reimbursement_email.text.erb
+- app/views/spree/return_mailer/refunded_email.html.erb
+- app/views/spree/return_mailer/refunded_email.text.erb
+- app/views/spree/seller_mailer/approved_email.html.erb
+- app/views/spree/seller_mailer/approved_email.text.erb
+- app/views/spree/seller_mailer/rejected_email.html.erb
+- 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/_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/_purchased_items_table.html.erb
 - app/views/spree/shared/_purchased_items_table.text.erb
-- app/views/spree/shared/purchased_items_table/_adjustment.html.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
-- app/views/spree/shipment_mailer/shipped_email.html.erb
-- app/views/spree/shipment_mailer/shipped_email.text.erb
-- config/initializers/assets.rb
 - 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_preview.rb
-- lib/spree/emails/previews/reimbursement_preview.rb
-- lib/spree/emails/previews/shipment_preview.rb
+- lib/spree/emails/previews/return_preview.rb
 - lib/spree_emails.rb
 homepage: https://spreecommerce.org
 licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.6.1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.0.beta1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.6.1
+  source_code_uri: https://github.com/spree/spree/tree/v6.0.0.beta1
 post_install_message:
 rdoc_options: []
 require_paths:

data/app/assets/config/spree_emails_manifest.js

@@ -1 +0,0 @@
-//= link_tree ../images

data/app/mailers/spree/reimbursement_mailer.rb

@@ -1,15 +0,0 @@
-module Spree
-  class ReimbursementMailer < BaseMailer
-    helper Spree::MailHelper
-
-    def reimbursement_email(reimbursement, resend = false)
-      @reimbursement = reimbursement.respond_to?(:id) ? reimbursement : Spree::Reimbursement.find(reimbursement)
-      @order = @reimbursement.order
-      current_store = @reimbursement.store || Spree::Store.default
-      with_store_locale(current_store, @order.locale) do
-        subject = order_email_subject(current_store, Spree.t('reimbursement_mailer.reimbursement_email.subject'), @order.number, resend: resend)
-        mail(to: @order.email, subject: subject, store_url: current_store.storefront_url)
-      end
-    end
-  end
-end

data/app/subscribers/spree/reimbursement_email_subscriber.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  class ReimbursementEmailSubscriber < Spree::Subscriber
-    subscribes_to 'reimbursement.reimbursed'
-
-    def handle(event)
-      reimbursement = find_reimbursement(event)
-      return unless reimbursement
-
-      store = reimbursement.store
-      return unless store.prefers_send_consumer_transactional_emails?
-
-      ReimbursementMailer.reimbursement_email(reimbursement.id).deliver_later
-    end
-
-    private
-
-    def find_reimbursement(event)
-      reimbursement_id = event.payload['id']
-      Spree::Reimbursement.find_by_prefix_id(reimbursement_id)
-    end
-  end
-end

data/app/subscribers/spree/shipment_email_subscriber.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  class ShipmentEmailSubscriber < Spree::Subscriber
-    subscribes_to 'shipment.shipped'
-
-    def handle(event)
-      shipment = find_shipment(event)
-      return unless shipment
-
-      store = shipment.store
-      return unless store.prefers_send_consumer_transactional_emails?
-
-      ShipmentMailer.shipped_email(shipment.id).deliver_later
-    end
-
-    private
-
-    def find_shipment(event)
-      shipment_id = event.payload['id']
-      Spree::Shipment.find_by_prefix_id(shipment_id)
-    end
-  end
-end