@bjsdistribution/dms-client-return 0.0.40 → 0.0.42

package/src/components/order-daily-overview/table/ReturnTable.tsx

@@ -37,6 +37,7 @@ const ReturnTable: React.FC = () => {
   const [, dispatch] = useAtom(filtersReducerAtom);
   const navigate = useNavigate();
   const [customers] = useCustomerData();
+  // const [searchParams] = useSearchParams();
 
   //sorting
   const [sortConfig, setSortConfig] = useState<{
@@ -93,7 +94,6 @@ const ReturnTable: React.FC = () => {
   });
 
   useEffect(() => {
-    // setLoading(staticDataLoading);
     if (fetchedStaticData && fetchedStaticData.data) {
       const result = fetchedStaticData?.data;
       setOrderStaticData(result[0]);
@@ -117,15 +117,7 @@ const ReturnTable: React.FC = () => {
   }, [customers, clientData]);
 
   //handle Redirect
-  const handleRedirect = (
-    customerName: string,
-    customerId: number,
-    account_number: string
-  ) => {
-    localStorage.setItem('clientName', customerName);
-    localStorage.setItem('clientId', customerId?.toString());
-    localStorage.setItem('account_number', account_number);
-
+  const handleRedirect = (customerId: number) => {
     if (customerId) {
       dispatch({
         type: 'SET_CLIENT_FILTER',
@@ -141,14 +133,45 @@ const ReturnTable: React.FC = () => {
         payload: [],
       });
     }
+
+    const queryParams = new URLSearchParams({
+      customerId: customerId?.toString(),
+    });
     //for dev
-    navigate(`filter/${customerId}`);
+    navigate(`filter?${queryParams.toString()}`);
 
     //for local
-    // navigate(`/filter/${customerId}`);
+    //navigate(`/filter?${queryParams.toString()}`);
   };
 
-  console.log(statsLoading, 'statsLoading');
+  //for RTS
+  const handleRedirectRTS = (customerId: number, RTS: string) => {
+    if (customerId) {
+      dispatch({
+        type: 'SET_CLIENT_FILTER',
+        payload: customerId,
+      });
+      dispatch({
+        type: 'SET_PAGE',
+        payload: 1,
+      });
+    } else {
+      dispatch({
+        type: 'SET_CLIENT_FILTER',
+        payload: [],
+      });
+    }
+
+    const queryParams = new URLSearchParams({
+      customerId: customerId?.toString(),
+      type: RTS,
+    });
+    //for dev
+    navigate(`filter?${queryParams.toString()}`);
+
+    //for local
+    //navigate(`/filter?${queryParams.toString()}`);
+  };
 
   return (
     <>
@@ -200,13 +223,7 @@ const ReturnTable: React.FC = () => {
                     <td>{key?.trading_as}</td>
 
                     <td
-                      onClick={() =>
-                        handleRedirect(
-                          key?.customer_name,
-                          key?.customer_id,
-                          key?.account_number
-                        )
-                      }
+                      onClick={() => handleRedirect(key?.customer_id)}
                       style={{
                         color: '#0099ff',
                         fontWeight: 600,
@@ -230,9 +247,25 @@ const ReturnTable: React.FC = () => {
                         <GreyBox>{key?.return_order_products}</GreyBox>
                       </ColumStyle>
                     </td>
-                    <td>
+                    <td
+                      style={{
+                        color: key?.RTS > 0 ? '#0099ff' : 'inherit',
+                        fontWeight: key?.RTS > 0 ? 600 : 'normal',
+                        cursor: key?.RTS > 0 ? 'pointer' : 'default',
+                      }}
+                      onClick={() => handleRedirectRTS(key?.customer_id, 'RTS')}
+                    >
                       <ColumStyle>
-                        <GreyBox>{key?.RTS}</GreyBox>
+                        <GreyBox
+                          style={{
+                            backgroundColor:
+                              key?.RTS > 0
+                                ? 'rgba(99, 150, 229, 0.1)'
+                                : 'rgba(153, 153, 153, 0.1)',
+                          }}
+                        >
+                          {key?.RTS}
+                        </GreyBox>
                       </ColumStyle>
                     </td>
 

package/src/components/order-view/hooks/useGetEventNotes.tsx

@@ -7,7 +7,7 @@ function useGetEventNotes() {
   const ssoToken = getCookie('id_token');
 
   const perform = async () => {
-    const endpoint = `${getBaseEndpoint()}/events/get/event_information/`;
+    const endpoint = `${getBaseEndpoint()}events/get/event_information/`;
     // setLoading(true);
     try {
       const headers = {

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

@@ -55,7 +55,7 @@ const ModalManager = () => {
     data: response,
     setShouldPerformAction,
     loading: confirmLoading,
-    error: apiError,
+    // error: apiError,
     setError,
   } = useApiHook<{
     data: ApiResponse[];
@@ -80,11 +80,12 @@ const ModalManager = () => {
 
   useEffect(() => {
     // @ts-ignore
-    if (apiError && apiError?.code !== 200) {
+    if (response && response?.code == 500) {
+      // @ts-ignore
       notification.error({
         message: 'Failure',
         // @ts-ignore
-        description: `${apiError?.message}`,
+        description: `${response?.message}`,
       });
       dispatch({ type: 'close' });
       setSelectedReturnOrder([]);
@@ -115,7 +116,7 @@ const ModalManager = () => {
       // for dev
       navigate('/returnclient/order-return');
     }
-  }, [response, apiError, postLoading]);
+  }, [postLoading]);
 
   return (
     <>

package/src/components/order-view/order-details/expanded-content/services-section/ServiceLevel.tsx

@@ -52,11 +52,10 @@ const Container = styled.div<{ disabled: boolean }>`
   ${({ disabled }) =>
     disabled &&
     `
-    cursor: not-allowed;
     pointer-events: none;
 
     > * {
-      cursor: not-allowed;
+      pointer-events: none;
     }
   `}
 

package/src/index.tsx

@@ -1,11 +1,11 @@
 import React, { Suspense, useEffect } from 'react';
-import { Route, Routes, useNavigate } from 'react-router-dom';
+import { Route, Routes, useSearchParams } from 'react-router-dom';
 import OrderView from './components/order-view';
 import ReturnTable from './components/order-daily-overview/return-order-table/ReturnTable';
 import ReturnAfterTable from './components/order-daily-overview/return-after-table/ReturnAfterTable';
 import {
-  useIdForTableName,
-  useTableName,
+  useSelectedAction,
+  useSelectedClient,
 } from './components/order-daily-overview/store/store';
 import ReturnMainTable from './components/order-daily-overview';
 import { notification } from 'antd';
@@ -27,8 +27,6 @@ function ReturnClient() {
     top: 80,
   });
   const LoadingMessage = () => <div>Loading...</div>;
-  const [selectedClientId] = useIdForTableName();
-  const navigate = useNavigate();
   const [, setCustomers] = useCustomerData();
   const [, setActionType] = useActionType();
   const [, setLocationData] = useLocationData();
@@ -36,7 +34,9 @@ function ReturnClient() {
   const [, setAssignData] = useAssignData();
   const [, setActionTypeOptions] = useActionTypeOptions();
   const [, setLocationOptions] = useLocationOptions();
-  const [, setTableName] = useTableName();
+  const [, setSelectedFilterValue] = useSelectedAction();
+  const [, setSelectedClient] = useSelectedClient();
+  const [searchParams] = useSearchParams();
 
   const splitPath = (str: any) => {
     const parts = str?.split('/')?.filter((part: any) => part !== ''); // Filter out empty parts
@@ -45,20 +45,18 @@ function ReturnClient() {
   const paths = splitPath(location.pathname);
   useEffect(() => {
     if (paths[paths.length - 1] === 'returnclient') {
-      localStorage.removeItem('clientName');
-      localStorage.removeItem('clientId');
-      localStorage.removeItem('account_number');
       setActionTypeOptions([]);
       setLocationOptions([]);
-      setTableName('');
+      setSelectedClient(null);
+      setSelectedFilterValue(null);
     }
-  }, [location.pathname]);
+  }, [location.pathname, searchParams]);
 
-  useEffect(() => {
-    if (selectedClientId) {
-      navigate(`filter/${selectedClientId}`);
-    }
-  }, [selectedClientId]);
+  // useEffect(() => {
+  //   if (selectedClientId) {
+  //     navigate(`filter/${selectedClientId}`);
+  //   }
+  // }, [selectedClientId]);
 
   //API for client data
   const { data: fetchedCustomerData, loading: loading } = useApiHook<
@@ -76,7 +74,6 @@ function ReturnClient() {
   >({
     endpoint: `/orders/getStaticData/all/`,
     method: 'GET',
-    // pagination: { page: 1, per_page: 50 },
   });
 
   //API for return locations
@@ -130,7 +127,7 @@ function ReturnClient() {
 
           <Route path="order-return" element={<ReturnAfterTable />} />
           <Route path="order-return/:id" element={<OrderView />} />
-          <Route path="filter/:clientId" element={<ReturnTable />} />
+          <Route path="filter" element={<ReturnTable />} />
 
           {/* <Route
           path=""