spree_core 5.5.3 → 5.6.0.rc2

data/app/services/spree/fulfillments/create.rb

@@ -0,0 +1,259 @@
+module Spree
+  module Fulfillments
+    # Manually creates a fulfillment (Spree::Shipment) on a completed order,
+    # bypassing order routing. Moves the requested quantities of each line
+    # item's not-yet-shipped inventory units out of their current shipments
+    # into the new fulfillment, mirroring externally-managed fulfillment
+    # (3PL, courier API, drop-shipping) back into Spree.
+    #
+    # Stock bookkeeping follows the split/transfer semantics: when the source
+    # and target stock locations differ, moved quantities are restocked at the
+    # source and unstocked at the target. Source shipments left empty are
+    # destroyed and their cost and selected delivery method carry over to the
+    # new fulfillment, unless the caller provides its own +cost+ /
+    # +delivery_method+.
+    #
+    # The resulting cost is frozen only for fulfillments registered with
+    # status: 'shipped' (rate refresh skips shipped shipments). Pending/ready
+    # fulfillments participate in the standard rate machinery — the order
+    # updater re-prices them from the delivery method calculators on the next
+    # recalculation, exactly like shipments created via split/transfer.
+    class Create
+      prepend Spree::ServiceModule::Base
+
+      # @param order [Spree::Order] completed order to fulfill
+      # @param stock_location [Spree::StockLocation] location the fulfillment ships from
+      # @param items [Array<Hash>, nil] `[{ line_item: Spree::LineItem, quantity: Integer }]`;
+      #   nil fulfills every not-yet-shipped unit on the order
+      # @param tracking [String, nil] carrier tracking number
+      # @param delivery_method [Spree::ShippingMethod, nil] carrier; stored as the selected rate.
+      #   Defaults to the delivery method of the drained source fulfillment(s)
+      # @param cost [String, Numeric, nil] explicit shipping cost (e.g. the 3PL's price).
+      #   Defaults to the summed cost of the drained source fulfillment(s), keeping the
+      #   order total unchanged; an explicit cost changes the order total and payment state.
+      #   Guaranteed to persist only with status: 'shipped' — pending fulfillments are
+      #   re-priced by the rate engine (see class docs)
+      # @param status [String, nil] pass 'shipped' to register an already-shipped fulfillment
+      # @param metadata [Hash, nil] metadata stored on the fulfillment
+      # @return [Spree::ServiceModule::Result] the created shipment on success
+      def call(order:, stock_location:, items: nil, tracking: nil, delivery_method: nil, cost: nil, status: nil, metadata: nil)
+        return failure(nil, Spree.t('fulfillments.errors.invalid_status')) unless status.nil? || status == 'shipped'
+
+        cost = parse_cost(cost)
+        return cost if cost.is_a?(Spree::ServiceModule::Result)
+
+        fulfillment = nil
+
+        # The order row is locked before reading fulfillable units so
+        # concurrent creations (e.g. duplicate carrier webhooks) validate and
+        # move units against a serialized snapshot. The API layer already
+        # serializes via with_order_lock; this covers direct service callers.
+        ActiveRecord::Base.transaction do
+          order.lock!
+
+          return failure(nil, Spree.t('fulfillments.errors.order_not_completed')) unless order.completed?
+          return failure(nil, Spree.t('fulfillments.errors.order_canceled')) if order.canceled?
+
+          units_by_line_item = fulfillable_units(order)
+
+          requested = normalize_items(order, items, units_by_line_item)
+          return requested if requested.is_a?(Spree::ServiceModule::Result)
+
+          fulfillment = order.shipments.new(
+            stock_location: stock_location,
+            address_id: order.ship_address_id,
+            tracking: tracking
+          )
+          fulfillment.metadata = metadata if metadata.present?
+          fulfillment.save!
+
+          source_shipments = move_units(order, fulfillment, requested, units_by_line_item)
+          inherited = destroy_drained_shipments(source_shipments, capture_delivery_method: delivery_method.nil?)
+          attach_cost_and_rate(fulfillment, delivery_method, cost, inherited)
+
+          if status == 'shipped'
+            mark_shipped(fulfillment)
+          else
+            fulfillment.update!(order)
+          end
+
+          order.reload.update_with_updater!
+        end
+
+        success(fulfillment.reload)
+      end
+
+      private
+
+      # Units that can still be moved into a manual fulfillment: on-hand or
+      # backordered units sitting in shipments that haven't shipped or been
+      # canceled (canceled shipments already restocked their stock). Loaded
+      # in one query, on-hand first so moved units stay shippable, grouped
+      # by line item for both validation and moving.
+      def fulfillable_units(order)
+        order.inventory_units.
+          on_hand_or_backordered.
+          joins(:shipment).
+          merge(Spree::Shipment.ready_or_pending).
+          preload(:shipment, :variant).
+          order(Arel.sql("CASE WHEN #{Spree::InventoryUnit.table_name}.state = 'on_hand' THEN 0 ELSE 1 END"), :id).
+          group_by(&:line_item_id)
+      end
+
+      def normalize_items(order, items, units_by_line_item)
+        available_for = ->(line_item) { units_by_line_item.fetch(line_item.id, []).sum(&:quantity) }
+
+        if items.nil?
+          derived = order.line_items.filter_map do |line_item|
+            quantity = available_for.call(line_item)
+            { line_item: line_item, quantity: quantity } if quantity.positive?
+          end
+          return failure(nil, Spree.t('fulfillments.errors.no_items_to_fulfill')) if derived.empty?
+
+          return derived
+        end
+
+        return failure(nil, Spree.t('fulfillments.errors.no_items_to_fulfill')) if items.empty?
+
+        # Merge duplicate line item entries, then validate quantities.
+        merged = items.group_by { |item| item[:line_item].id }.values.map do |grouped|
+          { line_item: grouped.first[:line_item], quantity: grouped.sum { |item| item[:quantity].to_i } }
+        end
+
+        merged.each do |item|
+          line_item = item[:line_item]
+          quantity = item[:quantity]
+
+          unless quantity.positive?
+            return failure(nil, Spree.t('fulfillments.errors.invalid_quantity', item: line_item.prefixed_id))
+          end
+
+          available = available_for.call(line_item)
+          if quantity > available
+            return failure(
+              nil,
+              Spree.t('fulfillments.errors.insufficient_quantity',
+                      item: line_item.prefixed_id, requested: quantity, available: available)
+            )
+          end
+        end
+
+        merged
+      end
+
+      # Moves the requested quantities into the fulfillment, on-hand units
+      # first so the new fulfillment is shippable whenever possible. Restocks
+      # the source location and unstocks the target for tracked variants when
+      # the locations differ, keeping stock levels truthful about where the
+      # goods actually leave from.
+      #
+      # @return [Array<Spree::Shipment>] the shipments units were taken from
+      def move_units(order, fulfillment, requested, units_by_line_item)
+        source_shipments = []
+        stock_moves = Hash.new(0)
+
+        requested.each do |item|
+          remaining = item[:quantity]
+
+          units_by_line_item.fetch(item[:line_item].id, []).each do |unit|
+            break if remaining.zero?
+
+            take = [unit.quantity, remaining].min
+            source_shipments << unit.shipment
+            stock_moves[[unit.shipment, unit.variant]] += take
+
+            target = fulfillment.inventory_units.find_or_initialize_by(
+              state: unit.state,
+              variant_id: unit.variant_id,
+              line_item_id: unit.line_item_id,
+              order_id: order.id
+            )
+            target.pending = unit.pending
+            # The quantity column has a database default of 1, so a fresh
+            # record must be set to the moved quantity, not incremented.
+            target.quantity = target.new_record? ? take : target.quantity + take
+            target.save!
+
+            if take == unit.quantity
+              unit.destroy!
+            else
+              unit.update!(quantity: unit.quantity - take)
+            end
+
+            remaining -= take
+          end
+        end
+
+        stock_moves.each do |(source_shipment, variant), quantity|
+          next unless variant.track_inventory?
+          next if source_shipment.stock_location_id == fulfillment.stock_location_id
+
+          source_shipment.stock_location.restock(variant, quantity, source_shipment)
+          fulfillment.stock_location.unstock(variant, quantity, fulfillment)
+        end
+
+        source_shipments.uniq
+      end
+
+      # Destroys fully drained source shipments, capturing what the new
+      # fulfillment inherits from them — the summed cost and the first
+      # selected delivery method, read before destroy since the rates are
+      # deleted along with the shipment. The delivery method lookup costs
+      # queries, so it is skipped when the caller provided its own.
+      #
+      # @return [Hash] `{ cost: BigDecimal, delivery_method: Spree::ShippingMethod or nil }`
+      def destroy_drained_shipments(source_shipments, capture_delivery_method:)
+        inherited = { cost: 0, delivery_method: nil }
+
+        source_shipments.each do |shipment|
+          next unless shipment.inventory_units.sum(:quantity).zero?
+
+          inherited[:cost] += shipment.cost
+          inherited[:delivery_method] ||= shipment.shipping_method if capture_delivery_method
+          shipment.destroy!
+        end
+
+        inherited
+      end
+
+      # The fulfillment inherits the cost and carrier of the shipments it
+      # replaced — keeping the order total (and thus payment state) unchanged —
+      # unless the caller provides its own. Frozen once shipped; see the class
+      # docs for pending-path re-pricing. The carrier rides along as a
+      # selected rate.
+      def attach_cost_and_rate(fulfillment, delivery_method, cost, inherited)
+        effective_cost = cost || inherited[:cost]
+        method = delivery_method || inherited[:delivery_method]
+
+        fulfillment.update_columns(cost: effective_cost) if effective_cost.positive?
+        fulfillment.add_shipping_method(method, true) if method
+      end
+
+      # Strict decimal parsing (same semantics as Shipment#cost=, which the
+      # update_columns freeze path bypasses) — the lenient LocalizedNumber
+      # would turn garbage into 0, and 0 is a legal cost here.
+      #
+      # @return [BigDecimal, Numeric, nil] nil when no cost was given (blank
+      #   counts as omitted); a failure Result for malformed or negative input
+      def parse_cost(cost)
+        return if cost.blank?
+
+        parsed = cost.is_a?(String) ? BigDecimal(cost.strip) : cost
+        return failure(nil, Spree.t('fulfillments.errors.invalid_cost')) if parsed.negative?
+
+        parsed
+      rescue ArgumentError
+        failure(nil, Spree.t('fulfillments.errors.invalid_cost'))
+      end
+
+      # Registers an externally-completed fulfillment: backorders are filled
+      # (the external location evidently had the goods) and the paid-order
+      # readiness gate is bypassed deliberately — the goods already left.
+      def mark_shipped(fulfillment)
+        fulfillment.inventory_units.backordered.each(&:fill_backorder!)
+        fulfillment.update_columns(state: 'ready') unless fulfillment.ready?
+        fulfillment.reload.ship!
+      end
+    end
+  end
+end

