From c255e59733f7c874feabdfe63d971508bae3528c Mon Sep 17 00:00:00 2001
From: wayanrivan <rivanwayan867@gmail.com>
Date: Tue, 6 May 2025 11:00:04 +0700
Subject: [PATCH] update filter

---
 .../approval-transaction/blocks/ListToolbar.tsx      |  8 ++++----
 .../hooks/ApprovalTransactionContext.tsx             | 12 ++++++++++++
 .../history-transaction/blocks/ListToolbar.tsx       |  8 ++++----
 .../history-transaction/hooks/TransactionContext.tsx | 12 ++++++++++++
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx b/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx
index 2bf79e0..d90d765 100644
--- a/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx
+++ b/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx
@@ -40,9 +40,9 @@ const ListToolbar = () => {
   // useEffect to set the default date values
   useEffect(() => {
     const today = new Date();
-    const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
+    // const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
     settrxDate({
-      from: formatDate(firstDayOfMonth),
+      from: formatDate(today),
       to: formatDate(today),
     });
   }, []);
@@ -136,13 +136,13 @@ const ListToolbar = () => {
               className="h-7.5"
               onClick={() => {
                 const today = new Date();
-                const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
+                // const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
 
                 // Resetting all filters
                 setSearchValue('');
                 setStatusApproval('');
                 settrxDate({
-                  from: formatDate(firstDayOfMonth),
+                  from: formatDate(today),
                   to: formatDate(today),
                 });
 
diff --git a/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx b/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
index 163055a..a015999 100644
--- a/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
+++ b/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
@@ -282,6 +282,18 @@ const ApprovalTransactionProvider = ({ children }: { children: React.ReactNode }
         formattedFilter["Transactions.code"] = { like: `%${transactioncode}%` };
       }
 
+      if (transactioncode) {
+        formattedFilter["Transactions.msisdn"] = {
+          like: `%${transactioncode}%`
+        };
+      }
+
+      if (transactioncode) {
+        formattedFilter["Transactions.fullname"] = {
+          like: `%${transactioncode}%`
+        };
+      }
+
       // Handle approval status filter
       formattedFilter["Transactions.status_approve"] = approvalstatus
         ? approvalstatus
diff --git a/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx b/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx
index f50e3ce..71e6e11 100644
--- a/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx
+++ b/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx
@@ -61,9 +61,9 @@ const ListToolbar = () => {
 
   useEffect(() => {
     const today = new Date();
-    const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
+    // const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
     settrxDate({
-      from: formatDate(firstDayOfMonth),
+      from: formatDate(today),
       to: formatDate(today),
     });
   }, []);
@@ -167,14 +167,14 @@ const ListToolbar = () => {
               onClick={() => {
                 // Preserve trxDate values (from, to) and reset others
                 const today = new Date();
-                const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
+                // const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
 
                 // Only reset filters excluding from and to
                 setSearchValue('');
                 // setStatusValue('');
                 setTypeValue('');
                 settrxDate({
-                  from: formatDate(firstDayOfMonth),
+                  from: formatDate(today),
                   to: formatDate(today),
                 });
 
diff --git a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
index 76f018c..6bef783 100644
--- a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
+++ b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
@@ -279,6 +279,18 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
         };
       }
 
+      if (transactioncode) {
+        formattedFilter["Transactions.msisdn"] = {
+          like: `%${transactioncode}%`
+        };
+      }
+
+      if (transactioncode) {
+        formattedFilter["Transactions.fullname"] = {
+          like: `%${transactioncode}%`
+        };
+      }
+
       // if (transactionstatus) {
       //   formattedFilter["Transactions.status"] = transactionstatus;
       // }