Daniel/hotel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into gli-2943

Browse Source
This commit is contained in:
Shazar Rahman
2026-08-18 14:16:19 +05:30
committed by GitHub
parent 9c3c6b6926 a1ceb1b2a9
commit 01d17c2253
250 changed files with 4346 additions and 11606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
classes/PaymentModule.php
View File

@@ -678,8 +678,14 @@ abstract class PaymentModuleCore extends Module
$orderTotals[$order->id]['excl'] -= $used['excl'];
$cart_rules[$key]['remaining'] -= $used['excl'];
}
$order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $values, 0, $cart_rule['obj']->free_shipping);
$order->addCartRule(
$cart_rule['obj']->id,
$cart_rule['obj']->name,
array('tax_incl' => $used['incl'], 'tax_excl' => $used['excl']),
0,
$cart_rule['obj']->free_shipping
);
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;
@@ -692,7 +698,7 @@ abstract class PaymentModuleCore extends Module
$cart_rules_list[] = array(
'voucher_name' => $cart_rule['obj']->name,
'voucher_reduction' => ($values['tax_incl'] != 0.00 ? '-' : '').Tools::displayPrice($values['tax_incl'], $this->context->currency, false)
'voucher_reduction' => ($used['incl'] != 0.00 ? '-' : '').Tools::displayPrice($used['incl'], $this->context->currency, false)
);
}