Merge branch 'fix-frontend-issues' into 'dev'

[AFP-NA] fix order date display and order created date display

See merge request !12

src/components/OrderDetails.tsx

@@ -21,7 +21,7 @@ const OrderDetails = (props: any) => {
     const status = props.status
     return (
         <>
-            <Td><Link to={"/orders/" + orderNumber}>{orderNumber}</Link></Td>
+            <Td><Link to={"/orders/" + orderNumber}>{orderNumber.slice(orderNumber.length - 7).toUpperCase()}</Link></Td>
             <Td>{date}</Td>
             <Td>{status}</Td>
         </>

src/pages/OrderIndexPage.tsx

@@ -19,8 +19,8 @@ const OrderIndexPage = () => {
     const [orderDetailsArr, setOrderDetailsArr] = useState<any>([])
     const orderDetailsArrCreator = (orders: Order[]) => {
         return orders.map((order: Order, idx: any) => {
-        return <Tr key={idx}><OrderDetails
-            date={order.orderCreatedAt} 
+            return <Tr key={idx}><OrderDetails
+            date={new Date(order.orderCreatedAt).toLocaleDateString()} 
             orderNumber={order.id}
             status={order.orderStatus}
             /></Tr>
@@ -42,11 +42,11 @@ const OrderIndexPage = () => {
     
     useEffect(() => {
         const newArray: Order[] = []
-        for (const ele of allOrders) {
-            if (ele.id.includes(searchInput)) {
-                newArray.push(ele)
+            for (const ele of allOrders) {
+                if (ele.id.includes(searchInput)) {
+                    newArray.push(ele)
+                }
             }
-        }
         setFilteredOrders(newArray)
     }, [searchInput, allOrders])
 
@@ -72,7 +72,7 @@ const OrderIndexPage = () => {
                     <Thead>
                         <Tr>
                             <Th>Order number</Th>
-                            <Th>Created</Th>
+                            <Th>Order Date</Th>
                             <Th>Order Status</Th>
                         </Tr>
                     </Thead>

src/pages/OrderShowPage.tsx

@@ -35,8 +35,8 @@ const OrderShowPage = (props: any) => {
         <>
             <div className="show-div">
                 <Flex justify="space-around">
-                    <Box><strong>Order Date:</strong> {order.orderCreatedAt}</Box>
-                    <Box><strong>Order Number:</strong> {order.id}</Box>
+                    <Box><strong>Order Date:</strong> {new Date(order.orderCreatedAt).toLocaleDateString()}</Box>
+                    <Box><strong>Order Number:</strong> {order.id.slice(order.id.length - 7).toUpperCase()}</Box>
                     <Box><strong>Order Status:</strong> {order.orderStatus}</Box>
                 </Flex>
                 <br/>

src/router/MainRouter.tsx

@@ -28,6 +28,4 @@ const MainRouter: React.FC = () => {
     )
 }
 
-export default MainRouter
-
-  
\ No newline at end of file
+export default MainRouter
\ No newline at end of file