From 6b3fd22db8ade6726b5a2fb2592d61d0df88651c Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Fri, 14 Sep 2018 15:33:42 +0100 Subject: [PATCH 1/2] Adapted order_decorator to spree 2 by fixing adjustment.update! call on update_adjustment --- app/models/spree/order_decorator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb index 8a88078b05..29308910e0 100644 --- a/app/models/spree/order_decorator.rb +++ b/app/models/spree/order_decorator.rb @@ -386,7 +386,7 @@ Spree::Order.class_eval do return if adjustment.finalized? state = adjustment.state adjustment.state = 'open' - adjustment.update!(self) + adjustment.update! adjustment.state = state end From d685b706adba10484e964dbaf7f0664c5d2444dd Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Fri, 14 Sep 2018 16:33:32 +0100 Subject: [PATCH 2/2] In order_decorator.update_shipping_fees! and order_decorator.update_payment_fees!, only update adjustment if it exists --- app/models/spree/order_decorator.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb index 29308910e0..ec9721a33d 100644 --- a/app/models/spree/order_decorator.rb +++ b/app/models/spree/order_decorator.rb @@ -153,7 +153,7 @@ Spree::Order.class_eval do def update_shipping_fees! shipments.each do |shipment| next if shipment.shipped? - update_adjustment! shipment.adjustment + update_adjustment! shipment.adjustment if shipment.adjustment shipment.save # updates included tax end end @@ -164,7 +164,7 @@ Spree::Order.class_eval do def update_payment_fees! payments.each do |payment| next if payment.completed? - update_adjustment! payment.adjustment + update_adjustment! payment.adjustment if payment.adjustment payment.save end end