data/app/services/spree/locales/set_fallback_locale_for_store.rb

@@ -9,7 +9,13 @@ module Spree
           object[locale] = [store_default_locale]
         end
 
-        fallbacks_instance = I18n::Locale::Fallbacks.new(fallbacks)
+        # Pass the store default as the terminal default so EVERY locale —
+        # including regional variants not in `supported_locales_list` (e.g.
+        # `pt-BR` when only `pt` is configured) — ultimately falls back to it.
+        # The store default resolves to the populated DB column via Mobility's
+        # `column_fallback`, so translated reads never return nil for a locale
+        # that lacks a translation row.
+        fallbacks_instance = I18n::Locale::Fallbacks.new(store_default_locale, fallbacks)
 
         Mobility.store_based_fallbacks = fallbacks_instance
       end

data/app/services/spree/locales.rb

@@ -0,0 +1,52 @@
+module Spree
+  module Locales
+    # Canonical set of locale codes a merchant may translate **data** into
+    # (Mobility-backed content such as product names, descriptions, taxons,
+    # option values, etc.).
+    #
+    # This is deliberately **independent of the admin/storefront UI translation
+    # set** (`Spree.available_locales`, which reflects which `spree_i18n` UI
+    # bundles happen to be installed). In a headless setup the storefront ships
+    # its own UI translations, so the languages a merchant can store content in
+    # must not be constrained by which admin chrome translations exist.
+    #
+    # Codes follow BCP-47 casing (lowercase language, uppercase region —
+    # `pt-BR`, `zh-CN`) so the browser's `Intl.DisplayNames` resolves a clean
+    # localized label for each. The list is the full ISO 639-1 base-language set
+    # plus the regional variants that matter for commerce (British vs. US
+    # English, Brazilian vs. European Portuguese, Simplified vs. Traditional
+    # Chinese, etc.).
+    #
+    # The underlying translation tables accept any locale string, so this list
+    # governs only what the locale pickers offer — it is not a hard storage
+    # constraint.
+    ALL = %w[
+      aa ab ae af ak am an ar as av ay az
+      ba be bg bh bi bm bn bo br bs
+      ca ce ch co cr cs cu cv cy
+      da de de-AT de-CH dv dz
+      ee el en en-AU en-CA en-GB en-IN en-NZ eo es es-419 es-MX et eu
+      fa ff fi fj fo fr fr-CA fy
+      ga gd gl gn gu gv
+      ha he hi ho hr ht hu hy hz
+      ia id ie ig ii ik io is it iu
+      ja jv
+      ka kg ki kj kk kl km kn ko kr ks ku kv kw ky
+      la lb lg li ln lo lt lu lv
+      mg mh mi mk ml mn mr ms mt my
+      na nb nd ne ng nl nn no nr nv ny
+      oc oj om or os
+      pa pi pl ps pt pt-BR pt-PT
+      qu
+      rm rn ro ru rw
+      sa sc sd se sg si sk sl sm sn so sq sr ss st su sv sw
+      ta te tg th ti tk tl tn to tr ts tt tw ty
+      ug uk ur uz
+      ve vi vo
+      wa wo
+      xh
+      yi yo
+      za zh-CN zh-HK zh-TW zu
+    ].freeze
+  end
+end

