diff --git a/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx b/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx index 1378a2e..8a67a8a 100644 --- a/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx +++ b/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx @@ -224,8 +224,7 @@ const DetailApprovalTransaction = () => {
Full Name
-- {transactionDetails?.origin_customer?.fullname ?? transactionDetails?.origin_customer?.origin_name}
+{transactionDetails?.origin_name ?? ""}
Transaction Date
{transactionDetails?.transaction_date @@ -436,9 +460,7 @@ const DetailApprovalTransaction = () => {
Full Name
-- {transactionDetails?.origin_customer?.fullname ?? transactionDetails?.origin_customer?.origin_name} -
+{transactionDetails?.origin_name ?? ""}
Amount
@@ -502,7 +524,32 @@ const DetailApprovalTransaction = () => { kind = 'RETURN'; } else if (transactionDetails?.kind === 'E') { kind = 'REWARD'; + } else if (transactionDetails?.kind === 'L') { + kind = 'PURCHASE LOJA'; + } else if (transactionDetails?.kind === 'B') { + kind = 'TOP UP P24'; + } else if (transactionDetails?.kind === 'A') { + 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; })()} @@ -526,6 +573,30 @@ const DetailApprovalTransaction = () => {{transactionDetails?.transfer.destination_iban}
Transfer Type
++ { + (() => { + if (transactionDetails?.transfer.type === "S") { + return "SEND"; + } else if (transactionDetails?.transfer.type === "R") { + return "RECEIVE"; + } else { + return "UNKNOWN"; + } + })() + } +
+Full Name
-- {transactionDetails?.origin_customer?.fullname ?? transactionDetails?.origin_customer?.origin_name} -
+{transactionDetails?.origin_name ?? ""}
Phone Number
diff --git a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx index f9133d4..65d1ff6 100644 --- a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx +++ b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx @@ -367,7 +367,7 @@ const DetailTransaction = () => {Full Name
-{transactionDetails?.origin_customer?.origin_name ?? ""}
+{transactionDetails?.origin_name ?? ""}
Amount
@@ -456,21 +456,21 @@ const DetailTransaction = () => { kind = 'TRANSFER AGENT'; } else if (transactionDetails?.kind === 'M') { kind = 'WITHDRAWAL AGENT'; - }else if( transactionDetails?.kind === 'O') { + } else if (transactionDetails?.kind === 'O') { kind = 'TOPUP AGENT'; - }else if (transactionDetails?.kind === 'S') { + } else if (transactionDetails?.kind === 'S') { kind = 'TOPUP P24'; - }else if (transactionDetails?.kind === 'I') { + } else if (transactionDetails?.kind === 'I') { kind = 'WITHDRAW MERCHANT'; - }else if (transactionDetails?.kind === 'D') { + } else if (transactionDetails?.kind === 'D') { kind = 'DONATION'; - }else if (transactionDetails?.kind === 'F') { + } else if (transactionDetails?.kind === 'F') { kind = 'FEE'; - }else if (transactionDetails?.kind === 'V') { + } else if (transactionDetails?.kind === 'V') { kind = 'REVERSAL'; - }else if( transactionDetails?.kind === 'C') { + } else if (transactionDetails?.kind === 'C') { kind = 'CASHBACK CASH'; - }else if( transactionDetails?.kind === 'H') { + } else if (transactionDetails?.kind === 'H') { kind = 'CASHBACK POINT'; } @@ -499,7 +499,7 @@ const DetailTransaction = () => { Info -Transaction Date
{transactionDetails?.transaction_date @@ -516,7 +516,7 @@ const DetailTransaction = () => {
Full Name
-{transactionDetails?.origin_customer?.origin_name ?? ""}
+{transactionDetails?.origin_name ?? ""}
Amount
@@ -589,12 +589,37 @@ const DetailTransaction = () => { kind = 'TOP UP'; } else if (transactionDetails?.kind === 'R') { kind = 'RETURN'; - } else if (transactionDetails?.kind === 'E') { } else if (transactionDetails?.kind === 'E') { kind = 'REWARD'; + } else if (transactionDetails?.kind === 'L') { + kind = 'PURCHASE LOJA'; + } else if (transactionDetails?.kind === 'B') { + kind = 'TOP UP P24'; + } else if (transactionDetails?.kind === 'A') { + 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; })()} +{transactionDetails?.transfer.destination_iban}
Transfer Type
++ { + (() => { + if (transactionDetails?.transfer.type === "S") { + return "SEND"; + } else if (transactionDetails?.transfer.type === "R") { + return "RECEIVE"; + } else { + return "UNKNOWN"; + } + })() + } +
+Full Name
-{transactionDetails?.origin_customer?.origin_name}
+{transactionDetails?.origin_name}
Phone Number