From 93d1065bccf65eb3cec6f888bc66957687e1d9ed Mon Sep 17 00:00:00 2001 From: rGaillard Date: Mon, 17 Sep 2012 17:36:11 +0000 Subject: [PATCH] // Fix #PSCFV-4136 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17400 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/order/Order.php | 14 ++++++++------ classes/order/OrderInvoice.php | 13 +++++++------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/classes/order/Order.php b/classes/order/Order.php index efe21c74a..f9aed1be6 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -628,16 +628,18 @@ class OrderCore extends ObjectModel { if (isset($product['product_attribute_id']) && $product['product_attribute_id']) $id_image = Db::getInstance()->getValue(' - SELECT id_image - FROM '._DB_PREFIX_.'product_attribute_image + SELECT image_shop.id_image + FROM '._DB_PREFIX_.'product_attribute_image pai'. + Shop::addSqlAssociation('image', 'pai', true).' WHERE id_product_attribute = '.(int)$product['product_attribute_id']); if (!isset($id_image) || !$id_image) $id_image = Db::getInstance()->getValue(' - SELECT id_image - FROM '._DB_PREFIX_.'image - WHERE id_product = '.(int)($product['product_id']).' AND cover = 1 - '); + SELECT image_shop.id_image + FROM '._DB_PREFIX_.'image i'. + Shop::addSqlAssociation('image', 'i', true, 'image_shop.cover=1').' + WHERE id_product = '.(int)($product['product_id']) + ); $product['image'] = null; $product['image_size'] = null; diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php index 709e88012..f64b19002 100644 --- a/classes/order/OrderInvoice.php +++ b/classes/order/OrderInvoice.php @@ -208,14 +208,15 @@ class OrderInvoiceCore extends ObjectModel { if (isset($product['product_attribute_id']) && $product['product_attribute_id']) $id_image = Db::getInstance()->getValue(' - SELECT id_image - FROM '._DB_PREFIX_.'product_attribute_image + SELECT image_shop.id_image + FROM '._DB_PREFIX_.'product_attribute_image pai'. + Shop::addSqlAssociation('image', 'pai', true).' WHERE id_product_attribute = '.(int)$product['product_attribute_id']); - if (!isset($image['id_image']) || !$image['id_image']) + if (!isset($id_image) || !$id_image) $id_image = Db::getInstance()->getValue(' - SELECT id_image - FROM '._DB_PREFIX_.'image'. + SELECT image_shop.id_image + FROM '._DB_PREFIX_.'image i'. Shop::addSqlAssociation('image', 'i', true, 'image_shop.cover=1').' WHERE id_product = '.(int)($product['product_id'])); @@ -666,4 +667,4 @@ class OrderInvoiceCore extends ObjectModel return $is_correct; } -} \ No newline at end of file +}