From 8121519a1fc2af2e89ef3fa895b187e6ba4d4d50 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Wed, 28 Aug 2024 14:41:30 +0530 Subject: [PATCH] Fixed partial cart rule creating with wrong currency --- classes/PaymentModule.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index affec5bcf..13fbaf1db 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -626,8 +626,16 @@ abstract class PaymentModuleCore extends Module $used = array('incl' => 0, 'excl' => 0); if (!isset($cart_rules[$key]['remaining'])) { - $cart_rules[$key]['remaining'] = $cart_rule['reduction_amount']; + $cart_rules[$key]['remaining'] = $cart_rule['obj']->reduction_amount; + if ((int) $cart_rule['obj']->reduction_currency !== (int) $cart->id_currency) { + $cart_rules[$key]['remaining'] = Tools::convertPriceFull( + $cart_rule['obj']->reduction_amount, + new Currency($cart_rule['obj']->reduction_currency), + new Currency($cart->id_currency) + ); + } } + if ($cart_rule['reduction_tax']) { if ($orderTotals[$order->id]['incl'] > $values['tax_incl']) { $used['incl'] = $values['tax_incl'];