[-] IN : remove warnings while upgrading
This commit is contained in:
1 parent
9c756a7fcb
commit
b975a9375c
3 files changed
+7
-3
No files matched your search
@@ -28,8 +28,9 @@ function generate_ntree()
|
|||||||
{
|
{
|
||||||
$categories = Db::getInstance()->executeS('SELECT id_category, id_parent FROM '._DB_PREFIX_.'category ORDER BY id_parent ASC, position ASC');
|
$categories = Db::getInstance()->executeS('SELECT id_category, id_parent FROM '._DB_PREFIX_.'category ORDER BY id_parent ASC, position ASC');
|
||||||
$categoriesArray = array();
|
$categoriesArray = array();
|
||||||
foreach ($categories AS $category)
|
if (is_array($categories))
|
||||||
$categoriesArray[(int)$category['id_parent']]['subcategories'][(int)$category['id_category']] = 1;
|
foreach ($categories AS $category)
|
||||||
|
$categoriesArray[(int)$category['id_parent']]['subcategories'][(int)$category['id_category']] = 1;
|
||||||
$n = 1;
|
$n = 1;
|
||||||
generate_ntree_subTree($categoriesArray, 1, $n);
|
generate_ntree_subTree($categoriesArray, 1, $n);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -122,7 +122,9 @@ function migrate_orders()
|
|||||||
if ($sum_total_products > 0)
|
if ($sum_total_products > 0)
|
||||||
$average_tax_used += $sum_tax_amount / $sum_total_products;
|
$average_tax_used += $sum_tax_amount / $sum_total_products;
|
||||||
$average_tax_used = round($average_tax_used, 4);
|
$average_tax_used = round($average_tax_used, 4);
|
||||||
$carrier_tax_rate = 1 + ((float)$order['carrier_tax_rate'] / 100);
|
$carrier_tax_rate = 1;
|
||||||
|
if (isset($order['carrier_tax_rate']))
|
||||||
|
$carrier_tax_rate + ((float)$order['carrier_tax_rate'] / 100);
|
||||||
|
|
||||||
$total_discount_tax_excl = $order['total_discounts'] / $average_tax_used;
|
$total_discount_tax_excl = $order['total_discounts'] / $average_tax_used;
|
||||||
$order['total_discounts_tax_incl'] = (float)$order['total_discounts'];
|
$order['total_discounts_tax_incl'] = (float)$order['total_discounts'];
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ function update_order_canada()
|
|||||||
$default_price_display_method = Db::getInstance()->getValue('SELECT price_display_method
|
$default_price_display_method = Db::getInstance()->getValue('SELECT price_display_method
|
||||||
FROM `'._DB_PREFIX_.'group` WHERE id_group=1');
|
FROM `'._DB_PREFIX_.'group` WHERE id_group=1');
|
||||||
$values = '';
|
$values = '';
|
||||||
|
if (is_array($id_order_list))
|
||||||
foreach ($id_order_list as $order)
|
foreach ($id_order_list as $order)
|
||||||
{
|
{
|
||||||
$amount = array();
|
$amount = array();
|
||||||
|
|||||||
Reference in new issue
Block a user