From f47c3c9ecc1e4cfdb81121c85759d88a8ae80431 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Thu, 26 Oct 2023 00:01:10 +0800
Subject: [PATCH] fixing the unknown tab to list the transactions of is_mapped
 false and also mapped and status in rejected

---
 .../Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php    | 4 +---
 app/Models/StatementTransaction.php                          | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php b/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php
index 8b264ff5..c0eb9e74 100644
--- a/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php
+++ b/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php
@@ -16,9 +16,7 @@ class IsMappedFalseOrMappedButStatusIn implements Filter
     {
         return $builder->where(function($q) use ($value) {
             $q->whereDoesntHave('owners');
-            $q->orwhereHas('owners', function($query) use ($value) {
-                $query->whereIn('status', $value);
-            });
+            $q->orwhereDoesntHave('owner_status');
         });
     }
 
diff --git a/app/Models/StatementTransaction.php b/app/Models/StatementTransaction.php
index eb4bcdc8..4bba7903 100644
--- a/app/Models/StatementTransaction.php
+++ b/app/Models/StatementTransaction.php
@@ -49,6 +49,11 @@ class StatementTransaction extends Model
         return $this->hasMany(StatementTransactionOwner::class);
     }
 
+    public function owner_status()
+    {
+        return $this->owners()->whereIn('status',[ApprovalStatus::APPROVED,ApprovalStatus::COMPLETED,ApprovalStatus::PENDING_VERIFICATION]);
+    }
+
     public function scopeDoesntMapStatement($query)
     {
         $query->whereDoesntHave('owners', function($query){