spree_emails 5.5.3 → 5.6.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f45895dba90121f176de0b3f18b6714d9703334a2bc9550c3e4381350579398
-  data.tar.gz: 36bd73f12429bea0eb3823f419b55c113d2a99ec8d24397e5744c9f290f4f195
+  metadata.gz: 67fb3d4d12386b0b96c47be15e652c59e9f19ac7a64330afe7ccb9b0c4103d9c
+  data.tar.gz: 801359f2dfc3e9d9fd6d40edaf20a37c2811b2a81a43e57e73d5a26da7c36883
 SHA512:
-  metadata.gz: a00191867bb2c160d53283f47fc7db4d656a9928f378e0a42c9f136a878a7b8a602017ae646704f8d3497884b8d3b7d4ed2a48b0f8f90711a4526c1515f1860a
-  data.tar.gz: 23ed76d697d4767051635e6fb6fbd7fe2370f396850c3002b2d2fea91215ddec6e1d3a38a9e585a2b643f133d273dd12ae8678085d1b18d2a385902c3622f993
+  metadata.gz: 3548d009080808abf54f55de6acbf287beb4edd07c9e2262dad88cc832cccde9c107c69e3a8c942fa104358f590c00a8e469ab50da555304265b684115fa1042
+  data.tar.gz: 56ff4023bee3cbb86eeb0bfb833ac9932ec2034be697495263589e17a0515a4f4c15b9df887e59c3791dbd6deedb0cbe1be3b2b3270445bf54fb3474e0ed8389

data/README.md

