From 8f6729024f4d58333c3edc702341edf9be9f7776 Mon Sep 17 00:00:00 2001
From: hamid zarghami <hamid.zarghami1@gmail.com>
Date: Tue, 4 Mar 2025 08:49:33 +0330
Subject: [PATCH] transaction detail

---
 .env                                          |  4 +-
 dev-dist/sw.js                                |  2 +-
 src/components/ServiceItem.tsx                |  2 +-
 src/langs/fa.json                             |  2 +-
 src/pages/transaction/List.tsx                |  2 +-
 src/pages/transaction/components/Detail.tsx   | 44 ++++++++++++++-----
 .../transaction/hooks/useTransactionData.ts   |  8 ++++
 .../transaction/service/TransactionService.ts |  5 +++
 8 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/.env b/.env
index 36eab8a..fc26a2e 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
 VITE_TOKEN_NAME = 'dsc_token'
 VITE_REFRESH_TOKEN_NAME = 'dsc_refresh_token'
-VITE_BASE_URL = 'https://api.danakcorp.com'
-# VITE_BASE_URL = 'http://192.168.1.124:4000'
\ No newline at end of file
+# VITE_BASE_URL = 'https://api.danakcorp.com'
+VITE_BASE_URL = 'http://192.168.0.216:4000'
\ No newline at end of file
diff --git a/dev-dist/sw.js b/dev-dist/sw.js
index 37e2ae9..4d71254 100644
--- a/dev-dist/sw.js
+++ b/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-e7681877'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.p2q1at3f1to"
+    "revision": "0.kim5d4lsg4"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
diff --git a/src/components/ServiceItem.tsx b/src/components/ServiceItem.tsx
index 30f0faf..0ceff18 100644
--- a/src/components/ServiceItem.tsx
+++ b/src/components/ServiceItem.tsx
@@ -36,7 +36,7 @@ const ServiceItem: FC<Props> = (props: Props) => {
                     <Button
                         className='h-8 w-fit px-5 text-xs text-black bg-description bg-opacity-20 rounded-xl'
                     >
-                        <div className='flex gap-2'>
+                        <div className='flex gap-2 whitespace-nowrap'>
                             <div>{t('service.detail')}</div>
                             <ArrowLeft color='black' size={16} />
                         </div>
diff --git a/src/langs/fa.json b/src/langs/fa.json
index 8e38849..3f9ae8f 100644
--- a/src/langs/fa.json
+++ b/src/langs/fa.json
@@ -273,7 +273,7 @@
     "transaction2": "تراکنش",
     "type_deposit": "نوع واریز",
     "status": "وضعیت",
-    "success_paid": "پرداخت موفق",
+    "success_paid": "موفق",
     "print": "پرینت",
     "download": "دانلود",
     "type_getway": "نوع درگاه",
diff --git a/src/pages/transaction/List.tsx b/src/pages/transaction/List.tsx
index 06ab366..9041f68 100644
--- a/src/pages/transaction/List.tsx
+++ b/src/pages/transaction/List.tsx
@@ -116,7 +116,7 @@ const TransactionList: FC = () => {
                                             <Td text={NumberFormat(+item.amount)} />
                                             <Td text={moment(item.createdAt).format('jYYYY-jMM-jDD')} />
                                             <Td text={''}>
-                                                <Detail />
+                                                <Detail id={item.id} />
                                             </Td>
                                         </tr>
                                     )
diff --git a/src/pages/transaction/components/Detail.tsx b/src/pages/transaction/components/Detail.tsx
index ed64f51..bdc692a 100644
--- a/src/pages/transaction/components/Detail.tsx
+++ b/src/pages/transaction/components/Detail.tsx
@@ -4,11 +4,21 @@ import DefaulModal from '../../../components/DefaulModal'
 import { useTranslation } from 'react-i18next'
 import StatusCircle from '../../../components/StatusCircle'
 import Button from '../../../components/Button'
+import { useGetTransactionDetail } from '../hooks/useTransactionData'
+import { NumberFormat } from '../../../config/func'
+import moment from 'moment-jalaali'
 
-const Detail: FC = () => {
+type Props = {
+    id: string
+}
+
+const Detail: FC<Props> = ({ id }) => {
 
     const { t } = useTranslation('global')
     const [showModal, setShowModal] = useState<boolean>(false)
+    const { data: d } = useGetTransactionDetail(id, showModal)
+
+    const data = d?.data?.transaction
 
     return (
         <div>
@@ -18,7 +28,7 @@ const Detail: FC = () => {
                 open={showModal}
                 close={() => setShowModal(false)}
                 isHeader
-                title_header={`${t('transaction.transaction2')} ۱۲۳۴۵۵`}
+                title_header={`${t('transaction.transaction2')}`}
             >
                 <div className='my-10'>
                     <div className='flex xl:flex-row flex-col gap-8'>
@@ -30,7 +40,14 @@ const Detail: FC = () => {
                                 </div>
                             </div>
                             <div>
-                                واریز شتابی
+                                {
+                                    data?.payment ?
+                                        ' واریز شتابی'
+                                        :
+                                        data?.depositRequest ?
+                                            t('wallet.' + data?.depositRequest?.type.toLowerCase())
+                                            : '-'
+                                }
                             </div>
                         </div>
                         <div className='flex-1 px-6 h-10 flex justify-between items-center'>
@@ -57,7 +74,12 @@ const Detail: FC = () => {
                                 </div>
                             </div>
                             <div>
-                                آنلاین بانک سامان
+                                {
+                                    data?.payment ?
+                                        data?.payment?.paymentGateway?.nameFa
+                                        :
+                                        '-'
+                                }
                             </div>
                         </div>
                         <div className='flex-1 px-6 h-10 flex justify-between items-center'>
@@ -68,7 +90,7 @@ const Detail: FC = () => {
                                 </div>
                             </div>
                             <div className='flex gap-2 items-center'>
-                                ۱۰,۰۰۰,۰۰۰ {t('toman')}
+                                {NumberFormat(data?.amount)} {t('toman')}
                             </div>
                         </div>
                     </div>
@@ -82,7 +104,7 @@ const Detail: FC = () => {
                                 </div>
                             </div>
                             <div>
-                                مهرداد مظفری
+                                {data?.wallet?.user?.firstName} {data?.wallet?.user?.lastName}
                             </div>
                         </div>
                         <div className='flex-1 px-6 h-10 flex justify-between items-center'>
@@ -93,7 +115,7 @@ const Detail: FC = () => {
                                 </div>
                             </div>
                             <div className='flex gap-2 items-center'>
-                                ۱۴۰۳/۰۹/۳۰
+                                {moment(data?.createdAt).format('jYYYY/jMM/jDD')}
                             </div>
                         </div>
                     </div>
@@ -105,8 +127,8 @@ const Detail: FC = () => {
                                     {t('transaction.tracking_number')}
                                 </div>
                             </div>
-                            <div>
-                                bbd704c-۱۲۳۴۵۶
+                            <div className='truncate max-w-20'>
+                                {data?.id}
                             </div>
                         </div>
                         <div className='flex-1 px-6 h-10 flex justify-between items-center'>
@@ -117,7 +139,7 @@ const Detail: FC = () => {
                                 </div>
                             </div>
                             <div className='flex gap-2 items-center'>
-                                bbd704c-۱۲۳۴۵۶
+                                {data?.numericId}
                             </div>
                         </div>
                     </div>
@@ -131,7 +153,7 @@ const Detail: FC = () => {
                                 </div>
                             </div>
                             <div>
-                                -
+                                {data?.description}
                             </div>
                         </div>
                     </div>
diff --git a/src/pages/transaction/hooks/useTransactionData.ts b/src/pages/transaction/hooks/useTransactionData.ts
index 8a03979..7b8c55e 100644
--- a/src/pages/transaction/hooks/useTransactionData.ts
+++ b/src/pages/transaction/hooks/useTransactionData.ts
@@ -7,3 +7,11 @@ export const useGetTransactions = (page: number) => {
     queryFn: () => api.getTransactions(page),
   });
 };
+
+export const useGetTransactionDetail = (id: string, enabled: boolean) => {
+  return useQuery({
+    queryKey: ["transactions-detail", id],
+    queryFn: () => api.getTransactionDetail(id),
+    enabled: enabled,
+  });
+};
diff --git a/src/pages/transaction/service/TransactionService.ts b/src/pages/transaction/service/TransactionService.ts
index 66a59c8..5f2b166 100644
--- a/src/pages/transaction/service/TransactionService.ts
+++ b/src/pages/transaction/service/TransactionService.ts
@@ -4,3 +4,8 @@ export const getTransactions = async (page: number) => {
   const { data } = await axios.get(`/wallets/transactions?page=${page}`);
   return data;
 };
+
+export const getTransactionDetail = async (id: string) => {
+  const { data } = await axios.get(`/wallets/transactions/${id}`);
+  return data;
+};