data/app/services/spree/newsletter/subscribe.rb

@@ -39,6 +39,7 @@ module Spree
           id: subscriber.prefixed_id,
           email: subscriber.email,
           verification_token: subscriber.verification_token,
+          unsubscribe_token: subscriber.generate_token_for(:unsubscribe),
           store_id: current_store.prefixed_id,
           customer_id: subscriber.user&.prefixed_id
         }

data/app/services/spree/products/prepare_nested_attributes.rb

@@ -7,6 +7,12 @@ module Spree
     # from other stores are preserved. This prevents accidental data loss when a store
     # admin updates product categories in their store without affecting other stores.
     #
+    # Variant removal is opt-in: only variants explicitly listed in the
+    # `removed_variant_ids` param are marked for destruction (or collected for
+    # discontinuation when they have completed orders). Variants merely absent from
+    # `variants_attributes` are left untouched, so a partially rendered or broken
+    # form can never silently mass-delete variants.
+    #
     # @example
     #   service = Spree::Products::PrepareNestedAttributes.new(
     #     product,
@@ -28,10 +34,13 @@ module Spree
       end
 
       def call
+        extract_removed_variant_ids
+
         if params[:variants_attributes]
           params[:variants_attributes].each do |key, variant_params|
             existing_variant = variant_params[:id].presence && @product.variants.find_by(id: variant_params[:id])
