diff --git a/src/pages/order/OrderDetail.tsx b/src/pages/order/OrderDetail.tsx index 2dd8e99..7cd6389 100644 --- a/src/pages/order/OrderDetail.tsx +++ b/src/pages/order/OrderDetail.tsx @@ -7,8 +7,7 @@ import RefreshButton from '@/components/RefreshButton' import Button from '@/components/Button' import { Paths } from '@/config/Paths' import { extractErrorMessage } from '@/config/func' -import { useGetInvoiceItem } from '@/pages/invoice/hooks/useInvoiceData' -import { useGetOrderDetails, useUpdateOrderStatus } from './hooks/useOrderData' + import { useGetOrderDetails, useUpdateOrderStatus } from './hooks/useOrderData' import TicketSection from './components/TicketSection' import OrderDetailSidebar from './components/OrderDetailSidebar' import type { OrderDetailDataType } from './types/Types' @@ -20,8 +19,8 @@ const OrderDetail: FC = () => { const { mutate: updateOrderStatus, isPending: isUpdatingStatus } = useUpdateOrderStatus() const order = data?.data as OrderDetailDataType | undefined - const { data: invoiceItemData } = useGetInvoiceItem(order?.invoiceItem ?? null) - const invoiceId = invoiceItemData?.data?.invoice?.id + // const { data: invoiceItemData } = useGetInvoiceItem(order?.invoiceItem ?? null) + const invoiceId = order?.invoiceItem?.invoice const handleUpdateStatus = (status: OrderStatusEnum) => { if (!id) return diff --git a/src/pages/order/types/Types.ts b/src/pages/order/types/Types.ts index 80e09aa..05591e0 100644 --- a/src/pages/order/types/Types.ts +++ b/src/pages/order/types/Types.ts @@ -136,7 +136,7 @@ export type OrderDetailDataType = { id: string; createdAt: string; deletedAt: string | null; - invoiceItem: string; + invoiceItem: { id: string, invoice: string } | null; product: Product | null; print: unknown | null; title: string; @@ -148,7 +148,7 @@ export type OrderDetailDataType = { status: string; estimatedDays: number; attachments: unknown[]; -}; + }; export type AttachmentsType = { url: string;