// Some files was missing in last commit............................................
This commit is contained in:
@@ -79,10 +79,10 @@ class CategoryCore extends ObjectModel
|
|||||||
|
|
||||||
/** @var boolean is Category Root */
|
/** @var boolean is Category Root */
|
||||||
public $is_root_category;
|
public $is_root_category;
|
||||||
|
|
||||||
/** @var integer */
|
/** @var integer */
|
||||||
public $id_shop_default;
|
public $id_shop_default;
|
||||||
|
|
||||||
public $groupBox;
|
public $groupBox;
|
||||||
|
|
||||||
protected static $_links = array();
|
protected static $_links = array();
|
||||||
@@ -609,7 +609,7 @@ class CategoryCore extends ObjectModel
|
|||||||
}
|
}
|
||||||
|
|
||||||
$sql = 'SELECT p.*, product_shop.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, product_attribute_shop.`id_product_attribute`, pl.`description`, pl.`description_short`, pl.`available_now`,
|
$sql = 'SELECT p.*, product_shop.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, product_attribute_shop.`id_product_attribute`, pl.`description`, pl.`description_short`, pl.`available_now`,
|
||||||
pl.`available_later`, pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`, pl.`name`, i.`id_image`,
|
pl.`available_later`, pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`, pl.`name`, image_shop.`id_image`,
|
||||||
il.`legend`, m.`name` AS manufacturer_name, tl.`name` AS tax_name, t.`rate`, cl.`name` AS category_default,
|
il.`legend`, m.`name` AS manufacturer_name, tl.`name` AS tax_name, t.`rate`, cl.`name` AS category_default,
|
||||||
DATEDIFF(product_shop.`date_add`, DATE_SUB(NOW(),
|
DATEDIFF(product_shop.`date_add`, DATE_SUB(NOW(),
|
||||||
INTERVAL '.(Validate::isUnsignedInt(Configuration::get('PS_NB_DAYS_NEW_PRODUCT')) ? Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20).'
|
INTERVAL '.(Validate::isUnsignedInt(Configuration::get('PS_NB_DAYS_NEW_PRODUCT')) ? Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20).'
|
||||||
@@ -630,10 +630,10 @@ class CategoryCore extends ObjectModel
|
|||||||
ON (p.`id_product` = pl.`id_product`
|
ON (p.`id_product` = pl.`id_product`
|
||||||
AND pl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('pl').')
|
AND pl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('pl').')
|
||||||
LEFT JOIN `'._DB_PREFIX_.'image` i
|
LEFT JOIN `'._DB_PREFIX_.'image` i
|
||||||
ON (i.`id_product` = p.`id_product`
|
ON (i.`id_product` = p.`id_product`)'.
|
||||||
AND i.`cover` = 1)
|
Shop::addSqlAssociation('image', 'i', false, 'image_shop.cover=1').'
|
||||||
LEFT JOIN `'._DB_PREFIX_.'image_lang` il
|
LEFT JOIN `'._DB_PREFIX_.'image_lang` il
|
||||||
ON (i.`id_image` = il.`id_image`
|
ON (image_shop.`id_image` = il.`id_image`
|
||||||
AND il.`id_lang` = '.(int)$id_lang.')
|
AND il.`id_lang` = '.(int)$id_lang.')
|
||||||
LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr
|
LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr
|
||||||
ON (product_shop.`id_tax_rules_group` = tr.`id_tax_rules_group`
|
ON (product_shop.`id_tax_rules_group` = tr.`id_tax_rules_group`
|
||||||
@@ -650,6 +650,7 @@ class CategoryCore extends ObjectModel
|
|||||||
WHERE product_shop.`id_shop` = '.(int)$context->shop->id.'
|
WHERE product_shop.`id_shop` = '.(int)$context->shop->id.'
|
||||||
AND ((product_attribute_shop.id_product_attribute IS NOT NULL OR pa.id_product_attribute IS NULL)
|
AND ((product_attribute_shop.id_product_attribute IS NOT NULL OR pa.id_product_attribute IS NULL)
|
||||||
OR (product_attribute_shop.id_product_attribute IS NULL AND pa.default_on=1))
|
OR (product_attribute_shop.id_product_attribute IS NULL AND pa.default_on=1))
|
||||||
|
AND ((image_shop.id_image IS NOT NULL OR i.id_image IS NULL) OR (image_shop.id_image IS NULL AND i.cover=1))
|
||||||
AND cp.`id_category` = '.(int)$this->id
|
AND cp.`id_category` = '.(int)$this->id
|
||||||
.($active ? ' AND product_shop.`active` = 1' : '')
|
.($active ? ' AND product_shop.`active` = 1' : '')
|
||||||
.($front ? ' AND product_shop.`visibility` IN ("both", "catalog")' : '')
|
.($front ? ' AND product_shop.`visibility` IN ("both", "catalog")' : '')
|
||||||
|
|||||||
@@ -323,7 +323,7 @@ class ManufacturerCore extends ObjectModel
|
|||||||
$alias = 'p.';
|
$alias = 'p.';
|
||||||
$sql = 'SELECT p.*, product_shop.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, pa.`id_product_attribute`,
|
$sql = 'SELECT p.*, product_shop.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, pa.`id_product_attribute`,
|
||||||
pl.`description`, pl.`description_short`, pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`,
|
pl.`description`, pl.`description_short`, pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`,
|
||||||
pl.`meta_title`, pl.`name`, i.`id_image`, il.`legend`, m.`name` AS manufacturer_name, tl.`name` AS tax_name, t.`rate`,
|
pl.`meta_title`, pl.`name`, image_shop.`id_image`, il.`legend`, m.`name` AS manufacturer_name, tl.`name` AS tax_name, t.`rate`,
|
||||||
DATEDIFF(
|
DATEDIFF(
|
||||||
product_shop.`date_add`,
|
product_shop.`date_add`,
|
||||||
DATE_SUB(
|
DATE_SUB(
|
||||||
@@ -340,7 +340,8 @@ class ManufacturerCore extends ObjectModel
|
|||||||
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl
|
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl
|
||||||
ON (p.`id_product` = pl.`id_product` AND pl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('pl').')
|
ON (p.`id_product` = pl.`id_product` AND pl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('pl').')
|
||||||
LEFT JOIN `'._DB_PREFIX_.'image` i
|
LEFT JOIN `'._DB_PREFIX_.'image` i
|
||||||
ON (i.`id_product` = p.`id_product` AND i.`cover` = 1)
|
ON (i.`id_product` = p.`id_product`)'.
|
||||||
|
Shop::addSqlAssociation('image', 'i', false, 'image_shop.cover=1').'
|
||||||
LEFT JOIN `'._DB_PREFIX_.'image_lang` il
|
LEFT JOIN `'._DB_PREFIX_.'image_lang` il
|
||||||
ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
|
ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
|
||||||
LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr
|
LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr
|
||||||
@@ -367,6 +368,7 @@ class ManufacturerCore extends ObjectModel
|
|||||||
($active_category ? ' INNER JOIN `'._DB_PREFIX_.'category` ca ON cp.`id_category` = ca.`id_category` AND ca.`active` = 1' : '').'
|
($active_category ? ' INNER JOIN `'._DB_PREFIX_.'category` ca ON cp.`id_category` = ca.`id_category` AND ca.`active` = 1' : '').'
|
||||||
WHERE cg.`id_group` '.$sql_groups.'
|
WHERE cg.`id_group` '.$sql_groups.'
|
||||||
)
|
)
|
||||||
|
AND ((image_shop.id_image IS NOT NULL OR i.id_image IS NULL) OR (image_shop.id_image IS NULL AND i.cover=1))
|
||||||
ORDER BY '.$alias.pSQL($order_by).' '.pSQL($order_way).'
|
ORDER BY '.$alias.pSQL($order_by).' '.pSQL($order_way).'
|
||||||
LIMIT '.(((int)$p - 1) * (int)$n).','.(int)$n;
|
LIMIT '.(((int)$p - 1) * (int)$n).','.(int)$n;
|
||||||
|
|
||||||
|
|||||||
+29
-18
@@ -1067,7 +1067,7 @@ class ProductCore extends ObjectModel
|
|||||||
{
|
{
|
||||||
$attributes_list = array();
|
$attributes_list = array();
|
||||||
$res = true;
|
$res = true;
|
||||||
|
$default_on = 1;
|
||||||
foreach ($combinations as $key => $combination)
|
foreach ($combinations as $key => $combination)
|
||||||
{
|
{
|
||||||
$id_combination = (int)$this->productAttributeExists($attributes[$key], false, null, true, true);
|
$id_combination = (int)$this->productAttributeExists($attributes[$key], false, null, true, true);
|
||||||
@@ -1079,6 +1079,9 @@ class ProductCore extends ObjectModel
|
|||||||
$obj->available_date = '0000-00-00';
|
$obj->available_date = '0000-00-00';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$obj->default_on = $default_on;
|
||||||
|
$default_on = 0;
|
||||||
|
|
||||||
foreach ($combination as $field => $value)
|
foreach ($combination as $field => $value)
|
||||||
$obj->$field = $value;
|
$obj->$field = $value;
|
||||||
|
|
||||||
@@ -1884,7 +1887,7 @@ class ProductCore extends ObjectModel
|
|||||||
$sql = new DbQuery();
|
$sql = new DbQuery();
|
||||||
$sql->select(
|
$sql->select(
|
||||||
'p.*, product_shop.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, pl.`description`, pl.`description_short`, pl.`link_rewrite`, pl.`meta_description`,
|
'p.*, product_shop.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, pl.`description`, pl.`description_short`, pl.`link_rewrite`, pl.`meta_description`,
|
||||||
pl.`meta_keywords`, pl.`meta_title`, pl.`name`, i.`id_image`, il.`legend`, t.`rate`, m.`name` AS manufacturer_name,
|
pl.`meta_keywords`, pl.`meta_title`, pl.`name`, image_shop.`id_image`, il.`legend`, t.`rate`, m.`name` AS manufacturer_name,
|
||||||
DATEDIFF(
|
DATEDIFF(
|
||||||
product_shop.`date_add`,
|
product_shop.`date_add`,
|
||||||
DATE_SUB(
|
DATE_SUB(
|
||||||
@@ -1901,7 +1904,8 @@ class ProductCore extends ObjectModel
|
|||||||
p.`id_product` = pl.`id_product`
|
p.`id_product` = pl.`id_product`
|
||||||
AND pl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('pl')
|
AND pl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('pl')
|
||||||
);
|
);
|
||||||
$sql->leftJoin('image', 'i', 'i.`id_product` = p.`id_product` AND i.`cover` = 1');
|
$sql->leftJoin('image', 'i', 'i.`id_product` = p.`id_product`');
|
||||||
|
$sql->join(Shop::addSqlAssociation('image', 'i', false, 'image_shop.cover=1'));
|
||||||
$sql->leftJoin('image_lang', 'il', 'i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang);
|
$sql->leftJoin('image_lang', 'il', 'i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang);
|
||||||
$sql->leftJoin('tax_rule', 'tr', '
|
$sql->leftJoin('tax_rule', 'tr', '
|
||||||
product_shop.`id_tax_rules_group` = tr.`id_tax_rules_group`
|
product_shop.`id_tax_rules_group` = tr.`id_tax_rules_group`
|
||||||
@@ -1912,6 +1916,7 @@ class ProductCore extends ObjectModel
|
|||||||
$sql->leftJoin('manufacturer', 'm', 'm.`id_manufacturer` = p.`id_manufacturer`');
|
$sql->leftJoin('manufacturer', 'm', 'm.`id_manufacturer` = p.`id_manufacturer`');
|
||||||
|
|
||||||
$sql->where('product_shop.`active` = 1');
|
$sql->where('product_shop.`active` = 1');
|
||||||
|
$sql->where('(image_shop.id_image IS NOT NULL OR i.id_image IS NULL) OR (image_shop.id_image IS NULL AND i.cover=1)');
|
||||||
if ($front)
|
if ($front)
|
||||||
$sql->where('product_shop.`visibility` IN ("both", "catalog")');
|
$sql->where('product_shop.`visibility` IN ("both", "catalog")');
|
||||||
$sql->where('
|
$sql->where('
|
||||||
@@ -2032,14 +2037,15 @@ class ProductCore extends ObjectModel
|
|||||||
|
|
||||||
$sql = 'SELECT p.*, product_shop.*, stock.`out_of_stock` out_of_stock, pl.`description`, pl.`description_short`,
|
$sql = 'SELECT p.*, product_shop.*, stock.`out_of_stock` out_of_stock, pl.`description`, pl.`description_short`,
|
||||||
pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`, pl.`name`,
|
pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`, pl.`name`,
|
||||||
p.`ean13`, p.`upc`, i.`id_image`, il.`legend`, t.`rate`
|
p.`ean13`, p.`upc`, image_shop.`id_image`, il.`legend`, t.`rate`
|
||||||
FROM `'._DB_PREFIX_.'product` p
|
FROM `'._DB_PREFIX_.'product` p
|
||||||
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (
|
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (
|
||||||
p.`id_product` = pl.`id_product`
|
p.`id_product` = pl.`id_product`
|
||||||
AND pl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('pl').'
|
AND pl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('pl').'
|
||||||
)
|
)
|
||||||
'.Shop::addSqlAssociation('product', 'p').'
|
'.Shop::addSqlAssociation('product', 'p').'
|
||||||
LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product` AND i.`cover` = 1)
|
LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product`)'.
|
||||||
|
Shop::addSqlAssociation('image', 'i', false, 'image_shop.cover=1').'
|
||||||
LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
|
LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
|
||||||
LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (product_shop.`id_tax_rules_group` = tr.`id_tax_rules_group`
|
LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (product_shop.`id_tax_rules_group` = tr.`id_tax_rules_group`
|
||||||
AND tr.`id_country` = '.(int)Context::getContext()->country->id.'
|
AND tr.`id_country` = '.(int)Context::getContext()->country->id.'
|
||||||
@@ -2047,6 +2053,7 @@ class ProductCore extends ObjectModel
|
|||||||
LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = tr.`id_tax`)
|
LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = tr.`id_tax`)
|
||||||
'.Product::sqlStock('p', 0).'
|
'.Product::sqlStock('p', 0).'
|
||||||
WHERE p.id_product = '.(int)$id_product.'
|
WHERE p.id_product = '.(int)$id_product.'
|
||||||
|
AND ((image_shop.id_image IS NOT NULL OR i.id_image IS NULL) OR (image_shop.id_image IS NULL AND i.cover=1))
|
||||||
'.($front ? ' AND product_shop.`visibility` IN ("both", "catalog")' : '');
|
'.($front ? ' AND product_shop.`visibility` IN ("both", "catalog")' : '');
|
||||||
$row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql);
|
$row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql);
|
||||||
if ($result['id_product_attribute'])
|
if ($result['id_product_attribute'])
|
||||||
@@ -2125,7 +2132,7 @@ class ProductCore extends ObjectModel
|
|||||||
}
|
}
|
||||||
$sql = 'SELECT p.*, product_shop.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, pl.`description`, pl.`description_short`,
|
$sql = 'SELECT p.*, product_shop.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity, pl.`description`, pl.`description_short`,
|
||||||
pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`,
|
pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`,
|
||||||
pl.`name`, i.`id_image`, il.`legend`, t.`rate`, m.`name` AS manufacturer_name,
|
pl.`name`, image_shop.`id_image`, il.`legend`, t.`rate`, m.`name` AS manufacturer_name,
|
||||||
DATEDIFF(
|
DATEDIFF(
|
||||||
p.`date_add`,
|
p.`date_add`,
|
||||||
DATE_SUB(
|
DATE_SUB(
|
||||||
@@ -2140,7 +2147,8 @@ class ProductCore extends ObjectModel
|
|||||||
p.`id_product` = pl.`id_product`
|
p.`id_product` = pl.`id_product`
|
||||||
AND pl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('pl').'
|
AND pl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('pl').'
|
||||||
)
|
)
|
||||||
LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product` AND i.`cover` = 1)
|
LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product`)'.
|
||||||
|
Shop::addSqlAssociation('image', 'i', false, 'image_shop.cover=1').'
|
||||||
LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
|
LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
|
||||||
LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (product_shop.`id_tax_rules_group` = tr.`id_tax_rules_group`
|
LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (product_shop.`id_tax_rules_group` = tr.`id_tax_rules_group`
|
||||||
AND tr.`id_country` = '.(int)Context::getContext()->country->id.'
|
AND tr.`id_country` = '.(int)Context::getContext()->country->id.'
|
||||||
@@ -2149,6 +2157,7 @@ class ProductCore extends ObjectModel
|
|||||||
LEFT JOIN `'._DB_PREFIX_.'manufacturer` m ON (m.`id_manufacturer` = p.`id_manufacturer`)
|
LEFT JOIN `'._DB_PREFIX_.'manufacturer` m ON (m.`id_manufacturer` = p.`id_manufacturer`)
|
||||||
WHERE product_shop.`active` = 1
|
WHERE product_shop.`active` = 1
|
||||||
AND product_shop.`show_price` = 1
|
AND product_shop.`show_price` = 1
|
||||||
|
AND ((image_shop.id_image IS NOT NULL OR i.id_image IS NULL) OR (image_shop.id_image IS NULL AND i.cover=1))
|
||||||
'.($front ? ' AND p.`visibility` IN ("both", "catalog")' : '').'
|
'.($front ? ' AND p.`visibility` IN ("both", "catalog")' : '').'
|
||||||
'.((!$beginning && !$ending) ? ' AND p.`id_product` IN ('.((is_array($tab_id_product) && count($tab_id_product)) ? implode(', ', $tab_id_product) : 0).')' : '').'
|
'.((!$beginning && !$ending) ? ' AND p.`id_product` IN ('.((is_array($tab_id_product) && count($tab_id_product)) ? implode(', ', $tab_id_product) : 0).')' : '').'
|
||||||
AND p.`id_product` IN (
|
AND p.`id_product` IN (
|
||||||
@@ -2273,7 +2282,7 @@ class ProductCore extends ObjectModel
|
|||||||
if (!$context)
|
if (!$context)
|
||||||
$context = Context::getContext();
|
$context = Context::getContext();
|
||||||
|
|
||||||
$sql = 'SELECT i.`cover`, i.`id_image`, il.`legend`, i.`position`
|
$sql = 'SELECT image_shop.`cover`, i.`id_image`, il.`legend`, i.`position`
|
||||||
FROM `'._DB_PREFIX_.'image` i
|
FROM `'._DB_PREFIX_.'image` i
|
||||||
'.Shop::addSqlAssociation('image', 'i').'
|
'.Shop::addSqlAssociation('image', 'i').'
|
||||||
LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
|
LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
|
||||||
@@ -2292,11 +2301,11 @@ class ProductCore extends ObjectModel
|
|||||||
if (!$context)
|
if (!$context)
|
||||||
$context = Context::getContext();
|
$context = Context::getContext();
|
||||||
|
|
||||||
$sql = 'SELECT i.`id_image`
|
$sql = 'SELECT image_shop.`id_image`
|
||||||
FROM `'._DB_PREFIX_.'image` i
|
FROM `'._DB_PREFIX_.'image` i
|
||||||
'.Shop::addSqlAssociation('image', 'i').'
|
'.Shop::addSqlAssociation('image', 'i').'
|
||||||
WHERE i.`id_product` = '.(int)$id_product.'
|
WHERE i.`id_product` = '.(int)$id_product.'
|
||||||
AND i.`cover` = 1';
|
AND image_shop.`cover` = 1';
|
||||||
return Db::getInstance()->getRow($sql);
|
return Db::getInstance()->getRow($sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2998,7 +3007,8 @@ class ProductCore extends ObjectModel
|
|||||||
product_shop.`id_category_default` = cl.`id_category`
|
product_shop.`id_category_default` = cl.`id_category`
|
||||||
AND cl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('cl').'
|
AND cl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('cl').'
|
||||||
)
|
)
|
||||||
LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product` AND i.`cover` = 1)
|
LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product`)'.
|
||||||
|
Shop::addSqlAssociation('image', 'i', false, 'image_shop.cover=1').'
|
||||||
LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
|
LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.')
|
||||||
LEFT JOIN `'._DB_PREFIX_.'manufacturer` m ON (p.`id_manufacturer`= m.`id_manufacturer`)
|
LEFT JOIN `'._DB_PREFIX_.'manufacturer` m ON (p.`id_manufacturer`= m.`id_manufacturer`)
|
||||||
LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (product_shop.`id_tax_rules_group` = tr.`id_tax_rules_group`
|
LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (product_shop.`id_tax_rules_group` = tr.`id_tax_rules_group`
|
||||||
@@ -3006,7 +3016,8 @@ class ProductCore extends ObjectModel
|
|||||||
AND tr.`id_state` = 0)
|
AND tr.`id_state` = 0)
|
||||||
LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = tr.`id_tax`)
|
LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = tr.`id_tax`)
|
||||||
'.Product::sqlStock('p', 0).'
|
'.Product::sqlStock('p', 0).'
|
||||||
WHERE `id_product_1` = '.(int)$this->id.
|
WHERE `id_product_1` = '.(int)$this->id.'
|
||||||
|
AND ((image_shop.id_image IS NOT NULL OR i.id_image IS NULL) OR (image_shop.id_image IS NULL AND i.cover=1))'.
|
||||||
($active ? ' AND product_shop.`active` = 1' : '');
|
($active ? ' AND product_shop.`active` = 1' : '');
|
||||||
if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql))
|
if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql))
|
||||||
return false;
|
return false;
|
||||||
@@ -4420,12 +4431,12 @@ class ProductCore extends ObjectModel
|
|||||||
*/
|
*/
|
||||||
public function setCoverWs($id_image)
|
public function setCoverWs($id_image)
|
||||||
{
|
{
|
||||||
Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'image`
|
Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'image_shop` image_shop, image i
|
||||||
SET `cover` = 0 WHERE `id_product` = '.(int)$this->id.'
|
SET image_shop.`cover` = 0
|
||||||
');
|
WHERE i.`id_product` = '.(int)$this->id.' AND i.id_image = image_shop.id_image
|
||||||
Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'image`
|
AND image_shop.id_shop='.(int)Context::getContext()->shop->id);
|
||||||
SET `cover` = 1 WHERE `id_product` = '.(int)$this->id.' AND `id_image` = '.(int)$id_image
|
Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'image_shop`
|
||||||
);
|
SET `cover` = 1 WHERE `id_image` = '.(int)$id_image);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user