@@ -188,23 +188,15 @@ bundle remove spree_emails
 
 If you prefer to use a third-party email service like Klaviyo for transactional emails, you can use the [spree_klaviyo](https://github.com/spree/spree_klaviyo) extension. This allows you to leverage Klaviyo's email marketing platform for order confirmations, shipment notifications, and other transactional emails.
 
-## Testing
+## Previewing emails
 
-Preview emails in development:
+[ActionMailer previews](https://guides.rubyonrails.org/action_mailer_basics.html#previewing-and-testing-mailers) for every transactional email ship with this gem and are served automatically in development — no setup required. With a seeded development database, start the server and visit:
 
-```ruby
-# test/mailers/previews/spree/order_mailer_preview.rb
-module Spree
-  class OrderMailerPreview < ActionMailer::Preview
-    def confirm_email
-      order = Spree::Order.complete.last
-      Spree::OrderMailer.confirm_email(order)
-    end
-  end
-end
-```
+`http://localhost:3000/rails/mailers`
 
-Visit `http://localhost:3000/rails/mailers/spree/order_mailer/confirm_email`
+for example `http://localhost:3000/rails/mailers/spree/order/confirm_email`.
+
+## Testing
 
 Run the test suite:
 

data/app/mailers/spree/customer_mailer.rb

@@ -0,0 +1,21 @@
+module Spree
+  class CustomerMailer < BaseMailer
+    # Password reset requested through the Store API (`customer.password_reset_requested`).
+    # The link goes to the validated redirect URL when the storefront supplied one,
+    # falling back to the store's storefront URL, with the reset token appended.
+    def password_reset_email(user, reset_token, store, redirect_url: nil)
+      @user = user
+      @current_store = store
+      base_url = redirect_url.presence || store.storefront_url
+      @reset_url = append_token(base_url, reset_token)
+
+      with_store_locale(store) do
+        mail(
+          to: user.email,
+          subject: "#{store.name} #{Spree.t('customer_mailer.password_reset_email.subject')}",
+          store_url: store.storefront_url
+        )
+      end
+    end
+  end
+end

data/app/mailers/spree/newsletter_mailer.rb

@@ -3,24 +3,15 @@ module Spree
     def email_confirmation(subscriber, redirect_url: nil)
       @subscriber = subscriber
       store = subscriber.store || Spree::Current.store || Spree::Store.default
+      # The shared header/footer and from address read current_store — set it
+      # to the subscriber's store so multi-store installs brand correctly.
+      @current_store = store
       base_url = redirect_url.presence || store.storefront_url
       @confirm_email_url = append_token(base_url, @subscriber.verification_token)
-      mail(to: @subscriber.email, from: from_address, subject: Spree.t('newsletter_mailer.email_confirmation.subject'))
+      with_store_locale(store) do
+        mail(to: @subscriber.email, subject: Spree.t('newsletter_mailer.email_confirmation.subject'))
+      end
     end
 
-    private
-
-    # URI-based merge preserves existing query params and fragments so the token
-    # doesn't get swallowed by a `#section` or clobber an existing `?source=`.
-    def append_token(url, token)
-      uri = URI.parse(url.to_s)
-      params = URI.decode_www_form(uri.query || '')
-      params << ['token', token.to_s]
-      uri.query = URI.encode_www_form(params)
-      uri.to_s
-    rescue URI::InvalidURIError
-      separator = url.include?('?') ? '&' : '?'
-      "#{url}#{separator}token=#{CGI.escape(token.to_s)}"
-    end
   end
 end

data/app/mailers/spree/order_mailer.rb

@@ -5,24 +5,28 @@ module Spree
     def confirm_email(order, resend = false)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
       current_store = @order.store
-      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{current_store.name} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.storefront_url, reply_to: reply_to_address)
+      with_store_locale(current_store, @order.locale) do
+        subject = order_email_subject(current_store, Spree.t('order_mailer.confirm_email.subject'), @order.number, resend: resend)
+        mail(to: @order.email, subject: subject, store_url: current_store.storefront_url)
+      end
     end
 
     def store_owner_notification_email(order)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
       current_store = @order.store
-      subject = Spree.t('order_mailer.store_owner_notification_email.subject', store_name: current_store.name)
-      mail(to: current_store.new_order_notifications_email, from: from_address, subject: subject, store_url: current_store.storefront_url, reply_to: reply_to_address)
+      with_store_locale(current_store) do
+        subject = Spree.t('order_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
 
     def cancel_email(order, resend = false)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
       current_store = @order.store
-      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{current_store.name} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.storefront_url, reply_to: reply_to_address)
+      with_store_locale(current_store, @order.locale) do
+        subject = order_email_subject(current_store, Spree.t('order_mailer.cancel_email.subject'), @order.number, resend: resend)
+        mail(to: @order.email, subject: subject, store_url: current_store.storefront_url)
+      end
     end
 
     def payment_link_email(order_id)
@@ -30,8 +34,10 @@ module Spree
       @current_store = @order.store
       @checkout_payment_url = spree.checkout_state_url(@order.token, :payment, host: @current_store.storefront_url)
 
-      mail(to: @order.email, from: from_address, subject: Spree.t('order_mailer.payment_link_email.subject', number: @order.number),
-           store_url: @current_store.storefront_url, reply_to: reply_to_address)
+      with_store_locale(@current_store, @order.locale) do
+        mail(to: @order.email, subject: Spree.t('order_mailer.payment_link_email.subject', number: @order.number),
+             store_url: @current_store.storefront_url)
+      end
     end
   end
 end

data/app/mailers/spree/reimbursement_mailer.rb

@@ -6,9 +6,10 @@ module Spree
       @reimbursement = reimbursement.respond_to?(:id) ? reimbursement : Spree::Reimbursement.find(reimbursement)
       @order = @reimbursement.order
       current_store = @reimbursement.store || Spree::Store.default
-      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{current_store.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.storefront_url, reply_to: reply_to_address)
+      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/mailers/spree/shipment_mailer.rb

@@ -7,9 +7,10 @@ module Spree
       @shipment = shipment.respond_to?(:id) ? shipment : Spree::Shipment.find(shipment)
       @order = @shipment.order
       current_store = @shipment.store
-      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{current_store.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.storefront_url, reply_to: reply_to_address)
+      with_store_locale(current_store, @order.locale) do
+        subject = order_email_subject(current_store, Spree.t('shipment_mailer.shipped_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/customer_email_subscriber.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Spree
+  class CustomerEmailSubscriber < Spree::Subscriber
+    subscribes_to 'customer.password_reset_requested'
+
+    def handle(event)
+      user = Spree.user_class.find_by(email: event.payload['email'])
+      return unless user
+
+      store = find_store(event)
+      return unless store.prefers_send_consumer_transactional_emails?
+
+      CustomerMailer.password_reset_email(
+        user,
+        event.payload['reset_token'],
+        store,
+        redirect_url: event.payload['redirect_url']
+      ).deliver_later
+    end
+
+    private
+
+    def find_store(event)
+      Spree::Store.find_by_prefix_id(event.payload['store_id']) ||
+        Spree::Current.store ||
+        Spree::Store.default
+    end
+  end
+end

data/app/views/spree/customer_mailer/password_reset_email.html.erb

@@ -1,26 +1,10 @@
-<h1>
-  <%= Spree.t('customer_mailer.password_reset_email.greeting', name: @user.first_name.presence || @user.email) %>
-</h1>
-<p>
-  <%= Spree.t('customer_mailer.password_reset_email.instructions') %>
-</p>
-<% if @reset_url %>
-  <table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-    <tr>
-      <td align="center">
-        <a href="<%= @reset_url %>" class="button" target="_blank">
-          <%= Spree.t('customer_mailer.password_reset_email.action') %>
-        </a>
-      </td>
-    </tr>
-  </table>
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('customer_mailer.password_reset_email.action') %></h1>
+  <p class="greeting"><%= Spree.t('customer_mailer.password_reset_email.greeting', name: @user.first_name.presence || @user.email) %></p>
+  <p><%= Spree.t('customer_mailer.password_reset_email.instructions') %></p>
+  <% if @reset_url %>
+    <%= render 'spree/shared/mailer_button', url: @reset_url, label: Spree.t('customer_mailer.password_reset_email.action') %>
+  <% end %>
+  <p class="sub"><%= Spree.t('customer_mailer.password_reset_email.expiry_notice') %></p>
+  <p class="sub"><%= Spree.t('customer_mailer.password_reset_email.ignore_notice') %></p>
 <% end %>
-<p>
-  <%= Spree.t('customer_mailer.password_reset_email.expiry_notice') %>
-</p>
-<p>
-  <%= Spree.t('customer_mailer.password_reset_email.ignore_notice') %>
-</p>
-<p>
-  <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
-</p>

data/app/views/spree/newsletter_mailer/email_confirmation.html.erb

@@ -1,23 +1,12 @@
-<h1><%= Spree.t('newsletter_mailer.email_confirmation.dear_customer') %></h1>
-
-<p><%= Spree.t('newsletter_mailer.email_confirmation.instructions') %></p>
-
-<p class="align-center">
-<%= link_to Spree.t('newsletter_mailer.email_confirmation.verify_email_address_link'), @confirm_email_url, class: 'button' %>
-</p>
-
-<p>
-  <%= Spree.t('newsletter_mailer.email_confirmation.message_copy_link') %>
-  <br>
-  <span style="word-break: break-all;">
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('newsletter_mailer.email_confirmation.subject') %></h1>
+  <p class="greeting"><%= Spree.t('newsletter_mailer.email_confirmation.dear_customer') %></p>
+  <p><%= Spree.t('newsletter_mailer.email_confirmation.instructions') %></p>
+  <%= render 'spree/shared/mailer_button', url: @confirm_email_url, label: Spree.t('newsletter_mailer.email_confirmation.verify_email_address_link') %>
+  <p class="sub">
+    <%= Spree.t('newsletter_mailer.email_confirmation.message_copy_link') %>
+    <br>
     <%= link_to @confirm_email_url, @confirm_email_url %>
-  </span>
-</p>
-
-<p><%= Spree.t('newsletter_mailer.email_confirmation.ignore_disclaimer') %></p>
-
-<p>
-  <%= Spree.t('newsletter_mailer.email_confirmation.thanks') %>
-  <br />
-  <%= Spree.t('newsletter_mailer.email_confirmation.store_team', store_name: current_store.name) %>
-</p>
+  </p>
+  <p class="sub"><%= Spree.t('newsletter_mailer.email_confirmation.ignore_disclaimer') %></p>
+<% end %>

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

@@ -1,24 +1,12 @@
-<h1>
-  <%= Spree.t('order_mailer.cancel_email.dear_customer', name: name_for(@order)) %>
-</h1>
-<p>
-  <%= Spree.t('order_mailer.cancel_email.instructions') %>
-</p>
+<%= render 'spree/shared/purchased_items_styles' %>
 
-<table class="purchase" role="presentation">
-  <tr>
-    <td>
-      <h3> <%= Spree.t('order_mailer.cancel_email.order_summary_canceled', number: @order.number) %></h3>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2">
-      <%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>
-    </td>
-  </tr>
-</table>
-<p>
-  <%= Spree.t('order_mailer.cancel_email.thanks') %>
-  <br />
-  <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
-</p>
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('order_mailer.cancel_email.subject') %></h1>
+  <p class="greeting"><%= Spree.t('order_mailer.cancel_email.dear_customer', name: name_for(@order)) %></p>
+  <p><%= Spree.t('order_mailer.cancel_email.instructions') %></p>
+<% end %>
+
+<%= render 'spree/shared/order_summary_section',
+           heading: Spree.t('order_mailer.cancel_email.order_summary_canceled', number: @order.number),
+           line_items: @order.line_items,
+           order: @order %>

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

@@ -1,23 +1,12 @@
-<h1>
-  <%= Spree.t('order_mailer.confirm_email.dear_customer', name: name_for(@order)) %>
-</h1>
-<p>
-  <%= Spree.t('order_mailer.confirm_email.instructions') %>
-</p>
-<table class="purchase" role="presentation">
-  <tr>
-    <td>
-      <h3><%= Spree.t('order_mailer.confirm_email.order_summary', number: @order.number) %></h3>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2">
-      <%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>
-    </td>
-  </tr>
-</table>
-<p>
-  <%= Spree.t('order_mailer.confirm_email.thanks') %>
-  <br />
-  <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
-</p>
+<%= render 'spree/shared/purchased_items_styles' %>
+
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('order_mailer.confirm_email.subject') %></h1>
+  <p class="greeting"><%= Spree.t('order_mailer.confirm_email.dear_customer', name: name_for(@order)) %></p>
+  <p><%= Spree.t('order_mailer.confirm_email.instructions') %></p>
+<% end %>
+
+<%= render 'spree/shared/order_summary_section',
+           heading: Spree.t('order_mailer.confirm_email.order_summary', number: @order.number),
+           line_items: @order.line_items,
+           order: @order %>

data/app/views/spree/order_mailer/payment_link_email.html.erb

@@ -1,16 +1,11 @@
-<h1>
-  <%= Spree.t('order_mailer.confirm_email.dear_customer', name: name_for(@order)) %>
-</h1>
-<p>
-  <%= Spree.t('order_mailer.payment_link_email.message', store_name: @current_store.name) %>
-</p>
-<p>
-  <%= link_to Spree.t('order_mailer.payment_link_email.pay_for_order'), @checkout_payment_url, class: 'button' %>
-  <p>
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('order_mailer.payment_link_email.subject', number: @order.number) %></h1>
+  <p class="greeting"><%= Spree.t('order_mailer.confirm_email.dear_customer', name: name_for(@order)) %></p>
+  <p><%= Spree.t('order_mailer.payment_link_email.message', store_name: @current_store.name) %></p>
+  <%= render 'spree/shared/mailer_button', url: @checkout_payment_url, label: Spree.t('order_mailer.payment_link_email.pay_for_order') %>
+  <p class="sub">
     <%= Spree.t('order_mailer.payment_link_email.message_copy_link') %>
     <br>
-    <span style="word-break: break-all;">
-      <%= link_to @checkout_payment_url, @checkout_payment_url %>
-    </span>
+    <%= link_to @checkout_payment_url, @checkout_payment_url %>
   </p>
-</p>
+<% end %>

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

@@ -1,23 +1,11 @@
-<h1>
-  <%= Spree.t('order_mailer.store_owner_notification_email.heading') %>
-</h1>
-<p>
-  <%= Spree.t('order_mailer.store_owner_notification_email.instructions') %>
-</p>
-<table class="purchase" role="presentation">
-  <tr>
-    <td>
-      <h3><%= Spree.t('order_mailer.store_owner_notification_email.order_summary', number: @order.number) %></h3>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2">
-      <%= render 'spree/shared/purchased_items_table', line_items: @order.line_items, order: @order %>
-    </td>
-  </tr>
-</table>
-<p>
-  <%= Spree.t('order_mailer.store_owner_notification_email.thanks') %>
-  <br />
-  <%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>
-</p>
+<%= render 'spree/shared/purchased_items_styles' %>
+
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('order_mailer.store_owner_notification_email.heading') %></h1>
+  <p><%= Spree.t('order_mailer.store_owner_notification_email.instructions') %></p>
+<% end %>
+
+<%= render 'spree/shared/order_summary_section',
+           heading: Spree.t('order_mailer.store_owner_notification_email.order_summary', number: @order.number),
+           line_items: @order.line_items,
+           order: @order %>

data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb

@@ -1,53 +1,47 @@
-<h1>
-  <%= Spree.t('reimbursement_mailer.reimbursement_email.dear_customer', name: name_for(@order)) %>
-</h1>
-<p>
-  <%= Spree.t('reimbursement_mailer.reimbursement_email.instructions') %>
-</p>
-<p>
-  <%= Spree.t('reimbursement_mailer.reimbursement_email.refund_summary') %>
-</p>
-<p>
-  <%= Spree.t('reimbursement_mailer.reimbursement_email.total_refunded', total: @reimbursement.display_total) %>
-</p>
-<% if @reimbursement.return_items.exchange_requested.present? %>
-  <p>
-    <%= Spree.t('reimbursement_mailer.reimbursement_email.exchange_summary') %>
-  </p>
+<%= render 'spree/shared/purchased_items_styles' %>
 
-  <table class="purchase_content">
-    <% @reimbursement.return_items.exchange_requested.each do |return_item| %>
-      <tr>
-        <td class="purchase_image">
-          <% image = return_item.variant.primary_media || return_item.variant.product.primary_media %>
-          <% if image.present? && image.attached? %>
-            <%= link_to(spree_image_tag(image, variant: :mini, alt: return_item.variant.name), spree_storefront_resource_url(return_item.variant.product)) %>
-          <% else %>
-            <%= link_to(image_tag('noimage/small.png', alt: return_item.variant.name), spree_storefront_resource_url(return_item.variant.product)) %>
-          <% end %>
-        </td>
-        <td class="purchase_item">
-          <strong>
-            <span class="f-fallback">
-              <%= link_to return_item.variant.name, spree_storefront_resource_url(return_item.variant.product) %>
-            </span>
-          </strong>
-          <p class="purchase_item--additional">
-            <%= "(#{return_item.exchange_variant.options_text})" if return_item.exchange_variant.options_text.present? -%>
-          </p>
-        </td>
-      </tr>
-    <% end %>
-  </table>
-  <% if @reimbursement.return_items.awaiting_return.present? && Spree::Config[:expedited_exchanges] %>
-    <p>
-      <%= Spree.t('reimbursement_mailer.reimbursement_email.days_to_send', days: Spree::Config[:expedited_exchanges_days_window]) %>
-    </p>
-  <% end %>
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('reimbursement_mailer.reimbursement_email.subject') %></h1>
+  <p class="greeting"><%= Spree.t('reimbursement_mailer.reimbursement_email.dear_customer', name: name_for(@order)) %></p>
+  <p><%= Spree.t('reimbursement_mailer.reimbursement_email.instructions') %></p>
 <% end %>
 
-<p>
-  <%= Spree.t('reimbursement_mailer.reimbursement_email.thanks') %>
-  <br />
-  <%= Spree.t('reimbursement_mailer.reimbursement_email.store_team', store_name: current_store.name) %>
-</p>
+<table class="section" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+  <tr>
+    <td>
+      <h3 class="f-fallback"><%= Spree.t('reimbursement_mailer.reimbursement_email.refund_summary') %></h3>
+      <p class="strong f-fallback"><%= Spree.t('reimbursement_mailer.reimbursement_email.total_refunded', total: @reimbursement.display_total) %></p>
+    </td>
+  </tr>
+</table>
+
+<% exchange_items = @reimbursement.return_items.exchange_requested.to_a %>
+<% if exchange_items.any? %>
+  <table class="section" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+    <tr>
+      <td>
+        <h3 class="f-fallback"><%= Spree.t('reimbursement_mailer.reimbursement_email.exchange_summary') %></h3>
+        <% exchange_items.each do |return_item| %>
+          <% product_url = spree_storefront_resource_url(return_item.variant.product) %>
+          <table class="item" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+            <tr>
+              <td class="item_image" width="96" valign="middle">
+                <% image = return_item.variant.primary_media || return_item.variant.product.primary_media %>
+                <%= render 'spree/shared/item_thumbnail_link', image: image, product_url: product_url, alt: return_item.variant.name %>
+              </td>
+              <td class="item_info" valign="middle">
+                <%= link_to return_item.variant.name, product_url, class: 'f-fallback item_name' %>
+                <% if return_item.exchange_variant.options_text.present? %>
+                  <p class="item_meta"><%= return_item.exchange_variant.options_text %></p>
+                <% end %>
+              </td>
+            </tr>
+          </table>
+        <% end %>
+        <% if @reimbursement.return_items.awaiting_return.exists? && Spree::Config[:expedited_exchanges] %>
+          <p class="sub f-fallback"><%= Spree.t('reimbursement_mailer.reimbursement_email.days_to_send', days: Spree::Config[:expedited_exchanges_days_window]) %></p>
+        <% end %>
+      </td>
+    </tr>
+  </table>
+<% end %>

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

@@ -0,0 +1,7 @@
+<%# Rounded 80px product thumbnail linking to the product page, with a
+    no-image fallback. Locals: image, product_url, alt. %>
+<% 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 %>
+<% end %>

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

@@ -0,0 +1,15 @@
+<%# Labelled line-items + totals section shared by the order-related emails.
+    Locals: heading, line_items, order, optional totals (default true — pass
+    false when line_items is a subset of the order, e.g. one shipment's items,
+    so whole-order amounts aren't shown next to a partial item list). %>
+<table class="section" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+  <tr>
+    <td>
+      <h3 class="f-fallback"><%= heading %></h3>
+      <%= render 'spree/shared/purchased_items_table',
+                 line_items: line_items,
+                 order: order,
+                 totals: local_assigns.fetch(:totals, true) %>
+    </td>
+  </tr>
+</table>

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

@@ -1,75 +1,31 @@
-<table class="purchase_content">
-  <%= render collection: line_items, partial: 'spree/shared/purchased_items_table/line_item', as: :line_item %>
+<%= 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 %>
   <% 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| %>
-        <tr>
-          <td></td>
-          <td>
-            <p class="f-fallback purchase_total purchase_total--label">
-              <%= Spree.t(:promotion) %>:
-            </p>
-            <p class="f-fallback purchase_total--name purchase_total--label">
-              <%= label %>
-            </p>
-          </td>
-          <td class="purchase_total-col">
-            <p class="f-fallback purchase_total">
-              <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
-            </p>
-          </td>
-        </tr>
-      <% end %>
+    <% 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 %>
   <% end %>
   <% order.shipments.group_by { |s| s.selected_shipping_rate&.name }.each do |name, shipments| %>
-    <tr>
-      <td></td>
-      <td>
-        <p class="f-fallback purchase_total purchase_total--label">
-          <%= Spree.t(:shipping) %>:
-        </p>
-        <p class="f-fallback purchase_total--name purchase_total--label">
-          <%= name %>
-        </p>
-      </td>
-      <td class="purchase_total-col">
-        <p class="f-fallback purchase_total">
-          <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: order.currency) %>
-        </p>
-      </td>
-    </tr>
+    <%= 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) %>
   <% end %>
   <% if order.additional_tax_total != 0 %>
-    <tr>
-      <td></td>
-      <td>
-        <p class="f-fallback purchase_total purchase_total--label">
-          <%= Spree.t(:tax) %>:
-        </p>
-      </td>
-      <td class="purchase_total-col">
-        <p class="f-fallback purchase_total">
-          <%= order.display_additional_tax_total.to_html %>
-        </p>
-      </td>
-    </tr>
+    <%= 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? %>
-    <tr>
-      <td></td>
-      <td>
-        <p class="f-fallback purchase_total purchase_total--label">
-          <%= Spree.t(:gift_card) %>:
-        </p>
-      </td>
-      <td class="purchase_total-col">
-        <p class="f-fallback purchase_total">
-          -<%= order.display_gift_card_total.to_html %>
-        </p>
-      </td>
-    </tr>
+    <%= 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.adjustments.eligible.each do |adjustment| %>
     <% next if (adjustment.source_type == 'Spree::TaxRate') || (adjustment.amount == 0) %>
@@ -77,3 +33,4 @@
   <% end %>
   <%= render 'spree/shared/purchased_items_table/total', order: order %>
 </table>
+<% end %>

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

@@ -1,13 +1,3 @@
-<tr>
-  <td></td>
-  <td>
-    <p class="f-fallback purchase_total purchase_total--label">
-      <%= adjustment.label %>:
-    </p>
-  </td>
-  <td class="purchase_total-col">
-    <p class="f-fallback purchase_total">
-      <%= Spree::Money.new(adjustment.amount, currency: order.currency) %>
-    </p>
-  </td>
-</tr>
+<%= render 'spree/shared/purchased_items_table/summary_row',
+           label: adjustment.label,
+           value: Spree::Money.new(adjustment.amount, currency: order.currency) %>

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

@@ -1,24 +1,19 @@
-<tr>
-  <td class="purchase_image">
-    <% image = line_item.variant.primary_media || line_item.product.primary_media %>
-    <% if image.present? && image.attached? %>
-      <%= link_to(spree_image_tag(image, variant: :mini, alt: line_item.name), spree_storefront_resource_url(line_item.product)) %>
-    <% else %>
-      <%= link_to(image_tag('noimage/small.png', alt: line_item.name), spree_storefront_resource_url(line_item.product)) %>
-    <% end %>
-  </td>
-  <td class="purchase_item">
-    <strong>
-      <span class="f-fallback">
-        <%= link_to line_item.name, spree_storefront_resource_url(line_item.product) %>
-      </span>
-    </strong>
-    <p class="purchase_item--additional"><%= line_item.variant.options_text -%></p>
-  </td>
-  <td class="align-right" width="30%">
-    <span class="f-fallback purchase_item_price">
-      <%= line_item.quantity %> x <%= line_item.single_money %><br>
-      <%= line_item.display_amount %>
-    </span>
-  </td>
-</tr>
+<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"><%= line_item.quantity %> x <%= line_item.single_money %></p>
+      <p class="item_price f-fallback"><%= line_item.display_amount %></p>
+    </td>
+  </tr>
+</table>

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

@@ -1,13 +1,3 @@
-<tr>
-  <td class="purchase_footer" valign="middle"></td>
-  <td class="purchase_footer" valign="middle">
-    <p class="f-fallback purchase_total purchase_total--label">
-      <%= Spree.t('order_mailer.subtotal') %>
-    </p>
-  </td>
-  <td class="purchase_footer" valign="middle">
-    <p class="f-fallback purchase_total">
-      <%= order.display_item_total %>
-    </p>
-  </td>
-</tr>
+<%= 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

@@ -0,0 +1,14 @@
+<%# 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,13 +1,4 @@
-<tr>
-  <td></td>
-  <td>
-    <p class="f-fallback purchase_total purchase_total--label">
-      <strong><%= Spree.t('order_mailer.total') %></strong>
-    </p>
-  </td>
-  <td>
-    <p class="f-fallback purchase_total">
-      <strong><%= order.display_total_minus_store_credits %></strong>
-    </p>
-  </td>
-</tr>
+<%= 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/app/views/spree/shipment_mailer/shipped_email.html.erb

@@ -1,36 +1,20 @@
-<h1>
-  <%= Spree.t('shipment_mailer.shipped_email.dear_customer', name: name_for(@shipment.order)) %>
-</h1>
-<p>
-  <%= Spree.t('shipment_mailer.shipped_email.instructions', number: @shipment.order.number) %>
-</p>
-<table class="purchase" role="presentation">
-  <tr>
-    <td>
-      <h3><%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %></h3>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2">
-      <%= render 'spree/shared/purchased_items_table', line_items: @shipment.manifest.map(&:line_item), order: @shipment.order %>
-    </td>
-  </tr>
-</table>
-<p>
-  <%= Spree.t('shipment_mailer.shipped_email.shipping_method', shipping_method: @shipment.shipping_method.name) %>
-</p>
-<% if @shipment.tracking %>
-  <p>
-    <%= Spree.t('shipment_mailer.shipped_email.track_information', tracking: @shipment.tracking) %>
-  </p>
+<%= render 'spree/shared/purchased_items_styles' %>
+
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('shipment_mailer.shipped_email.subject') %></h1>
+  <p class="greeting"><%= Spree.t('shipment_mailer.shipped_email.dear_customer', name: name_for(@shipment.order)) %></p>
+  <p><%= Spree.t('shipment_mailer.shipped_email.instructions', number: @shipment.order.number) %></p>
+  <p><%= Spree.t('shipment_mailer.shipped_email.shipping_method', shipping_method: @shipment.shipping_method.name) %></p>
+  <% if @shipment.tracking %>
+    <p><%= Spree.t('shipment_mailer.shipped_email.track_information', tracking: @shipment.tracking) %></p>
+  <% end %>
+  <% if @shipment.tracking_url %>
+    <p><%= Spree.t('shipment_mailer.shipped_email.track_link', url: shipment_tracking_link_to(shipment: @shipment)).html_safe %></p>
+  <% end %>
 <% end %>
-<% if @shipment.tracking_url %>
-  <p>
-    <%= Spree.t('shipment_mailer.shipped_email.track_link', url: shipment_tracking_link_to(shipment: @shipment)).html_safe %>
-  </p>
-<% end %>
-<p>
-  <%= Spree.t('shipment_mailer.shipped_email.thanks') %>
-  <br />
-  <%= Spree.t('shipment_mailer.shipped_email.store_team', store_name: current_store.name) %>
-</p>
+
+<%= render 'spree/shared/order_summary_section',
+           heading: Spree.t('shipment_mailer.shipped_email.shipment_summary'),
+           line_items: @shipment.manifest.map(&:line_item),
+           order: @shipment.order,
+           totals: false %>

data/lib/generators/spree/emails/install/install_generator.rb

@@ -4,22 +4,14 @@ require 'spree/core'
 module Spree
   module Emails
     module Generators
+      # Kept as a no-op so `rake test_app` and any existing `rails g spree:emails:install`
+      # invocations keep working. Mailer previews now ship inside the gem and are served
+      # automatically at /rails/mailers — there is nothing left to copy into the host app.
       class InstallGenerator < Rails::Generators::Base
-        desc 'Installs mailers previews for Spree transactional emails'
+        desc 'No-op. Spree email previews are now bundled and served automatically at /rails/mailers.'
 
-        def self.source_paths
-          [
-            File.expand_path('templates', __dir__)
-          ]
-        end
-
-        def copy_mailers_previews
-          preview_path = Rails.application&.config&.action_mailer&.preview_path.presence || 'test/mailers/previews'
-
-          template 'mailers/previews/order_preview.rb', "#{preview_path}/order_preview.rb"
-          template 'mailers/previews/shipment_preview.rb', "#{preview_path}/shipment_preview.rb"
-          template 'mailers/previews/reimbursement_preview.rb', "#{preview_path}/reimbursement_preview.rb"
-          template 'mailers/previews/user_preview.rb', "#{preview_path}/user_preview.rb"
+        def notify_previews_are_bundled
+          say 'Spree email previews are bundled with spree_emails and served automatically at /rails/mailers — nothing to install.'
         end
       end
     end

data/lib/spree/emails/engine.rb

@@ -9,13 +9,22 @@ module Spree
       # Add app/subscribers to autoload paths
       config.paths.add 'app/subscribers', eager_load: true
 
+      # Register bundled ActionMailer previews so they show up at /rails/mailers
+      # without the host app having to copy any files.
+      initializer 'spree_emails.mailer_previews' do |app|
+        if app.config.action_mailer.show_previews
+          app.config.action_mailer.preview_paths << File.expand_path('previews', __dir__)
+        end
+      end
+
       # Add email event subscribers
       config.after_initialize do
         Spree.subscribers.concat [
           Spree::OrderEmailSubscriber,
           Spree::ShipmentEmailSubscriber,
           Spree::ReimbursementEmailSubscriber,
-          Spree::NewsletterSubscriberEmailSubscriber
+          Spree::NewsletterSubscriberEmailSubscriber,
+          Spree::CustomerEmailSubscriber
         ]
       end
     end

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

@@ -0,0 +1,14 @@
+require 'spree/core/previews/preview_data'
+
+# Preview Spree customer account emails at /rails/mailers/spree/customer
+class Spree::CustomerPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def password_reset_email
+    Spree::CustomerMailer.password_reset_email(
+      Spree::PreviewData.customer,
+      'preview-token',
+      Spree::PreviewData.store(locale)
+    )
+  end
+end

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

@@ -0,0 +1,30 @@
+require 'spree/core/previews/preview_data'
+
+# Preview Spree newsletter emails at /rails/mailers/spree/newsletter
+class Spree::NewsletterPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def email_confirmation
+    Spree::NewsletterMailer.email_confirmation(subscriber)
+  end
+
+  private
+
+  def subscriber
+    return example_subscriber if locale.present?
+
+    Spree::NewsletterSubscriber.unverified.last || example_subscriber
+  end
+
+  # Build an in-memory subscriber so the preview works on a database with no
+  # newsletter subscribers. When the preview toolbar requests a locale, its
+  # store carries that locale. Never saved, so no records are created.
+  def example_subscriber
+    subscriber = Spree::NewsletterSubscriber.new(
+      email: 'guest@example.com',
+      store: Spree::PreviewData.store(locale)
+    )
+    subscriber.verification_token ||= 'preview-token'
+    subscriber
+  end
+end

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

@@ -0,0 +1,28 @@
+require 'spree/core/previews/preview_data'
+
+# Preview Spree order emails at /rails/mailers/spree/order
+class Spree::OrderPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def confirm_email
+    Spree::OrderMailer.confirm_email(order)
+  end
+
+  def cancel_email
+    Spree::OrderMailer.cancel_email(order)
+  end
+
+  def store_owner_notification_email
+    Spree::OrderMailer.store_owner_notification_email(order)
+  end
+
+  private
+
+  # The most recent complete order, with its locale overridden in memory when the
+  # preview toolbar requests one (the change is never saved).
+  def order
+    order = Spree::Order.complete.last
+    order.locale = locale if order && locale.present?
+    order
+  end
+end

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

@@ -0,0 +1,12 @@
+require 'spree/core/previews/preview_data'
+
+# Preview Spree reimbursement emails at /rails/mailers/spree/reimbursement
+class Spree::ReimbursementPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def reimbursement_email
+    reimbursement = Spree::Reimbursement.last
+    reimbursement.order.locale = locale if reimbursement && locale.present?
+    Spree::ReimbursementMailer.reimbursement_email(reimbursement)
+  end
+end

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

@@ -0,0 +1,12 @@
+require 'spree/core/previews/preview_data'
+
+# Preview Spree shipment emails at /rails/mailers/spree/shipment
+class Spree::ShipmentPreview < ActionMailer::Preview
+  include Spree::PreviewData::LocaleParam
+
+  def shipped_email
+    shipment = Spree::Shipment.shipped.last
+    shipment.order.locale = locale if shipment && locale.present?
+    Spree::ShipmentMailer.shipped_email(shipment)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_emails
 version: !ruby/object:Gem::Version
-  version: 5.5.3
+  version: 5.6.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-10 00:00:00.000000000 Z
+date: 2026-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.5.3
+        version: 5.6.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.5.3
+        version: 5.6.0.rc2
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
@@ -58,10 +58,12 @@ files:
 - app/assets/images/noimage/noimage/small.png
 - app/assets/images/noimage/small.png
 - app/helpers/spree/mail_helper.rb
+- app/mailers/spree/customer_mailer.rb
 - app/mailers/spree/newsletter_mailer.rb
 - app/mailers/spree/order_mailer.rb
 - app/mailers/spree/reimbursement_mailer.rb
 - app/mailers/spree/shipment_mailer.rb
+- app/subscribers/spree/customer_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
@@ -79,31 +81,35 @@ files:
 - 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/shared/_item_thumbnail_link.html.erb
+- app/views/spree/shared/_order_summary_section.html.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/generators/spree/emails/install/templates/mailers/previews/order_preview.rb
-- lib/generators/spree/emails/install/templates/mailers/previews/reimbursement_preview.rb
-- lib/generators/spree/emails/install/templates/mailers/previews/shipment_preview.rb
-- lib/generators/spree/emails/install/templates/mailers/previews/user_preview.rb
 - lib/spree/emails.rb
 - lib/spree/emails/engine.rb
+- lib/spree/emails/previews/customer_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.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.5.3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.6.0.rc2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.5.3
+  source_code_uri: https://github.com/spree/spree/tree/v5.6.0.rc2
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/generators/spree/emails/install/templates/mailers/previews/order_preview.rb

@@ -1,13 +0,0 @@
-class OrderPreview < ActionMailer::Preview
-  def confirm_email
-    Spree::OrderMailer.confirm_email(Spree::Order.complete.first)
-  end
-
-  def cancel_email
-    Spree::OrderMailer.cancel_email(Spree::Order.complete.first)
-  end
-
-  def store_owner_notification_email
-    Spree::OrderMailer.store_owner_notification_email(Spree::Order.complete.first)
-  end
-end

data/lib/generators/spree/emails/install/templates/mailers/previews/reimbursement_preview.rb

@@ -1,5 +0,0 @@
-class ReimbursementPreview < ActionMailer::Preview
-  def reimbursement_email
-    Spree::ReimbursementMailer.reimbursement_email(Spree::Reimbursement.first)
-  end
-end

data/lib/generators/spree/emails/install/templates/mailers/previews/shipment_preview.rb

@@ -1,7 +0,0 @@
-class ShipmentPreview < ActionMailer::Preview
-  helper Spree::ShipmentHelper
-
-  def shipped_email
-    Spree::ShipmentMailer.shipped_email(Spree::Shipment.shipped.first)
-  end
-end

data/lib/generators/spree/emails/install/templates/mailers/previews/user_preview.rb

@@ -1,11 +0,0 @@
-class UserPreview < ActionMailer::Preview
-  def reset_password_instructions
-    Spree::UserMailer.reset_password_instructions(Spree.user_class.first, 'your_token', { current_store_id: Spree::Store.default.id })
-  end
-
-  if Spree::Auth::Config[:confirmable]
-    def confirmation_instructions
-      Spree::UserMailer.confirmation_instructions(Spree.user_class.first, 'your_token')
-    end
-  end
-end