fix: orders list status

bigcommerce · Nov 22, 2022 · 49537d3 · 49537d3
1 parent 8a08a6a
commit 49537d3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/apps/storefront/src/pages/order/Order.tsx b/apps/storefront/src/pages/order/Order.tsx
@@ -45,6 +45,7 @@ import {
   FilterSearchProps,
   getFilterMoreData,
   currencySymbol,
+  getOrderStatusText,
 } from './config'
 
 import {
@@ -166,6 +167,8 @@ const Order = ({
 
   const [filterInfo, setFilterInfo] = useState<Array<any>>([])
 
+  const [getOrderStatuses, setOrderStatuses] = useState<Array<any>>([])
+
   useEffect(() => {
     const search = getInitFilter(isCompanyOrder, isB2BUser)
     setFilterData(search)
@@ -175,7 +178,7 @@ const Order = ({
         orderStatuses = [],
       }: any = await fn()
       const filterInfo = getFilterMoreData(isB2BUser, isCompanyOrder, orderStatuses)
-
+      setOrderStatuses(orderStatuses)
       setFilterInfo(filterInfo)
     }
 
@@ -263,7 +266,7 @@ const Order = ({
       title: 'Order status',
       render: (item: ListItem) => (
         <OrderStatus
-          text={item.customStatus}
+          text={getOrderStatusText(item.status, getOrderStatuses)}
           code={item.status}
         />
       ),

diff --git a/apps/storefront/src/pages/order/config.ts b/apps/storefront/src/pages/order/config.ts
@@ -120,3 +120,5 @@ export const currencySymbol = (currencyItem: string) => {
     return ''
   }
 }
+
+export const getOrderStatusText = (status: number | string, getOrderStatuses: any) => getOrderStatuses.find((item: any) => item.systemLabel === status)?.customLabel || ''