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
Fixed resending order email confirmation from admin
Damian Legawiec315158df655f
diff --git a/admin/app/controllers/spree/admin/orders_controller.rb b/admin/app/controllers/spree/admin/orders_controller.rbindex 6a7974a86b..7e525e9f9e 100644--- a/admin/app/controllers/spree/admin/orders_controller.rb+++ b/admin/app/controllers/spree/admin/orders_controller.rb@@ -55,11 +55,11 @@ module Spree# POST /admin/orders/:id/resenddef resend- @order.deliver_order_confirmation_email- if @order.errors.any?- flash[:error] = @order.errors.full_messages.join(', ')- else+ if @order.completed?+ Spree::Events.publish('order.resend_confirmation_email', { 'id' => @order.id })flash[:success] = Spree.t(:order_email_resent)+ else+ flash[:error] = Spree.t(:order_email_resent_error)endredirect_back fallback_location: spree.edit_admin_order_url(@order)diff --git a/emails/app/subscribers/spree/order_email_subscriber.rb b/emails/app/subscribers/spree/order_email_subscriber.rbindex d862b3f801..33ca9bca63 100644--- a/emails/app/subscribers/spree/order_email_subscriber.rb+++ b/emails/app/subscribers/spree/order_email_subscriber.rb@@ -2,10 +2,11 @@module Spreeclass OrderEmailSubscriber < Spree::Subscriber- subscribes_to 'order.complete', 'order.cancel'+ subscribes_to 'order.complete', 'order.cancel', 'order.resend_confirmation_email'on 'order.complete', :send_confirmation_emailon 'order.cancel', :send_cancel_email+ on 'order.resend_confirmation_email', :resend_confirmation_emailprivate@@ -23,6 +24,17 @@ module Spreesend_store_owner_notification(order) if should_notify_store_owner?(order)end+ def resend_confirmation_email(event)+ order = find_order(event)+ return unless order++ store = order.store+ return unless store.prefers_send_consumer_transactional_emails?++ OrderMailer.confirm_email(order.id).deliver_later+ order.update_column(:confirmation_delivered, true)+ end+def send_cancel_email(event)order = find_order(event)return unless order