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

[-] INSTALLER : Fix bug #PSCFV-8289 bad orders vouchers total after update

Browse Source
This commit is contained in:
gRoussac
2013-09-05 15:31:13 +02:00
parent 824a6b90f3
commit 6e5fb47642
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/upgrade/php/migrate_orders.php
+5 -6
View File
@@ -95,7 +95,8 @@ function migrate_orders()
$reduction_amount_tax_incl = (float)$products['reduction_amount'];
// cart::getTaxesAverageUsed equivalent
$sum_total_products += $products['total_wt'];
$sum_total_products += $products['total_price'];
$sum_tax_amount += $products['total_wt'] - $products['total_price'];
$order_details['reduction_amount_tax_incl'] = $reduction_amount_tax_incl;
@@ -119,12 +120,11 @@ function migrate_orders()
$average_tax_used = 1;
if ($sum_total_products > 0)
$average_tax_used += ($sum_tax_amount / $sum_total_products) * 0.01;
$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);
$total_discount_tax_excl = $order['total_discounts'] / $average_tax_used;
$order['total_discounts_tax_incl'] = (float)$order['total_discounts'];
$order['total_discounts_tax_excl'] = (float)$total_discount_tax_excl;
@@ -321,5 +321,4 @@ function mo_setProductPrices($row, $tax_calculation_method)
$row['total_price'] = $row['product_quantity'] * $row['product_price'];
return $row;
}
}