feat: add company name

bigcommerce · Nov 30, 2022 · 7b02b7e · 7b02b7e
1 parent 9365900
commit 7b02b7e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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) => {
         <Typography variant="body1">
           {`${addressInfo.firstName} ${addressInfo.lastName}`}
         </Typography>
-        <Typography variant="body1">company name</Typography>
+        <Typography variant="body1">{(isBCPermission ? addressInfo.company : companyName) || ''}</Typography>
         <Typography variant="body1">{addressInfo.addressLine1}</Typography>
         <Typography variant="body1">{addressInfo.addressLine2}</Typography>
         <Typography variant="body1">

diff --git 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 {