@bjsdistribution/dms-client-return 0.0.12 → 0.0.13

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

@@ -3,7 +3,7 @@ import { AntModal, useApiHook } from '@bjsdistribution/dms-component-library';
 import { useAtom } from 'jotai';
 import {
   countReducerAtom,
-  selectedProductIdAtom,
+  letselectedProductIdAtom,
   selectedTabKeyAtom,
   useCreateOrderProducts,
   useDeleteProdsID,
@@ -39,7 +39,7 @@ const ModalManager = () => {
   const [selectedRows] = useDeleteProdsID();
   const [unRecieve, setUnRecieve] = useRecieveOrderProducts();
   const [updateOrderProduct, setUpdateOrderProduct] = useUpdateOrderProducts();
-  const [selectedProductId] = useAtom(selectedProductIdAtom);
+  const [selectedProductId] = useAtom(letselectedProductIdAtom);
   const [selectedTab] = useAtom(selectedTabKeyAtom);
   const [, setIsFormValid] = useState(false);
   const [newGrouped, setNewGrouped] = useFinalPayload();

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

@@ -2,10 +2,10 @@ import React from 'react';
 import { Tabs } from 'antd';
 import styled from 'styled-components';
 import { useAtom } from 'jotai';
-import { selectedTabKeyAtom } from '../store';
 import QCLogs from './qclogs';
 import UpdateProduct from './UpdateProducts';
 import UnReceiveProduct from './UnReceiveProduct';
+import { selectedTabKeyAtom } from '../store';
 
 const ProductAction = () => {
   const [, setSelectedTabKey] = useAtom(selectedTabKeyAtom);

package/src/components/order-view/notes/AddNote.tsx

@@ -26,10 +26,8 @@ function AddNote() {
   const pathname = location.pathname;
   const orderIdLocaation = pathname.split('/')[1];
 
-  // const [note, setNote] = useState('');
   const [, CallAPi] = useCallAPi();
   const ssoToken = getCookie('id_token');
-
   const [moduleIds] = usemoduleIds();
 
   // Save New Note
@@ -56,6 +54,7 @@ function AddNote() {
           action: 'create',
           description: noteText,
           data_dump: '{}',
+          manual: 1,
         },
       ],
     };
@@ -81,7 +80,7 @@ function AddNote() {
         });
         setNoteLoadingStore(true);
         setNoteText('');
-        setNoteLoadingStore(false);
+        // setNoteLoadingStore(false);
         CallAPi(true);
       } else if (error) {
         // Error: Set error notification

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

@@ -4,6 +4,7 @@ import AddNote from './AddNote';
 import AuditLogs from './logs';
 import { useApiHook } from '@bjsdistribution/dms-component-library';
 import {
+  SeteauditLogToggle,
   useCallAPi,
   usegetNotes,
   usemoduleIds,
@@ -20,9 +21,7 @@ function Notes() {
   const [, setNoteLoadingStore] = UseNotesLoading();
   const [, setNotes] = usegetNotes();
   const [loderStatus] = useCallAPi();
-
-  // Declare `allIds` state to store the comma-separated IDs
-  // const [allIds, setAllIds] = useState<string | null>(null);
+  const [auditState] = SeteauditLogToggle();
 
   // Fetch module IDs
   const { data: fetchedData, loading: apiLoading } = useApiHook<{ data: any }>({
@@ -44,13 +43,6 @@ function Notes() {
             }))
           ) || [];
 
-      // console.log(modules, 'modulesmodules');
-
-      // const ids = modules?.map((module: any) => module.id).join(',');
-      // setAllIds(ids);
-
-      // console.log(ids, 'allIds');
-
       const orderNoteModule = modules?.find(
         (module: any) => module?.name === 'ORDER-NOTE'
       );
@@ -59,48 +51,43 @@ function Notes() {
     }
   }, [apiLoading, fetchedData]);
 
