From 07e4d2628a1a2c5107e693e2a99d1abb4d634e58 Mon Sep 17 00:00:00 2001
From: BrianJiang2021 <80307788+BrianJiang2021@users.noreply.github.com>
Date: Tue, 26 Dec 2023 16:23:36 +0800
Subject: [PATCH] Revert "feat: quote Tax and Estimated Tax judgment and
 shipping display
 https://bigc-b2b.atlassian.net/jira/software/c/projects/BUN/issues/BUN-1812"

This reverts commit 96d35fb72132e170dfb83a459b94dd14991a1200.
---
 .../quote/components/QuoteDetailSummary.tsx   | 127 ++++++++----------
 .../pages/quote/components/QuoteSummary.tsx   |  24 +---
 packages/lang/locales/en.json                 |   5 +-
 3 files changed, 57 insertions(+), 99 deletions(-)

diff --git a/apps/storefront/src/pages/quote/components/QuoteDetailSummary.tsx b/apps/storefront/src/pages/quote/components/QuoteDetailSummary.tsx
index 040e1692..4372ead5 100644
--- a/apps/storefront/src/pages/quote/components/QuoteDetailSummary.tsx
+++ b/apps/storefront/src/pages/quote/components/QuoteDetailSummary.tsx
@@ -44,51 +44,6 @@ export default function QuoteDetailSummary(props: QuoteDetailSummaryProps) {
 
   const priceFormat = (price: number) => `${currencyFormat(price)}`
 
-  const getShippingAndTax = () => {
-    if (quoteDetail?.shippingMethod?.id) {
-      return {
-        shippingText: `${b3Lang('quoteDetail.summary.shipping')}(${
-          quoteDetail?.shippingMethod?.description || ''
-        })`,
-        shippingVal: priceFormat(+shipping),
-        taxText: b3Lang('quoteDetail.summary.tax'),
-        taxVal: priceFormat(+tax),
-      }
-    }
-
-    if (
-      !quoteDetail?.salesRepEmail &&
-      !quoteDetail?.shippingMethod?.id &&
-      +status === 1
-    ) {
-      return {
-        shippingText: b3Lang('quoteDetail.summary.shipping'),
-        shippingVal: b3Lang('quoteDetail.summary.tbd'),
-        taxText: b3Lang('quoteDetail.summary.estimatedTax'),
-        taxVal: priceFormat(+tax),
-      }
-    }
-
-    if (
-      quoteDetail?.salesRepEmail &&
-      !quoteDetail?.shippingMethod?.id &&
-      (+status === 1 || +status === 5)
-    ) {
-      return {
-        shippingText: `${b3Lang('quoteDetail.summary.shipping')}(${b3Lang(
-          'quoteDetail.summary.quoteCheckout'
-        )})`,
-        shippingVal: b3Lang('quoteDetail.summary.tbd'),
-        taxText: b3Lang('quoteDetail.summary.tax'),
-        taxVal: b3Lang('quoteDetail.summary.tbd'),
-      }
-    }
-
-    return null
-  }
-
-  const shippingAndTax = getShippingAndTax()
-
   return (
     <Card>
       <CardContent>
@@ -116,26 +71,22 @@ export default function QuoteDetailSummary(props: QuoteDetailSummaryProps) {
                 {priceFormat(getCurrentPrice(subtotalPrice, quoteDetailTax))}
               </Typography>
             </Grid>
-
-            {!quoteDetail?.salesRepEmail && +status === 1 ? null : (
-              <Grid
-                container
-                justifyContent="space-between"
-                sx={{
-                  margin: '4px 0',
-                }}
-              >
-                <Typography>
-                  {b3Lang('quoteDetail.summary.discountAmount')}
-                </Typography>
-                <Typography>
-                  {+discount > 0
-                    ? `-${priceFormat(+discount)}`
-                    : priceFormat(+discount)}
-                </Typography>
-              </Grid>
-            )}
-
+            <Grid
+              container
+              justifyContent="space-between"
+              sx={{
+                margin: '4px 0',
+              }}
+            >
+              <Typography>
+                {b3Lang('quoteDetail.summary.discountAmount')}
+              </Typography>
+              <Typography>
+                {+discount > 0
+                  ? `-${priceFormat(+discount)}`
+                  : priceFormat(+discount)}
+              </Typography>
+            </Grid>
             <Grid
               container
               justifyContent="space-between"
@@ -160,8 +111,7 @@ export default function QuoteDetailSummary(props: QuoteDetailSummaryProps) {
                 {priceFormat(getCurrentPrice(quotedSubtotal, quoteDetailTax))}
               </Typography>
             </Grid>
-
-            {shippingAndTax && (
+            {quoteDetail?.shippingMethod?.id ? (
               <>
                 <Grid
                   container
@@ -176,9 +126,11 @@ export default function QuoteDetailSummary(props: QuoteDetailSummaryProps) {
                       wordBreak: 'break-word',
                     }}
                   >
-                    {shippingAndTax.shippingText}
+                    {`${b3Lang('quoteDetail.summary.shipping')}(${
+                      quoteDetail?.shippingMethod?.description || ''
+                    })`}
                   </Typography>
-                  <Typography>{shippingAndTax.shippingVal}</Typography>
+                  <Typography>{priceFormat(+shipping)}</Typography>
                 </Grid>
                 <Grid
                   container
@@ -187,12 +139,43 @@ export default function QuoteDetailSummary(props: QuoteDetailSummaryProps) {
                     margin: '4px 0',
                   }}
                 >
-                  <Typography>{shippingAndTax.taxText}</Typography>
-                  <Typography>{shippingAndTax.taxVal}</Typography>
+                  <Typography>{b3Lang('quoteDetail.summary.tax')}</Typography>
+                  <Typography>{priceFormat(+tax)}</Typography>
                 </Grid>
               </>
-            )}
+            ) : null}
 
+            {quoteDetail?.salesRepEmail &&
+            !quoteDetail?.shippingMethod?.id &&
+            (+status === 1 || +status === 5) ? (
+              <>
+                <Grid
+                  container
+                  justifyContent="space-between"
+                  sx={{
+                    margin: '4px 0',
+                    flexWrap: 'nowrap',
+                  }}
+                >
+                  <Typography>
+                    {`${b3Lang('quoteDetail.summary.shipping')}(${b3Lang(
+                      'quoteDetail.summary.quoteCheckout'
+                    )})`}
+                  </Typography>
+                  <Typography>TBD</Typography>
+                </Grid>
+                <Grid
+                  container
+                  justifyContent="space-between"
+                  sx={{
+                    margin: '4px 0',
+                  }}
+                >
+                  <Typography>{b3Lang('quoteDetail.summary.tax')}</Typography>
+                  <Typography>TBD</Typography>
+                </Grid>
+              </>
+            ) : null}
             <Grid
               container
               justifyContent="space-between"
diff --git a/apps/storefront/src/pages/quote/components/QuoteSummary.tsx b/apps/storefront/src/pages/quote/components/QuoteSummary.tsx
index 74c9c2db..2aee3c04 100644
--- a/apps/storefront/src/pages/quote/components/QuoteSummary.tsx
+++ b/apps/storefront/src/pages/quote/components/QuoteSummary.tsx
@@ -110,29 +110,7 @@ const QuoteSummary = forwardRef((_, ref: Ref<unknown>) => {
               <Typography>{priceFormat(quoteSummary.subtotal)}</Typography>
             </Grid>
 
-            <Grid
-              container
-              justifyContent="space-between"
-              sx={{
-                margin: '4px 0',
-              }}
-            >
-              <Typography>
-                {b3Lang('quoteDraft.quoteSummary.shipping')}
-              </Typography>
-              <Typography>{b3Lang('quoteDraft.quoteSummary.tbd')}</Typography>
-            </Grid>
-
-            <Grid
-              container
-              justifyContent="space-between"
-              sx={{
-                margin: '4px 0',
-              }}
-            >
-              <Typography>{b3Lang('quoteDraft.quoteSummary.tax')}</Typography>
-              <Typography>{priceFormat(quoteSummary.tax)}</Typography>
-            </Grid>
+            {/* Remove the Shipping and Tax lines on a “draft” Quote. --BUN-1550 */}
 
             <Grid
               container
diff --git a/packages/lang/locales/en.json b/packages/lang/locales/en.json
index cdd4e161..859dcfeb 100644
--- a/packages/lang/locales/en.json
+++ b/packages/lang/locales/en.json
@@ -518,8 +518,7 @@
   "quoteDraft.quoteSummary.summary": "Quote summary",
   "quoteDraft.quoteSummary.subTotal": "Sub total",
   "quoteDraft.quoteSummary.shipping": "Shipping",
-  "quoteDraft.quoteSummary.tax": "Estimated Tax",
-  "quoteDraft.quoteSummary.tbd": "TBD",
+  "quoteDraft.quoteSummary.tax": "Tax",
   "quoteDraft.quoteSummary.grandTotal": "Grand total",
   "quoteDraft.quoteTable.productUpdated": "Product was updated in your quote.",
   "quoteDraft.quoteTable.product": "Product",
@@ -589,8 +588,6 @@
   "quoteDetail.summary.quotedSubtotal": "Quoted subtotal",
   "quoteDetail.summary.shipping": "Shipping",
   "quoteDetail.summary.tax": "Tax",
-  "quoteDetail.summary.tbd": "TBD",
-  "quoteDetail.summary.estimatedTax": "Estimated Tax",
   "quoteDetail.summary.grandTotal": "Grand total",
   "quoteDetail.table.product": "Product",
   "quoteDetail.table.price": "Price",