fix: company order invoice

bigcommerce · Aug 15, 2023 · 8cc078b · 8cc078b
1 parent 2a3f942
commit 8cc078b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/apps/storefront/src/pages/invoice/Invoice.tsx b/apps/storefront/src/pages/invoice/Invoice.tsx
@@ -251,6 +251,12 @@ function Invoice() {
         snackbar.error('pdf url resolution error')
         return
       }
+
+      const { href } = window.location
+      if (!href.includes('invoice')) {
+        return
+      }
+
       window.open(pdfUrl, '_blank', 'fullscreen=yes')
     } catch (err) {
       console.error(err)

diff --git a/apps/storefront/src/pages/invoice/components/B3Pulldown.tsx b/apps/storefront/src/pages/invoice/components/B3Pulldown.tsx
@@ -68,6 +68,12 @@ function B3Pulldown({
       snackbar.error('pdf url resolution error')
       return
     }
+
+    const { href } = window.location
+    if (!href.includes('invoice')) {
+      return
+    }
+
     window.open(pdfUrl, '_blank', 'fullscreen=yes')
   }
 

diff --git a/apps/storefront/src/pages/invoice/components/PrintTempalte.tsx b/apps/storefront/src/pages/invoice/components/PrintTempalte.tsx
@@ -47,13 +47,19 @@ function PrintTempalte({ row }: PrintTempalteProps) {
       return
     }
 
+    if (!container?.current) return
+
     PDFObject.embed(invoicePDFUrl, container.current)
 
     setLoadding(false)
   }
 
   useEffect(() => {
     viewPrint()
+
+    return () => {
+      container.current = null
+    }
   }, [row])
 
   return (

diff --git a/apps/storefront/src/pages/orderDetail/components/OrderAction.tsx b/apps/storefront/src/pages/orderDetail/components/OrderAction.tsx
@@ -408,7 +408,7 @@ export default function OrderAction(props: OrderActionProps) {
           key: 'aboutInvoice',
           name: isB2BUser ? 'viewInvoice' : 'printInvoice',
           variant: 'outlined',
-          isCanShow: createdEmail === emailAddress,
+          isCanShow: +ipStatus !== 0 || createdEmail === emailAddress,
         },
       ],
       infos: {