// Clean product and carrier tax rules group on update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14057 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
+5
-4
@@ -931,14 +931,15 @@ class CarrierCore extends ObjectModel
|
|||||||
{
|
{
|
||||||
if (!$context)
|
if (!$context)
|
||||||
$context = Context::getContext();
|
$context = Context::getContext();
|
||||||
if (!Cache::isStored((int)$id_carrier.'_'.(int)$context->shop->id))
|
$key = 'carrier_id_tax_rules_group_'.(int)$id_carrier.'_'.(int)$context->shop->id;
|
||||||
Cache::store((int)$id_carrier.'_'.(int)$context->shop->id,
|
if (!Cache::isStored($key))
|
||||||
|
Cache::store($key,
|
||||||
Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
|
Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
|
||||||
SELECT `id_tax_rules_group`
|
SELECT `id_tax_rules_group`
|
||||||
FROM `'._DB_PREFIX_.'carrier_tax_rules_group_shop`
|
FROM `'._DB_PREFIX_.'carrier_tax_rules_group_shop`
|
||||||
WHERE `id_carrier` = '.(int)$id_carrier.' AND id_shop='.(int)Context::getContext()->shop->id));
|
WHERE `id_carrier` = '.(int)$id_carrier.' AND id_shop='.(int)Context::getContext()->shop->id));
|
||||||
|
|
||||||
return Cache::retrieve((int)$id_carrier.'_'.(int)$context->shop->id);
|
return Cache::retrieve($key);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function deleteTaxRulesGroup(array $shops = null)
|
public function deleteTaxRulesGroup(array $shops = null)
|
||||||
@@ -971,7 +972,7 @@ class CarrierCore extends ObjectModel
|
|||||||
'id_tax_rules_group' => (int)$id_tax_rules_group,
|
'id_tax_rules_group' => (int)$id_tax_rules_group,
|
||||||
'id_shop' => (int)$id_shop,
|
'id_shop' => (int)$id_shop,
|
||||||
);
|
);
|
||||||
|
Cache::clean('carrier_id_tax_rules_group_'.(int)$this->id.'_'.(int)Context::getContext()->shop->id);
|
||||||
return Db::getInstance()->insert('carrier_tax_rules_group_shop', $values);
|
return Db::getInstance()->insert('carrier_tax_rules_group_shop', $values);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+6
-4
@@ -4125,7 +4125,7 @@ class ProductCore extends ObjectModel
|
|||||||
'id_tax_rules_group' => (int)$id_tax_rules_group,
|
'id_tax_rules_group' => (int)$id_tax_rules_group,
|
||||||
'id_shop' => (int)$id_shop,
|
'id_shop' => (int)$id_shop,
|
||||||
);
|
);
|
||||||
|
Cache::clean('product_id_tax_rules_group_'.(int)$this->id.'_'.(int)Context::getContext()->shop->id);
|
||||||
return Db::getInstance()->insert('product_tax_rules_group_shop', $values);
|
return Db::getInstance()->insert('product_tax_rules_group_shop', $values);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4138,14 +4138,16 @@ class ProductCore extends ObjectModel
|
|||||||
{
|
{
|
||||||
if (!$context)
|
if (!$context)
|
||||||
$context = Context::getContext();
|
$context = Context::getContext();
|
||||||
if (!Cache::isStored((int)$id_product.'_'.(int)$context->shop->id))
|
|
||||||
Cache::store((int)$id_product.'_'.(int)$context->shop->id,
|
$key = 'product_id_tax_rules_group_'.(int)$id_product.'_'.(int)$context->shop->id;
|
||||||
|
if (!Cache::isStored($key))
|
||||||
|
Cache::store($key,
|
||||||
Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
|
Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
|
||||||
SELECT `id_tax_rules_group`
|
SELECT `id_tax_rules_group`
|
||||||
FROM `'._DB_PREFIX_.'product_tax_rules_group_shop`
|
FROM `'._DB_PREFIX_.'product_tax_rules_group_shop`
|
||||||
WHERE `id_product` = '.(int)$id_product.' AND id_shop='.(int)Context::getContext()->shop->id));
|
WHERE `id_product` = '.(int)$id_product.' AND id_shop='.(int)Context::getContext()->shop->id));
|
||||||
|
|
||||||
return Cache::retrieve((int)$id_product.'_'.(int)$context->shop->id);
|
return Cache::retrieve($key);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user