From deebba530ab104183776cfca24dccc4daa1b4833 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Wed, 21 May 2025 09:50:21 +0700 Subject: [PATCH] update transaction kind --- .../home/blocks/TransactionPieChart.tsx | 8 ++++++ .../home/blocks/TransactionValue.tsx | 26 ++++++++++++++++++- .../blocks/DetailTransaction.tsx | 17 ++++++++++++ .../blocks/ListToolbar.tsx | 9 +++++++ .../hooks/TransactionContext.tsx | 8 ++++++ 5 files changed, 67 insertions(+), 1 deletion(-) diff --git a/src/pages/dashboards/home/blocks/TransactionPieChart.tsx b/src/pages/dashboards/home/blocks/TransactionPieChart.tsx index d5b0aae..0d40772 100644 --- a/src/pages/dashboards/home/blocks/TransactionPieChart.tsx +++ b/src/pages/dashboards/home/blocks/TransactionPieChart.tsx @@ -48,6 +48,14 @@ const TransactionPieChart = ({ startdate, enddate }: Props) => { { name: 'Top Up P24', value: parseFloat((responseTransactionValue?.data?.B ?? 0).toFixed(2)), color: '#FADA7A' }, { name: 'Transfer Agent', value: parseFloat((responseTransactionValue?.data?.A ?? 0).toFixed(2)), color: '#B1C29E' }, { name: 'Withdrawal Agent', value: parseFloat((responseTransactionValue?.data?.M ?? 0).toFixed(2)), color: '#FCE7C8' }, + { name: 'Top Up Agent', value: parseFloat((responseTransactionValue?.data?.O ?? 0).toFixed(2)), color: '#F0A04B' }, + { name: 'Transfer P24', value: parseFloat((responseTransactionValue?.data?.S ?? 0).toFixed(2)), color: '#FADA7A' }, + { name: 'Withdraw Merchant', value: parseFloat((responseTransactionValue?.data?.I ?? 0).toFixed(2)), color: '#B1C29E' }, + { name: 'Donation', value: parseFloat((responseTransactionValue?.data?.D ?? 0).toFixed(2)), color: '#FCE7C8' }, + { name: 'Fee', value: parseFloat((responseTransactionValue?.data?.F ?? 0).toFixed(2)), color: '#F0A04B' }, + { name: 'Reversal', value: parseFloat((responseTransactionValue?.data?.V ?? 0).toFixed(2)), color: '#FADA7A' }, + { name: 'Cashback Cash', value: parseFloat((responseTransactionValue?.data?.C ?? 0).toFixed(2)), color: '#B1C29E' }, + { name: 'Cashback Point', value: parseFloat((responseTransactionValue?.data?.H ?? 0).toFixed(2)), color: '#FCE7C8' }, ]; return ( diff --git a/src/pages/dashboards/home/blocks/TransactionValue.tsx b/src/pages/dashboards/home/blocks/TransactionValue.tsx index 3892b15..97f1fc8 100644 --- a/src/pages/dashboards/home/blocks/TransactionValue.tsx +++ b/src/pages/dashboards/home/blocks/TransactionValue.tsx @@ -71,7 +71,7 @@ const TransactionValue = ({ startdate, enddate }: Props) => { type = "Purchase Loja" break; case "B": - type ="Top Up P24"; + type = "Top Up P24"; break; case "A": type = " Transfer Agent"; @@ -79,6 +79,30 @@ const TransactionValue = ({ startdate, enddate }: Props) => { case "M": type = "Withdrawal Agent"; break; + case 'O': + type = 'TOP UP AGENT'; + break; + case 'S': + type = 'TRANSFER P24'; + break; + case 'I': + type = 'WIJTDRAW MERCHANT'; + break; + case 'D': + type = 'DONATION'; + break; + case 'F': + type = 'FEE'; + break; + case 'V': + type = 'REVERSAL'; + break; + case 'C': + type = 'CASHBACK CASH'; + break; + case 'H': + type = 'CASHBACK POINT'; + break; default: type = "Unknown"; break; diff --git a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx index e9b1186..f9133d4 100644 --- a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx +++ b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx @@ -456,7 +456,24 @@ const DetailTransaction = () => { kind = 'TRANSFER AGENT'; } else if (transactionDetails?.kind === 'M') { kind = 'WITHDRAWAL AGENT'; + }else if( transactionDetails?.kind === 'O') { + kind = 'TOPUP AGENT'; + }else if (transactionDetails?.kind === 'S') { + kind = 'TOPUP P24'; + }else if (transactionDetails?.kind === 'I') { + kind = 'WITHDRAW MERCHANT'; + }else if (transactionDetails?.kind === 'D') { + kind = 'DONATION'; + }else if (transactionDetails?.kind === 'F') { + kind = 'FEE'; + }else if (transactionDetails?.kind === 'V') { + kind = 'REVERSAL'; + }else if( transactionDetails?.kind === 'C') { + kind = 'CASHBACK CASH'; + }else if( transactionDetails?.kind === 'H') { + kind = 'CASHBACK POINT'; } + return kind; })()}

diff --git a/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx b/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx index 413b7ef..696dfe6 100644 --- a/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx +++ b/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx @@ -171,6 +171,7 @@ const ListToolbar = () => { + TRANSFER PURCHASE WITHDRAW @@ -182,6 +183,14 @@ const ListToolbar = () => { TOP UP P24 TRANSFER AGENT WITHDRAWAL AGENT + TOP UP AGENT + TRANSFER P24 + WITHDRAW MERCHANT + DONATION + FEE + REVERSAL + CASHBACK CASH + CASHBACK POINT diff --git a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx index 8f2a12c..6069da8 100644 --- a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx +++ b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx @@ -82,6 +82,14 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => { case 'B': return 'TOP UP P24'; case 'A': return 'TRANSFER AGENT'; case 'M': return 'WITHDRAWAL AGENT'; + case 'O': return 'TOP UP AGENT'; + case 'S': return 'TRANSFER P24'; + case 'I': return 'WIJTDRAW MERCHANT'; + case 'D': return 'DONATION'; + case 'F': return 'FEE'; + case 'V': return 'REVERSAL'; + case 'C': return 'CASHBACK CASH'; + case 'H': return 'CASHBACK POINT'; default: return '_'; } },