@bjsdistribution/dms-client-return 0.0.18 → 0.0.20

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

@@ -8,8 +8,9 @@ import {
   usePrevOrderDetails,
   errorAtom,
   useCustomerInfo,
-  useLogsCallAPi,
+  // useLogsCallAPi,
   useApiCalling,
+  // UseNotesLoading,
 } from '../../../store';
 import useUpdateOrder from '../../../hooks/useUpdateOrder';
 import { compareOrderDetailsStates, filterObject } from '../../../utils';
@@ -21,8 +22,9 @@ function OrderDetailsFooter() {
   const [, setCustomerInfo] = useCustomerInfo();
   const updateOrder = useUpdateOrder();
   const [errorState] = useAtom(errorAtom);
-  const [, setLogsCallAPi] = useLogsCallAPi();
+  // const [, setLogsCallAPi] = useLogsCallAPi();
   const [, setCallApi] = useApiCalling(); //single detail
+  // const [, setNoteLoadingStore] = UseNotesLoading();
 
   const errorFound = () => {
     const isError =
@@ -76,11 +78,11 @@ function OrderDetailsFooter() {
   };
 
   const onSave = async () => {
+    setCallApi(true);
     const payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
     const response = await updateOrder([payload]);
 
-    setLogsCallAPi(prev => !prev);
-    setCallApi(false);
+    // setLogsCallAPi(prev => !prev);
 
     if (response && response?.data?.length > 0) {
       setOrderDetails(response?.data[0]);
@@ -89,13 +91,14 @@ function OrderDetailsFooter() {
         recipient_name: response?.data[0]?.order_recipient?.recipient_name,
         postcode: response?.data[0]?.order_recipient?.postcode,
       });
-      setTimeout(() => {
-        setLogsCallAPi(true);
-        setCallApi(true);
-      }, 2000);
+      // setNoteLoadingStore(true);
+      // setTimeout(() => {
+      // setLogsCallAPi(true);
+      setCallApi(true);
+      // }, 2000);
     } else {
-      setLogsCallAPi(false);
-      setCallApi(false);
+      // setLogsCallAPi(false);
+      // setCallApi(false);
       setOrderDetails(prevOrderDetails);
     }
   };
@@ -115,9 +118,9 @@ const Container = styled.div`
   justify-content: space-between;
   padding: 10px 15px;
   align-items: flex-start;
-  border-top: 1px solid #edebe8;
+  border: 1px solid #edebe8;
   background: #f8fafc;
-  margin: 0px -15px -15px -15px;
+  margin: 0px;
   border-radius: 0px 0px 8px 8px;
 `;
 

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

@@ -52,6 +52,8 @@ export const ordersInitialValue: OrdersType = {
   drop_time: null,
   created_by: null,
   created_at: null,
+  recipient_name: '',
+  postcode: '',
   order_recipient: {
     id: null,
     order_id: null,
@@ -210,6 +212,11 @@ function useProductDetails() {
   return useAtom(productDetails);
 }
 
+const fetchAgain = atom<boolean>(false);
+export function usefetchAgain() {
+  return useAtom(fetchAgain);
+}
+
 const productDetailsCopy = atom<any>([]);
 export function useProductDetailsCopy() {
   return useAtom(productDetailsCopy);

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

@@ -113,6 +113,7 @@ export interface OrderRouteType {
   route_id?: number;
   drop_no?: number;
   // drop_time?: number;
+  slot?: string;
   slot_date?: string;
   slot_fixed?: string;
   est_arrival?: string;
@@ -160,8 +161,10 @@ export interface OrdersType {
   order_locked_by: string | null;
   delivery_instructions: string | null;
   drop_time: string | null;
-  created_by: any | null;
-  created_at: any | null;
+  created_by: any;
+  created_at: any;
+  recipient_name: any;
+  postcode: any
 }
 
 export type DeleteProds = {