raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix queries for pending order shipment in OrderSyncer

Browse Source
This commit is contained in:
Kristina Lim
2019-02-26 17:55:13 +08:00
parent 54991f8191
commit 5b5d1967fd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/services/order_syncer.rb
View File

@@ -66,12 +66,13 @@ class OrderSyncer
end
def update_shipment_for(order)
shipment = order.shipments.with_state('pending').where(shipping_method_id: shipping_method_id_was).last
if shipment
shipment = order.shipment
if shipment.andand.state == "pending" && shipment.shipping_method.id == shipping_method_id_was
shipment.update_attributes(shipping_method_id: shipping_method_id)
order.update_attribute(:shipping_method_id, shipping_method_id)
else
unless order.shipments.with_state('pending').where(shipping_method_id: shipping_method_id).any?
unless shipment.andand.state == "pending" && shipment.shipping_method.id == shipping_method_id
order_update_issues.add(order, I18n.t('admin.shipping_method'))
end
end