From 393572a3e3fd5976d897196365a7ad802d94ddc6 Mon Sep 17 00:00:00 2001 From: morteza-mortezai Date: Fri, 26 Jun 2026 12:24:32 +0330 Subject: [PATCH] up --- src/pages/invoice/ProformaInvoice.tsx | 11 +++-------- src/pages/invoice/types/Types.ts | 1 + 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/pages/invoice/ProformaInvoice.tsx b/src/pages/invoice/ProformaInvoice.tsx index 2d51c02..8c07f57 100644 --- a/src/pages/invoice/ProformaInvoice.tsx +++ b/src/pages/invoice/ProformaInvoice.tsx @@ -11,11 +11,6 @@ import type { FilterValues } from '@/components/Filters' import { useGetInvoice } from './hooks/useInvoiceData' import type { InvoiceType } from './types/Types' -const isInvoiceConfirmed = (item: InvoiceType) => { - const items = item.items ?? [] - return items.length > 0 && items.every((i) => !!i.confirmedAt) -} - const ProformaInvoice: FC = () => { const [activeTab, setActiveTab] = useState(ProformaInvoiceStatusEnum.ALL) const [page, setPage] = useState(1) @@ -29,10 +24,10 @@ const ProformaInvoice: FC = () => { const list = data?.data ?? [] if (activeTab === ProformaInvoiceStatusEnum.CONFIRMED) { - return list.filter((o) => isInvoiceConfirmed(o)) + return list.filter((o) => o.confirmStatus === 'confirmed') } if (activeTab === ProformaInvoiceStatusEnum.NOT_CONFIRMED) { - return list.filter((o) => !isInvoiceConfirmed(o)) + return list.filter((o) => o.confirmStatus === 'pending') } let result = list @@ -168,7 +163,7 @@ const ProformaInvoice: FC = () => { key: 'confirmStatus', title: 'وضعیت تایید', render: (item) => { - const confirmed = isInvoiceConfirmed(item) + const confirmed = item.confirmStatus === 'confirmed' return (