Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
newsletter subscribe on complete order event (#13161)
Szymon Chorobski4d5d675bc86e
diff --git a/core/app/models/spree/order/checkout.rb b/core/app/models/spree/order/checkout.rbindex 72820e36bb..f4043f9b80 100644--- a/core/app/models/spree/order/checkout.rb+++ b/core/app/models/spree/order/checkout.rb@@ -122,6 +122,7 @@ module Spreeafter_transition to: :complete, do: :redeem_gift_cardafter_transition to: :resumed, do: :after_resumeafter_transition to: :canceled, do: :after_cancel+ after_transition to: :complete, do: :subscribe_to_newsletterafter_transition from: any - :cart, to: any - [:confirm, :complete] do |order|order.update_totals@@ -132,6 +133,12 @@ module Spreealias_method :save_state, :saveend+ def subscribe_to_newsletter+ return unless accept_marketing?++ Spree::NewsletterSubscriber.subscribe(email: email, user: user)+ end+def self.go_to_state(name, options = {})self.checkout_steps[name] = optionsself.previous_states.each { |state| add_transition({ from: state, to: name }.merge(options)) }diff --git a/core/app/services/spree/orders/create_user_account.rb b/core/app/services/spree/orders/create_user_account.rbindex 6a949e1dc3..590967fdc1 100644--- a/core/app/services/spree/orders/create_user_account.rb+++ b/core/app/services/spree/orders/create_user_account.rb@@ -6,12 +6,8 @@ module Spreeprepend ::Spree::ServiceModule::Basedef call(order:, accepts_email_marketing: false)- Spree.user_class.find_by(email: order.email).tap do |existing_user|- next if existing_user.blank?-- create_newsletter_subscriber(existing_user) if accepts_email_marketing- return existing_user- end+ existing_user = Spree.user_class.find_by(email: order.email)+ return existing_user if existing_user.present?user = create_new_user(order, accepts_email_marketing)return failure(:user_creation_failed) unless user.persisted?@@ -26,7 +22,6 @@ module Spree# send welcome emailuser.send_welcome_email if user.respond_to?(:send_welcome_email)- create_newsletter_subscriber(user) if accepts_email_marketingsuccess(user.reload)end@@ -70,10 +65,6 @@ module Spreeuser.update_columns(ship_address_id: order.ship_address_id, updated_at: Time.current) unless user.ship_address_id.present?endend-- def create_newsletter_subscriber(user)- Spree::NewsletterSubscriber.subscribe(email: user.email, user: user)- endendendenddiff --git a/core/spec/models/spree/order/checkout_spec.rb b/core/spec/models/spree/order/checkout_spec.rbindex da924ff9fb..9fd376032b 100644--- a/core/spec/models/spree/order/checkout_spec.rb+++ b/core/spec/models/spree/order/checkout_spec.rb@@ -3,8 +3,9 @@ require 'spree/testing_support/order_walkthrough'describe Spree::Order, type: :model dolet!(:store) { @default_store }- let(:order) { build(:order, store: store) }+ let(:order) { build(:order, store: store, accept_marketing: accept_marketing) }let(:country) { store.default_country || create(:country_us) }+ let(:accept_marketing) { false }let!(:state) { country.states.first || create(:state, country: country, name: 'New York', abbr: 'NY') }def assert_state_changed(order, from, to)@@ -471,6 +472,26 @@ describe Spree::Order, type: :model doorder.save!end+ describe 'newsletter subscription' do+ context 'when newsletter is accepted for the order' do+ let(:accept_marketing) { true }++ it 'subscribes to newsletter' do+ expect(Spree::NewsletterSubscriber).to receive(:subscribe).with(email: order.email, user: order.user)+ order.next!+ end+ end++ context 'when newsletter is not accepted for the order' do+ let(:accept_marketing) { false }++ it 'does not subscribe to newsletter' do+ expect(Spree::NewsletterSubscriber).not_to receive(:subscribe)+ order.next!+ end+ end+ end+it "makes the current credit card a user's default credit card" doorder.next!expect(order.state).to eq 'complete'diff --git a/core/spec/services/spree/orders/create_user_account_spec.rb b/core/spec/services/spree/orders/create_user_account_spec.rbindex 133deea430..6d2a066c40 100644--- a/core/spec/services/spree/orders/create_user_account_spec.rb+++ b/core/spec/services/spree/orders/create_user_account_spec.rb@@ -10,26 +10,6 @@ describe Spree::Orders::CreateUserAccount docreate(:completed_order_with_totals, bill_address: address, ship_address: address, store: store, user: nil, email: '[email protected]')end- context 'when accepts_email_marketing is true' do- let(:accepts_email_marketing) { true }-- it 'calls subscribe for newsletter' do- expect(Spree::NewsletterSubscriber).to receive(:subscribe).with(email: order.email, user: kind_of(Spree.user_class))-- service- end- end-- context 'when accepts_email_marketing is false' do- let(:accepts_email_marketing) { false }-- it 'does not call subscribe for newsletter' do- expect(Spree::NewsletterSubscriber).to_not receive(:subscribe)-- service- end- end-context 'when order has no user' dolet(:new_user) { Spree.user_class.find_by!(email: order.email) }@@ -64,15 +44,5 @@ describe Spree::Orders::CreateUserAccount doit 'does not create a new user' doexpect { subject }.to change { Spree.user_class.count }.by(0)end-- context 'when accepts_email_marketing is true' do- let(:accepts_email_marketing) { true }-- it 'calls subscribe for newsletter' do- expect(Spree::NewsletterSubscriber).to receive(:subscribe).with(email: order.email, user: user)-- service- end- endendend