From 0d267991a7092a93fddb0fdb905c416440a804e1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 27 Mar 2022 11:19:07 +0800
Subject: [PATCH 1/2] filter out pending purchase order without payments

---
 app/Classes/General/Eloquent/Filters/PendingPurchaseOrder.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Classes/General/Eloquent/Filters/PendingPurchaseOrder.php b/app/Classes/General/Eloquent/Filters/PendingPurchaseOrder.php
index d3fa28f9..4097cbe0 100644
--- a/app/Classes/General/Eloquent/Filters/PendingPurchaseOrder.php
+++ b/app/Classes/General/Eloquent/Filters/PendingPurchaseOrder.php
@@ -23,6 +23,8 @@ class PendingPurchaseOrder implements Filter
             });
         })->whereDoesntHave('transactions', function($transaction){
             return $transaction->where('type', TransactionType::PURCHASE_ORDER)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+        })->whereHas('transactions', function($transaction){
+            return $transaction->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
         });
     }
 

From 38445216664119a71de62c15aae664d6868910e1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 28 Mar 2022 11:02:22 +0800
Subject: [PATCH 2/2] fix bank bug

---
 .../vue/components/banks/elements/BankAccountComponent.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/banks/elements/BankAccountComponent.vue b/resources/assets/vue/components/banks/elements/BankAccountComponent.vue
index 380080e3..0585e4aa 100644
--- a/resources/assets/vue/components/banks/elements/BankAccountComponent.vue
+++ b/resources/assets/vue/components/banks/elements/BankAccountComponent.vue
@@ -26,7 +26,7 @@
         </div>
         <div class="col">
             <div class="font-heading fs-10">{{item.holder_name}}</div>
-            <div class="font-heading fs-11 text-complete m-b-5">{{item.bank.type === 3 ? item.bank.account_no : item.bank.account_no.replace(/[^\dA-Z]/g, '').replace(/(.{4})/g, '$1 ').trim() }}</div>
+            <div class="font-heading fs-11 text-complete m-b-5">{{item.type === 3 ? item.account_no : item.account_no.replace(/[^\dA-Z]/g, '').replace(/(.{4})/g, '$1 ').trim() }}</div>
         </div>
         <div class="col-auto">
             <div class="row align-items-center">