@bjsdistribution/dms-client-return 0.0.21 → 0.0.23

package/package.json

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

package/src/components/order-daily-overview/header-filters/SelectionFilter.tsx

@@ -177,7 +177,6 @@ function SelectionFilter() {
         type: 'SET_CLIENT_FILTER',
         payload: storedClientId,
       });
-      // Reset to the first page
       dispatch({
         type: 'SET_PAGE',
         payload: 1,
@@ -194,7 +193,6 @@ function SelectionFilter() {
         type: 'SET_ACTIONS_FILTER',
         payload: selectedFilterValue,
       });
-      // Reset to the first page
       dispatch({
         type: 'SET_PAGE',
         payload: 1,
@@ -206,7 +204,6 @@ function SelectionFilter() {
         type: 'SET_LOCATION_FILTER',
         payload: selectedLocationValue,
       });
-      // Reset to the first page
       dispatch({
         type: 'SET_PAGE',
         payload: 1,
@@ -214,12 +211,6 @@ function SelectionFilter() {
     }
   };
 
-  useEffect(() => {
-    return () => {
-      dispatch({ type: 'CLEAR_CLIENT' });
-    };
-  }, []);
-
   useEffect(() => {
     if (storedClientId) {
       dispatch({
@@ -252,6 +243,8 @@ function SelectionFilter() {
     }
   }, [selectedFilterValue, selectedLocationValue]);
 
+  console.log(storedName, 'storedName');
+
   return (
     <Wrapper>
       <FilterRow>
@@ -267,7 +260,7 @@ function SelectionFilter() {
             />
           </FilterColumn>
 
-          {storedName && location.pathname.includes(`/filter/`) ? (
+          {storedName && location.pathname.includes(`filter/`) ? (
             <>
               <FilterColumn>
                 <Label>Action Type</Label>

package/src/components/order-daily-overview/return-after-table/ReturnAfterTable.tsx

@@ -1,7 +1,5 @@
 import React, { useEffect, useState } from 'react';
 import styled from 'styled-components';
-// import RouterHeader from '../header/route-header/RouterHeader';
-// import HeaderFilter from '../header-filters/HeaderFilter';
 import OrderTable from './table/OrderTable';
 import ReturnOrderFilter from './table-filters/ReturnOrderFilter';
 import { useAtom, useReturnAfterOrderData } from '../../order-view/store';

package/src/components/order-daily-overview/return-order-table/return-orders-filters/ReturnOrderTable.tsx

@@ -43,11 +43,9 @@ const ReturnOrderTable = () => {
   const [locationData] = useLocationData();
   const [, setPaginationObject] = UsePaginationData();
   const [callForFetch] = usefetchAgain();
-  // console.log(callForFetch, 'callForFetchcallForFetchcallForFetchcallForFetch');
   const OpenDropDown = (index: number) => {
     setPrintToggle(prevIndex => (prevIndex === index ? null : index));
   };
-  console.log(newpayload, 'newpayload');
   // Close dropdown outside click
   useEffect(() => {
     document.addEventListener('mousedown', handleClickOutside);
@@ -156,9 +154,6 @@ const ReturnOrderTable = () => {
     }
   };
 
-  console.log(selectedReturnOrder, 'selectedReturnOrder');
-  console.log(newpayload, 'newpayload');
-
   const handleSelectOrderReturn = (
     id: any,
     return_location: any,
@@ -280,7 +275,7 @@ const ReturnOrderTable = () => {
               <th>Product Location</th>
               <th>Return Location</th>
               <th>Recipient</th>
-              <th>Return Action Type</th>
+              {/* <th>Return Action Type</th> */}
               <th>Code</th>
               <th>Description</th>
               <th>Part</th>
@@ -368,9 +363,9 @@ const ReturnOrderTable = () => {
                       </li>
                     </ul>
                   </td>
-                  <td>
+                  {/* <td>
                     {displayValueOrNA(item?.order_product_return_action?.type)}
-                  </td>
+                  </td> */}
                   <td>{displayValueOrNA(item?.code)}</td>
                   <td>{displayValueOrNA(item?.description)}</td>
                   <td>{displayValueOrNA(item?.parts_count)}</td>

package/src/index.tsx

@@ -40,12 +40,22 @@ function ReturnClient() {
   console.log(selectedClientString, 'selectedClient');
   console.log(`../filter/:${selectedClientString}`);
 
+  const splitPath = (str: any) => {
+    const parts = str?.split('/')?.filter((part: any) => part !== ''); // Filter out empty parts
+    return parts;
+  };
+  const paths = splitPath(location.pathname);
+  console.log(paths, 'pathssssssssssssssssssssssssssss');
+
   useEffect(() => {
-    if (location.pathname.includes('/returnClient')) {
+    console.log(
+      paths[paths.length - 1],
+      'paths[paths.length] paths[paths.length]'
+    );
+    if (paths[paths.length - 1] === 'returnclient') {
       localStorage.removeItem('clientName');
       localStorage.removeItem('clientId');
       localStorage.removeItem('uuid');
-      localStorage.removeItem('customer_id');
       // dispatch({ type: 'CLEAR_CLIENT', payload: [] });
     }
   }, [location.pathname]);
@@ -116,7 +126,12 @@ function ReturnClient() {
       <RouterHeader />
       <Suspense fallback={<LoadingMessage />}>
         <Routes>
+          {/* for local */}
+          {/* <Route path="returnclient" element={<ReturnMainTable />} /> */}
+
+          {/* for dev */}
           <Route path="" element={<ReturnMainTable />} />
+
           <Route path="order-return" element={<ReturnAfterTable />} />
           <Route path="order-return/:id" element={<OrderView />} />
           <Route path="filter/:clientName" element={<ReturnTable />} />