From 8b316957d8afcb9ba00fc8897d84f7c85e2d91c3 Mon Sep 17 00:00:00 2001
From: wayanrivan <rivanwayan867@gmail.com>
Date: Fri, 23 May 2025 14:59:44 +0700
Subject: [PATCH] update

---
 .../blocks/DetailApprovalTransaction.tsx      | 87 +++++++++++++++++--
 .../blocks/DetailTransaction.tsx              | 75 +++++++++++++---
 2 files changed, 140 insertions(+), 22 deletions(-)

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 = () => {
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
-                                        <p className="font-medium">
-                                            {transactionDetails?.origin_customer?.fullname ?? transactionDetails?.origin_customer?.origin_name}                                        </p>
+                                        <p className="font-medium">{transactionDetails?.origin_name ?? ""}</p>
                                     </div>
 
                                     <div>
@@ -299,7 +298,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;
                                             })()}
                                         </p>
@@ -419,7 +443,7 @@ const DetailApprovalTransaction = () => {
                                         Info
                                     </span>
                                 </h3>
-                                <div className="grid grid-cols-2 gap-4">
+                                <div className="grid grid-cols-3 gap-4">
                                     <div>
                                         <p className="text-sm text-gray-500">Transaction Date</p>
                                         <p className="font-medium">{transactionDetails?.transaction_date
@@ -436,9 +460,7 @@ const DetailApprovalTransaction = () => {
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
-                                        <p className="font-medium">
-                                            {transactionDetails?.origin_customer?.fullname ?? transactionDetails?.origin_customer?.origin_name}
-                                        </p>
+                                        <p className="font-medium">{transactionDetails?.origin_name ?? ""}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Amount</p>
@@ -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;
                                             })()}
                                         </p>
@@ -526,6 +573,30 @@ const DetailApprovalTransaction = () => {
                                         <p className="font-medium">{transactionDetails?.transfer.destination_iban}</p>
                                     </div>
                                 </div>
+                                <h3 className="font-semibold flex items-center">
+                                    Transfer Type
+                                    <span className="ml-2 bg-blue-100 text-blue-800 text-xs font-semibold mr-2 px-2.5 py-0.5 rounded">
+                                        Transfer Type
+                                    </span>
+                                </h3>
+                                <div className="grid grid-cols-3 gap-4">
+                                    <div>
+                                        <p className="text-sm text-gray-500">Transfer Type</p>
+                                        <p className="font-medium">
+                                            {
+                                                (() => {
+                                                    if (transactionDetails?.transfer.type === "S") {
+                                                        return "SEND";
+                                                    } else if (transactionDetails?.transfer.type === "R") {
+                                                        return "RECEIVE";
+                                                    } else {
+                                                        return "UNKNOWN";
+                                                    }
+                                                })()
+                                            }
+                                        </p>
+                                    </div>
+                                </div>
                             </div>
                         )}
 
@@ -535,9 +606,7 @@ const DetailApprovalTransaction = () => {
                                 <div className="grid grid-cols-2 gap-4">
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
-                                        <p className="font-medium">
-                                            {transactionDetails?.origin_customer?.fullname ?? transactionDetails?.origin_customer?.origin_name}
-                                        </p>
+                                        <p className="font-medium">{transactionDetails?.origin_name ?? ""}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Phone Number</p>
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 = () => {
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer?.origin_name ?? ""}</p>
+                                        <p className="font-medium">{transactionDetails?.origin_name ?? ""}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Amount</p>
@@ -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
                                     </span>
                                 </h3>
-                                <div className="grid grid-cols-2 gap-4">
+                                <div className="grid grid-cols-3 gap-4">
                                     <div>
                                         <p className="text-sm text-gray-500">Transaction Date</p>
                                         <p className="font-medium">{transactionDetails?.transaction_date
@@ -516,7 +516,7 @@ const DetailTransaction = () => {
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer?.origin_name ?? ""}</p>
+                                        <p className="font-medium">{transactionDetails?.origin_name ?? ""}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Amount</p>
@@ -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;
                                             })()}
+
                                         </p>
                                     </div>
                                     <div>
@@ -614,6 +639,30 @@ const DetailTransaction = () => {
                                         <p className="font-medium">{transactionDetails?.transfer.destination_iban}</p>
                                     </div>
                                 </div>
+                                <h3 className="font-semibold flex items-center">
+                                    Transfer Type
+                                    <span className="ml-2 bg-blue-100 text-blue-800 text-xs font-semibold mr-2 px-2.5 py-0.5 rounded">
+                                        Transfer Type
+                                    </span>
+                                </h3>
+                                <div className="grid grid-cols-3 gap-4">
+                                    <div>
+                                        <p className="text-sm text-gray-500">Transfer Type</p>
+                                        <p className="font-medium">
+                                            {
+                                                (() => {
+                                                    if (transactionDetails?.transfer.type === "S") {
+                                                        return "SEND";
+                                                    } else if (transactionDetails?.transfer.type === "R") {
+                                                        return "RECEIVE";
+                                                    } else {
+                                                        return "UNKNOWN";
+                                                    }
+                                                })()
+                                            }
+                                        </p>
+                                    </div>
+                                </div>
                             </div>
                         )}
 
@@ -623,7 +672,7 @@ const DetailTransaction = () => {
                                 <div className="grid grid-cols-2 gap-4">
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer?.origin_name}</p>
+                                        <p className="font-medium">{transactionDetails?.origin_name}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Phone Number</p>