@bjsdistribution/dms-client-return 0.0.53 → 0.0.55

package/package.json

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

package/src/components/order-daily-overview/common/fakedata.tsx

@@ -93,12 +93,30 @@ export const TableData = [
   },
 ];
 
-export const optionsPrint = [
-  { icon: 'runSheet', label: 'Print Runsheet' },
-  { icon: 'loadSheet', label: 'Print Loadsheet' },
-  { icon: 'deliveryLables', label: 'Print Delivery Labels' },
-  { icon: 'customerLables', label: 'Print Customer Labels' },
-  { icon: 'collectionLables', label: 'Print Collection Labels' },
+interface PrintOption {
+  icon: string;
+  label: string;
+  type: string;
+}
+
+export const optionsPrint: PrintOption[] = [
+  { icon: 'runSheet', label: 'Print Runsheet', type: 'runsheet_url' },
+  { icon: 'loadSheet', label: 'Print Loadsheet', type: 'loadsheet_url' },
+  {
+    icon: 'deliveryLables',
+    label: 'Print Delivery Labels',
+    type: 'delivery_label_url',
+  },
+  {
+    icon: 'customerLables',
+    label: 'Print Customer Labels',
+    type: 'customer_label_url',
+  },
+  {
+    icon: 'collectionLables',
+    label: 'Print Return Labels',
+    type: 'return_label_url',
+  },
 ];
 
 export const optionsForReturnPrint = [

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

@@ -372,9 +372,9 @@ const OrderTable = ({ loadingskeleton }: any) => {
                             <PrinterIcon />
                             <DownIcon />
 
-                            {printToogle == index && (
+                            {printToogle === index && (
                               <div ref={dropdownRef}>
-                                <PrintDropDown legacyProductId={item.id} />
+                                <PrintDropDown legacyProductId={item} />
                               </div>
                             )}
                           </li>
@@ -383,13 +383,6 @@ const OrderTable = ({ loadingskeleton }: any) => {
                           <LoadIcon />
                         </li>
                       </ul>
-                      {/* <div className="shareIconContainer">
-                      <PrinterIcon />
-                      <DownIcon />
-                    </div>
-                    <div className="downloadcontainer">
-                      <LoadIcon />
-                    </div> */}
                     </td>
                   </tr>
                 );

package/src/components/order-daily-overview/shared/elements/PrintDropDown.tsx

@@ -8,43 +8,30 @@ const PrintDropDown = ({
 }: {
   legacyProductId: Record<string, any>;
 }) => {
-  const downloadFiles = (label: string) => {
-    const url =
-      legacyProductId?.[
-        `${label
-          .replace('Print ', '')
-          .toLowerCase()
-          .replace(' ', '_')}_url`
-      ];
+  const downloadFiles = (type: string) => {
+    let url: string | undefined;
+
+    if (type) {
+      url = legacyProductId[type];
+    }
 
     if (url) {
       window.open(url, '_blank');
     } else {
-      console.log('URL not available for', label);
+      console.log('URL not available for', type);
     }
   };
 
-  const isOptionDisabled = (label: string) => {
-    const url =
-      legacyProductId?.[
-        `${label
-          .replace('Print ', '')
-          .toLowerCase()
-          .replace(' ', '_')}_url`
-      ];
-    return !url;
-  };
-
   return (
     <OptionsList>
-      {optionsPrint.map((item, index) => {
+      {optionsPrint?.map((item, index) => {
         const IconComponent = PrintIconMap[item.icon];
-        const isDisabled = isOptionDisabled(item.label);
+        const isDisabled = !legacyProductId[item.type];
 
         return (
           <OptionsListLi
             key={index}
-            onClick={() => !isDisabled && downloadFiles(item.label)}
+            onClick={() => !isDisabled && downloadFiles(item.type)}
             disabled={isDisabled}
           >
             {IconComponent && <IconComponent />}

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/hooks/useUpdateOrder.ts

@@ -1,10 +1,12 @@
 import { getBaseEndpoint } from '@bjsdistribution/dms-component-library';
 import { getCookie } from '../utils';
 import { notification } from 'antd';
+import { useUpdateApiCall } from '../store';
 
 function useUpdateOrder() {
   let controller: AbortController;
   const ssoToken = getCookie('id_token');
+  const [, setCallApi] = useUpdateApiCall(); //single detail
 
   const update = async (data: any) => {
     const endpoint = `${getBaseEndpoint()}/orders/update/`;
@@ -38,6 +40,7 @@ function useUpdateOrder() {
         message: 'Success',
         description: 'Order has been updated.',
       });
+      setCallApi(true);
       return json;
     } catch (err) {
       //   setLoading(false);

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

@@ -30,7 +30,7 @@ import {
   useRouteId,
   useGsitOrderId,
   useOrderProductId,
-  useApiCalling,
+  useUpdateApiCall,
   useLiveRecalling,
 } from './store';
 // import Loader from '../order-daily-overview/header/loader/Loader';
@@ -72,7 +72,7 @@ function OrderView() {
   const location = useLocation();
   const paths = splitPath(location.pathname);
   const [, setLocationOptions] = useLocationOptions();
-  const [apiCalling] = useApiCalling();
+  const [apiCalling] = useUpdateApiCall();
   const [orderResources, setOrderResources] = useOrderProductsResources();
   const [orderToolbox, setOrderToolbox] = useOrderProductsToolbox();
   const [GsitCUstomerId, setGsitCUstomerId] = useGsitCUstomerId();
@@ -128,11 +128,8 @@ function OrderView() {
   }, [orderId, liveRecalling]);
 
   useEffect(() => {
-    if (apiCalling) {
-      orderUpdate(true);
-    } else {
-      orderUpdate(false);
-    }
+    orderUpdate(true);
+    apiCalling ? orderUpdate(true) : orderUpdate(false);
   }, [apiCalling]);
 
   useEffect(() => {

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

@@ -1,11 +1,11 @@
 import React, { useEffect } from 'react';
 import { useDeleteProdsID, useProductDetails } from '../store';
+import { Empty, Skeleton } from 'antd';
 import {
   EmptyDataContainer,
   StyledTable,
   StyledTableWrapper,
-} from '../all-reminder/table-view/ReminderStyles';
-import { Empty, Skeleton } from 'antd';
+} from '../order-actions/actions/confirm-order/tables/ReminderStyles';
 
 const DeleteProduct = () => {
   const [productdata] = useProductDetails();

package/src/components/order-view/order-details/expanded-content/footer/index.tsx

@@ -9,7 +9,7 @@ import {
   errorAtom,
   useCustomerInfo,
   // useLogsCallAPi,
-  useApiCalling,
+  useUpdateApiCall,
   // UseNotesLoading,
 } from '../../../store';
 import useUpdateOrder from '../../../hooks/useUpdateOrder';
@@ -23,7 +23,7 @@ function OrderDetailsFooter() {
   const updateOrder = useUpdateOrder();
   const [errorState] = useAtom(errorAtom);
   // const [, setLogsCallAPi] = useLogsCallAPi();
-  const [, setCallApi] = useApiCalling(); //single detail
+  const [, setCallApi] = useUpdateApiCall(); //single detail
   // const [, setNoteLoadingStore] = UseNotesLoading();
 
   const errorFound = () => {
@@ -78,12 +78,10 @@ function OrderDetailsFooter() {
   };
 
   const onSave = async () => {
-    setCallApi(true);
     const payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
     const response = await updateOrder([payload]);
-
+    setCallApi(false);
     // setLogsCallAPi(prev => !prev);
-
     if (response && response?.data?.length > 0) {
       setOrderDetails(response?.data[0]);
       setPrevOrderDetails(response?.data[0]);

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

@@ -437,10 +437,10 @@ const returnDataAtom = atom<any[]>([]);
 export function useReturnData() {
   return useAtom(returnDataAtom);
 }
-const apiCalling = atom<boolean>(false);
+const apiUpdateCalling = atom<boolean>(false);
 
-export function useApiCalling() {
-  return useAtom(apiCalling);
+export function useUpdateApiCall() {
+  return useAtom(apiUpdateCalling);
 }
 const liveRecalling = atom<boolean>(false);
 
@@ -448,6 +448,14 @@ const liveRecalling = atom<boolean>(false);
 export function useLiveRecalling() {
   return useAtom(liveRecalling);
 }
+
+//delete products
+const onDeleteProduct = atom<boolean>(false);
+
+export function useDeleteRecall() {
+  return useAtom(onDeleteProduct);
+}
+
 export const selectedTabKeyAtom = atom<string>('1');
 export const letselectedProductIdAtom = atom<number | null>(null);
 
@@ -475,12 +483,10 @@ const popupReducer = (state: any, action: any) => {
   } else if (action.type === 'addProduct') {
     state = 'addProduct';
     return { state };
-  }
-  else if (action.type === 'split-order') {
+  } else if (action.type === 'split-order') {
     state = 'split-order';
     return { state };
-  }  
-  else if (action.type === 'deleteProduct') {
+  } else if (action.type === 'deleteProduct') {
     state = 'deleteProduct';
     return { state };
   } else if (action.type === 'defectsModal') {