fix: repair quote price display

bigcommerce · Feb 3, 2023 · 5d7dc81 · 5d7dc81
1 parent 278f13e
commit 5d7dc81
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 30 deletions.
diff --git a/apps/storefront/src/main.css b/apps/storefront/src/main.css
@@ -250,7 +250,7 @@ input[type=number]::-webkit-outer-spin-button
 .b2b-quote-global-action {
   display: flex;
   align-items: center;
-  padding: 4px 0px 0px 16px;
+  padding: 2px 0 2px 16px;
   margin-left: 30px;
 }
 

diff --git a/apps/storefront/src/pages/quote/QuoteDetail.tsx b/apps/storefront/src/pages/quote/QuoteDetail.tsx
@@ -345,7 +345,7 @@ const QuoteDetail = () => {
         </Grid>
 
         {
-          (+role !== 100 && +quoteDetail.status !== 4) && (
+          (+role !== 2 && +quoteDetail.status !== 4) && (
             <QuoteDetailFooter
               quoteId={quoteDetail.id}
               quoteDate={quoteDetail?.createdAt?.toString()}

diff --git a/apps/storefront/src/pages/quote/QuotesList.tsx b/apps/storefront/src/pages/quote/QuotesList.tsx
@@ -262,17 +262,17 @@ const QuotesList = () => {
       render: (item: ListItem) => format(displayFormat(item.expiredAt, false), 'dd MMM yy'),
     },
     {
-      key: 'subtotal',
+      key: 'grandTotal',
       title: 'Subtotal',
       render: (item: ListItem) => {
         const {
           currency: {
             token,
           },
-          subtotal,
+          grandTotal,
         } = item
 
-        return (`${token}${(+subtotal).toFixed(2)}`)
+        return (`${token}${(+grandTotal).toFixed(2)}`)
       },
     },
     {

diff --git a/apps/storefront/src/pages/quote/components/QuoteDetailTable.tsx b/apps/storefront/src/pages/quote/components/QuoteDetailTable.tsx
@@ -204,12 +204,12 @@ const QuoteDetailTable = (props: ShoppingDetailTableProps, ref: Ref<unknown>) =>
       render: (row) => {
         const {
           basePrice,
-          discount,
+          offeredPrice,
         } = row
 
         const price = +basePrice
-        const isDiscount = +discount > 0
-        const offeredPrice = +basePrice - +discount
+        const discountPrice = +offeredPrice
+        const isDiscount = price - discountPrice > 0
 
         return (
           <>
@@ -228,11 +228,11 @@ const QuoteDetailTable = (props: ShoppingDetailTableProps, ref: Ref<unknown>) =>
 
             <Typography
               sx={{
-                padding: 0,
+                padding: isDiscount ? '0' : '12px 0 0 0',
                 color: isDiscount ? '#2E7D32' : '#212121',
               }}
             >
-              {`${currencyToken}${offeredPrice.toFixed(2)}`}
+              {`${currencyToken}${discountPrice.toFixed(2)}`}
             </Typography>
 
           </>
@@ -261,13 +261,14 @@ const QuoteDetailTable = (props: ShoppingDetailTableProps, ref: Ref<unknown>) =>
         const {
           basePrice,
           quantity,
-          discount,
+          offeredPrice,
         } = row
-        const total = +basePrice * +quantity
-        const offeredPrice = +basePrice - +discount
+        const price = +basePrice
+        const discountPrice = +offeredPrice
+        const isDiscount = price - discountPrice > 0
 
-        const isDiscount = +discount > 0
-        const totalWithDiscount = +offeredPrice * +quantity
+        const total = price * +quantity
+        const totalWithDiscount = discountPrice * +quantity
 
         return (
           <Box>
@@ -285,7 +286,7 @@ const QuoteDetailTable = (props: ShoppingDetailTableProps, ref: Ref<unknown>) =>
             }
             <Typography
               sx={{
-                padding: '0',
+                padding: isDiscount ? '0' : '12px 0 0 0',
                 color: isDiscount ? '#2E7D32' : '#212121',
               }}
             >

diff --git a/apps/storefront/src/pages/quote/components/QuoteDetailTableCard.tsx b/apps/storefront/src/pages/quote/components/QuoteDetailTableCard.tsx
@@ -36,14 +36,15 @@ const QuoteDetailTableCard = (props: QuoteTableCardProps) => {
     options,
     sku,
     notes,
-    discount,
+    offeredPrice,
   } = quoteTableItem
 
-  const total = +basePrice * +quantity
   const price = +basePrice
-  const isDiscount = +discount > 0
-  const offeredPrice = +basePrice - +discount
-  const totalWithDiscount = +offeredPrice * +quantity
+  const discountPrice = +offeredPrice
+  const isDiscount = price - discountPrice > 0
+
+  const total = price * +quantity
+  const totalWithDiscount = discountPrice * +quantity
 
   return (
     <Box

diff --git a/apps/storefront/src/pages/quote/components/QuoteItemCard.tsx b/apps/storefront/src/pages/quote/components/QuoteItemCard.tsx
@@ -49,7 +49,7 @@ export const QuoteItemCard = (props: QuoteItemCardProps) => {
       title: 'Title',
     },
     {
-      key: 'salesRep',
+      key: 'salesRepEmail',
       title: 'Sales rep',
     },
     {
@@ -72,17 +72,17 @@ export const QuoteItemCard = (props: QuoteItemCardProps) => {
       render: () => format(+item.expiredAt * 1000, 'dd MMM yy'),
     },
     {
-      key: 'subtotal',
+      key: 'grandTotal',
       title: 'Subtotal',
       render: () => {
         const {
           currency: {
             token,
           },
-          subtotal,
+          grandTotal,
         } = item
 
-        return (`${token}${subtotal}`)
+        return (`${token}${(+grandTotal).toFixed(2)}`)
       },
     },
   ]

diff --git a/apps/storefront/src/utils/b3Init.ts b/apps/storefront/src/utils/b3Init.ts
@@ -54,13 +54,12 @@ export const getQuoteEnabled = (
   let productQuoteEnabled = quoteEnabled && customerEnabled === '1' && productEnabled === '1'
   let cartQuoteEnabled = quoteEnabled && customerEnabled === '1' && cartEnabled === '1'
 
-  // BCUser
-  if (!isB2BUser || (`${role}` === '3' && !isAgenting)) {
-    productQuoteEnabled = productQuoteEnabled && bcUserEnabled === '1'
-    cartQuoteEnabled = cartQuoteEnabled && bcUserEnabled === '1'
-  } else if (`${role}` === '100') { // guest
+  if (`${role}` === '100') { // guest
     productQuoteEnabled = productQuoteEnabled && guestEnabled === '1'
     cartQuoteEnabled = cartQuoteEnabled && guestEnabled === '1'
+  } else if (!isB2BUser || (`${role}` === '3' && !isAgenting)) { // BCUser
+    productQuoteEnabled = productQuoteEnabled && bcUserEnabled === '1'
+    cartQuoteEnabled = cartQuoteEnabled && bcUserEnabled === '1'
   }
 
   return {