Merge branch 'develop'

common/logic/User/CreditHistory/Service/CreditUtils.php

@@ -67,7 +67,7 @@ class CreditUtils extends AbstractService implements UtilsInterface
 
     public function payOrder(Order $order, User $userAction, bool $checkCreditLimit): void
     {
-        $amountRemaining = $this->orderSolver->getOrderAmountWithTax($order, Order::AMOUNT_REMAINING);
+        $amountRemaining = $this->orderSolver->getOrderAmountWithTax($order, Order::AMOUNT_REMAINING, true);
 
         if($checkCreditLimit) {
             $creditLimit = $this->producerRepository->getConfig('credit_limit');
@@ -93,7 +93,7 @@ class CreditUtils extends AbstractService implements UtilsInterface
 
     public function refundOrder(Order $order, User $userAction): void
     {
-        $amountPaid = $this->orderSolver->getOrderAmount($order, Order::AMOUNT_PAID);
+        $amountPaid = $this->orderSolver->getOrderAmount($order, Order::AMOUNT_PAID, true);
 
         if ($amountPaid >= 0.01 && $order->id_user) {
             $this->creditHistoryBuilder->createCreditHistory(