Use carrier_tax_rate

This commit is contained in:
Michael RICOIS 2018-02-01 16:10:48 +01:00
parent 852fbffa98
commit 27ca6d9652

View File

@ -478,7 +478,7 @@ if ($orderNb > 0) {
$_total_products_wo_taxes_40,
$_total_taxes_40,
$_total_products_wo_taxes_export,
($address['id_country'] != 19 ? (float) $order['total_shipping'] / (strtotime($order['date_add']) >= mktime(0, 0, 0, 1, 1, 2014) ? 1.2 : 1.196) : 0.0),
($address['id_country'] != 19 ? (float) $order['total_shipping'] / ( 1 + $order['carrier_tax_rate'] / 100) : 0.0),
($address['id_country'] != 19 ? 0.0 : $order['total_shipping']),
$country,
$order['total_discounts'],
@ -852,7 +852,7 @@ if($slipNb > 0) {
$_total_products_wo_taxes_export = 0.0;
foreach($total_products_wo_taxes_export as $value) {
$_total_products_wo_taxes_export += $value;
//$_total_products_wo_taxes_export += $value;
}
$refundreason = Db::getInstance()->getValue('
@ -912,7 +912,7 @@ if($slipNb > 0) {
'-'.$_total_products_wo_taxes_40,
'-'.$_total_taxes_40,
'-'.$_total_products_wo_taxes_export,
'-'.($slip['shipping_cost'] == 1 ? ($address['id_country'] != 19 ? (float) $order['total_shipping'] / (strtotime($order['date_add']) >= mktime(0, 0, 0, 1, 1, 2014) ? 1.2 : 1.196) : 0.0) : 0.0),
'-'.($slip['shipping_cost'] == 1 ? ($address['id_country'] != 19 ? (float) $order['total_shipping'] / (1 + $order['carrier_tax_rate'] / 100) : 0.0) : 0.0),
'-'.($slip['shipping_cost'] == 1 ? ($address['id_country'] != 19 ? 0.0 : $order['total_shipping']) : 0.0),
$country,
'-0.0',