From 75e11b018cef48b261c6816479fcc09f9c529dc2 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Wed, 7 Dec 2022 15:45:37 +0530 Subject: [PATCH] update amount paid calculation --- classes/PaymentModule.php | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 48b772562..407f0ded3 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -356,11 +356,23 @@ abstract class PaymentModuleCore extends Module // advance payment information $order->is_advance_payment = $this->context->cart->is_advance_payment; if ($order->is_advance_payment) { - $order->advance_paid_amount = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT, $order->product_list, $id_carrier), _PS_PRICE_COMPUTE_PRECISION_); - $order->real_paid_amount = ($order->advance_paid_amount * $amount_paid) / (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT, null, $id_carrier)); + $order->advance_paid_amount = (float)Tools::ps_round( + (float)$this->context->cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT, $order->product_list, $id_carrier), + _PS_PRICE_COMPUTE_PRECISION_ + ); + $order->amount_paid = (float)Tools::ps_round( + (($order->advance_paid_amount * $amount_paid) / $this->context->cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT, null, $id_carrier)), + _PS_PRICE_COMPUTE_PRECISION_ + ); } else { - $order->advance_paid_amount = (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH, $order->product_list, $id_carrier), _PS_PRICE_COMPUTE_PRECISION_); - $order->real_paid_amount = ($order->advance_paid_amount * $amount_paid) / (float)Tools::ps_round((float)$this->context->cart->getOrderTotal(true, Cart::BOTH, null, $id_carrier)); + $order->advance_paid_amount = (float)Tools::ps_round( + (float)$this->context->cart->getOrderTotal(true, Cart::BOTH, $order->product_list, $id_carrier), + _PS_PRICE_COMPUTE_PRECISION_ + ); + $order->amount_paid = (float)Tools::ps_round( + (($order->advance_paid_amount * $amount_paid) / $this->context->cart->getOrderTotal(true, Cart::BOTH, null, $id_carrier)), + _PS_PRICE_COMPUTE_PRECISION_ + ); } // Creating order @@ -439,7 +451,7 @@ abstract class PaymentModuleCore extends Module } foreach($order_list as $order) { - $order->addOrderPaymentDetail($order->real_paid_amount); + $order->addOrderPaymentDetail($order->amount_paid); } }