spree_emails 5.4.0.beta7 → 5.4.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75fb2d74e5aca0dcc60597867e8e354bf2f6ca32ce5d45bbdca62e286c5d045b
-  data.tar.gz: d2b7ec3adee7cb1ee77a98670db666a048ae3959f11ba1180ba444677574b09d
+  metadata.gz: 67f60d55f4678131cc6aef5fa9c225b3e189d853a64637d833a1e3fb2dfa6200
+  data.tar.gz: 997cf645f50e346c7bf8e901e9cadfea738760dff15d3919e7e5d04a1c603344
 SHA512:
-  metadata.gz: 52e2e67decb78998455dbf5de09cb441881fbcaf5e0520e8838a3fd0e7d658cae6fb4af4b7577408b895d4741b38f9e62da97e0b6a713bd44f4a39f3ec968d79
-  data.tar.gz: b69587fc2b588552c46807ace481d242fc6562d954e144fd19c51f297f80e0a55c22967703be64c3c9cd31b42972bf1cf97081a3d42335cd222e4b08eb212e7d
+  metadata.gz: d98ec2dc83c4f9d7065680e57968b9dc98f83cee1bf077b1a0ec989f325e481ec3dc1e156585bd35d6eedb0f112d89bbfcaec1ab22beb193811c534d0db65f25
+  data.tar.gz: 79cdfd6c7dc8bb11c1d0305dab76a061e3b279212da428dfa7c45c330c312f622ea43e8dd8bc465255a5ccbb613f9a84f1b17fae6fdabaed7a532267d9a67190

data/app/helpers/spree/mail_helper.rb

@@ -4,7 +4,7 @@ module Spree
     include Spree::ImagesHelper
 
     def variant_image_url(variant)
-      image = variant.default_image
+      image = variant.primary_media
       image.present? && image.attached? ? spree_image_url(image, variant: :mini) : image_url('noimage/small.png')
     end
 

data/app/mailers/spree/customer_mailer.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Spree
+  class CustomerMailer < BaseMailer
+    def password_reset_email(user_id, store_id, reset_token, redirect_url = nil)
+      @user = Spree.user_class.find(user_id)
+      @current_store = Spree::Store.find(store_id)
+      @reset_token = reset_token
+      @reset_url = build_reset_url(redirect_url, reset_token)
+
+      subject = "#{@current_store.name} #{Spree.t('customer_mailer.password_reset_email.subject')}"
+      mail(
+        to: @user.email,
+        from: from_address,
+        subject: subject,
+        store_url: @current_store.storefront_url,
+        reply_to: reply_to_address
+      )
+    end
+
+    private
+
+    def build_reset_url(redirect_url, token)
+      return nil if redirect_url.blank?
+
+      uri = URI.parse(redirect_url)
+      params = URI.decode_www_form(uri.query || '')
+      params << ['token', token]
+      uri.query = URI.encode_www_form(params)
+      uri.to_s
+    end
+  end
+end

data/app/mailers/spree/newsletter_mailer.rb

@@ -2,7 +2,7 @@ module Spree
   class NewsletterMailer < BaseMailer
     def email_confirmation(subscriber)
       @subscriber = subscriber
-      @confirm_email_url = spree.verify_newsletter_subscribers_url(token: @subscriber.verification_token, host: Spree::Current.store.url_or_custom_domain)
+      @confirm_email_url = spree.verify_newsletter_subscribers_url(token: @subscriber.verification_token, host: Spree::Current.store.storefront_url)
       mail(to: @subscriber.email, from: from_address, subject: Spree.t('newsletter_mailer.email_confirmation.subject'))
     end
   end

data/app/mailers/spree/order_mailer.rb

@@ -7,14 +7,14 @@ module Spree
       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.url_or_custom_domain, reply_to: reply_to_address)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.storefront_url, reply_to: reply_to_address)
     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.url_or_custom_domain, reply_to: reply_to_address)
+      mail(to: current_store.new_order_notifications_email, from: from_address, subject: subject, store_url: current_store.storefront_url, reply_to: reply_to_address)
     end
 
     def cancel_email(order, resend = false)
@@ -22,16 +22,16 @@ module Spree
       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.url_or_custom_domain, reply_to: reply_to_address)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.storefront_url, reply_to: reply_to_address)
     end
 
     def payment_link_email(order_id)
       @order = Spree::Order.incomplete.not_canceled.find(order_id)
       @current_store = @order.store
-      @checkout_payment_url = spree.checkout_state_url(@order.token, :payment, host: @current_store.url_or_custom_domain)
+      @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.url_or_custom_domain, reply_to: reply_to_address)
+           store_url: @current_store.storefront_url, reply_to: reply_to_address)
     end
   end
 end

data/app/mailers/spree/reimbursement_mailer.rb

@@ -8,7 +8,7 @@ module Spree
       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.url_or_custom_domain, reply_to: reply_to_address)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.storefront_url, reply_to: reply_to_address)
     end
   end
 end

data/app/mailers/spree/shipment_mailer.rb

@@ -9,7 +9,7 @@ module Spree
       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.url_or_custom_domain, reply_to: reply_to_address)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.storefront_url, reply_to: reply_to_address)
     end
   end
 end

data/app/subscribers/spree/customer_email_subscriber.rb

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

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

@@ -0,0 +1,26 @@
+<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>
+<% 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/customer_mailer/password_reset_email.text.erb

@@ -0,0 +1,13 @@
+<%= Spree.t('customer_mailer.password_reset_email.greeting', name: @user.first_name.presence || @user.email) %>
+
+<%= Spree.t('customer_mailer.password_reset_email.instructions') %>
+
+<% if @reset_url %>
+<%= Spree.t('customer_mailer.password_reset_email.action') %>: <%= @reset_url %>
+<% end %>
+
+<%= Spree.t('customer_mailer.password_reset_email.expiry_notice') %>
+
+<%= Spree.t('customer_mailer.password_reset_email.ignore_notice') %>
+
+<%= Spree.t('order_mailer.store_team', store_name: current_store.name) %>

data/lib/spree/emails/engine.rb

@@ -15,7 +15,8 @@ module Spree
           Spree::OrderEmailSubscriber,
           Spree::ShipmentEmailSubscriber,
           Spree::ReimbursementEmailSubscriber,
-          Spree::NewsletterSubscriberEmailSubscriber
+          Spree::NewsletterSubscriberEmailSubscriber,
+          Spree::CustomerEmailSubscriber
         ]
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_emails
 version: !ruby/object:Gem::Version
-  version: 5.4.0.beta7
+  version: 5.4.0.beta8
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-15 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.0.beta7
+        version: 5.4.0.beta8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.0.beta7
+        version: 5.4.0.beta8
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,18 @@ 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
 - app/subscribers/spree/shipment_email_subscriber.rb
+- app/views/spree/customer_mailer/password_reset_email.html.erb
+- app/views/spree/customer_mailer/password_reset_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
@@ -99,9 +103,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.beta7
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.beta8
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta7
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta8
 post_install_message:
 rdoc_options: []
 require_paths: