diff --git a/apps/storefront/src/components/B3ProductList.tsx b/apps/storefront/src/components/B3ProductList.tsx index 57c329f8..fb47aca2 100644 --- a/apps/storefront/src/components/B3ProductList.tsx +++ b/apps/storefront/src/components/B3ProductList.tsx @@ -31,6 +31,9 @@ interface FlexItemProps { width?: string padding?: string textAlignLocation?: string + sx?: { + [key: string]: string | number + } } const Flex = styled('div')(({ isHeader, isMobile }: FlexProps) => { @@ -67,7 +70,7 @@ const Flex = styled('div')(({ isHeader, isMobile }: FlexProps) => { }) const FlexItem = styled('div')( - ({ width, textAlignLocation, padding = '0' }: FlexItemProps) => ({ + ({ width, textAlignLocation, padding = '0', sx }: FlexItemProps) => ({ display: 'flex', justifyContent: textAlignLocation === 'right' ? 'flex-end' : 'flex-start', flexGrow: width ? 0 : 1, @@ -75,6 +78,7 @@ const FlexItem = styled('div')( alignItems: 'center', width, padding, + ...sx, }) ) @@ -336,12 +340,29 @@ export default function B3ProductList(props: ProductProps) { textAlignLocation={textAlign} padding={quantityEditable ? '10px 0 0' : ''} {...itemStyle.default} + sx={ + isMobile + ? { + fontSize: '14px', + } + : {} + } > {isMobile && Price:} {`${currencyFormat(productPrice)}`} - + {quantityEditable ? ( (props: ProductProps) { padding={quantityEditable ? '10px 0 0' : ''} {...itemStyle.default} textAlignLocation={textAlign} + sx={ + isMobile + ? { + fontSize: '14px', + } + : {} + } > {isMobile && {totalText}:} {`${currencyFormat( diff --git a/apps/storefront/src/pages/invoice/Invoice.tsx b/apps/storefront/src/pages/invoice/Invoice.tsx index 9f14bf2d..6ff28b3c 100644 --- a/apps/storefront/src/pages/invoice/Invoice.tsx +++ b/apps/storefront/src/pages/invoice/Invoice.tsx @@ -587,7 +587,7 @@ function Invoice() { let code = item.status // (3, "Overdue")-【Display status when invoice exceeds due date. For front-end display only】 - if (status !== 2 && currentDate > dueDate * 1000) { + if (status === 0 && currentDate > dueDate * 1000) { code = 3 } diff --git a/apps/storefront/src/pages/invoice/InvoiceItemCard.tsx b/apps/storefront/src/pages/invoice/InvoiceItemCard.tsx index 28c9f3eb..3854384b 100644 --- a/apps/storefront/src/pages/invoice/InvoiceItemCard.tsx +++ b/apps/storefront/src/pages/invoice/InvoiceItemCard.tsx @@ -57,7 +57,7 @@ export function InvoiceItemCard(props: InvoiceItemCardProps) { const currentCurrencyToken = handleGetCorrespondingCurrency(currentCode) let statusCode = item.status - if (status !== 2 && currentDate > dueDate * 1000) { + if (status === 0 && currentDate > dueDate * 1000) { statusCode = 3 } diff --git a/apps/storefront/src/pages/quickorder/components/QuickOrderCard.tsx b/apps/storefront/src/pages/quickorder/components/QuickOrderCard.tsx index a1be0210..4a1966ac 100644 --- a/apps/storefront/src/pages/quickorder/components/QuickOrderCard.tsx +++ b/apps/storefront/src/pages/quickorder/components/QuickOrderCard.tsx @@ -86,7 +86,9 @@ function QuickOrderCard(props: QuickOrderCardProps) { )} - {`Price: ${currencyFormat(price)}`} + {`Price: ${currencyFormat( + price + )}`} { handleUpdateProductQty(shoppingDetail.id, e.target.value) @@ -115,7 +123,7 @@ function QuickOrderCard(props: QuickOrderCardProps) { /> - {`Last ordered: ${displayFormat( + {`Last ordered: ${displayFormat( lastOrderedAt )}`} diff --git a/apps/storefront/src/pages/quote/components/QuoteDetailTableCard.tsx b/apps/storefront/src/pages/quote/components/QuoteDetailTableCard.tsx index a2bf98e7..f17b57d3 100644 --- a/apps/storefront/src/pages/quote/components/QuoteDetailTableCard.tsx +++ b/apps/storefront/src/pages/quote/components/QuoteDetailTableCard.tsx @@ -128,7 +128,11 @@ function QuoteDetailTableCard(props: QuoteTableCardProps) { {notes} - + Price: {isDiscount && ( {`Qty: ${quantity}`} - + Total: {isDiscount && ( - {`Price: ${currencyFormat(price)}`} + {`Price: ${currencyFormat( + price + )}`} { handleUpdateProductQty(quoteTableItem, e.target.value) }} /> - {`Total: ${currencyFormat(total)}`} + {`Total: ${currencyFormat( + total + )}`} {`Price: ${currencyFormat(price)}`} @@ -169,6 +170,10 @@ function ShoppingDetailCard(props: ShoppingDetailCardProps) { maxWidth: '100px', '& label': { zIndex: 0, + fontSize: '14px', + }, + '& input': { + fontSize: '14px', }, }} onChange={(e) => { @@ -181,6 +186,7 @@ function ShoppingDetailCard(props: ShoppingDetailCardProps) { {`Total: ${currencyFormat(total)}`}