@bjsdistribution/dms-client-return 0.1.66-prod → 0.1.67-prod

package/package.json

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

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

@@ -10,7 +10,7 @@ import SortIcon from '../../../../common/SortIcon';
 import PrintDropDownReturn from '../../../order-view/details-filters/left-side-filters/dropdowns/PrintDropDownReturn';
 import { usefetchAgain, useReturnData } from '../../../order-view/store';
 import {
-  useCustomerData,
+  useFlatCustomerData,
   useGroupedPayload,
   useLocationData,
   useNewReturnPayload,
@@ -31,7 +31,14 @@ import { CustomDrop, StyledTable, StyledTableWrapper } from './returnstyles';
 import { NavLink, useSearchParams } from 'react-router-dom';
 import { WEIGHT_UNIT } from '../../../../common/utils';
 
-const SELECTABLE_ACTIONS = ['RTS', 'CLAIMS PAID', 'DISPOSE', 'RE-ALLOCATE', 'RECYCLE', 'UNKNOWN'];
+const SELECTABLE_ACTIONS = [
+  'RTS',
+  'CLAIMS PAID',
+  'DISPOSE',
+  'RE-ALLOCATE',
+  'RECYCLE',
+  'UNKNOWN',
+];
 
 const isSelectableItem = (item: any) =>
   SELECTABLE_ACTIONS.includes(item?.product_return_action) &&
@@ -179,9 +186,10 @@ const ReturnOrderTable = () => {
     }
     // setShouldPerformAction(false);
   }, [fetchedOrderData, returnDataLoad, locationData, state, callForFetch]);
-  const [customers] = useCustomerData();
+  // const [customers] = useCustomerData();
+  const [flatCustomers] = useFlatCustomerData();
 
