From b31d592e4a2801dd46d8aad8e89a4fc23ff11eaa Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Sun, 16 Jun 2024 11:50:29 +0800
Subject: [PATCH] update command logic

---
 ...eBillGroupAndGroupToIncludeTransferFee.php | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/app/Console/Commands/UpdateBillGroupAndGroupToIncludeTransferFee.php b/app/Console/Commands/UpdateBillGroupAndGroupToIncludeTransferFee.php
index 3712f8a7..72a1c8f2 100644
--- a/app/Console/Commands/UpdateBillGroupAndGroupToIncludeTransferFee.php
+++ b/app/Console/Commands/UpdateBillGroupAndGroupToIncludeTransferFee.php
@@ -103,23 +103,8 @@ class UpdateBillGroupAndGroupToIncludeTransferFee extends Command
                 continue;
             }
 
-            // get the groups
-            $payments = $billGroup->groups;
-
-            $totalOriginalTransferFee = 0;
-            $totalTransferFee = 0;
-            // for each group
-            foreach ($payments as $group) {
-                $group_transfer_fee = $group->morphTransactions()->where('type', TransactionType::TRANSFER_FEE)->first();
-
-                if ($group_transfer_fee) {
-                    $totalOriginalTransferFee += $group_transfer_fee->original_amount;
-                    $totalTransferFee = $totalTransferFee + ($group_transfer_fee->original_amount / $group->currency_rate);
-                }
-            }
-
-            $totalOriginal = $billGroup->original_amount + $totalOriginalTransferFee;
-            $total = $billGroup->amount + $totalTransferFee;
+            $totalOriginal = $billGroup->groups()->sum('original_amount');
+            $total = $billGroup->groups()->sum('amount');
 
             // update bill group payment transaction amount if there is only 1 payment transaction
             $payment_transactions = $billGroup->transactions()->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();