From 4e12f9eb783772a8b47a35c44a5726fee2904f82 Mon Sep 17 00:00:00 2001 From: bagusajisaputroo Date: Wed, 21 May 2025 10:15:15 +0700 Subject: [PATCH] Add new value on status kind in transfer type --- .../transfertype/blocks/AddDialog.tsx | 9 ++++++++ .../transfertype/blocks/EditDialog.tsx | 11 ++++++++- .../transfertype/blocks/ListToolBar.tsx | 13 +++++++++-- .../hooks/ManageTransferTypeContext.tsx | 23 +++++++++++++------ 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/src/pages/transfer/transfertype/blocks/AddDialog.tsx b/src/pages/transfer/transfertype/blocks/AddDialog.tsx index 8977d5c..c6790ec 100644 --- a/src/pages/transfer/transfertype/blocks/AddDialog.tsx +++ b/src/pages/transfer/transfertype/blocks/AddDialog.tsx @@ -568,6 +568,15 @@ const AddDialog = () => { Top Up P24 Transfer Agent Withdraw Agent + Top Up Agent + Transfer P24 + Withdraw Merchant + Donation + Fee + Raversal + Cashback Cash + Cashback Point + Withdraw Admin {errors.status_kind && ( diff --git a/src/pages/transfer/transfertype/blocks/EditDialog.tsx b/src/pages/transfer/transfertype/blocks/EditDialog.tsx index a9c771c..8a15db6 100644 --- a/src/pages/transfer/transfertype/blocks/EditDialog.tsx +++ b/src/pages/transfer/transfertype/blocks/EditDialog.tsx @@ -766,7 +766,16 @@ const EditDialog = () => { Top Up P24 Transfer Agent Withdraw Agent - + Top Up Agent + Transfer P24 + Withdraw Merchant + Donation + Fee + Raversal + Cashback Cash + Cashback Point + Withdraw Admin + {' '} {errors.status_kind && ( {errors.status_kind} diff --git a/src/pages/transfer/transfertype/blocks/ListToolBar.tsx b/src/pages/transfer/transfertype/blocks/ListToolBar.tsx index b281c29..832c484 100644 --- a/src/pages/transfer/transfertype/blocks/ListToolBar.tsx +++ b/src/pages/transfer/transfertype/blocks/ListToolBar.tsx @@ -62,14 +62,14 @@ const ListToolbar = () => { const handleKeyDown = (event: React.KeyboardEvent) => { if (event.key === 'Enter') { - table.getColumn('name')?.setFilterValue(searchValue); +table.getColumn('name')?.setFilterValue(`%${searchValue}%`); table.setPageIndex(0); } }; useEffect(() => { const timer = setTimeout(() => { - table.getColumn('name')?.setFilterValue(searchValue); +table.getColumn('name')?.setFilterValue(`%${searchValue}%`); table.setPageIndex(0); }, 200); return () => clearTimeout(timer); @@ -210,6 +210,15 @@ const ListToolbar = () => { Top Up P24 Transfer Agent Withdraw Agent + Top Up Agent + Transfer P24 + Withdraw Merchant + Donation + Fee + Raversal + Cashback Cash + Cashback Point + Withdraw Admin diff --git a/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx b/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx index 736d83b..569156e 100644 --- a/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx +++ b/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx @@ -34,8 +34,8 @@ const formatInteger = (num: number): string => { return num.toLocaleString('en-US', { style: 'decimal', maximumFractionDigits: 0 - }) -} + }); +}; interface AccountProps { id: string; @@ -224,9 +224,9 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React TM: 'Top Up Master Agent', TA: 'Top Up Agent', PL: 'Purchase Loja', - DE: 'Disbursment Escrow', - DM: 'Disbursment Master Agent', - DA: 'Disbursment Agent', + DE: 'Disbursement Escrow', + DM: 'Disbursement Master Agent', + DA: 'Disbursement Agent', WI: 'Withdraw Merchant', IC: 'Income Merchant', DN: 'Donation' @@ -287,7 +287,16 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React L: { label: 'Purchase Loja', className: 'bg-rose-100 text-rose-600' }, B: { label: 'Top Up P24', className: 'bg-rose-100 text-rose-600' }, A: { label: 'Transfer Agent', className: 'bg-rose-100 text-rose-600' }, - M: { label: 'Withdraw Agent', className: 'bg-rose-100 text-rose-600' } + M: { label: 'Withdraw Agent', className: 'bg-rose-100 text-rose-600' }, + O: { label: 'Top Up Agent', className: 'bg-rose-100 text-rose-600' }, + S: { label: 'Transfer P24', className: 'bg-rose-100 text-rose-600' }, + I: { label: 'Withdraw Merchant', className: 'bg-rose-100 text-rose-600' }, + D: { label: 'Donation', className: 'bg-rose-100 text-rose-600' }, + F: { label: 'Fee', className: 'bg-rose-100 text-rose-600' }, + V: { label: 'Raversal', className: 'bg-rose-100 text-rose-600' }, + C: { label: 'Cashback Cash', className: 'bg-rose-100 text-rose-600' }, + H: { label: 'Cashback Point', className: 'bg-rose-100 text-rose-600' }, + J: { label: 'Withdraw Admin', className: 'bg-rose-100 text-rose-600' }, }; const kindInfo = mapping[kind] || { @@ -366,7 +375,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React let filterObject: Record = {}; if (debouncedSearchTerm) { - filterObject['any'] = debouncedSearchTerm.toLowerCase(); + filterObject['name'] = `%${debouncedSearchTerm.toLowerCase()}%`; } if (columnFilters.length > 0) {