fix: discount still showing when"discount disabled" inside a Buyer Po…

…rtal quote https://bigc-b2b.atlassian.net/browse/BUN-1974
bigcommerce · Feb 7, 2024 · 9372408 · 9372408
1 parent ebd189d
commit 9372408
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 21 deletions.
diff --git a/apps/storefront/src/pages/quote/QuoteDetail.tsx b/apps/storefront/src/pages/quote/QuoteDetail.tsx
@@ -525,6 +525,7 @@ function QuoteDetail() {
                 isHandleApprove={isHandleApprove}
                 getQuoteTableDetails={getQuoteTableDetails}
                 getTaxRate={getTaxRate}
+                displayDiscount={quoteDetail.displayDiscount}
               />
             </Box>
           </Grid>

diff --git a/apps/storefront/src/pages/quote/components/QuoteDetailSummary.tsx b/apps/storefront/src/pages/quote/components/QuoteDetailSummary.tsx
@@ -110,22 +110,24 @@ export default function QuoteDetailSummary(props: QuoteDetailSummaryProps) {
               color: '#212121',
             }}
           >
-            <Grid
-              container
-              justifyContent="space-between"
-              sx={{
-                margin: '4px 0',
-              }}
-            >
-              <Typography>
-                {b3Lang('quoteDetail.summary.originalSubtotal')}
-              </Typography>
-              <Typography>
-                {showPrice(
-                  priceFormat(getCurrentPrice(subtotalPrice, quoteDetailTax))
-                )}
-              </Typography>
-            </Grid>
+            {quoteDetail?.displayDiscount && (
+              <Grid
+                container
+                justifyContent="space-between"
+                sx={{
+                  margin: '4px 0',
+                }}
+              >
+                <Typography>
+                  {b3Lang('quoteDetail.summary.originalSubtotal')}
+                </Typography>
+                <Typography>
+                  {showPrice(
+                    priceFormat(getCurrentPrice(subtotalPrice, quoteDetailTax))
+                  )}
+                </Typography>
+              </Grid>
+            )}
 
             {!quoteDetail?.salesRepEmail && +status === 1 ? null : (
               <Grid

diff --git a/apps/storefront/src/pages/quote/components/QuoteDetailTable.tsx b/apps/storefront/src/pages/quote/components/QuoteDetailTable.tsx
@@ -49,6 +49,7 @@ interface ShoppingDetailTableProps {
   }>
   isHandleApprove: boolean
   getTaxRate: (taxClassId: number, variants: any) => number
+  displayDiscount: boolean
 }
 
 interface SearchProps {
@@ -103,7 +104,13 @@ const StyledImage = styled('img')(() => ({
 
 function QuoteDetailTable(props: ShoppingDetailTableProps, ref: Ref<unknown>) {
   const b3Lang = useB3Lang()
-  const { total, getQuoteTableDetails, getTaxRate, isHandleApprove } = props
+  const {
+    total,
+    getQuoteTableDetails,
+    getTaxRate,
+    isHandleApprove,
+    displayDiscount,
+  } = props
 
   const {
     global: {
@@ -240,7 +247,7 @@ function QuoteDetailTable(props: ShoppingDetailTableProps, ref: Ref<unknown>) {
         const price = getBCPrice(+basePrice, taxPrice)
         const discountPrice = getBCPrice(+offeredPrice, discountTaxPrice)
 
-        const isDiscount = +basePrice - +offeredPrice > 0
+        const isDiscount = +basePrice - +offeredPrice > 0 && displayDiscount
 
         return (
           <>
@@ -309,7 +316,7 @@ function QuoteDetailTable(props: ShoppingDetailTableProps, ref: Ref<unknown>) {
 
         const price = getBCPrice(+basePrice, taxPrice)
         const discountPrice = getBCPrice(+offeredPrice, discountTaxPrice)
-        const isDiscount = +basePrice - +offeredPrice > 0
+        const isDiscount = +basePrice - +offeredPrice > 0 && displayDiscount
 
         const total = price * +quantity
         const totalWithDiscount = discountPrice * +quantity
@@ -381,6 +388,7 @@ function QuoteDetailTable(props: ShoppingDetailTableProps, ref: Ref<unknown>) {
             item={row}
             showPrice={showPrice}
             itemIndex={index}
+            displayDiscount={displayDiscount}
             getTaxRate={getTaxRate}
           />
         )}

diff --git a/apps/storefront/src/pages/quote/components/QuoteDetailTableCard.tsx b/apps/storefront/src/pages/quote/components/QuoteDetailTableCard.tsx
@@ -12,6 +12,7 @@ interface QuoteTableCardProps {
   getTaxRate: (taxClassId: number, variants: any) => number
   itemIndex?: number
   showPrice: (price: string, row: CustomFieldItems) => string | number
+  displayDiscount: boolean
 }
 
 const StyledImage = styled('img')(() => ({
@@ -21,7 +22,14 @@ const StyledImage = styled('img')(() => ({
 }))
 
 function QuoteDetailTableCard(props: QuoteTableCardProps) {
-  const { item: quoteTableItem, len, itemIndex, getTaxRate, showPrice } = props
+  const {
+    item: quoteTableItem,
+    len,
+    itemIndex,
+    getTaxRate,
+    showPrice,
+    displayDiscount,
+  } = props
   const b3Lang = useB3Lang()
 
   const {
@@ -51,7 +59,7 @@ function QuoteDetailTableCard(props: QuoteTableCardProps) {
   const price = getBCPrice(+basePrice, taxPrice)
   const discountPrice = getBCPrice(+offeredPrice, discountTaxPrice)
 
-  const isDiscount = +basePrice - +offeredPrice > 0
+  const isDiscount = +basePrice - +offeredPrice > 0 && displayDiscount
 
   const total = +price * +quantity
   const totalWithDiscount = discountPrice * +quantity