-            variants_to_remove.delete(variant_params[:id]) if variant_params[:id].present?
+            # a re-submitted variant always wins over a removal request
+            variants_to_remove.delete(variant_params[:id].to_s) if variant_params[:id].present?
 
             variant_params.delete(:price) # remove legacy price param
 
@@ -72,17 +81,20 @@ module Spree
         # ensure the product is owned by a store
         params[:store_id] = store.id if params[:store_id].blank? && product.store_id.blank?
 
-        # Add empty list for option_type_ids and mark variants as removed if there are no variants and options
-        if params[:variants_attributes].blank? && variants_to_remove.any? && !params.key?(:option_type_ids)
-          params[:option_type_ids] = []
-          params[:variants_attributes] = {}
+        # The variants matrix was emptied: no variant rows re-submitted, removals sent instead.
+        # Option types are detached only when the removal list covers every variant, so a
+        # partial (possibly broken) submission never turns the product into a simple one.
+        # Variants kept alive by discontinuation still count as removed from the matrix,
+        # so the detachment can't hinge on any of them yielding a `_destroy` row.
+        if params[:variants_attributes].blank? && variants_to_remove.any? && can_remove_variants?
+          attributes = removed_variants_attributes
 
-          populate_variants_to_discontinue
-          variant_ids_to_destroy.each_with_index do |variant_id, index|
-            params[:variants_attributes][index.to_s] = { id: variant_id, _destroy: '1' }
-          end
+          params[:option_type_ids] = [] if removing_all_variants? && !params.key?(:option_type_ids)
 