-  const selectedCustomer = customers?.find((customer: any) => {
+  const selectedCustomer = flatCustomers?.find((customer: any) => {
     const customerId = customer?.customer_id?.toString();
     return customerId && customerId === urlCustomerId;
   });
@@ -193,16 +201,21 @@ const ReturnOrderTable = () => {
     setSelectAll(isChecked);
 
     if (isChecked) {
-      const firstSelectable = returnData?.find((loc: any) => isSelectableItem(loc));
-      const targetAction = selectedReturnOrder.length > 0
-        ? selectedReturnOrder[0]?.product_return_action
-        : firstSelectable?.product_return_action;
+      const firstSelectable = returnData?.find((loc: any) =>
+        isSelectableItem(loc)
+      );
+      const targetAction =
+        selectedReturnOrder.length > 0
+          ? selectedReturnOrder[0]?.product_return_action
+          : firstSelectable?.product_return_action;
 
       if (!targetAction) return;
 
       const filteredData = returnData?.filter(
-        (loc: any) => isSelectableItem(loc) && loc?.product_return_action === targetAction
+        (loc: any) =>
+          isSelectableItem(loc) && loc?.product_return_action === targetAction
       );
+
       const selectedOrders = filteredData.map((loc: any) => ({
         id: loc.id,
         return_locations: loc?.return_location_name,
@@ -219,6 +232,7 @@ const ReturnOrderTable = () => {
         return_action: loc?.product_return_action,
         return_location_token: loc?.return_location || null,
       }));
+      console.log(newPayload, 'newPayloadnewPayload');
 
       setSelectedReturnOrder(selectedOrders);
       setNewPayload(newPayload);
@@ -258,12 +272,13 @@ const ReturnOrderTable = () => {
 
         const targetAction = product_return_action;
         const totalItemsOfAction = returnData?.filter(
-          (loc: any) => isSelectableItem(loc) && loc?.product_return_action === targetAction
+          (loc: any) =>
+            isSelectableItem(loc) && loc?.product_return_action === targetAction
         )?.length;
 
         setSelectAll(
           updatedSelectedLocations?.length > 0 &&
-          updatedSelectedLocations?.length === totalItemsOfAction
+            updatedSelectedLocations?.length === totalItemsOfAction
         );
         return updatedSelectedLocations;
       } else {
@@ -290,12 +305,11 @@ const ReturnOrderTable = () => {
 
         const targetAction = product_return_action;
         const totalItemsOfAction = returnData?.filter(
-          (loc: any) => isSelectableItem(loc) && loc?.product_return_action === targetAction
+          (loc: any) =>
+            isSelectableItem(loc) && loc?.product_return_action === targetAction
         )?.length;
 
-        setSelectAll(
-          updatedSelectedLocations?.length === totalItemsOfAction
-        );
+        setSelectAll(updatedSelectedLocations?.length === totalItemsOfAction);
         return updatedSelectedLocations;
       }
     });
@@ -319,16 +333,10 @@ const ReturnOrderTable = () => {
         };
       }
 
-      acc[key].products = [
-        ...acc[key].products,
-        ...item.products,
-      ];
+      acc[key].products = [...acc[key].products, ...item.products];
 
       acc[key].return_action = Array.from(
-        new Set([
-          ...acc[key].return_action,
-          ...item.return_action,
-        ])
+        new Set([...acc[key].return_action, ...item.return_action])
       );
 
       return acc;
@@ -416,7 +424,8 @@ const ReturnOrderTable = () => {
                         className="custom-check"
                         disabled={
                           selectedReturnOrder.length > 0 &&
-                          selectedReturnOrder[0]?.product_return_action !== item?.product_return_action
+                          selectedReturnOrder[0]?.product_return_action !==
+                            item?.product_return_action
                         }
                         checked={selectedReturnOrder.some(
                           (selectedInvoice: any) =>
@@ -443,7 +452,9 @@ const ReturnOrderTable = () => {
                     )}
                   </td>
                   <td> {displayValueOrNA(item?.return_location_name)}</td>
-                  <td title={item?.client_name ?? ''}>{displayValueOrNA(item?.client_name)}</td>
+                  <td title={item?.client_name ?? ''}>
+                    {displayValueOrNA(item?.client_name)}
+                  </td>
                   <td>
                     <ul style={{ listStyleType: 'none', padding: 0 }}>
                       <li

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

@@ -36,7 +36,10 @@ const ModalManager = () => {
   const [, setGrouped] = useGroupedPayload();
   const [, setSelectAll] = useSelectAll();
   const [, setCallForFetch] = usefetchAgain();
-  const [sendEmailNotification, setSendEmailNotification] = useSendEmailNotification();
+  const [
+    sendEmailNotification,
+    setSendEmailNotification,
+  ] = useSendEmailNotification();
   const navigate = useNavigate();
 
   const closeModal = () => {
@@ -67,6 +70,7 @@ const ModalManager = () => {
     body: newGrouped,
     performAction: false,
   });
+
   useEffect(() => {
     SetPostLoading(confirmLoading);
   }, [confirmLoading]);
@@ -116,14 +120,15 @@ const ModalManager = () => {
 
       const emailApiPayload = {
         // order_ids: response?.data ? response.data.map((item: any) => item?.order_id ?? 0) : [],
-        gsit_order_ids: response?.data ? response.data.map((item: any) => item?.order_id ?? 0) : [],
+        gsit_order_ids: response?.data
+          ? response.data.map((item: any) => item?.order_id ?? 0)
+          : [],
       };
 
       // send to API
       if (sendEmailNotification) {
         callSendEmail({ payload: emailApiPayload });
       }
-      console.log("orderIdsString", orderIdsString)
       if (orderIdsString) {
         navigate(`/orders/view/return/?order=${orderIdsString}`);
       } else {
@@ -163,14 +168,29 @@ const ModalManager = () => {
                 {
                   name: (
                     <div
-                      style={{ display: 'flex', alignItems: 'center', marginRight: '16px', gap: '8px' }}
-                      onClick={(e) => e.stopPropagation()}
+                      style={{
+                        display: 'flex',
+                        alignItems: 'center',
+                        marginRight: '16px',
+                        gap: '8px',
+                      }}
+                      onClick={e => e.stopPropagation()}
                     >
                       <Checkbox
                         checked={sendEmailNotification}
-                        onChange={() => setSendEmailNotification(!sendEmailNotification)}
+                        onChange={() =>
+                          setSendEmailNotification(!sendEmailNotification)
+                        }
                       />
-                      <span style={{ color: '#8d8f90', fontFamily: 'Poppins', fontSize: '14px', fontWeight: 400, textTransform: 'none' }}>
+                      <span
+                        style={{
+                          color: '#8d8f90',
+                          fontFamily: 'Poppins',
+                          fontSize: '14px',
+                          fontWeight: 400,
+                          textTransform: 'none',
+                        }}
+                      >
                         Send Email Notification
                       </span>
                     </div>
@@ -223,4 +243,4 @@ const ModalManager = () => {
   );
 };
 
-export default ModalManager;
+export default ModalManager;