From 0bf92e81378a6646f27833ef334a5b11406166b3 Mon Sep 17 00:00:00 2001 From: "Brian.Jiang2021" Date: Thu, 10 Nov 2022 14:38:46 +0800 Subject: [PATCH] fix: show or hide viewInvocie btn --- .../src/pages/orderDetail/components/OrderAction.tsx | 3 ++- apps/storefront/src/pages/orderDetail/shared/B2BOrderData.ts | 2 ++ apps/storefront/src/shared/service/b2b/graphql/orders.ts | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/storefront/src/pages/orderDetail/components/OrderAction.tsx b/apps/storefront/src/pages/orderDetail/components/OrderAction.tsx index f9326069..54e44831 100644 --- a/apps/storefront/src/pages/orderDetail/components/OrderAction.tsx +++ b/apps/storefront/src/pages/orderDetail/components/OrderAction.tsx @@ -258,6 +258,7 @@ export const OrderAction = (props: any) => { orderComments, products, orderId, + ipStatus, } = detailsData const getFullPaymentAddress = (billingAddress: any) => { @@ -345,7 +346,7 @@ export const OrderAction = (props: any) => { key: 'aboutInvoice', name: isB2BUser ? 'viewInvoice' : 'printInvoice', variant: 'outlined', - isCanShow: true, + isCanShow: !isB2BUser || +ipStatus !== 0, }, ], infos: { diff --git a/apps/storefront/src/pages/orderDetail/shared/B2BOrderData.ts b/apps/storefront/src/pages/orderDetail/shared/B2BOrderData.ts index 570d74d6..c545f642 100644 --- a/apps/storefront/src/pages/orderDetail/shared/B2BOrderData.ts +++ b/apps/storefront/src/pages/orderDetail/shared/B2BOrderData.ts @@ -172,4 +172,6 @@ export const convertB2BOrderDetails = (data: B2BOrderData) => ({ products: handleProductQuantity(data), orderId: +data.id, customStatus: data.customStatus, + ipStatus: +data.ipStatus || 0, // 0: no invoice, 1,2: have invoice + invoiceId: +data.invoiceId, }) diff --git a/apps/storefront/src/shared/service/b2b/graphql/orders.ts b/apps/storefront/src/shared/service/b2b/graphql/orders.ts index a7046410..7fb56567 100644 --- a/apps/storefront/src/shared/service/b2b/graphql/orders.ts +++ b/apps/storefront/src/shared/service/b2b/graphql/orders.ts @@ -180,6 +180,8 @@ const orderDetail = (id: number, fn: string) => `{ isInvoiceOrder, updatedAt, externalOrderId, + ipStatus, + invoiceId, orderHistoryEvent { id, eventType,