spree_emails 5.4.0.beta2 → 5.4.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 472dd966debba0e48ac7f67163c475642ce439adcb5cc2e508d1b86fc92787a4
-  data.tar.gz: 855c6c6af09f1697967db84c641d9785114c175c5954948288321031c671260e
+  metadata.gz: e9536aae09c3cb148e9db5971a6d18b9f2a4eabb514d2750cb1f0b7d908a7c54
+  data.tar.gz: f55125d3213f2d1d13773808c6ec53cd30a644a0f29ffd23d50ea59f898f3a3a
 SHA512:
-  metadata.gz: d992fc6b0f232de66bf5f346a60350aa76014a907e3bc5c65cac4fb752e750114af2c07e6189c4b206c0b15b37e4dc07480a013a55889eae276f5153b8b1324a
-  data.tar.gz: b00a34accd48f4f1f0865f08f6005cb64455e3ed9fae16ca5075debd182339bc74b2c114d3c2d127573bfd9bb6547655b0db4a5562424290eda0d1cf4258b04a
+  metadata.gz: 0d91f9153fe6a66aa4de79084d35500cd5810d85886d070ce2e028c40aec19aa633eb570f34fb36eaae62ab0437efb5c6bf67394645158a828638d0960c646a5
+  data.tar.gz: 33d50a198fe492b3ffd4d23a4d25b68672c5f2faafe951f91acfbf0a1f4178f2999ba6b5f12eda7255d11ee863bc8d17bce547dc21ac852d5e34bb6201ee0933

data/app/subscribers/spree/newsletter_subscriber_email_subscriber.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Spree
+  class NewsletterSubscriberEmailSubscriber < Spree::Subscriber
+    subscribes_to 'newsletter_subscriber.subscribed'
+
+    def handle(event)
+      subscriber = find_subscriber(event)
+      return unless subscriber
+      return if subscriber.verified?
+
+      store = Spree::Current.store || Spree::Store.default
+      return unless store.prefers_send_consumer_transactional_emails?
+
+      NewsletterMailer.email_confirmation(subscriber).deliver_later
+    end
+
+    private
+
+    def find_subscriber(event)
+      subscriber_id = event.payload['id']
+      Spree::NewsletterSubscriber.find_by_prefix_id(subscriber_id)
+    end
+  end
+end

data/app/subscribers/spree/order_email_subscriber.rb

@@ -57,7 +57,7 @@ module Spree
 
     def find_order(event)
       order_id = event.payload['id']
-      Spree::Order.find_by(id: order_id)
+      Spree::Order.find_by_prefix_id(order_id)
     end
   end
 end

data/app/subscribers/spree/reimbursement_email_subscriber.rb

@@ -18,7 +18,7 @@ module Spree
 
     def find_reimbursement(event)
       reimbursement_id = event.payload['id']
-      Spree::Reimbursement.find_by(id: reimbursement_id)
+      Spree::Reimbursement.find_by_prefix_id(reimbursement_id)
     end
   end
 end

data/app/subscribers/spree/shipment_email_subscriber.rb

@@ -18,7 +18,7 @@ module Spree
 
     def find_shipment(event)
       shipment_id = event.payload['id']
-      Spree::Shipment.find_by(id: shipment_id)
+      Spree::Shipment.find_by_prefix_id(shipment_id)
     end
   end
 end

data/lib/spree/emails/engine.rb

@@ -14,7 +14,8 @@ module Spree
         Spree.subscribers.concat [
           Spree::OrderEmailSubscriber,
           Spree::ShipmentEmailSubscriber,
-          Spree::ReimbursementEmailSubscriber
+          Spree::ReimbursementEmailSubscriber,
+          Spree::NewsletterSubscriberEmailSubscriber
         ]
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_emails
 version: !ruby/object:Gem::Version
-  version: 5.4.0.beta2
+  version: 5.4.0.beta3
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-28 00:00:00.000000000 Z
+date: 2026-03-02 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.beta2
+        version: 5.4.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.0.beta2
+        version: 5.4.0.beta3
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ files:
 - app/mailers/spree/order_mailer.rb
 - app/mailers/spree/reimbursement_mailer.rb
 - app/mailers/spree/shipment_mailer.rb
-- app/models/spree/newsletter_subscriber/emails.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
@@ -99,9 +99,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.beta2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.beta3
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta2
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta3
 post_install_message:
 rdoc_options: []
 require_paths:

data/app/models/spree/newsletter_subscriber/emails.rb

@@ -1,13 +0,0 @@
-module Spree
-  class NewsletterSubscriber < Spree.base_class
-    module Emails
-      def store
-        @store ||= Spree::Store.current || Spree::Store.default
-      end
-
-      def deliver_newsletter_email_verification
-        NewsletterMailer.email_confirmation(self).deliver_later if store.prefers_send_consumer_transactional_emails?
-      end
-    end
-  end
-end