spree_emails 5.4.3 → 5.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da84825bada326b818e3fc0e2eb80adac7d80557c7d12f247b2637933cd76c74
-  data.tar.gz: 225fa9fad5e23168d98e371fb9bf635d663e4161ae8263e2a3472b3b3d821496
+  metadata.gz: 6f105404cde1ab45780524ad90e755e522c01a385f39672a308ca8a863e58789
+  data.tar.gz: 6bbd904ed84f030a4e4bb8c2518995ca600812f7d6ca432e9845a83261bc0025
 SHA512:
-  metadata.gz: c544d1cbdb7f9d9251f2ed26f0d623dd32679df7e6f269b88ca2a940db2bff3d4a111dcf31eefbe1af4b9cfb3ff92a342b36ebe1eb935100f1cc8a2a766ad007
-  data.tar.gz: 7dd7c1b33f4c33e928e175dc2afdadfdd60f1da725d81ac05b617cffcc9f7ab2f2f8cb82b7fc943f56f3e2731b43c7924ea29f6a3186c0c2c69ea4dda0c70db8
+  metadata.gz: b159c2f14073cfabb93ac4811a7ddfdc66bf58b0b36b3f4e53d92d2fba71f8ce72c7bffcf52597d3dfa0af665aa6a6c9f2ed468718c19209b70721a4c46bfe55
+  data.tar.gz: 92f88380e7bcf0d088fa075516d64974390dba7b59a29d2792c451eccd3869d01a5b76230702be42653d86ffb4766382050f9c22c806f02c143f85a980ab044a

data/app/helpers/spree/mail_helper.rb

@@ -15,13 +15,5 @@ module Spree
     def store_logo
       @store_logo ||= current_store&.mailer_logo || current_store&.logo
     end
-
-    def logo_path
-      Spree::Deprecation.warn('logo_path is deprecated and will be removed in Spree 5.5. Please use Active Storage URL helpers instead.')
-
-      return main_app.cdn_image_url(store_logo.variant(resize_to_limit: [244, 104])) if store_logo&.variable?
-
-      return main_app.cdn_image_url(store_logo) if store_logo&.image?
-    end
   end
 end

data/app/mailers/spree/newsletter_mailer.rb

@@ -1,9 +1,26 @@
 module Spree
   class NewsletterMailer < BaseMailer
-    def email_confirmation(subscriber)
+    def email_confirmation(subscriber, redirect_url: nil)
       @subscriber = subscriber
-      @confirm_email_url = spree.verify_newsletter_subscribers_url(token: @subscriber.verification_token, host: Spree::Current.store.storefront_url)
+      store = subscriber.store || Spree::Current.store || Spree::Store.default
+      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'))
     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/subscribers/spree/newsletter_subscriber_email_subscriber.rb

@@ -2,17 +2,17 @@
 
 module Spree
   class NewsletterSubscriberEmailSubscriber < Spree::Subscriber
-    subscribes_to 'newsletter_subscriber.subscribed'
+    subscribes_to 'newsletter_subscriber.subscription_requested'
 
     def handle(event)
       subscriber = find_subscriber(event)
       return unless subscriber
       return if subscriber.verified?
 
-      store = Spree::Current.store || Spree::Store.default
+      store = subscriber.store || Spree::Current.store || Spree::Store.default
       return unless store.prefers_send_consumer_transactional_emails?
 
-      NewsletterMailer.email_confirmation(subscriber).deliver_later
+      NewsletterMailer.email_confirmation(subscriber, redirect_url: event.payload['redirect_url']).deliver_later
     end
 
     private

data/app/subscribers/spree/order_email_subscriber.rb

@@ -14,6 +14,7 @@ module Spree
       order = find_order(event)
       return unless order
       return if order.confirmation_delivered?
+      return if event.payload['notify_customer'] == false
 
       store = order.store
       return unless store.prefers_send_consumer_transactional_emails?
@@ -38,6 +39,7 @@ module Spree
     def send_cancel_email(event)
       order = find_order(event)
       return unless order
+      return if event.payload['notify_customer'] == false
 
       OrderMailer.cancel_email(order.id).deliver_later
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_emails
 version: !ruby/object:Gem::Version
-  version: 5.4.3
+  version: 5.5.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-19 00:00:00.000000000 Z
+date: 2026-06-10 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.3
+        version: 5.5.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.3
+        version: 5.5.0.rc1
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
@@ -101,9 +101,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.3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.5.0.rc1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.3
+  source_code_uri: https://github.com/spree/spree/tree/v5.5.0.rc1
 post_install_message:
 rdoc_options: []
 require_paths: