Merge pull request #2727 from luisramos0/2-0-shipment-adjustment

[Spree Upgrade] Adapt order_decorator.shipments.adjustments to spree 2
openfoodfoundation · Sep 18, 2018 · e79f7c1 · e79f7c1
2 parents 1130bb3 + d685b70
commit e79f7c1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
@@ -153,7 +153,7 @@ def add_variant(variant, quantity = 1, max_quantity = nil, currency = nil)
   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 @@ def update_shipping_fees!
   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
@@ -386,7 +386,7 @@ def update_adjustment!(adjustment)
     return if adjustment.finalized?
     state = adjustment.state
     adjustment.state = 'open'
-    adjustment.update!(self)
+    adjustment.update!
     adjustment.state = state
   end