-          params[:variants_attributes].permit!
+          if attributes.any?
+            params[:variants_attributes] = attributes
+            params[:variants_attributes].permit!
+          end
         end
 
         params
@@ -116,8 +128,24 @@ module Spree
         @product_option_types_to_remove ||= product.product_option_type_ids
       end
 
+      # Pulls `removed_variant_ids` out of the params so it never reaches Product#update.
+      # Must run before any `variants_to_remove` access.
+      def extract_removed_variant_ids
+        @removed_variant_ids = Array(params.delete(:removed_variant_ids)).map(&:to_s)
+      end
+
+      # Only variants the client explicitly asked to remove, and only ones that
+      # actually belong to this product.
       def variants_to_remove
-        @variants_to_remove ||= product.variant_ids.map(&:to_s)
+        @variants_to_remove ||= (@removed_variant_ids || []).uniq & all_variant_ids
+      end
+
+      def all_variant_ids
+        @all_variant_ids ||= product.variant_ids.map(&:to_s)
+      end
+
+      def removing_all_variants?
+        (all_variant_ids - variants_to_remove).empty?
       end
 
       def can_update_prices?
@@ -142,7 +170,7 @@ module Spree
         populate_variants_to_discontinue
 
         attributes = {}
-        last_index = params[:variants_attributes].keys.map(&:to_i).max
+        last_index = params[:variants_attributes].presence&.keys&.map(&:to_i)&.max || -1
         variant_ids_to_destroy.each_with_index do |variant_id, index|
           attributes[(last_index + 1 + index).to_s] = { id: variant_id, _destroy: '1' }
         end

data/app/services/spree/shipments/update.rb

@@ -8,7 +8,7 @@ module Spree
         ActiveRecord::Base.transaction do
           return failure(shipment) unless shipment.update(shipment_attributes)
 
-          if shipment_attributes.key?(:selected_shipping_rate_id)
+          if shipment_attributes.key?(:selected_shipping_rate_id) || shipment_attributes.key?(:selected_delivery_rate_id)
             order = shipment.order
 
             # Changing the selected Shipping Rate won't update the cost (for now)

data/app/services/spree/stock_reservations/reserve.rb

@@ -65,7 +65,10 @@ module Spree
           next unless variant&.should_track_inventory?
 
           stock_item = select_stock_item(variant)
-          next if stock_item.nil? || stock_item.backorderable?
+          # Backorderable and pre-order variants oversell past count_on_hand,
+          # so a reservation capped at on-hand stock would wrongly reject them;
+          # their cap is enforced by Stock::Quantifier#can_supply? instead.
+          next if stock_item.nil? || stock_item.backorderable? || variant.preorder?
 
           [line_item, stock_item]
         end

