diff --git a/src/App.tsx b/src/App.tsx index d32d196..ec25db7 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -38,7 +38,7 @@ const queryClient = new QueryClient({ defaultOptions: { queries: { refetchOnWindowFocus: false, - staleTime: 86400000 // 1 day in milliseconds + // staleTime: 86400000 // 1 day in milliseconds }, }, }); diff --git a/src/components/ServiceSection.tsx b/src/components/ServiceSection.tsx index e0713c0..06d853a 100644 --- a/src/components/ServiceSection.tsx +++ b/src/components/ServiceSection.tsx @@ -2,7 +2,7 @@ import { FC } from 'react' import { ItemServiceType } from '../pages/service/types/ServiecTypes' type Props = { - item: ItemServiceType + item: ItemServiceType, } const ServiceSection: FC = (props: Props) => { diff --git a/src/langs/fa.json b/src/langs/fa.json index 57be8c4..3eec5e4 100644 --- a/src/langs/fa.json +++ b/src/langs/fa.json @@ -233,13 +233,13 @@ "date_receipt": "تاریخ صورتحساب", "last_date_receipt": "آخرین مهلت پرداخت", "service": "سرویس", - "status": "وضعیت تایید", + "status": "وضعیت ", "status_paid": "وضعیت پرداخت", "PENDING": "در انتظار ", "PAID": "پرداخت شده", "CANCELED": "لغو شده", "EXPIRED": "منقضی شده", - "APPROVED": "تایید شده", + "WAIT_PAYMENT": "در انتظار پرداخت", "real_person": "شخص حقیقی", "fullName": "نام و نام خانوادگی", "compelete_financal_info_error": "برای دریافت فاکتور رسمی اطلاعات مالی خود را وارد کنید", @@ -256,6 +256,8 @@ "apply": "اعمال", "pending": "تایید نشده" }, + "active": "فعال", + "inactive": "غیرفعال", "confrim": { "subject": "حذف", "content": "برای حذف این آیتم مطمئن هستید؟", diff --git a/src/pages/receipts/Detail.tsx b/src/pages/receipts/Detail.tsx index d5c17cf..6f2c6a6 100644 --- a/src/pages/receipts/Detail.tsx +++ b/src/pages/receipts/Detail.tsx @@ -139,17 +139,20 @@ const ReceiptsDetail: FC = () => {
-
-

{t('receip.thank_pay_1')}

-

{t('receip.thank_pay_2')}

-
+ { + getInvoce.data?.data?.invoice?.status === 'PAID' && +
+

{t('receip.thank_pay_1')}

+

{t('receip.thank_pay_2')}

+
+ }
{t('receip.receip_information')}
{t(`receip.${getInvoce.data?.data?.invoice?.status}`)}
@@ -190,7 +193,7 @@ const ReceiptsDetail: FC = () => {
{ - getInvoce.data?.data?.invoice?.status === 'APPROVED' && + getInvoce.data?.data?.invoice?.status === 'WAIT_PAYMENT' &&
- + diff --git a/src/pages/receipts/components/ApproveInvoice.tsx b/src/pages/receipts/components/ApproveInvoice.tsx index 2252b1f..191e01a 100644 --- a/src/pages/receipts/components/ApproveInvoice.tsx +++ b/src/pages/receipts/components/ApproveInvoice.tsx @@ -54,7 +54,7 @@ const ApproveInvoice: FC = ({ id, refetch, status }) => { }) } - if (status === 'PENDING' || status === 'APPROVED' && getProfile.isSuccess) + if (status === 'PENDING' || status === 'WAIT_PAYMENT' && getProfile.isSuccess) return (