diff --git a/apps/storefront/src/components/B3TipsDialog.tsx b/apps/storefront/src/components/B3TipsDialog.tsx index 414b98b5..fb518632 100644 --- a/apps/storefront/src/components/B3TipsDialog.tsx +++ b/apps/storefront/src/components/B3TipsDialog.tsx @@ -7,7 +7,6 @@ import React, { import { Box, Button, - Typography, } from '@mui/material' import HighlightOffIcon from '@mui/icons-material/HighlightOff' import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline' diff --git a/apps/storefront/src/components/filter/B3Filter.tsx b/apps/storefront/src/components/filter/B3Filter.tsx index 643d7c73..2735ed9d 100644 --- a/apps/storefront/src/components/filter/B3Filter.tsx +++ b/apps/storefront/src/components/filter/B3Filter.tsx @@ -1,7 +1,6 @@ import { useState, ReactElement, - ReactNode, } from 'react' import { Box, diff --git a/apps/storefront/src/pages/address/Address.tsx b/apps/storefront/src/pages/address/Address.tsx index 5909b71b..1f1b3c14 100644 --- a/apps/storefront/src/pages/address/Address.tsx +++ b/apps/storefront/src/pages/address/Address.tsx @@ -26,7 +26,7 @@ import { import { Pagination, B3Table, -} from '@/components/B3Table' +} from '@/components/table/B3Table' import { B3Sping, } from '@/components/spin/B3Sping' @@ -331,6 +331,7 @@ const Address = () => { onEdit={() => handleEdit(row)} onDelete={handleDelete} onSetDefault={handleSetDefault} + companyName={companyName} editPermission={editPermission} isBCPermission={isBCPermission} /> diff --git a/apps/storefront/src/pages/address/components/AddressForm.tsx b/apps/storefront/src/pages/address/components/AddressForm.tsx index 68e3afad..0d17a6c6 100644 --- a/apps/storefront/src/pages/address/components/AddressForm.tsx +++ b/apps/storefront/src/pages/address/components/AddressForm.tsx @@ -1,6 +1,5 @@ import { useEffect, - useContext, useState, forwardRef, useImperativeHandle, @@ -33,14 +32,6 @@ import { snackbar, } from '@/utils' -import { - GlobaledContext, -} from '@/shared/global' - -import { - snackbar, -} from '@/utils' - import { updateB2BAddress, createB2BAddress, diff --git a/apps/storefront/src/pages/address/components/AddressItemCard.tsx b/apps/storefront/src/pages/address/components/AddressItemCard.tsx index 6d089bcb..ca4b2a89 100644 --- a/apps/storefront/src/pages/address/components/AddressItemCard.tsx +++ b/apps/storefront/src/pages/address/components/AddressItemCard.tsx @@ -30,6 +30,7 @@ export interface OrderItemCardProps { onSetDefault: (data: AddressItemType) => void editPermission: boolean isBCPermission: boolean + companyName: string | number } interface TagBoxProps { @@ -66,6 +67,7 @@ export const AddressItemCard = (props: OrderItemCardProps) => { onSetDefault, editPermission: hasPermission, isBCPermission, + companyName, } = props const theme = useTheme() @@ -114,7 +116,7 @@ export const AddressItemCard = (props: OrderItemCardProps) => { {`${addressInfo.firstName} ${addressInfo.lastName}`} - company name + {(isBCPermission ? addressInfo.company : companyName) || ''} {addressInfo.addressLine1} {addressInfo.addressLine2} diff --git a/apps/storefront/src/types/address.ts b/apps/storefront/src/types/address.ts index f27fdc45..1d228b1a 100644 --- a/apps/storefront/src/types/address.ts +++ b/apps/storefront/src/types/address.ts @@ -32,7 +32,7 @@ export interface AddressItemType { isDefaultShipping?: number isDefaultBilling?: number bcAddressId?: number - company: string + company?: string } export interface BcAddressExtraFieldType {