// Merge -> revision 8199

This commit is contained in:
rMalie
2011-08-26 07:59:29 +00:00
parent 0adb0a7814
commit 35055a3a70
20 changed files with 358 additions and 316 deletions
+5 -3
View File
@@ -85,8 +85,8 @@ class CompareProductCore extends ObjectModel
public static function addGuestCompareProduct($id_guest, $id_product)
{
return Db::getInstance()->Execute('
INSERT INTO `'._DB_PREFIX_.'compare_product` (`id_product`, `id_guest`, `date_add`, `date_upd`)
VALUES ('.(int)($id_product).', '.(int)($id_guest).', NOW(), NOW())
INSERT INTO `'._DB_PREFIX_.'compare_product` (`id_product`, `id_guest`, `id_customer`, `date_add`, `date_upd`)
VALUES ('.(int)($id_product).', '.(int)($id_guest).', 0, NOW(), NOW())
');
}
@@ -145,7 +145,9 @@ class CompareProductCore extends ObjectModel
*/
public static function addCustomerCompareProduct($id_customer, $id_product)
{
return Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'compare_product` (`id_product`, `id_customer`, `date_add`, `date_upd`) VALUES ('.(int)($id_product).', '.(int)($id_customer).', NOW(), NOW())');
return Db::getInstance()->Execute('
INSERT INTO `'._DB_PREFIX_.'compare_product` (`id_product`, `id_guest`, `id_customer`, `date_add`, `date_upd`)
VALUES ('.(int)($id_product).', 0, '.(int)($id_customer).', NOW(), NOW())');
}
+6 -6
View File
@@ -146,7 +146,7 @@ class GroupReductionCore extends ObjectModel
WHERE `id_group` = '.(int)($id_group).' AND `id_category` = '.(int)($id_category));
}
public function getGroupByCategoryId($id_category)
public static function getGroupByCategoryId($id_category)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT gr.`id_group` as id_group, gr.`reduction` as reduction
@@ -155,7 +155,7 @@ class GroupReductionCore extends ObjectModel
, false);
}
public function getGroupReductionByCategoryId($id_category)
public static function getGroupReductionByCategoryId($id_category)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT gr.`id_group_reduction` as id_group_reduction
@@ -164,7 +164,7 @@ class GroupReductionCore extends ObjectModel
, false);
}
public function setProductReduction($id_product, $id_group, $id_category, $reduction)
public static function setProductReduction($id_product, $id_group, $id_category, $reduction)
{
$row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT pgr.`id_product`, pgr.`id_group`, pgr.`reduction`
@@ -183,7 +183,7 @@ class GroupReductionCore extends ObjectModel
return (Db::getInstance()->Execute($query));
}
public function deleteProductReduction($id_product)
public static function deleteProductReduction($id_product)
{
$query = 'DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache` WHERE `id_product` = '.(int)($id_product);
if (Db::getInstance()->Execute($query) === false)
@@ -191,7 +191,7 @@ class GroupReductionCore extends ObjectModel
return true;
}
public function duplicateReduction($id_product_old, $id_product)
public static function duplicateReduction($id_product_old, $id_product)
{
$row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT pgr.`id_product`, pgr.`id_group`, pgr.`reduction`
@@ -206,7 +206,7 @@ class GroupReductionCore extends ObjectModel
return (Db::getInstance()->Execute($query));
}
public function deleteCategory($id_category)
public static function deleteCategory($id_category)
{
$query = 'DELETE FROM `'._DB_PREFIX_.'group_reduction` WHERE `id_category` = '.(int)($id_category);
if (Db::getInstance()->Execute($query) === false)