data/app/services/spree/taxons/add_products.rb

@@ -33,6 +33,9 @@ module Spree
         product_ids = products.pluck(:id)
         taxon_ids.each { |id| Spree::Taxon.reset_counters(id, :classifications) }
         product_ids.each { |id| Spree::Product.reset_counters(id, :classifications) }
+        # Recompute the descendant-inclusive products_count for the taxons and
+        # their ancestors (bulk insert skips Classification callbacks).
+        Spree::Taxon.recalculate_products_count(taxon_ids)
 
         # clear cache & index products
         Spree::Product.where(id: product_ids).touch_all

data/app/services/spree/taxons/remove_products.rb

@@ -48,6 +48,9 @@ module Spree
         # update counter caches
         taxon_ids.each { |id| Spree::Taxon.reset_counters(id, :classifications) }
         product_ids.each { |id| Spree::Product.reset_counters(id, :classifications) }
+        # Recompute the descendant-inclusive products_count for the taxons and
+        # their ancestors (delete_all skips Classification callbacks).
+        Spree::Taxon.recalculate_products_count(taxon_ids)
 
         # clear cache & index products
         Spree::Product.where(id: product_ids).touch_all

data/app/subscribers/spree/admin_user_email_subscriber.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Spree
+  class AdminUserEmailSubscriber < Spree::Subscriber
+    subscribes_to 'admin_user.password_reset_requested'
+
+    def handle(event)
+      user = Spree.admin_user_class.find_by(email: event.payload['email'])
+      return unless user
+
+      store = find_store(event)
+
+      AdminUserMailer.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/subscribers/spree/import_email_subscriber.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Spree
+  # Emails the import's owner when processing finishes — including after a
+  # failed-rows retry pass, which publishes `import.completed` again.
+  # App-created imports (API key without an admin creator) have no recipient
+  # and send nothing.
+  #
+  # We use async: false because this subscriber only enqueues the mail job.
+  class ImportEmailSubscriber < Spree::Subscriber
+    subscribes_to 'import.completed', async: false
+
+    on 'import.completed', :send_import_done_email
+
+    def send_import_done_email(event)
+      import_id = event.payload['id']
+      return unless import_id
+
+      import = Spree::Import.find_by_prefix_id(import_id)
+      return unless import
+      return if import.user&.email.blank?
+
+      Spree::ImportMailer.import_done(import).deliver_later
+    end
+  end
+end

data/app/views/layouts/spree/base_mailer.html.erb

@@ -1,46 +1,43 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<html lang="<%= I18n.locale %>">
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <meta name="x-apple-disable-message-reformatting"/>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <meta name="color-scheme" content="light"/>
+    <meta name="supported-color-schemes" content="light"/>
 
     <%= render partial: 'spree/shared/base_mailer_stylesheets' %>
+    <%# Per-email styles — templates add their own via `content_for :head` %>
+    <%= yield :head %>
   </head>
-  <body>
-    <table class="email-wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation">
+  <body class="email-bg" style="margin: 0; padding: 0; -webkit-text-size-adjust: none;" bgcolor="#FFFFFF">
+    <table class="email-wrapper" width="100%" cellpadding="0" cellspacing="0" role="presentation" bgcolor="#FFFFFF">
       <tr>
         <td align="center">
           <table class="email-content" width="100%" cellpadding="0" cellspacing="0" role="presentation">
-            <%= render partial: 'spree/shared/base_mailer_header' %>
             <!-- Email Body -->
             <tr>
-              <td class="email-body" width="570" cellpadding="0" cellspacing="0">
-                <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
-                  <!-- Body content -->
-                  <tbody>
+              <td class="email-card" bgcolor="#F6F6F6">
+                <%= render partial: 'spree/shared/base_mailer_header' %>
+                <table width="100%" cellpadding="0" cellspacing="0" role="presentation">
                   <tr>
-                    <td class="content-cell">
-                      <div class="f-fallback">
-                        <%= yield %>
-                      </div>
+                    <td class="content-cell f-fallback" align="left">
+                      <%= yield %>
                     </td>
                   </tr>
