raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[Spree Upgrade] Adapt order_decorator.shipments.adjustments to spree 2
This commit is contained in:
Pau Pérez Fabregat
2018-09-18 09:37:10 +02:00
committed by GitHub
parent 1130bb341d d685b706ad
commit e79f7c13f1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/spree/order_decorator.rb
View File

@@ -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
@@ -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