dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix #PSCFV-4136

Browse Source
This commit is contained in:
rGaillard committed 2012-09-17 17:36:11 +00:00
1 parent e9d1673e4c
commit 8a7598b893
2 files changed
+15 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/order/Order.php
+8 -6
View File
@@ -628,16 +628,18 @@ class OrderCore extends ObjectModel
{ {
if (isset($product['product_attribute_id']) && $product['product_attribute_id']) if (isset($product['product_attribute_id']) && $product['product_attribute_id'])
$id_image = Db::getInstance()->getValue(' $id_image = Db::getInstance()->getValue('
SELECT id_image SELECT image_shop.id_image
FROM '._DB_PREFIX_.'product_attribute_image FROM '._DB_PREFIX_.'product_attribute_image pai'.
Shop::addSqlAssociation('image', 'pai', true).'
WHERE id_product_attribute = '.(int)$product['product_attribute_id']); WHERE id_product_attribute = '.(int)$product['product_attribute_id']);
if (!isset($id_image) || !$id_image) if (!isset($id_image) || !$id_image)
$id_image = Db::getInstance()->getValue(' $id_image = Db::getInstance()->getValue('
SELECT id_image SELECT image_shop.id_image
FROM '._DB_PREFIX_.'image FROM '._DB_PREFIX_.'image i'.
WHERE id_product = '.(int)($product['product_id']).' AND cover = 1 Shop::addSqlAssociation('image', 'i', true, 'image_shop.cover=1').'
'); WHERE id_product = '.(int)($product['product_id'])
);
$product['image'] = null; $product['image'] = null;
$product['image_size'] = null; $product['image_size'] = null;
classes/order/OrderInvoice.php
+7 -6
View File
@@ -208,14 +208,15 @@ class OrderInvoiceCore extends ObjectModel
{ {
if (isset($product['product_attribute_id']) && $product['product_attribute_id']) if (isset($product['product_attribute_id']) && $product['product_attribute_id'])
$id_image = Db::getInstance()->getValue(' $id_image = Db::getInstance()->getValue('
SELECT id_image SELECT image_shop.id_image
FROM '._DB_PREFIX_.'product_attribute_image FROM '._DB_PREFIX_.'product_attribute_image pai'.
Shop::addSqlAssociation('image', 'pai', true).'
WHERE id_product_attribute = '.(int)$product['product_attribute_id']); 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(' $id_image = Db::getInstance()->getValue('
SELECT id_image SELECT image_shop.id_image
FROM '._DB_PREFIX_.'image'. FROM '._DB_PREFIX_.'image i'.
Shop::addSqlAssociation('image', 'i', true, 'image_shop.cover=1').' Shop::addSqlAssociation('image', 'i', true, 'image_shop.cover=1').'
WHERE id_product = '.(int)($product['product_id'])); WHERE id_product = '.(int)($product['product_id']));
@@ -666,4 +667,4 @@ class OrderInvoiceCore extends ObjectModel
return $is_correct; return $is_correct;
} }
} }