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

[-] FO : wrong calcul of the free shipping in multi-shipping

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15548 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-05-21 17:08:16 +00:00
parent 4b4f1be743
commit fc33b24f3d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/PaymentModule.php
View File

@@ -327,7 +327,7 @@ abstract class PaymentModuleCore extends Module
$cart_rules_list = '';
foreach ($cart->getCartRules() as $cart_rule)
{
$package = array('id_address' => $order->id_address_delivery, 'products' => $order->product_list);
$package = array('id_carrier' => $order->id_carrier, 'id_address' => $order->id_address_delivery, 'products' => $order->product_list);
$values = array(
'tax_incl' => $cart_rule['obj']->getContextualValue(true, $this->context, CartRule::FILTER_ACTION_ALL, $package),
'tax_excl' => $cart_rule['obj']->getContextualValue(false, $this->context, CartRule::FILTER_ACTION_ALL, $package)