dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] IN : remove warnings while upgrading

Browse Source
This commit is contained in:
gRoussac
2013-09-09 00:10:03 +02:00
parent 9c756a7fcb
commit b975a9375c
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/upgrade/php/generate_ntree.php
+3 -2
View File
@@ -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');
$categoriesArray = array();
foreach ($categories AS $category)
$categoriesArray[(int)$category['id_parent']]['subcategories'][(int)$category['id_category']] = 1;
if (is_array($categories))
foreach ($categories AS $category)
$categoriesArray[(int)$category['id_parent']]['subcategories'][(int)$category['id_category']] = 1;
$n = 1;
generate_ntree_subTree($categoriesArray, 1, $n);
}
install-dev/upgrade/php/migrate_orders.php
+3 -1
View File
@@ -122,7 +122,9 @@ function migrate_orders()
if ($sum_total_products > 0)
$average_tax_used += $sum_tax_amount / $sum_total_products;
$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;
$order['total_discounts_tax_incl'] = (float)$order['total_discounts'];
install-dev/upgrade/php/update_order_canada.php
+1
View File
@@ -57,6 +57,7 @@ function update_order_canada()
$default_price_display_method = Db::getInstance()->getValue('SELECT price_display_method
FROM `'._DB_PREFIX_.'group` WHERE id_group=1');
$values = '';
if (is_array($id_order_list))
foreach ($id_order_list as $order)
{
$amount = array();