From bc7469c7aa68e0c002ce848bcb23549aa1a06716 Mon Sep 17 00:00:00 2001 From: Andy Brett Date: Fri, 5 Mar 2021 12:05:06 -0800 Subject: [PATCH] fix order test --- app/models/spree/order.rb | 6 ------ app/models/spree/order/checkout.rb | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index 2ff4f85317..c0a8721eae 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -21,12 +21,6 @@ module Spree go_to_state :complete end - state_machine.after_transition to: :payment, do: :charge_shipping_and_payment_fees! - - state_machine.event :restart_checkout do - transition to: :cart, unless: :completed? - end - token_resource belongs_to :user, class_name: Spree.user_class.to_s diff --git a/app/models/spree/order/checkout.rb b/app/models/spree/order/checkout.rb index 39992a5701..6f746d33e7 100644 --- a/app/models/spree/order/checkout.rb +++ b/app/models/spree/order/checkout.rb @@ -63,6 +63,10 @@ module Spree transition to: :awaiting_return end + event :restart_checkout do + transition to: :cart, unless: :completed? + end + if states[:payment] before_transition to: :complete do |order| order.process_payments! if order.payment_required? @@ -78,6 +82,7 @@ module Spree after_transition to: :delivery, do: :create_tax_charge! after_transition to: :resumed, do: :after_resume after_transition to: :canceled, do: :after_cancel + after_transition to: :payment, do: :charge_shipping_and_payment_fees! end end