request id

src/pages/invoice/Detail.tsx

@@ -7,6 +7,7 @@ import type { RowDataType } from '@/components/types/TableTypes'
 import { Link, useParams } from 'react-router-dom'
 import { useQueryClient } from '@tanstack/react-query'
 import { useConfirmInvoiceItem, useGetInvoiceDetail } from './hooks/useInvoiceData'
+import { useGetRequestDetails } from '@/pages/request/hooks/useRequestData'
 import { NumberFormat } from '@/config/func'
 import moment from 'moment-jalaali'
 import type { InvoiceItem as ApiInvoiceItem } from './types/InvoiceTypes'
@@ -36,6 +37,7 @@ const InvoiceDetail: FC = () => {
     const queryClient = useQueryClient()
     const { data, isPending } = useGetInvoiceDetail(id!)
     useGetPaymentInvoice(id)
+    const { data: requestData } = useGetRequestDetails(data?.data?.requestId ?? '')
     const { mutate: confirmInvoiceItem, isPending: isConfirming } = useConfirmInvoiceItem()
     const [confirmingItemId, setConfirmingItemId] = useState<string | null>(null)
     const invoice = data?.data
@@ -52,7 +54,7 @@ const InvoiceDetail: FC = () => {
                 '-',
             orderDate: moment(invoice.createdAt).format('jYYYY/jMM/jDD'),
             phoneNumber: invoice.user?.phone || '-',
-            orderNumber: String(invoice.request?.requestNumber ?? '-'),
+            orderNumber: String(requestData?.data?.requestNumber ?? '-'),
             address: invoice.user?.addresse || '-',
             paymentMethod: invoice.paymentMethod || '-',
         }

src/pages/invoice/types/InvoiceTypes.ts

@@ -13,15 +13,6 @@ export type InvoiceUser = {
   phone: string;
 };
 
-export type InvoiceRequest = {
-  id: string;
-  createdAt: string;
-  deletedAt: string | null;
-  user: string;
-  requestNumber: number;
-  status: string;
-};
-
 export type InvoiceProduct = {
   id: string;
   createdAt: string;
@@ -57,7 +48,7 @@ export type Invoice = {
   createdAt: string;
   deletedAt: string | null;
   user: InvoiceUser;
-  request: InvoiceRequest;
+  requestId?: string | null;
   invoiceNumber: number;
   discount: number | null;
   subTotal: number;