From 03b24bfc38c7b3e594557ffd2db7c34431f0bec6 Mon Sep 17 00:00:00 2001 From: georgethoppil Date: Mon, 16 May 2022 19:50:16 -0400 Subject: [PATCH 1/2] Destroy all adjustments on cart empty --- app/models/spree/order.rb | 2 +- spec/models/spree/order_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index b4b2c3bf75..66b2e7129b 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -430,7 +430,7 @@ module Spree def empty! line_items.destroy_all - adjustments.destroy_all + all_adjustments.destroy_all payments.clear shipments.destroy_all end diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb index beea7371cc..c490457aa3 100644 --- a/spec/models/spree/order_spec.rb +++ b/spec/models/spree/order_spec.rb @@ -315,7 +315,7 @@ describe Spree::Order do allow(order).to receive_messages(line_items: line_items = []) allow(order).to receive_messages(adjustments: adjustments = []) expect(order.line_items).to receive(:destroy_all) - expect(order.adjustments).to receive(:destroy_all) + expect(order.all_adjustments).to receive(:destroy_all) order.empty! end From ec7d4b7c215905e440dac9512684886fcd991e44 Mon Sep 17 00:00:00 2001 From: georgethoppil Date: Thu, 19 May 2022 20:54:25 -0400 Subject: [PATCH 2/2] Restart checkout flow on cart empty if state of checkout is payment --- app/models/spree/order.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index 66b2e7129b..4ffe08afaf 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -433,6 +433,7 @@ module Spree all_adjustments.destroy_all payments.clear shipments.destroy_all + restart_checkout_flow if state == "payment" end def state_changed(name)