@bjsdistribution/dms-client-return 0.0.19 → 0.0.21

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

@@ -25,7 +25,7 @@ import { ApiResponse } from '../types';
 import CreateReturnModal from './CreateReturnModal';
 import {
   useFinalPayload,
-  // useGroupedPayload,
+  useGroupedPayload,
   useNewReturnPayload,
   usePostLoading,
   useSelectAll,
@@ -33,6 +33,7 @@ import {
   useSelectedOrders,
 } from '../../store';
 import { notification } from 'antd';
+import { useNavigate } from 'react-router-dom';
 
 const ModalManager = () => {
   const [popupName, dispatch] = useAtom(countReducerAtom);
@@ -50,9 +51,10 @@ const ModalManager = () => {
   const [, setSelectedReturnOrder] = useSelectedOrders();
   const [forDisabledCheck, setCheck] = useSelectedConfirmLoc();
   const [, setNewPayload] = useNewReturnPayload();
-  // const [, setGrouped] = useGroupedPayload();
+  const [, setGrouped] = useGroupedPayload();
   const [, setSelectAll] = useSelectAll();
   const [, setCallForFetch] = usefetchAgain();
+  const navigate = useNavigate();
 
   console.log(orderProduct, 'abcabcabcabcabcabcabcabcabcabcabc');
 
@@ -134,7 +136,7 @@ const ModalManager = () => {
     data: response,
     setShouldPerformAction,
     loading: confirmLoading,
-    error,
+    error: apiError,
     setError,
   } = useApiHook<{
     data: ApiResponse[];
@@ -150,42 +152,78 @@ const ModalManager = () => {
     }, [confirmLoading]);
 
   const handleConfirmReturn = () => {
-    // setStateCheck(!forCheck);
-    if (newGrouped.length > 0) {
+    if (newGrouped?.length > 0) {
       setShouldPerformAction(true);
       setCallForFetch(true);
     }
     dispatch({ type: 'close' });
   };
 
-  useEffect(() => {
-    console.log(error, 'error');
-    //@ts-ignore
-    if (!confirmLoading) {
-      if (error && error.errorStatus !== 200) {
-        console.log(error, 'errorINsodeofIFFFFFF');
-        notification.error({
-          message: error.errorStatus || 'Error',
-          description: error.errorMessage || 'Something went wrong',
-        });
-        setError(null);
-      }
+  // useEffect(() => {
+  //   console.log(error, 'error');
+  //   //@ts-ignore
+  //   if (!confirmLoading) {
+  //     // if (error && error.errorStatus !== 200) {
+  //     //   console.log(error, 'errorINsodeofIFFFFFF');
+  //     //   notification.error({
+  //     //     message: error.errorStatus || 'Error',
+  //     //     description: error.errorMessage || 'Something went wrong',
+  //     //   });
+  //     //   setError(null);
+  //     // }
+
+  //     //@ts-ignore
+  //     if (error === null && response && response?.code === 200) {
+  //       notification.success({
+  //         message: 'Success',
+  //         // @ts-ignore
+  //         description: `${response?.message}`,
+  //       });
+  //       dispatch({ type: 'close' });
+  //       setSelectedReturnOrder([]);
+  //       setCheck([]);
+  //       setNewPayload([]);
+  //       setSelectAll(false);
+  //     }
+  //   }
+  // }, [confirmLoading]); //forCheck
 
-      //@ts-ignore
-      if (error === null && response && response?.code === 200) {
-        notification.success({
-          message: 'Success',
-          // @ts-ignore
-          description: `${response?.message}`,
-        });
-        dispatch({ type: 'close' });
-        setSelectedReturnOrder([]);
-        setCheck([]);
-        setNewPayload([]);
-        setSelectAll(false);
-      }
+  useEffect(() => {
+    // @ts-ignore
+    if (apiError && apiError?.code !== 200) {
+      dispatch({ type: 'close' });
+      setSelectedReturnOrder([]);
+      setCheck([]);
+      setNewPayload([]);
+      setGrouped([]);
+      setSelectAll(false);
+      setShouldPerformAction(false);
+      notification.error({
+        message: 'Failure',
+        // @ts-ignore
+        description: `${apiError?.message}`,
+      });
+      setError(null);
+      // @ts-ignore
+    } else if (response?.code === 200) {
+      notification.success({
+        message: 'Success',
+        // @ts-ignore
+        description: `${response?.message}`,
+      });
+      dispatch({ type: 'close' });
+      setSelectedReturnOrder([]);
+      setCheck([]);
+      setNewPayload([]);
+      setShouldPerformAction(false);
+      setSelectAll(false);
+      setError(null);
+      navigate('/order-return');
     }
-  }, [confirmLoading]); //forCheck
+  }, [response, apiError]);
+
+  console.log(apiError, 'apiError apiError');
+  console.log(response, 'response response ');
 
   return (
     <>

package/src/components/order-view/return-client-products/product-table/ReturnProductTable.tsx

@@ -6,7 +6,7 @@ import {
 import { Checkbox, useApiHook } from '@bjsdistribution/dms-component-library';
 import ActionIcon from '../../../../assets/icons/ActionIcon';
 import { useSelectedOrders } from '../../../store';
-import { useOrderId, useProductDetails } from '../../store';
+import { useOrderId, useOrderStaticData, useProductDetails } from '../../store';
 import { ApiResponse } from '../../types';
 
 const ReturnProductTable = () => {
@@ -52,6 +52,23 @@ const ReturnProductTable = () => {
     setSelectAll(prevSelectAll => !prevSelectAll);
   }, []);
 
+  // const returnreason =
+  const [orderStaticData] = useOrderStaticData();
+
+  const returnReasonsOptions = orderStaticData?.return_reasons?.map(
+    (option: any) => ({
+      label: option.reason,
+      value: option.id,
+    })
+  );
+
+  const getReturnReasonLabel = (returnReasonId: number) => {
+    const matchedReason = returnReasonsOptions?.find(
+      (option: any) => option.value === returnReasonId
+    );
+    return matchedReason ? matchedReason.label : 'N/A'; // Return label or 'N/A' if no match found
+  };
+
   return (
     <div>
       <StyledTableWrapper id="tableScrolling">
@@ -85,7 +102,9 @@ const ReturnProductTable = () => {
                   <td>{'N/A'}</td>
                   <td>{invoice.code}</td>
                   <td>{invoice.description}</td>
-                  <td>{'N/A'}</td>
+                  <td>
+                    {getReturnReasonLabel(invoice?.return_reason_id)}
+                  </td>{' '}
                   <td>1 of 1</td>
                   <td>
                     <div

package/src/index.tsx

@@ -10,6 +10,17 @@ import { useTableName } from './components/order-daily-overview/store/store';
 import ReturnMainTable from './components/order-daily-overview';
 import { notification } from 'antd';
 import RouterHeader from './components/order-daily-overview/header/route-header/RouterHeader';
+import {
+  useActionType,
+  // useAtom,
+  // useAtom,
+  useCustomerData,
+  useLocationData,
+  useStatusOrderData,
+} from './components/store';
+import { ApiResponse } from './components/types';
+import { useApiHook } from '@bjsdistribution/dms-component-library';
+// import { filtersReducerAtom } from './components/order-daily-overview/header-filters/filterStore';
 
 function ReturnClient() {
   notification.config({
@@ -20,14 +31,22 @@ function ReturnClient() {
   const navigate = useNavigate();
   let selectedClientString = selectedClient?.replace(/\s+/g, '-');
   selectedClientString = selectedClientString?.toLowerCase();
+  const [, setCustomers] = useCustomerData();
+  const [, setActionType] = useActionType();
+  const [, setLocationData] = useLocationData();
+  const [, setStatusOfOrders] = useStatusOrderData();
+  // const [, dispatch] = useAtom(filtersReducerAtom);
 
   console.log(selectedClientString, 'selectedClient');
   console.log(`../filter/:${selectedClientString}`);
 
   useEffect(() => {
-    if (!location.pathname.includes('/filter')) {
+    if (location.pathname.includes('/returnClient')) {
       localStorage.removeItem('clientName');
       localStorage.removeItem('clientId');
+      localStorage.removeItem('uuid');
+      localStorage.removeItem('customer_id');
+      // dispatch({ type: 'CLEAR_CLIENT', payload: [] });
     }
   }, [location.pathname]);
 
@@ -38,6 +57,60 @@ function ReturnClient() {
     }
   }, [selectedClient]);
 
+  //API for client data
+  const { data: fetchedCustomerData, loading: loading } = useApiHook<
+    ApiResponse
+  >({
+    endpoint: `/customers/`,
+    method: 'GET',
+    //@ts-ignore
+    pagination: { is_pagination: false },
+  });
+
+  //API for action type
+  const { data: fetchedStaticData, loading: actionLoading } = useApiHook<
+    ApiResponse
+  >({
+    endpoint: `/orders/getStaticData/all/`,
+    method: 'GET',
+    // pagination: { page: 1, per_page: 50 },
+  });
+
+  //API for return locations
+  const { data: fetchedLocationData, loading: locationloading } = useApiHook<
+    ApiResponse
+  >({
+    endpoint: `/return_locations/`,
+    method: 'GET',
+    //@ts-ignore
+    pagination: { is_pagination: false },
+  });
+
+  useEffect(() => {
+    if (fetchedCustomerData && fetchedCustomerData?.data) {
+      setCustomers(fetchedCustomerData?.data);
+    }
+  }, [loading]);
+
+  useEffect(() => {
+    if (fetchedStaticData && fetchedStaticData?.data) {
+      setActionType(
+        fetchedStaticData?.data?.flatMap(
+          (i: any) => i?.order_product_return_action
+        )
+      );
+      setStatusOfOrders(
+        fetchedStaticData?.data?.flatMap((i: any) => i?.order_stock_alias)
+      );
+    }
+  }, [actionLoading]);
+
+  useEffect(() => {
+    if (fetchedLocationData && fetchedLocationData?.data) {
+      setLocationData(fetchedLocationData?.data);
+    }
+  }, [locationloading]);
+
   return (
     <>
       <RouterHeader />