From 910f190075c82c4e2467abab2318e6236f1365cd Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Wed, 25 Oct 2023 18:03:31 +0800
Subject: [PATCH] fixing the unknown tab to list the transactions of is_mapped
 false and also mapped and status in rejected

---
 .../IsMappedFalseOrMappedButStatusIn.php      | 25 +++++++++++++++++++
 .../sections/TransactionsMappingComponent.vue |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php

diff --git a/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php b/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php
new file mode 100644
index 00000000..8b264ff5
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class IsMappedFalseOrMappedButStatusIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where(function($q) use ($value) {
+            $q->whereDoesntHave('owners');
+            $q->orwhereHas('owners', function($query) use ($value) {
+                $query->whereIn('status', $value);
+            });
+        });
+    }
+
+}
diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index 4604f2e5..160221bf 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -311,7 +311,7 @@ export default {
                         this.filter = {min_amount: 0, is_mapped: true, is_mapped_with_multiple: true, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [1], per_page: 100, order_by: {column: 'posting_date', DESC: true}}
                         break;
                     case 3:
-                        this.filter = {min_amount: 0, is_mapped: false, per_page: 100, order_by: {column: 'posting_date', DESC: true}}
+                        this.filter = {min_amount: 0, is_mapped_false_or_mapped_but_status_in: [4], per_page: 100, order_by: {column: 'posting_date', DESC: true}}
                         break;
                     case 4:
                         this.filter = {min_amount: 0, is_mapped: true, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [2], per_page: 100, order_by: {column: 'posting_date', DESC: true}}