From 5b3fbe0aedb4b8d5c47974242d049b388c9952fa Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Fri, 10 Jul 2020 16:49:11 +0100 Subject: [PATCH] Merge decorator OrderUpdater --- app/models/spree/order_updater.rb | 8 +++----- app/models/spree/order_updater_decorator.rb | 8 -------- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 app/models/spree/order_updater_decorator.rb diff --git a/app/models/spree/order_updater.rb b/app/models/spree/order_updater.rb index ec70ebbbe6..3c1622d336 100644 --- a/app/models/spree/order_updater.rb +++ b/app/models/spree/order_updater.rb @@ -28,7 +28,7 @@ module Spree end update_promotion_adjustments - update_shipping_adjustments + update_all_adjustments # update totals a second time in case updated adjustments have an effect on the total update_totals @@ -137,10 +137,8 @@ module Spree choose_best_promotion_adjustment end - # Shipping adjustments don't receive order on update! because they calculated - # over a shipping / package object rather than an order object - def update_shipping_adjustments - order.adjustments.reload.shipping.each(&:update!) + def update_all_adjustments + order.adjustments.reload.each(&:update!) end def before_save_hook diff --git a/app/models/spree/order_updater_decorator.rb b/app/models/spree/order_updater_decorator.rb deleted file mode 100644 index b227444c8b..0000000000 --- a/app/models/spree/order_updater_decorator.rb +++ /dev/null @@ -1,8 +0,0 @@ -# frozen_string_literal: true - -Spree::OrderUpdater.class_eval do - # Override spree method to make it update all adjustments as in Spree v2.0.4 - def update_shipping_adjustments - order.adjustments.reload.each(&:update!) - end -end