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: Registered missing email subscribers so import, company invitation, data export and download emails are sent (#14796)

Damian Legawiec03b56986313b
diff --git a/spree/core/lib/spree/core/engine.rb b/spree/core/lib/spree/core/engine.rb
index eb2cac7707..59aa5f5379 100644
--- a/spree/core/lib/spree/core/engine.rb
+++ b/spree/core/lib/spree/core/engine.rb
@@ -648,6 +648,7 @@ module Spree
Spree::SellerTransferSubscriber,
Spree::SellerTransferReversalSubscriber,
Spree::ExportSubscriber,
+ Spree::ImportEmailSubscriber,
Spree::InvitationEmailSubscriber,
Spree::SellerOnboardingSubscriber,
Spree::AdminUserEmailSubscriber,
diff --git a/spree/core/lib/spree/core/previews/import_preview.rb b/spree/core/lib/spree/core/previews/import_preview.rb
new file mode 100644
index 0000000000..2ab2772898
--- /dev/null
+++ b/spree/core/lib/spree/core/previews/import_preview.rb
@@ -0,0 +1,10 @@
+require_relative 'preview_data'
+
+# Preview Spree import emails at /rails/mailers/spree/import
+class Spree::ImportPreview < ActionMailer::Preview
+ include Spree::PreviewData::LocaleParam
+
+ def import_done
+ Spree::ImportMailer.import_done(Spree::Import.where.not(user_id: nil).last)
+ end
+end
diff --git a/spree/core/spec/subscribers/spree/import_email_subscriber_spec.rb b/spree/core/spec/subscribers/spree/import_email_subscriber_spec.rb
index cb64486769..e7e0f5a7a8 100644
--- a/spree/core/spec/subscribers/spree/import_email_subscriber_spec.rb
+++ b/spree/core/spec/subscribers/spree/import_email_subscriber_spec.rb
@@ -46,4 +46,17 @@ RSpec.describe Spree::ImportEmailSubscriber do
subscriber.send_import_done_email(event_for(import.prefixed_id))
end
end
+
+ describe 'through the registered subscribers', events: true do
+ let(:import) { create(:product_import, store: @default_store, user: create(:admin_user), status: 'processing') }
+
+ it 'emails the owner when the import completes' do
+ perform_enqueued_jobs do
+ expect { Spree::Imports::Complete.call(import: import) }.
+ to change { ActionMailer::Base.deliveries.count }.by(1)
+ end
+
+ expect(ActionMailer::Base.deliveries.last.to).to eq([import.user.email])
+ end
+ end
end
diff --git a/spree/emails/lib/spree/emails/engine.rb b/spree/emails/lib/spree/emails/engine.rb
index e71fc71e75..23d616b8a3 100644
--- a/spree/emails/lib/spree/emails/engine.rb
+++ b/spree/emails/lib/spree/emails/engine.rb
@@ -26,6 +26,9 @@ module Spree
Spree::ReturnEmailSubscriber,
Spree::NewsletterSubscriberEmailSubscriber,
Spree::CustomerEmailSubscriber,
+ Spree::DataRequestEmailSubscriber,
+ Spree::CompanyEmailSubscriber,
+ Spree::DigitalAssetEmailSubscriber,
Spree::SellerEmailSubscriber
]
end
diff --git a/spree/emails/lib/spree/emails/previews/company_preview.rb b/spree/emails/lib/spree/emails/previews/company_preview.rb
new file mode 100644
index 0000000000..7479632367
--- /dev/null
+++ b/spree/emails/lib/spree/emails/previews/company_preview.rb
@@ -0,0 +1,10 @@
+require 'spree/core/previews/preview_data'
+
+# Preview Spree company emails at /rails/mailers/spree/company
+class Spree::CompanyPreview < ActionMailer::Preview
+ include Spree::PreviewData::LocaleParam
+
+ def invitation_email
+ Spree::CompanyMailer.invitation_email(Spree::CompanyInvitation.pending.last)
+ end
+end
diff --git a/spree/emails/lib/spree/emails/previews/customer_preview.rb b/spree/emails/lib/spree/emails/previews/customer_preview.rb
index 7d9bce16c0..8f14d8b18a 100644
--- a/spree/emails/lib/spree/emails/previews/customer_preview.rb
+++ b/spree/emails/lib/spree/emails/previews/customer_preview.rb
@@ -11,4 +11,8 @@ class Spree::CustomerPreview < ActionMailer::Preview
Spree::PreviewData.store(locale)
)
end
+
+ def data_export_email
+ Spree::CustomerMailer.data_export_email(Spree::DataRequest.access.with_status(:completed).last)
+ end
end
diff --git a/spree/emails/lib/spree/emails/previews/digital_asset_preview.rb b/spree/emails/lib/spree/emails/previews/digital_asset_preview.rb
new file mode 100644
index 0000000000..c4315c22b4
--- /dev/null
+++ b/spree/emails/lib/spree/emails/previews/digital_asset_preview.rb
@@ -0,0 +1,20 @@
+require 'spree/core/previews/preview_data'
+
+# Preview Spree digital download emails at /rails/mailers/spree/digital_asset
+class Spree::DigitalAssetPreview < ActionMailer::Preview
+ include Spree::PreviewData::LocaleParam
+
+ def files_ready_email
+ Spree::DigitalAssetMailer.files_ready_email(order)
+ end
+
+ private
+
+ # The most recent order with downloads, with its locale overridden in memory
+ # when the preview toolbar requests one (the change is never saved).
+ def order
+ order = Spree::Order.complete.joins(line_items: :digital_links).last
+ order.locale = locale if order && locale.present?
+ order
+ end
+end
diff --git a/spree/emails/spec/mailers/spree/rendered_emails_spec.rb b/spree/emails/spec/mailers/spree/rendered_emails_spec.rb
index 908d9f4fba..96ded7a08e 100644
--- a/spree/emails/spec/mailers/spree/rendered_emails_spec.rb
+++ b/spree/emails/spec/mailers/spree/rendered_emails_spec.rb
@@ -18,6 +18,12 @@ describe 'rendered emails', type: :mailer do
let(:order_group) { create(:order_group, :with_parcels, store: store, sellers_count: 2) }
let(:seller) { create(:seller, store: store, name: payload, contact_email: '[email protected]') }
let(:company) { create(:company, store: store, name: payload) }
+ let(:order_with_downloads) do
+ create(:completed_order_with_totals, store: store).tap do |order|
+ line_item = order.line_items.first
+ create(:digital_link, line_item: line_item, digital_asset: create(:digital_asset, variant: line_item.variant))
+ end
+ end
let(:emails) do
{
@@ -28,6 +34,7 @@ describe 'rendered emails', type: :mailer do
'purchase confirmation' => Spree::OrderGroupMailer.confirm_email(order_group),
'new purchase notification' => Spree::OrderGroupMailer.store_owner_notification_email(order_group),
'fulfillment' => Spree::FulfillmentMailer.fulfilled_email(create(:shipped_order, store: store).fulfillments.first),
+ 'files ready' => Spree::DigitalAssetMailer.files_ready_email(order_with_downloads),
'refund' => Spree::ReturnMailer.refunded_email(create(:received_return, store: store)),
'password reset' => Spree::CustomerMailer.password_reset_email(create(:user, first_name: payload), 'token', store),
'data export' => Spree::CustomerMailer.data_export_email(create(:data_request, store: store)),
diff --git a/spree/emails/spec/subscribers/spree/company_email_subscriber_spec.rb b/spree/emails/spec/subscribers/spree/company_email_subscriber_spec.rb
index 631bd4b460..13c4a0e09c 100644
--- a/spree/emails/spec/subscribers/spree/company_email_subscriber_spec.rb
+++ b/spree/emails/spec/subscribers/spree/company_email_subscriber_spec.rb
@@ -32,4 +32,13 @@ describe Spree::CompanyEmailSubscriber do
expect { handle(invitation) }.not_to have_enqueued_job(ActionMailer::MailDeliveryJob)
end
+
+ it 'mails the invite through the registered subscribers', events: true do
+ perform_enqueued_jobs do
+ expect { create(:company_invitation, company: company, email: '[email protected]') }.
+ to change { ActionMailer::Base.deliveries.count }.by(1)
+ end
+
+ expect(ActionMailer::Base.deliveries.last.to).to eq(['[email protected]'])
+ end
end
diff --git a/spree/emails/spec/subscribers/spree/data_request_email_subscriber_spec.rb b/spree/emails/spec/subscribers/spree/data_request_email_subscriber_spec.rb
index d3dd7b192e..36fe1f7350 100644
--- a/spree/emails/spec/subscribers/spree/data_request_email_subscriber_spec.rb
+++ b/spree/emails/spec/subscribers/spree/data_request_email_subscriber_spec.rb
@@ -72,4 +72,17 @@ RSpec.describe Spree::DataRequestEmailSubscriber do
subscriber.handle(mock_event(data_request.reload))
end
end
+
+ describe 'through the registered subscribers', events: true do
+ let(:data_request) { create(:data_request, store: store, customer: customer) }
+
+ it 'emails the download link once the request is fulfilled' do
+ perform_enqueued_jobs do
+ expect { Spree::DataRequests::Fulfill.call(data_request: data_request) }.
+ to change { ActionMailer::Base.deliveries.count }.by(1)
+ end
+
+ expect(ActionMailer::Base.deliveries.last.to).to eq([data_request.reload.email])
+ end
+ end
end
diff --git a/spree/emails/spec/subscribers/spree/digital_asset_email_subscriber_spec.rb b/spree/emails/spec/subscribers/spree/digital_asset_email_subscriber_spec.rb
index 1ed942f92f..11e586198e 100644
--- a/spree/emails/spec/subscribers/spree/digital_asset_email_subscriber_spec.rb
+++ b/spree/emails/spec/subscribers/spree/digital_asset_email_subscriber_spec.rb
@@ -51,4 +51,20 @@ RSpec.describe Spree::DigitalAssetEmailSubscriber do
subscriber.send(:send_files_ready_email, mock_event(order))
end
end
+
+ describe 'through the registered subscribers', events: true do
+ before do
+ digital_asset = create(:digital_asset, variant: line_item.variant)
+ create(:digital_link, digital_asset: digital_asset, line_item: line_item)
+ end
+
+ it 'sends the files-ready email when the links are resent' do
+ perform_enqueued_jobs do
+ expect { order.publish_event('order.resend_digital_links_email') }.
+ to change { ActionMailer::Base.deliveries.count }.by(1)
+ end
+
+ expect(ActionMailer::Base.deliveries.last.to).to eq([order.email])
+ end
+ end
end