From a45ef3436ac1b5be194a02a7676e2c0ba8dbdb07 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Thu, 13 Sep 2012 14:25:32 +0000 Subject: [PATCH] // Fix #PSCFV-4033 --- classes/order/Order.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/classes/order/Order.php b/classes/order/Order.php index 20441c4d1..efe21c74a 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -1133,10 +1133,11 @@ class OrderCore extends ObjectModel if ($use_existing_payment) { $id_order_payments = Db::getInstance()->executeS(' - SELECT id_order_payment FROM `'._DB_PREFIX_.'order_payment` op - INNER JOIN `'._DB_PREFIX_.'orders` o - ON o.reference = op.order_reference - WHERE id_order = '.(int)$order_invoice->id_order); + SELECT op.id_order_payment + FROM `'._DB_PREFIX_.'order_payment` op + INNER JOIN `'._DB_PREFIX_.'orders` o ON (o.reference = op.order_reference) + LEFT JOIN `'._DB_PREFIX_.'order_invoice_payment` oip ON (oip.id_order_payment = op.id_order_payment) + WHERE oip.id_order_payment IS NULL AND o.id_order = '.(int)$order_invoice->id_order); if (count($id_order_payments)) foreach ($id_order_payments as $order_payment)