diff --git a/engines/order_management/app/services/order_management/order/updater.rb b/engines/order_management/app/services/order_management/order/updater.rb index 4aac1f7843..b391592577 100644 --- a/engines/order_management/app/services/order_management/order/updater.rb +++ b/engines/order_management/app/services/order_management/order/updater.rb @@ -157,8 +157,7 @@ module OrderManagement def infer_payment_state_from_balance # This part added so that we don't need to override # order.outstanding_balance - balance = order.outstanding_balance - balance = -1 * order.payment_total if canceled_and_paid_for? + balance = order.new_outstanding_balance infer_state(balance) end @@ -184,20 +183,10 @@ module OrderManagement order.state_changed('payment') end - # Taken from order.outstanding_balance in Spree 2.4 - # See: https://github.com/spree/spree/commit/7b264acff7824f5b3dc6651c106631d8f30b147a - def canceled_and_paid_for? - order.canceled? && paid? - end - def canceled_and_not_paid_for? order.state == 'canceled' && order.payment_total.zero? end - def paid? - payments.present? && !payments.completed.empty? - end - def failed_payments? payments.present? && payments.valid.empty? end