@bjsdistribution/dms-client-return 0.1.21-prod → 0.1.22-dev

package/src/components/order-view/order-details/expanded-content/footer/index.tsx

@@ -11,6 +11,8 @@ import {
   useGlobalStateHitAuditLog,
   useGlobalStateHitOrder,
   useLiveRecalling,
+  useOrderAlertsData,
+  useStatusDetails,
 } from '../../../store';
 // import useUpdateOrder from '../../../hooks/useUpdateOrder';
 import { compareOrderDetailsStates, filterObject } from '../../../utils';
@@ -28,6 +30,24 @@ function OrderDetailsFooter() {
   const [, setRecallOrders] = useGlobalStateHitOrder();
   const [isClientPortal] = useClientPortal();
   const [, setRecalling] = useLiveRecalling();
+  const [, setOrderAlertsData] = useOrderAlertsData();
+  const [, setOrderStatus] = useStatusDetails();
+
+  // call alerts api
+  const { fetchData: callOrderAlertsApi } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `v1/orders/alerts/?order_id=${orderDetails?.id}`,
+    method: 'GET',
+  });
+
+  //Order status api
+  const { fetchData: callOrderStatusApi } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/orders/get_live_status/${orderDetails?.id}`,
+    method: 'GET',
+  });
   //update order
   const { fetchData: callUpdateOrderAPI } = useAxios<{
     data: ApiResponse[];
@@ -38,12 +58,12 @@ function OrderDetailsFooter() {
 
   const errorFound = () => {
     const isError =
-      errorState.w3wError.length > 0 ||
-      errorState.emailError.length > 0 ||
-      errorState.homeContactError.length > 0 ||
-      errorState.workCOntanctError.length > 0 ||
-      errorState.mobileError.length > 0 ||
-      errorState.postCodeError.length > 0;
+      errorState?.w3wError?.length > 0 ||
+      errorState?.emailError?.length > 0 ||
+      errorState?.homeContactError?.length > 0 ||
+      errorState?.workCOntanctError?.length > 0 ||
+      errorState?.mobileError?.length > 0 ||
+      errorState?.postCodeError?.length > 0;
 
     return isError;
   };
@@ -76,7 +96,15 @@ function OrderDetailsFooter() {
     setRecalling(false);
     const payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
 
-    const serviceKeys = [
+    type ServiceKey =
+      | 'assemble'
+      | 'disassemble'
+      | 'unpack_items'
+      | 'collect_disposal'
+      | 'take_packaging_away'
+      | 'assembly_type';
+
+    const serviceKeys: ServiceKey[] = [
       'assemble',
       'disassemble',
       'unpack_items',
@@ -85,28 +113,18 @@ function OrderDetailsFooter() {
       'assembly_type',
     ];
 
-    let orderServicesPayload: Record<string, any> = {};
-
-    const includesKey = serviceKeys.some(key => key in payload);
-
-    if (includesKey) {
-      for (const key of serviceKeys) {
-        orderServicesPayload[key as keyof typeof payload] =
-          key in payload
-            ? payload[key as keyof typeof payload]
-            : orderDetails[key as keyof OrdersType];
-        delete payload[key as keyof typeof payload];
-        if (
-          orderServicesPayload?.assemble === false &&
-          orderServicesPayload?.disassemble === false
-        ) {
-          orderServicesPayload.assembly_type = null;
-        }
+    for (const key of serviceKeys) {
+      if (key in payload) {
+        (payload as Record<ServiceKey, any>)[key] =
+          payload[key as keyof typeof payload];
+      } else if (key in orderDetails) {
+        (payload as Record<ServiceKey, any>)[key] =
+          orderDetails[key as keyof OrdersType];
       }
     }
 
-    if (Object.keys(orderServicesPayload).length > 0) {
-      payload.order_services = [orderServicesPayload];
+    if (payload?.assemble === false && payload?.disassemble === false) {
+      payload.assembly_type = null;
     }
 
     let response = (await callUpdateOrderAPI({
@@ -133,8 +151,26 @@ function OrderDetailsFooter() {
     } else {
       setOrderDetails(prevOrderDetails);
     }
-  };
 
+    const alertsApiRes = (await callOrderAlertsApi()) as {
+      code: number | null;
+      error?: string | null | undefined;
+      [key: string]: any;
+    };
+    if (alertsApiRes?.code === 200 && alertsApiRes?.data) {
+      setOrderAlertsData(alertsApiRes?.data);
+    }
+
+    const orderStatusApiRes = (await callOrderStatusApi()) as {
+      code: number | null;
+      error?: string | null | undefined;
+      [key: string]: any;
+    };
+    if (orderStatusApiRes?.code === 200 && orderStatusApiRes?.data) {
+      setOrderStatus(orderStatusApiRes?.data);
+    }
+  };
+  //here changes needed
   return (
     <Container>
       <AllowTracking />

package/src/components/order-view/order-details/expanded-content/orders-section/DeliveryDate.tsx

@@ -62,7 +62,7 @@ function DeliveryDate() {
         onChange={onChange}
         value={actionDate === null ? actionDate : dayjs(actionDate)}
         format="DD/MM/YY"
-        disabledDate={current => current && current < dayjs().startOf('day')}
+        disabledDate={() => false}
         allowClear={false}
         disabled={
           isClientPortal

package/src/components/order-view/products-info/index.tsx

@@ -31,6 +31,7 @@ function ProductsInfo({ locationloading }: any) {
   }>({
     endpoint: `/v1/return/products/${returnOrder?.id}`,
     method: 'GET',
+    pagination: { is_pagination: false },
   });
 
   useEffect(() => {

package/src/components/order-view/types.ts

@@ -51,7 +51,8 @@ export type OrderActionsType =
   | 'clear-date'
   | 'uncancel-order'
   | 'remove-from-route'
-  | 'force-debrief';
+  | 'force-debrief'
+  | 'what3Words';
 
 export interface ChargeLogData {
   id: number;
@@ -76,8 +77,8 @@ export type OrderRecipientType = {
   postcode?: string | null;
   postcode_district?: string | null;
   postcode_short?: string | null;
-  latitude?: number | null;
-  longitude?: number | null;
+  latitude?: string | null;
+  longitude?: string | null;
   what_3words_address?: string | null;
   contact_home?: string | null;
   contact_work?: string | null;
@@ -157,7 +158,7 @@ export interface OrdersType {
   vehicle_type: string | null;
   order_recipient: OrderRecipientType | null;
   order_services_detail: OrderServicesDetailType | null;
-  order_services: OrderServiceType[];
+  order_services?: OrderServiceType[];
   order_routes?: OrderRouteType | null;
   order_eta_updates: any[];
   order_delivery_declined_dates: any[];
@@ -180,6 +181,7 @@ export interface OrdersType {
   take_packaging_away: boolean;
   collect_disposal: boolean;
   assembly_type: string | null;
+  labels?: any;
 }
 
 export type DeleteProds = {

package/src/components/store.ts

@@ -262,11 +262,17 @@ export function useSelectedData() {
 export function useNewReturnOrderData() {
   return useAtom(newReturnOrderData);
 }
-
+//call
 const isClientPortalAtom = atom<boolean | undefined>(undefined);
 function useClientPortal() {
   return useAtom(isClientPortalAtom);
 }
+
+const isClientLoading = atom<boolean>(true);
+function useClientLoading() {
+  return useAtom(isClientLoading);
+}
+
 const activeCardIdAtom = atom<number>(1);
 export const useActiveCardId = () => {
   return useAtom(activeCardIdAtom);
@@ -306,4 +312,5 @@ export {
   useStartDate,
   useEndDate,
   useSelectedClientAfterOrders,
+  useClientLoading,
 };

package/src/index.tsx

@@ -19,6 +19,7 @@ import {
   useActionType,
   useActionTypeOptions,
   useAssignData,
+  useClientLoading,
   useClientPortal,
   useLocationData,
   useStatusOrderData,
@@ -54,10 +55,11 @@ function ReturnClient() {
   const [, setOrderStaticData] = useOrderStaticData();
   const [clientPortal, setClientPortal] = useClientPortal();
   const location = useLocation();
-  const userType = JSON.parse(localStorage.getItem('user_type')!);
-
+  const userType = JSON.parse(localStorage.getItem('user_type') ?? 'null');
+  const [, setLoading] = useClientLoading();
   useEffect(() => {
-    setClientPortal(userType?.is_customer || false); // change it to false bydefault
+    setClientPortal(userType?.is_customer ? true : false); // change it to false bydefault
+    setLoading(false);
   }, []);
 
   const splitPath = (str: any) => {
@@ -134,7 +136,7 @@ function ReturnClient() {
       <Suspense fallback={<LoadingMessage />}>
         {clientPortal ? (
           <Routes>
-            <Route path="" element={<Navigate to={'outstanding_return'} />} />
+            <Route path="" element={<Navigate to={'return_completed'} />} />
             <Route path=":status" element={<ReturnOverview />} />
             <Route
               path="view/:id"