-  // Fetch Notes Data when `allIds` is available
   const {
     data: NotesData,
     loading: NotesLoading,
     setShouldPerformAction,
   } = useApiHook<{ data: any }>({
-    // Use `allIds` in the endpoint if it's set
     endpoint: `audit_logs/?module_id=${
       moduleIds?.parentId
-    }&module_object_id=${orderId || orderIdLocaation}
-    `,
+    }&module_object_id=${orderId || orderIdLocaation}`,
     method: 'GET',
     performAction: false,
   });
 
-  // &sub_module_ids=${allIds}
-
   useEffect(() => {
     setNoteLoadingStore(true);
+
     if (moduleIds) {
-      // Ensure `allIds` is set
-      setShouldPerformAction(true);
+      setShouldPerformAction(auditState);
     }
     if (!NotesLoading && NotesData?.data) {
       const updatedData = NotesData?.data
-        // .filter((item: any) => item['ORDER-NOTE'] || item['ORDER'])
-        // .map((item: any) => [item['ORDER-NOTE'], item['ORDER']])
+        .filter((item: any) => item['ORDER-NOTE'] || item['ORDER'])
+        .map((item: any) => [item['ORDER-NOTE'], item['ORDER']])
         .flat()
         .filter(Boolean);
-
       const combinedArray = updatedData.flat();
       combinedArray.sort(
         (a: any, b: any) =>
           new Date(b.created_at).getTime() - new Date(a.created_at).getTime()
       );
       setNotes(combinedArray);
+      setNotes(combinedArray);
       setNoteLoadingStore(NotesLoading);
       loderStatus
         ? setShouldPerformAction(true)
         : setShouldPerformAction(false);
     }
-  }, [moduleIds, NotesLoading, loderStatus]); // Add `allIds` to dependencies
+  }, [moduleIds, NotesLoading, auditState]);
 
   return (
     <Container>

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

@@ -2,87 +2,108 @@ import React from 'react';
 import styled from 'styled-components';
 import AllowTracking from './AllowTracking';
 import { Button } from '@bjsdistribution/dms-component-library';
-// import {
-//   useAtom,
-//   useOrderDetails,
-//   usePrevOrderDetails,
-//   errorAtom,
-// } from '../../../store';
-// import useUpdateOrder from '../../../hooks/useUpdateOrder';
-// import { compareOrderDetailsStates, filterObject } from '../../../utils';
-// import { OrderServiceType } from '../../../types';
+import {
+  useAtom,
+  useOrderDetails,
+  usePrevOrderDetails,
+  errorAtom,
+  useCustomerInfo,
+  useLogsCallAPi,
+  useApiCalling,
+} from '../../../store';
+import useUpdateOrder from '../../../hooks/useUpdateOrder';
+import { compareOrderDetailsStates, filterObject } from '../../../utils';
+import { OrderServiceType } from '../../../types';
 
 function OrderDetailsFooter() {
-  // const [orderDetails, setOrderDetails] = useOrderDetails();
-  // const [prevOrderDetails, setPrevOrderDetails] = usePrevOrderDetails();
-  // const updateOrder = useUpdateOrder();
-  // const [errorState] = useAtom(errorAtom);
+  const [orderDetails, setOrderDetails] = useOrderDetails();
+  const [prevOrderDetails, setPrevOrderDetails] = usePrevOrderDetails();
+  const [, setCustomerInfo] = useCustomerInfo();
+  const updateOrder = useUpdateOrder();
+  const [errorState] = useAtom(errorAtom);
+  const [, setLogsCallAPi] = useLogsCallAPi();
+  const [, setCallApi] = useApiCalling(); //single detail
 
-  // const errorFound = () => {
-  //   const isError =
-  //     errorState.w3wError.length > 0 || errorState.emailError.length > 0;
-  //   return isError;
-  // };
+  const errorFound = () => {
+    const isError =
+      errorState.w3wError.length > 0 ||
+      errorState.emailError.length > 0 ||
+      errorState.homeContactError.length > 0 ||
+      errorState.workCOntanctError.length > 0 ||
+      errorState.mobileError.length > 0 ||
+      errorState.postCodeError.length > 0;
 
-  // const isDifferent = () => {
-  //   const keysToRemovefromOrders = [
-  //     'order_locked',
-  //     'order_communications',
-  //     'updated_at',
-  //     'updated_by',
-  //     'order_services',
-  //   ];
-  //   const filteredOrderDetails = filterObject(
-  //     orderDetails,
-  //     keysToRemovefromOrders
-  //   );
-  //   const filteredPrevOrderDetails = filterObject(
-  //     prevOrderDetails,
-  //     keysToRemovefromOrders
-  //   );
+    return isError;
+  };
+
+  const isDifferent = () => {
+    const keysToRemovefromOrders = [
+      'order_locked',
+      'order_communications',
+      'updated_at',
+      'updated_by',
+      'order_services',
+    ];
+    const filteredOrderDetails = filterObject(
+      orderDetails,
+      keysToRemovefromOrders
+    );
+    const filteredPrevOrderDetails = filterObject(
+      prevOrderDetails,
+      keysToRemovefromOrders
+    );
 
-  //   const newOrderServices =
-  //     orderDetails?.order_services?.length > 0 &&
-  //     orderDetails.order_services.sort(
-  //       (a: OrderServiceType, b: OrderServiceType) => a.id! - b.id!
-  //     );
+    const newOrderServices =
+      orderDetails?.order_services?.length > 0 &&
+      orderDetails.order_services.sort(
+        (a: OrderServiceType, b: OrderServiceType) => a.id! - b.id!
+      );
 
-  //   const prevOrderServices =
-  //     prevOrderDetails?.order_services?.length > 0 &&
-  //     prevOrderDetails.order_services.sort(
-  //       (a: OrderServiceType, b: OrderServiceType) => a.id! - b.id!
-  //     );
+    const prevOrderServices =
+      prevOrderDetails?.order_services?.length > 0 &&
+      prevOrderDetails.order_services.sort(
+        (a: OrderServiceType, b: OrderServiceType) => a.id! - b.id!
+      );
 
-  //   const newOrderServicesSorted = JSON.stringify(newOrderServices);
-  //   const prevOrderServicesSorted = JSON.stringify(prevOrderServices);
-  //   const orderDetailsSorted = JSON.stringify(filteredOrderDetails);
-  //   const prevOrderDetailsSorted = JSON.stringify(filteredPrevOrderDetails);
-  //   const isSame =
-  //     orderDetailsSorted === prevOrderDetailsSorted &&
-  //     newOrderServicesSorted === prevOrderServicesSorted;
-  //   return !isSame;
-  // };
+    const newOrderServicesSorted = JSON.stringify(newOrderServices);
+    const prevOrderServicesSorted = JSON.stringify(prevOrderServices);
+    const orderDetailsSorted = JSON.stringify(filteredOrderDetails);
+    const prevOrderDetailsSorted = JSON.stringify(filteredPrevOrderDetails);
+    const isSame =
+      orderDetailsSorted === prevOrderDetailsSorted &&
+      newOrderServicesSorted === prevOrderServicesSorted;
+    return !isSame;
+  };
 
-  // const onSave = async () => {
-  //   const payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
-  //   const response = await updateOrder([payload]);
+  const onSave = async () => {
+    const payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
+    const response = await updateOrder([payload]);
 
-  //   if (response && response.data) {
-  //     setOrderDetails(response.data[0]);
-  //     setPrevOrderDetails(response.data[0]);
-  //   }
-  // };
-  const onSave = () => {
-    console.log('save');
+    setLogsCallAPi(prev => !prev);
+    setCallApi(false);
+
+    if (response && response?.data?.length > 0) {
+      setOrderDetails(response?.data[0]);
+      setPrevOrderDetails(response?.data[0]);
+      setCustomerInfo({
+        recipient_name: response?.data[0]?.order_recipient?.recipient_name,
+        postcode: response?.data[0]?.order_recipient?.postcode,
+      });
+      setTimeout(() => {
+        setLogsCallAPi(true);
+        setCallApi(true);
+      }, 2000);
+    } else {
+      setLogsCallAPi(false);
+      setCallApi(false);
+      setOrderDetails(prevOrderDetails);
+    }
   };
+
   return (
     <Container>
       <AllowTracking />
-      <Button
-        style={{ borderRadius: '20px' }}
-        onClick={onSave}
-        // disabled={!isDifferent() || errorFound()}
-      >
+      <Button onClick={onSave} disabled={!isDifferent() || errorFound()}>
         Save Details
       </Button>
     </Container>
@@ -96,12 +117,8 @@ const Container = styled.div`
   align-items: flex-start;
   border-top: 1px solid #edebe8;
   background: #f8fafc;
-  /* margin: 0px -15px -15px -15px; */
+  margin: 0px -15px -15px -15px;
   border-radius: 0px 0px 8px 8px;
-  /* margin-bottom: 22px; */
-  position: relative;
-  align-items: center;
-  /* top: 21px; */
 `;
 
 export default OrderDetailsFooter;

package/src/components/order-view/order-details/expanded-content/instruction-section/DeliveryInstructions.tsx

@@ -5,19 +5,12 @@ import { useOrderDetails } from '../../../store';
 
 function DeliveryInstructions() {
   const [orderDetails, setOrderDetails] = useOrderDetails();
-  const orderRoutes = orderDetails?.order_routes;
 
   const onChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
-    const val = e.target.value;
-    const updatedOrderRoutes = {
-      ...(orderRoutes === null
-        ? { delivery_instructions: val }
-        : { ...orderRoutes, delivery_instructions: val }),
-    };
     setOrderDetails(prev => {
       return {
         ...prev,
-        order_routes: updatedOrderRoutes,
+        delivery_instructions: e.target.value,
       };
     });
   };
@@ -26,7 +19,7 @@ function DeliveryInstructions() {
     <Container>
       <Label label="Delivery Instructions" />
       <CustomTextArea
-        value={orderRoutes?.delivery_instructions || ''}
+        value={orderDetails?.delivery_instructions || ''}
         placeholder="add delivery instructions"
         onChange={onChange}
       />

package/src/components/order-view/order-details/expanded-content/orders-section/Droptime.tsx

@@ -6,19 +6,12 @@ import { handleKeyDown } from '../../../utils';
 
 function Droptime() {
   const [orderDetails, setOrderDetails] = useOrderDetails();
-  const orderRoutes = orderDetails?.order_routes;
 
   const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const val = parseFloat(e.target.value);
-    const updatedOrderRoutes = {
-      ...(orderRoutes === null
-        ? { drop_time: val }
-        : { ...orderRoutes, drop_time: val }),
-    };
     setOrderDetails(prev => {
       return {
         ...prev,
-        order_routes: updatedOrderRoutes,
+        drop_time: e.target.value,
       };
     });
   };
@@ -31,7 +24,7 @@ function Droptime() {
         type="number"
         placeholder="0"
         onKeyDown={handleKeyDown}
-        value={orderRoutes?.drop_time}
+        value={orderDetails?.drop_time || ''}
         onChange={onChange}
       />
     </Container>
@@ -39,7 +32,6 @@ function Droptime() {
 }
 
 const CustomInput = styled(Input)`
-  border-radius: 25px;
   &::-webkit-outer-spin-button,
   &::-webkit-inner-spin-button {
     -webkit-appearance: none;

package/src/components/order-view/order-details/expanded-content/orders-section/VehicleType.tsx

@@ -1,13 +1,20 @@
-import {
-  Label,
-  SelectDropdown,
-  dropdownStyles,
-} from '@bjsdistribution/dms-component-library';
+import { Label, SelectDropdown } from '@bjsdistribution/dms-component-library';
 import React from 'react';
 import styled from 'styled-components';
 import { vehicleTypeOptions } from '../../helper';
+import { useOrderDetails } from '../../../store';
 
 function VehicleTypeDropdown() {
+  const [orderDetails, setOrderDetails] = useOrderDetails();
+  const onChange = (e: any) => {
+    setOrderDetails(prev => {
+      return {
+        ...prev,
+        vehicle_type: e.label,
+      };
+    });
+  };
+
   return (
     <FormContainer>
       <Label label="Vehicle Type" htmlFor="vehicleType" />
@@ -16,16 +23,10 @@ function VehicleTypeDropdown() {
         options={vehicleTypeOptions}
         inputId="vehicleType"
         openMenuOnFocus
-        isDisabled={true}
-        value={vehicleTypeOptions[1]}
-        styles={{
-          ...dropdownStyles,
-          control: styles => ({
-            ...styles,
-            borderRadius: '25px',
-            cursor: 'pointer',
-          }),
-        }}
+        value={vehicleTypeOptions?.filter(
+          (x: any) => x.label === orderDetails?.vehicle_type
+        )}
+        onChange={onChange}
       />
     </FormContainer>
   );

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

@@ -9,16 +9,21 @@ function AssemblyType() {
   const [orderStaticData] = useOrderStaticData();
   const orderServices = orderData?.order_services;
   const cloneServices = [...orderServices];
-
   const assembleOrderService = orderStaticData?.order_service_list?.find(
     (x: any) => x?.type?.toLowerCase() === 'assemble'
   );
-
+  const disassembleOrderService = orderStaticData?.order_service_list?.find(
+    (x: any) => x?.type?.toLowerCase() === 'disassemble'
+  );
   const assemblyTypeService = cloneServices?.find(
     (x: any) => x?.order_service_list_id === assembleOrderService?.id
   );
-  const assemblyTypeId = assemblyTypeService?.service_category_id;
-
+  const disassemblyTypeService = cloneServices?.find(
+    (x: any) => x?.order_service_list_id === disassembleOrderService?.id
+  );
+  const assemblyTypeId =
+    assemblyTypeService?.service_category_id ||
+    disassemblyTypeService?.service_category_id;
   const assemblyTypeOptions = orderStaticData?.order_service_list_category?.map(
     (option: any) => ({
       label: capitalize(option.type.replaceAll('_', ' ')),
@@ -27,30 +32,98 @@ function AssemblyType() {
   );
 
   const radioGroupHandler = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const updatedAssemblyTypeService = {
-      ...assemblyTypeService!,
-      service_category_id: +event.target.value,
-    };
+    let updatedAssemblyTypeService = {};
+
+    let updatedDisassemblyTypeService = {};
 
-    const updatedOrderServices = cloneServices?.filter(
-      s => s?.order_service_list_id !== assembleOrderService?.id
-    );
+    let updatedOrderServices: any = [];
 
-    updatedOrderServices.push(updatedAssemblyTypeService);
+    if (
+      (assemblyTypeService?.is_deleted === false &&
+        disassemblyTypeService?.is_deleted === true &&
+        disassemblyTypeService !== undefined &&
+        disassemblyTypeService !== null) ||
+      (disassemblyTypeService?.is_deleted === false &&
+        assemblyTypeService?.is_deleted === true &&
+        assemblyTypeService !== undefined &&
+        assemblyTypeService !== null) ||
+      (assemblyTypeService?.is_deleted === false &&
+        disassemblyTypeService?.is_deleted === false)
+    ) {
+      updatedAssemblyTypeService = {
+        ...assemblyTypeService!,
+        service_category_id: +event.target.value,
+      };
+      updatedDisassemblyTypeService = {
+        ...disassemblyTypeService!,
+        service_category_id: +event.target.value,
+      };
+      updatedOrderServices = cloneServices?.filter(
+        s =>
+          s?.order_service_list_id !== assembleOrderService?.id &&
+          s?.order_service_list_id !== disassembleOrderService?.id
+      );
+      updatedOrderServices.push(updatedAssemblyTypeService);
+      updatedOrderServices.push(updatedDisassemblyTypeService);
+    } else if (
+      assemblyTypeService?.is_deleted === false &&
+      (disassemblyTypeService?.is_deleted === true ||
+        disassemblyTypeService === undefined ||
+        disassemblyTypeService === null)
+    ) {
+      updatedAssemblyTypeService = {
+        ...assemblyTypeService!,
+        service_category_id: +event.target.value,
+      };
+      updatedOrderServices = cloneServices?.filter(
+        s => s?.order_service_list_id !== assembleOrderService?.id
+      );
+      updatedOrderServices.push(updatedAssemblyTypeService);
+    } else {
+      updatedDisassemblyTypeService = {
+        ...disassemblyTypeService!,
+        service_category_id: +event.target.value,
+      };
+      updatedOrderServices = cloneServices?.filter(
+        s => s?.order_service_list_id !== disassembleOrderService?.id
+      );
+
+      updatedOrderServices.push(updatedDisassemblyTypeService);
+    }
     const newData = { ...orderData, order_services: updatedOrderServices };
     setOrderData(newData);
   };
 
+  const isServiceDisable = () => {
+    if (
+      (assemblyTypeService?.is_deleted === true &&
+        (disassemblyTypeService?.is_deleted === true ||
+          disassemblyTypeService === undefined ||
+          disassemblyTypeService === null)) ||
+      (disassemblyTypeService?.is_deleted === true &&
+        (assemblyTypeService?.is_deleted === true ||
+          assemblyTypeService === undefined ||
+          assemblyTypeService === null)) ||
+      (assemblyTypeService === undefined &&
+        disassemblyTypeService === undefined) ||
+      (assemblyTypeService === null && disassemblyTypeService === null)
+    ) {
+      return true;
+    } else {
+      return false;
+    }
+  };
+
   return (
-    <Container
-      $isDisable={assemblyTypeService?.is_deleted === true ? true : false}
-    >
+    <Container $isDisable={isServiceDisable()}>
       <RadioButtonGroup
         selectedValue={assemblyTypeId?.toString() || ''}
         heading="Assembly Type"
         options={assemblyTypeOptions || []}
         onChange={radioGroupHandler}
         required={false}
+        //@ts-ignore
+        isDisabled={isServiceDisable()}
       />
     </Container>
   );

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

@@ -1,9 +1,5 @@
 import React from 'react';
-import {
-  Label,
-  SelectDropdown,
-  dropdownStyles,
-} from '@bjsdistribution/dms-component-library';
+import { Label, SelectDropdown } from '@bjsdistribution/dms-component-library';
 import { useOrderDetails, useOrderStaticData } from '../../../store';
 import styled from 'styled-components';
 import { capitalize } from '../../../utils';
@@ -42,14 +38,6 @@ function DeliveryPointDropdown() {
         )}
         openMenuOnFocus
         onChange={onChange}
-        styles={{
-          ...dropdownStyles,
-          control: styles => ({
-            ...styles,
-            borderRadius: '25px',
-            cursor: 'pointer',
-          }),
-        }}
       />
     </Container>
   );