fix order track status

atlp-rwanda · Jul 25, 2024 · 59a09bd · 59a09bd
1 parent 102bfd8
commit 59a09bd
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 9 deletions.
diff --git a/src/Components/orderComponent.tsx b/src/Components/orderComponent.tsx
@@ -51,7 +51,13 @@ const Order: React.FC<OrderProps> = ({ orderId, orderDate, keyIndex, expectedDel
                 </div>
                 <div>
                     <div className="text-sm text-gray-400">Expected Delivery Date</div>
-                    <div>{formatDate(expectedDeliveryDate)}</div>
+                    <div>  {expectedDeliveryDate
+                ? new Date(expectedDeliveryDate).toLocaleDateString("en-US", {
+                    year: "numeric",
+                    month: "long",
+                    day: "numeric",
+                  })
+                : "N/A"}</div>
                 </div>
                 <div>
                 <div className="text-sm text-gray-400">Status</div>

diff --git a/src/Components/orders.tsx b/src/Components/orders.tsx
@@ -1,8 +1,9 @@
-import React from "react";
+import React, { useEffect } from "react";
 import OrderTable from "./orderComponent";
-import { useGetAllOrdersQuery } from "../Redux/OrderSlice";
+import { useAllOrdersQuery, useGetAllOrdersQuery, useGetSellerOrderQuery } from "../Redux/OrderSlice";
 import Skeleton from "react-loading-skeleton";
 import 'react-loading-skeleton/dist/skeleton.css';
+import useAuthUser from "react-auth-kit/hooks/useAuthUser";
 
 interface Order {
     orderId: string;
@@ -12,6 +13,7 @@ interface Order {
 }
 
 const OrderComponent = () => {
+    const authData:any = useAuthUser()
     function getAuthCookie() {
         const cookies = document.cookie.split(';');
         for (let cookie of cookies) {
@@ -25,8 +27,10 @@ const OrderComponent = () => {
 
     const token = getAuthCookie();
     console.log('token ', token);
-    const { data: orders, isLoading, error } = useGetAllOrdersQuery({ token });
-
+    const vendorData:any = localStorage.getItem("vendorData")
+    const vendor = JSON.parse(vendorData) 
+    const { data: orders, isLoading, error } = useGetSellerOrderQuery({ token,vendorId:vendor?.vendorId });
+    const { data: buyerOrder, isLoading:buyerLoad, error:buyerError } =  useGetAllOrdersQuery({token});
     const LoadingSkeleton = () => {
         return (
             <div className="m-10">
@@ -66,10 +70,14 @@ const OrderComponent = () => {
                 <LoadingSkeleton/>
             ) : error ? (
                 <div>Error loading orders</div>
-            ) : !orders || orders.length === 0 ? (
-                <div>No orders available</div>
+
             ) : (
-                <OrderTable orders={orders} />
+                authData.role == "vendor" ? (
+                    <OrderTable orders={orders} />
+
+                ):(
+                    <OrderTable orders={buyerOrder} />  
+                )
             )}
         </div>
     );

diff --git a/src/Redux/OrderSlice.tsx b/src/Redux/OrderSlice.tsx
@@ -45,8 +45,17 @@ const OrderApiSlice = apiSlice.injectEndpoints({
         url: `/order/getAllOrder`,
       }),
     }),
+    getSellerOrder: builder.query({
+      query: ({ token,vendorId }) => ({
+        url: `/order/getSellerOrder/${vendorId}`,
+        headers: {
+          Authorization: `Bearer ${token}`,
+        },
+        credentials: "include",
+      }),
+    }),
   }),
 });
 
-export const { useGetOrderStatusQuery, useGetOrderQuery, useUpdateOrderStatusMutation, useGetUserInfoQuery, useGetAllOrdersQuery, useAllOrdersQuery } = OrderApiSlice;
+export const { useGetOrderStatusQuery, useGetOrderQuery, useUpdateOrderStatusMutation, useGetUserInfoQuery, useGetAllOrdersQuery, useAllOrdersQuery,useGetSellerOrderQuery } = OrderApiSlice;
 export default OrderApiSlice;