From fbf097eb624d4a23d260bd79fd6d13f2a136f882 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Wed, 13 Sep 2023 14:22:36 +0800
Subject: [PATCH] fix wallet transaction history and top up list bug

---
 .../FixBillplzFailedCallbackPayment.php       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/Console/Commands/FixBillplzFailedCallbackPayment.php b/app/Console/Commands/FixBillplzFailedCallbackPayment.php
index d04919e3..07361a13 100644
--- a/app/Console/Commands/FixBillplzFailedCallbackPayment.php
+++ b/app/Console/Commands/FixBillplzFailedCallbackPayment.php
@@ -75,14 +75,14 @@ class FixBillplzFailedCallbackPayment extends Command
      */
     public function handle()
     {
-        ini_set('memory_limit', '-1'); 
+        ini_set('memory_limit', '-1');
 
-        $this->outputArray = []; 
+        $this->outputArray = [];
         $start   = new Carbon();
 
         $approvalStatusArray = ApprovalStatus::APPROVAL_STATUS_ID;
 
-        $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+        $transactions = Transaction::whereIn('type', [TransactionType::PAYMENT, TransactionType::TOP_UP])->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
         $totalTransactions = count($transactions);
 
         if ($totalTransactions) {
@@ -93,7 +93,7 @@ class FixBillplzFailedCallbackPayment extends Command
         $totalAmount = 0;
         foreach ($transactions as $transaction){
             $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
-    
+
             if($response->successful()){
                 $data = $response->json();
                 if($data['paid']){
@@ -122,36 +122,36 @@ class FixBillplzFailedCallbackPayment extends Command
                         // $billPlz = $this->getBillplzBill->execute($billplzXSignatureObject->getBillPlzId());
 
                         // if(!$billPlz) throw new ResourceNotFoundException('Billplz bill not found.');
-                
+
                         // $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
 
                         $invoice = $transaction->owner;
                         $packingList = $invoice->owner;
                         $order = $packingList->owner;
-                
+
                         $status = ApprovalStatus::PENDING_VERIFICATION;
-                
+
                         if($data['state'] === 'paid') {
                             $status = ApprovalStatus::APPROVED;
                         }
-                
+
                         // if($data->state === 'due') {
                         //     $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
                         // }
-                
+
                         // $token = Auth::fromUser(User::find(1));
                         // $request->headers->set('Authorization', 'Bearer '.$token);
-                
+
                         $this->updatesTransactionStatus->execute($transaction, $status);
-                
+
                         $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
-                
+
                         if(($invoice->amount - $totalPaidAmount) < 0.01) {
                             $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-                
+
                             $packingList->status = ApprovalStatus::APPROVED;
                             $packingList->save();
-                
+
                             if(app()->environment('production')){
                                 $this->updateDoFromVTPortalProcessor->execute($packingList);
                                 $this->updateDoFromYDPortalProcessor->execute($packingList);
@@ -170,7 +170,7 @@ class FixBillplzFailedCallbackPayment extends Command
                             $this->info($counter . ' of ' . $totalTransactions . '. Order: '. $order->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . '. Status: ' . $approvalStatusArray[$transaction->status] . '. Invoice Status: ' . $invoiceStatus);
                         }
                     }
-                    
+
                 } else {
                     // $totalAmount += $transaction->amount;
                     // $this->appendToOutput($counter . ' of ' . $totalTransactions . '. Order: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount);
@@ -180,7 +180,7 @@ class FixBillplzFailedCallbackPayment extends Command
             }
             $counter++;
         }
-    
+
         $end = new Carbon();
         $elapsedTime = $start->diff($end)->format('%H:%I:%S');