// Normalize

This commit is contained in:
rMalie
2012-03-09 09:19:30 +00:00
parent 724c96fbde
commit 50a44277db
54 changed files with 297 additions and 320 deletions
@@ -44,7 +44,7 @@ function generate_tax_rules()
$id_tax_rules_group = Db::getInstance()->insert_id;
$countries = Db::getInstance()->ExecuteS('
$countries = Db::getInstance()->executeS('
SELECT * FROM `'._DB_PREFIX_.'country` c
LEFT JOIN `'._DB_PREFIX_.'zone` z ON (c.`id_zone` = z.`id_zone`)
LEFT JOIN `'._DB_PREFIX_.'tax_zone` tz ON (tz.`id_zone` = z.`id_zone`)
@@ -54,7 +54,7 @@ function generate_tax_rules()
{
foreach ($countries AS $country)
{
$res = Db::getInstance()->Execute('
$res = Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'tax_rule` (`id_tax_rules_group`, `id_country`, `id_state`, `state_behavior`, `id_tax`)
VALUES (
'.(int)$id_tax_rules_group.',
@@ -67,7 +67,7 @@ function generate_tax_rules()
}
}
$states = Db::getInstance()->ExecuteS('
$states = Db::getInstance()->executeS('
SELECT * FROM `'._DB_PREFIX_.'states s
LEFT JOIN `'._DB_PREFIX_.'tax_state ts ON (ts.`id_state` = s.`id_state`)
WHERE `id_tax` = '.(int)$id_tax