From b7aad701ec9f618f91a21fb1ee8a453dc08182f2 Mon Sep 17 00:00:00 2001
From: BrianJiang2021 <80307788+BrianJiang2021@users.noreply.github.com>
Date: Tue, 5 Dec 2023 11:11:40 +0800
Subject: [PATCH] feat: quote shipping bun1306 (#861)

* feat: quote shipping option updates

* feat: quote shipping option updates2
---
 .../quote/components/QuoteDetailSummary.tsx   | 38 ++++++++++++++++++-
 packages/lang/locales/en.json                 |  1 +
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/apps/storefront/src/pages/quote/components/QuoteDetailSummary.tsx b/apps/storefront/src/pages/quote/components/QuoteDetailSummary.tsx
index 15133eb2..218da7cb 100644
--- a/apps/storefront/src/pages/quote/components/QuoteDetailSummary.tsx
+++ b/apps/storefront/src/pages/quote/components/QuoteDetailSummary.tsx
@@ -111,7 +111,7 @@ export default function QuoteDetailSummary(props: QuoteDetailSummaryProps) {
                 {priceFormat(getCurrentPrice(quotedSubtotal, quoteDetailTax))}
               </Typography>
             </Grid>
-            {+status !== 1 || quoteDetail?.shippingMethod?.id ? (
+            {quoteDetail?.shippingMethod?.id ? (
               <>
                 <Grid
                   container
@@ -121,7 +121,9 @@ export default function QuoteDetailSummary(props: QuoteDetailSummaryProps) {
                   }}
                 >
                   <Typography>
-                    {b3Lang('quoteDetail.summary.shipping')}
+                    {`${b3Lang('quoteDetail.summary.shipping')}(${
+                      quoteDetail?.shippingMethod?.description || ''
+                    })`}
                   </Typography>
                   <Typography>{priceFormat(+shipping)}</Typography>
                 </Grid>
@@ -137,6 +139,38 @@ export default function QuoteDetailSummary(props: QuoteDetailSummaryProps) {
                 </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/packages/lang/locales/en.json b/packages/lang/locales/en.json
index f963cb3a..5ce90027 100644
--- a/packages/lang/locales/en.json
+++ b/packages/lang/locales/en.json
@@ -466,6 +466,7 @@
   "quoteDetail.header.print": "Print",
   "quoteDetail.header.downloadPDF": "DownLoad pdf",
   "quoteDetail.summary.quoteSummary": "Quote summary",
+  "quoteDetail.summary.quoteCheckout": "Customer choice at checkout",
   "quoteDetail.summary.originalSubtotal": "Original subtotal",
   "quoteDetail.summary.discountAmount": "Discount amount",
   "quoteDetail.summary.quotedSubtotal": "Quoted subtotal",