Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Fix account newsletter (#12441)

Łukasz Adamczyk763096b86213
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 6b3651b253..0623bb9e45 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -855,7 +855,7 @@ en:
delete_selected: Delete selected
deleted: Deleted
delivery: Delivery
- delivery_address: Delivery address
+ delivery_address: Delivery Address
delivery_information: Delivery Information
depth: Depth
description: Description
@@ -1200,7 +1200,7 @@ en:
new_address: New address
new_adjustment: New Adjustment
new_balance: New balance
- new_billing_address: New billing address
+ new_billing_address: New Billing Address
new_country: New Country
new_customer: Create new account
new_customer_return: New Customer Return
diff --git a/core/lib/spree/core/engine.rb b/core/lib/spree/core/engine.rb
index ef0dbab8e7..4fdf537562 100644
--- a/core/lib/spree/core/engine.rb
+++ b/core/lib/spree/core/engine.rb
@@ -244,6 +244,7 @@ module Spree
product_removed_from_wishlist: 'Product Removed from Wishlist',
subscribed_to_newsletter: 'Subscribed to Newsletter',
+ unsubscribed_from_newsletter: 'Unsubscribed from Newsletter',
payment_info_entered: 'Payment Info Entered',
coupon_entered: 'Coupon Entered',
diff --git a/storefront/app/controllers/spree/account/newsletter_controller.rb b/storefront/app/controllers/spree/account/newsletter_controller.rb
index 467fb83a97..0b9bd38ed0 100644
--- a/storefront/app/controllers/spree/account/newsletter_controller.rb
+++ b/storefront/app/controllers/spree/account/newsletter_controller.rb
@@ -5,6 +5,17 @@ module Spree
def update
try_spree_current_user.update(newsletter_params)
+
+ event_properties = {
+ user: try_spree_current_user,
+ email: try_spree_current_user.email
+ }
+
+ if try_spree_current_user.accepts_email_marketing?
+ track_event('subscribed_to_newsletter', event_properties)
+ else
+ track_event('unsubscribed_from_newsletter', event_properties)
+ end
end
private
diff --git a/storefront/spec/controllers/spree/account/newsletter_controller_spec.rb b/storefront/spec/controllers/spree/account/newsletter_controller_spec.rb
new file mode 100644
index 0000000000..dbd2925108
--- /dev/null
+++ b/storefront/spec/controllers/spree/account/newsletter_controller_spec.rb
@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+RSpec.describe Spree::Account::NewsletterController, type: :controller do
+ let(:store) { Spree::Store.default }
+ let(:user) { create(:user, email: '[email protected]') }
+
+ before do
+ allow(controller).to receive(:current_store).and_return(store)
+ allow(controller).to receive(:try_spree_current_user).and_return(user)
+ end
+
+ describe 'PUT #update' do
+ subject { put :update, params: { user: { accepts_email_marketing: accepts_email_marketing } } }
+
+ context 'when user subscribes to the newsletter' do
+ let(:accepts_email_marketing) { true }
+
+ it 'tracks the subscribed_to_newsletter event' do
+ expect(controller).to receive(:track_event).with('subscribed_to_newsletter', { email: '[email protected]', user: user })
+ subject
+
+ expect(response).to have_http_status(:ok)
+ expect(user.reload.accepts_email_marketing).to be(true)
+ end
+ end
+
+ context 'when user unsubscribes from the newsletter' do
+ let(:accepts_email_marketing) { false }
+
+ it 'tracks the unsubscribed_from_newsletter event' do
+ expect(controller).to receive(:track_event).with('unsubscribed_from_newsletter', { email: '[email protected]', user: user })
+ subject
+
+ expect(response).to have_http_status(:ok)
+ expect(user.reload.accepts_email_marketing).to be(false)
+ end
+ end
+ end
+end