-                  </tbody>
                 </table>
               </td>
             </tr>
+            <!-- Email Footer -->
             <tr>
-              <td>
+              <td class="email-footer" align="center">
                 <%= render partial: 'spree/shared/base_mailer_footer' %>
               </td>
             </tr>
           </table>
         </td>
       </tr>
-      <tr>
-        <td height="60px">&nbsp;</td>
-      </tr>
     </table>
   </body>
 </html>

data/app/views/spree/admin_user_mailer/confirmation_email.html.erb

@@ -0,0 +1,7 @@
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('admin_user_mailer.confirmation_email.action') %></h1>
+  <p class="greeting"><%= Spree.t('admin_user_mailer.confirmation_email.greeting', name: @user.first_name.presence || @user.email) %></p>
+  <p><%= Spree.t('admin_user_mailer.confirmation_email.instructions', store_name: @current_store.name) %></p>
+  <%= render 'spree/shared/mailer_button', url: @confirmation_url, label: Spree.t('admin_user_mailer.confirmation_email.action') %>
+  <p class="sub"><%= Spree.t('admin_user_mailer.confirmation_email.ignore_notice') %></p>
+<% end %>

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

@@ -0,0 +1,8 @@
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('admin_user_mailer.password_reset_email.action') %></h1>
+  <p class="greeting"><%= Spree.t('admin_user_mailer.password_reset_email.greeting', name: @user.first_name.presence || @user.email) %></p>
+  <p><%= Spree.t('admin_user_mailer.password_reset_email.instructions', store_name: @current_store.name) %></p>
+  <%= render 'spree/shared/mailer_button', url: @reset_url, label: Spree.t('admin_user_mailer.password_reset_email.action') %>
+  <p class="sub"><%= Spree.t('admin_user_mailer.password_reset_email.expiry_notice') %></p>
+  <p class="sub"><%= Spree.t('admin_user_mailer.password_reset_email.ignore_notice') %></p>
+<% end %>

data/app/views/spree/export_mailer/export_done.html.erb

@@ -1,15 +1,7 @@
-<h1>
-  <%= Spree.t('export_mailer.greeting', user_name: @export.user&.first_name) %>
-</h1>
-<p>
-  <%= Spree.t('export_mailer.export_done.message') %>
-</p>
-<% if spree.respond_to?(:admin_export_url) %>
-  <p>
-    <%= link_to @export.attachment.filename, spree.admin_export_url(@export, host: @current_store.formatted_url) %>
-  </p>
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('export_mailer.greeting', user_name: @export.user&.first_name) %></h1>
+  <p><%= Spree.t('export_mailer.export_done.message') %></p>
+  <% if @export.results_url.present? %>
+    <%= render 'spree/shared/mailer_button', url: @export.results_url, label: @export.attachment.filename %>
+  <% end %>
 <% end %>
-<p>
-  <%= Spree.t('export_mailer.thanks') %><br />
-  <%= "#{current_store.name}" %>
-</p>

data/app/views/spree/import_mailer/import_done.html.erb

@@ -0,0 +1,12 @@
+<%= render layout: 'spree/shared/mailer_hero' do %>
+  <h1><%= Spree.t('import_mailer.greeting', user_name: @import.user&.first_name) %></h1>
+  <p><%= Spree.t('import_mailer.import_done.message', completed_count: @import.rows_status_counts['completed'] || 0) %></p>
+  <% failed_count = @import.rows_status_counts['failed'] || 0 %>
+  <% if failed_count > 0 %>
+    <p><strong><%= Spree.t('import_mailer.import_done.failed_message', failed_count: failed_count) %></strong></p>
+  <% end %>
+  <% results_url = @import.results_page_url %>
+  <% if results_url.present? %>
+    <%= render 'spree/shared/mailer_button', url: results_url, label: Spree.t('import_mailer.import_done.view_results') %>
+  <% end %>
+<% end %>