diff --git a/apps/storefront/src/components/B3DropDown.tsx b/apps/storefront/src/components/B3DropDown.tsx index 908c662d..67bdca7b 100644 --- a/apps/storefront/src/components/B3DropDown.tsx +++ b/apps/storefront/src/components/B3DropDown.tsx @@ -57,6 +57,9 @@ export const B3DropDown: (props: B3DropDownProps) => ReactElement = ({ > {open ? : } diff --git a/apps/storefront/src/components/B3ProductList.tsx b/apps/storefront/src/components/B3ProductList.tsx index 85d115d2..d7f1ffc6 100644 --- a/apps/storefront/src/components/B3ProductList.tsx +++ b/apps/storefront/src/components/B3ProductList.tsx @@ -123,7 +123,7 @@ const mobileItemStyle = { }, qty: { width: '100%', - padding: '0 0 0 72px', + padding: '0 0 0 76px', }, } @@ -262,6 +262,7 @@ export const B3ProductList: (props: ProductProps) => ReactElement = (props {totalText} @@ -416,7 +417,7 @@ export const B3ProductList: (props: ProductProps) => ReactElement = (props padding={quantityEditable ? '10px 0 0' : ''} {...itemStyle.default} width={isMobile ? '100%' : actionWidth} - textAlignLocation="right" + textAlignLocation={textAlign} > {isMobile && ( diff --git a/apps/storefront/src/components/filter/B3FilterMore.tsx b/apps/storefront/src/components/filter/B3FilterMore.tsx index 0a76f437..cce8eb74 100644 --- a/apps/storefront/src/components/filter/B3FilterMore.tsx +++ b/apps/storefront/src/components/filter/B3FilterMore.tsx @@ -162,7 +162,12 @@ const B3FilterMore: ({ { ((fiterMoreInfo && fiterMoreInfo.length) || isShowMore) && ( - + { !isFiltering && ( { handleOpenBtnList(e) }} > - + { onChange={() => handleSelectChange(product.variant_id)} /> - + ReactElement = ({ onProductChange={handleProductChange} currencyInfo={currencyInfo} setCheckedArr={setCheckedArr} + textAlign={isMobile ? 'left' : 'right'} /> { diff --git a/apps/storefront/src/pages/quickorder/components/QuickorderTable.tsx b/apps/storefront/src/pages/quickorder/components/QuickorderTable.tsx index 005eb028..760de2ef 100644 --- a/apps/storefront/src/pages/quickorder/components/QuickorderTable.tsx +++ b/apps/storefront/src/pages/quickorder/components/QuickorderTable.tsx @@ -116,6 +116,22 @@ const StyledImage = styled('img')(() => ({ marginRight: '0.5rem', })) +const StyleQuickOrderTable = styled(Box)(() => ({ + display: 'flex', + flexDirection: 'column', + + '& tbody': { + '& tr': { + '& td': { + verticalAlign: 'top', + }, + '& td: first-of-type': { + paddingTop: '25px', + }, + }, + }, +})) + interface QuickorderTableProps { setIsRequestLoading: Dispatch>, setCheckedArr: (values: CustomFieldItems) => void, @@ -411,6 +427,9 @@ const QuickorderTable = ({ /> ), width: '15%', + style: { + textAlign: 'right', + }, }, { key: 'lastOrderedAt', @@ -434,12 +453,7 @@ const QuickorderTable = ({ - + )} /> - - + ) } diff --git a/apps/storefront/src/pages/shoppingListDetails/ShoppingListDetails.tsx b/apps/storefront/src/pages/shoppingListDetails/ShoppingListDetails.tsx index 85a63c01..eb890a99 100644 --- a/apps/storefront/src/pages/shoppingListDetails/ShoppingListDetails.tsx +++ b/apps/storefront/src/pages/shoppingListDetails/ShoppingListDetails.tsx @@ -508,6 +508,7 @@ const ShoppingListDetails = ({ currencyToken={currencyToken} setValidateFailureProducts={setValidateFailureProducts} setValidateSuccessProducts={setValidateSuccessProducts} + textAlign={isMobile ? 'left' : 'right'} /> ({ color: '#455A64', })) +const StyleTextField = styled(TextField)(() => ({ + '& input::-webkit-outer-spin-button, input::-webkit-inner-spin-button': { + marginTop: '-8px', + marginBottom: '8px', + }, +})) + interface ChooseOptionsDialogProps { isOpen: boolean, product?: ShoppingListProductItem, @@ -386,7 +393,7 @@ export const ChooseOptionsDialog = (props: ChooseOptionsDialogProps) => { - { ( diff --git a/apps/storefront/src/pages/shoppingListDetails/components/ReAddToCart.tsx b/apps/storefront/src/pages/shoppingListDetails/components/ReAddToCart.tsx index 0d57d044..f69b29c3 100644 --- a/apps/storefront/src/pages/shoppingListDetails/components/ReAddToCart.tsx +++ b/apps/storefront/src/pages/shoppingListDetails/components/ReAddToCart.tsx @@ -73,6 +73,7 @@ interface ShoppingProductsProps { onProductChange?: (products: ProductsProps[]) => void setValidateFailureProducts: (arr: ProductsProps[]) => void, setValidateSuccessProducts: (arr: ProductsProps[]) => void, + textAlign?: string, } interface FlexProps { @@ -86,6 +87,7 @@ interface FlexItemProps { flexBasis?: string, alignItems?: string, flexDirection?: 'column' | 'inherit' | '-moz-initial' | 'initial' | 'revert' | 'unset' | 'column-reverse' | 'row' | 'row-reverse', + textAlignLocation?: string, } const Flex = styled('div')(({ @@ -127,8 +129,10 @@ const FlexItem = styled(Box)(({ flexBasis, flexDirection = 'row', alignItems, + textAlignLocation, }: FlexItemProps) => ({ display: 'flex', + justifyContent: textAlignLocation === 'right' ? 'flex-end' : 'flex-start', flexDirection, flexGrow: width ? 0 : 1, flexShrink: width ? 0 : 1, @@ -189,6 +193,7 @@ export const ReAddToCart = (props: ShoppingProductsProps) => { allowJuniorPlaceOrder, setValidateFailureProducts, setValidateSuccessProducts, + textAlign = 'left', } = props const [isOpen, setOpen] = useState(false) @@ -375,7 +380,10 @@ export const ReAddToCart = (props: ShoppingProductsProps) => { Product - + Price { justifyContent: 'center', }} {...itemStyle.default} + textAlignLocation={textAlign} > Qty - + Total @@ -484,11 +496,15 @@ export const ReAddToCart = (props: ShoppingProductsProps) => { {isMobile && Price: } {`${currencyToken}${price.toFixed(2)}`} - + { {isMobile &&
Total:
} {`${currencyToken}${total.toFixed(2)}`} diff --git a/apps/storefront/src/pages/shoppingListDetails/components/ShoppingDetailTable.tsx b/apps/storefront/src/pages/shoppingListDetails/components/ShoppingDetailTable.tsx index 373b5053..03ca7436 100644 --- a/apps/storefront/src/pages/shoppingListDetails/components/ShoppingDetailTable.tsx +++ b/apps/storefront/src/pages/shoppingListDetails/components/ShoppingDetailTable.tsx @@ -134,7 +134,7 @@ const StyledShoppingListTableContainer = styled('div')(() => ({ verticalAlign: 'top', }, '& td: first-of-type': { - verticalAlign: 'inherit', + paddingTop: '25px', }, }, '& tr: hover': {