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

[-] Core: Store partial value in OrderCartRules #PSCFV-6566

Browse Source
This commit is contained in:
Rémi Gaillard
2013-01-21 17:33:35 +01:00
parent 1915ea63a7
commit a70e92dced
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/PaymentModule.php
+5 -2
View File
@@ -414,8 +414,6 @@ abstract class PaymentModuleCore extends Module
if (!$values['tax_excl']) if (!$values['tax_excl'])
continue; continue;
$order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $values);
/* IF /* IF
** - This is not multi-shipping ** - This is not multi-shipping
** - The value of the voucher is greater than the total of the order ** - The value of the voucher is greater than the total of the order
@@ -466,8 +464,13 @@ abstract class PaymentModuleCore extends Module
null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop null, null, null, null, _PS_MAIL_DIR_, false, (int)$order->id_shop
); );
} }
$values['tax_incl'] -= $values['tax_incl'] - $order->total_products_wt;
$values['tax_excl'] -= $values['tax_excl'] - $order->total_products;
} }
$order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $values);
if ($id_order_state != Configuration::get('PS_OS_ERROR') && $id_order_state != Configuration::get('PS_OS_CANCELED') && !in_array($cart_rule['obj']->id, $cart_rule_used)) if ($id_order_state != Configuration::get('PS_OS_ERROR') && $id_order_state != Configuration::get('PS_OS_CANCELED') && !in_array($cart_rule['obj']->id, $cart_rule_used))
{ {
$cart_rule_used[] = $cart_rule['obj']->id; $cart_rule_used[] = $cart_rule['obj']->id;