From 5b5d1967fd8cf2baba41b47b4bafe3e103620ea1 Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Tue, 26 Feb 2019 17:55:13 +0800 Subject: [PATCH] Fix queries for pending order shipment in OrderSyncer --- app/services/order_syncer.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/services/order_syncer.rb b/app/services/order_syncer.rb index de7aa44790..663073fadd 100644 --- a/app/services/order_syncer.rb +++ b/app/services/order_syncer.rb @@ -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