@bjsdistribution/dms-client-return 0.0.13 → 0.0.15

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.13",
+  "version": "0.0.15",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

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

@@ -73,7 +73,7 @@ function OrderView() {
   const paths = splitPath(location.pathname);
   const [, setLocationOptions] = useLocationOptions();
   const [apiCalling] = useApiCalling();
-
+  console.log(paths, 'paths');
   const [orderResources, setOrderResources] = useOrderProductsResources();
   const [orderToolbox, setOrderToolbox] = useOrderProductsToolbox();
   const [GsitCUstomerId, setGsitCUstomerId] = useGsitCUstomerId();
@@ -138,7 +138,7 @@ function OrderView() {
 
   useEffect(() => {
     if (paths.length > 1) {
-      setOrderId(paths[1]);
+      setOrderId(paths[2]);
     }
     // for local
     // if (paths.length >= 0) {

package/src/components/order-view/modalsPopup/CreateReturnModal.tsx

@@ -16,7 +16,7 @@ const CreateReturnModal = () => {
   const [selectedReturnOrder] = useSelectedOrders();
   const [load] = usePostLoading();
   const [groupedPayload] = useGroupedPayload();
-  const [forDisabledCheck] = useSelectedConfirmLoc();
+  // const [forDisabledCheck] = useSelectedConfirmLoc();
   const [, setNew] = useFinalPayload();
 
   const handleSelectLocations = (id: number) => {
@@ -42,9 +42,9 @@ const CreateReturnModal = () => {
   }, []);
 
   useEffect(() => {
-    if (groupedPayload?.length > 0 && forDisabledCheck?.length > 0) {
+    if (groupedPayload?.length > 0 && selectedlocation?.length > 0) {
       const matchedItems = groupedPayload?.filter((item: any) =>
-        forDisabledCheck.includes(item.id)
+        selectedlocation.includes(item.id)
       );
 
       if (matchedItems.length > 0) {
@@ -52,7 +52,7 @@ const CreateReturnModal = () => {
         setNew(finalPayload);
       }
     }
-  }, [forDisabledCheck]);
+  }, [selectedlocation]);
 
   return (
     <>

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

@@ -251,7 +251,7 @@ function useUpdateOrderProducts() {
 const CallAPi = atom(false);
 
 export function useCallAPi() {
-return useAtom(CallAPi);
+  return useAtom(CallAPi);
 }
 // export const selectedProductIdAtom = atom<number | null>(null);
 
@@ -328,12 +328,11 @@ const returnAfterOrderAtom = atom<any[]>([]);
 
 export function useReturnAfterOrderData() {
   return useAtom(returnAfterOrderAtom);
-  }
-  const clientDataAtom = atom<ClientData[]>([]);
-  function useClientData() {
-    return useAtom(clientDataAtom);
-    }
-    
+}
+const clientDataAtom = atom<ClientData[]>([]);
+function useClientData() {
+  return useAtom(clientDataAtom);
+}
 
 export {
   useAtom,
@@ -355,7 +354,7 @@ export {
   useEventNotesData,
   useSelectedProductId,
   useSelectedProductActionTabKey,
-  useClientData
+  useClientData,
 };
 
 const NotesLoading = atom<boolean>(true);
@@ -428,13 +427,13 @@ export function useOrderProductId() {
 const returnDataAtom = atom<any[]>([]);
 export function useReturnData() {
   return useAtom(returnDataAtom);
-  }
-  const apiCalling = atom<boolean>(false);
+}
+const apiCalling = atom<boolean>(false);
 
-  export function useApiCalling() {
-    return useAtom(apiCalling);
-  }
-  const liveRecalling = atom<boolean>(false);
+export function useApiCalling() {
+  return useAtom(apiCalling);
+}
+const liveRecalling = atom<boolean>(false);
 
 //re api call of live status
 export function useLiveRecalling() {
@@ -449,14 +448,18 @@ export const letselectedProductIdAtom = atom<number | null>(null);
 // };
 
 const auditLogToggle = atom<boolean>(true);
-export const SeteauditLogToggle= () => {
+export const SeteauditLogToggle = () => {
   return useAtom(auditLogToggle);
 };
 
-
 // Popup state Manage
 const initialState = null;
+
 const popupReducer = (state: any, action: any) => {
+  if (action.type === 'create-return') {
+    state = 'create-return';
+    return { state };
+  }
   if (action.type === 'bulkUpdate') {
     state = 'bulkUpdate';
     return { state };