From 683109a271344980abf763a2fb4a379a71812ec1 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Fri, 25 Apr 2025 10:31:35 +0700 Subject: [PATCH 1/5] update total pagination for first load to 10 for all datatable --- src/pages/groups/ManageGroups.tsx | 2 +- src/pages/master/wallet/hooks/ManageWalletContext.tsx | 2 +- src/pages/members/kyc-delete-member/ManageKycDeletion.tsx | 2 +- .../kyc-delete-member/hooks/ManageKycDeletionContext.tsx | 2 +- src/pages/members/kyc/Kyc.tsx | 2 +- src/pages/members/manage-members/ManageMembers.tsx | 2 +- src/pages/menu/manage-menu/hooks/ManageMenusContext.tsx | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/groups/ManageGroups.tsx b/src/pages/groups/ManageGroups.tsx index 5051f20..5b8b5b9 100644 --- a/src/pages/groups/ManageGroups.tsx +++ b/src/pages/groups/ManageGroups.tsx @@ -235,7 +235,7 @@ const ManageGroups = () => { } layout={{ card: true }} sorting={[{ id: 'wallets.created_at', desc: true }]} diff --git a/src/pages/members/kyc-delete-member/ManageKycDeletion.tsx b/src/pages/members/kyc-delete-member/ManageKycDeletion.tsx index 8a175b7..7168dac 100644 --- a/src/pages/members/kyc-delete-member/ManageKycDeletion.tsx +++ b/src/pages/members/kyc-delete-member/ManageKycDeletion.tsx @@ -22,7 +22,7 @@ const ManageKycDeletion = () => { - History Disbursement + Manage KYC Deletion
diff --git a/src/pages/members/kyc-delete-member/hooks/ManageKycDeletionContext.tsx b/src/pages/members/kyc-delete-member/hooks/ManageKycDeletionContext.tsx index e36ab10..4cd8c63 100644 --- a/src/pages/members/kyc-delete-member/hooks/ManageKycDeletionContext.tsx +++ b/src/pages/members/kyc-delete-member/hooks/ManageKycDeletionContext.tsx @@ -126,7 +126,7 @@ const ManageKycDeletionContextProvider = ({ children }: { children: React.ReactN order_direction: 'DESC', filter: JSON.stringify(formattedFilter) }); - + setManageKyc(response?.data.list); return { data: response?.data.list, totalCount: response?.data.total_count }; } catch (error) { diff --git a/src/pages/members/kyc/Kyc.tsx b/src/pages/members/kyc/Kyc.tsx index 1473bab..6ee593f 100644 --- a/src/pages/members/kyc/Kyc.tsx +++ b/src/pages/members/kyc/Kyc.tsx @@ -259,7 +259,7 @@ const Kyc = () => { } layout={{ card: true }} sorting={[{ id: 'created_at', desc: true }]} diff --git a/src/pages/members/manage-members/ManageMembers.tsx b/src/pages/members/manage-members/ManageMembers.tsx index efe2788..5c20861 100644 --- a/src/pages/members/manage-members/ManageMembers.tsx +++ b/src/pages/members/manage-members/ManageMembers.tsx @@ -265,7 +265,7 @@ const ManageMembers = () => { )} } layout={{ card: true }} sorting={[{ id: 'created_at', desc: true }]} From 3d584b56dba9f2ae0eac0b88533402773db1736b Mon Sep 17 00:00:00 2001 From: Wikzyy Date: Fri, 25 Apr 2025 10:37:28 +0700 Subject: [PATCH 2/5] remove console log save log activity --- src/actions/GlobalActions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/actions/GlobalActions.ts b/src/actions/GlobalActions.ts index 5292e5c..fa86739 100644 --- a/src/actions/GlobalActions.ts +++ b/src/actions/GlobalActions.ts @@ -46,7 +46,7 @@ export async function doSaveLogActivity(payload: SaveLogsParams): Promise', dtParams); + // console.log('Success Create logs with params =>', dtParams); return { status: true, message: 'Success logs users' }; } catch (error: any) { From 97996a99dc75481101f7e134508b9b4527488fe0 Mon Sep 17 00:00:00 2001 From: bagusajisaputroo Date: Fri, 25 Apr 2025 10:42:34 +0700 Subject: [PATCH 3/5] fixing feedback member --- src/pages/members/feedback-member/blocks/EditDialog.tsx | 2 +- .../feedback-member/hooks/ManageFeedbackMemberContext.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/members/feedback-member/blocks/EditDialog.tsx b/src/pages/members/feedback-member/blocks/EditDialog.tsx index 53a0715..b12a0c0 100644 --- a/src/pages/members/feedback-member/blocks/EditDialog.tsx +++ b/src/pages/members/feedback-member/blocks/EditDialog.tsx @@ -97,7 +97,7 @@ const EditDialog = () => { } const data = response.data; - console.log('Fetched data:', data); + // console.log('Fetched data:', data); setReviewNotes(data.review_notes || ''); diff --git a/src/pages/members/feedback-member/hooks/ManageFeedbackMemberContext.tsx b/src/pages/members/feedback-member/hooks/ManageFeedbackMemberContext.tsx index 8b93158..04bc9c2 100644 --- a/src/pages/members/feedback-member/hooks/ManageFeedbackMemberContext.tsx +++ b/src/pages/members/feedback-member/hooks/ManageFeedbackMemberContext.tsx @@ -92,7 +92,7 @@ const ManageFeedbackMemberProvider = ({ children }: { children: React.ReactNode const columns = useMemo[]>( () => [ { - accessorFn: (row) => row.customerid, + accessorFn: (row) => row.fullname, id: 'customer_id', header: ({ column }) => , enableSorting: false, From daae143823b7399ce3a73f8b691170476b5b78e5 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Fri, 25 Apr 2025 11:34:21 +0700 Subject: [PATCH 4/5] update add new kind N --- src/pages/dashboards/home/DashboardHomePage.tsx | 12 ++++++------ .../dashboards/home/blocks/TransactionPieChart.tsx | 1 + .../dashboards/home/blocks/TransactionValue.tsx | 3 +++ .../history-transaction/blocks/ListToolbar.tsx | 1 + .../history-transaction/hooks/TransactionContext.tsx | 1 + 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/pages/dashboards/home/DashboardHomePage.tsx b/src/pages/dashboards/home/DashboardHomePage.tsx index c591184..31faf32 100644 --- a/src/pages/dashboards/home/DashboardHomePage.tsx +++ b/src/pages/dashboards/home/DashboardHomePage.tsx @@ -252,14 +252,14 @@ const DashboardHomePage = () => { { diff --git a/src/pages/dashboards/home/blocks/TransactionPieChart.tsx b/src/pages/dashboards/home/blocks/TransactionPieChart.tsx index d7b768d..580e0d3 100644 --- a/src/pages/dashboards/home/blocks/TransactionPieChart.tsx +++ b/src/pages/dashboards/home/blocks/TransactionPieChart.tsx @@ -42,6 +42,7 @@ const TransactionPieChart = ({ startdate, enddate }: Props) => { { name: 'Topup', value: parseFloat((responseTransactionValue?.data?.U ?? 0).toFixed(2)), color: '#9f7aea' }, { name: 'Purchase', value: parseFloat((responseTransactionValue?.data?.P ?? 0).toFixed(2)), color: '#baf7c5' }, { name: 'Withdraw', value: parseFloat((responseTransactionValue?.data?.W ?? 0).toFixed(2)), color: '#f56565' }, + { name: 'Top Up Partner', value: parseFloat((responseTransactionValue?.data?.N ?? 0).toFixed(2)), color: '#f7fa52' }, ]; return ( diff --git a/src/pages/dashboards/home/blocks/TransactionValue.tsx b/src/pages/dashboards/home/blocks/TransactionValue.tsx index bb6c53d..1d6a73a 100644 --- a/src/pages/dashboards/home/blocks/TransactionValue.tsx +++ b/src/pages/dashboards/home/blocks/TransactionValue.tsx @@ -61,6 +61,9 @@ const TransactionValue = ({ startdate, enddate }: Props) => { case "R": type = "Return"; break; + case "N": + type = "Top Up Partner"; + break; default: type = "Unknown"; break; diff --git a/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx b/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx index 49bdb4a..f50e3ce 100644 --- a/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx +++ b/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx @@ -144,6 +144,7 @@ const ListToolbar = () => { WITHDRAW TOP UP RETURN + TOP UP PARTNER diff --git a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx index 725cc9b..76f018c 100644 --- a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx +++ b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx @@ -70,6 +70,7 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => { case 'W': return 'WITHDRAW'; case 'U': return 'TOP UP'; case 'R': return 'RETURN'; + case 'N': return 'TOP UP PARTNER'; default: return '_'; } }, From 3802650b0cf64a7429d77497bad90f3422c2a095 Mon Sep 17 00:00:00 2001 From: Wikzyy Date: Fri, 25 Apr 2025 14:43:07 +0700 Subject: [PATCH 5/5] fix double notification transfer fee --- .../transferfee/blocks/EditDialog.tsx | 206 +++++++++--------- .../hooks/ManageTransferFeeContext.tsx | 2 +- 2 files changed, 110 insertions(+), 98 deletions(-) diff --git a/src/pages/transfer/transferfee/blocks/EditDialog.tsx b/src/pages/transfer/transferfee/blocks/EditDialog.tsx index 3d6b0ce..f80794e 100644 --- a/src/pages/transfer/transferfee/blocks/EditDialog.tsx +++ b/src/pages/transfer/transferfee/blocks/EditDialog.tsx @@ -25,7 +25,14 @@ import { useCallApi } from '@/hooks'; import { doSaveLogActivity } from '@/actions/GlobalActions'; import { getAuth } from '@/auth'; import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'; -import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from '@/components/ui/command'; +import { + Command, + CommandEmpty, + CommandGroup, + CommandInput, + CommandItem, + CommandList +} from '@/components/ui/command'; const API_URL = apiConfig.service_transaction; const API_URL_MASTER_DATA = apiConfig.service_master_data; @@ -178,9 +185,9 @@ const EditFeeDialog = () => { ); if (response?.status) { - toast.success('Successfully updated transfer fee'); reload(); handleEditFeeDialog(false, null); + toast.success('Successfully updated transfer fee'); const createActivity = { module: 'Manage Transfer Fee', description: `Edit Transfer Fee => ${formField.name}`, @@ -197,7 +204,7 @@ const EditFeeDialog = () => { setIsSubmitting(false); } }, - [formField, selectedTransferFee, PutData, reload, handleEditFeeDialog] + [formField, selectedTransferFee, handleEditFeeDialog] ); const fetchWallets = useCallback(async () => { @@ -315,7 +322,7 @@ const EditFeeDialog = () => { updated_by: parsedUser?.username, updated_at: new Date().toISOString().slice(0, 19).replace('T', ' ') }); - + if (response.data.transaction_type?.name) { setTransactionTypeName(response.data.transaction_type.name); } @@ -421,7 +428,7 @@ const EditFeeDialog = () => {
)} - + {isLoadingTransferFee ? (
@@ -458,14 +465,14 @@ const EditFeeDialog = () => {
)} - - +
- +
- +
{ placeholder="Enter Minimum Amount" />
- +
{ placeholder="Enter Maximum Amount" />
- +
- +
- +
{ placeholder="Enter Deduct Amount" />
- +
{ placeholder="Enter Deduct Percentage" />
- +
{ placeholder="Enter Fee Amount" />
- +
- +
- +
- + {formField.credit_to === 'I' && ( -
- -
-
setOpen(!open)} - > - - {customers.find(customer => customer.id === formField.credit_destination)?.username || 'Search customer...'} - - -
- - {open && ( -
-
- setCustomerSearchTerm(e.target.value)} - autoComplete="off" - onClick={(e) => e.stopPropagation()} - autoFocus - /> -
-
- {customers - .filter(customer => - customer.username.toLowerCase().includes(customerSearchTerm.toLowerCase()) || - customer.msisdn.includes(customerSearchTerm) - ) - .map(customer => ( -
{ - setFormField({ - ...formField, - credit_destination: customer.id - }); - setOpen(false); - }} - > - {customer.username} -
- ))} - {customers.filter(customer => - customer.username.toLowerCase().includes(customerSearchTerm.toLowerCase()) || - customer.msisdn.includes(customerSearchTerm) - ).length === 0 && ( -
No customer found
- )} -
-
- )} -
-
-)} +
+ +
+
setOpen(!open)} + > + + {customers.find( + (customer) => customer.id === formField.credit_destination + )?.username || 'Search customer...'} + + +
+ {open && ( +
+
+ setCustomerSearchTerm(e.target.value)} + autoComplete="off" + onClick={(e) => e.stopPropagation()} + autoFocus + /> +
+
+ {customers + .filter( + (customer) => + customer.username + .toLowerCase() + .includes(customerSearchTerm.toLowerCase()) || + customer.msisdn.includes(customerSearchTerm) + ) + .map((customer) => ( +
{ + setFormField({ + ...formField, + credit_destination: customer.id + }); + setOpen(false); + }} + > + {customer.username} +
+ ))} + {customers.filter( + (customer) => + customer.username + .toLowerCase() + .includes(customerSearchTerm.toLowerCase()) || + customer.msisdn.includes(customerSearchTerm) + ).length === 0 && ( +
+ No customer found +
+ )} +
+
+ )} +
+
+ )} - -
- +
- +
- +
- +
-