@bjsdistribution/dms-client-return 0.1.16-prod → 0.1.17-prod

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

@@ -3,111 +3,29 @@ import React from 'react';
 import styled from 'styled-components';
 import { useOrderDetails, useOrderStaticData } from '../../../store';
 import { capitalize } from '../../../utils';
+import { OrdersType } from '../../../types';
 
 function AssemblyType() {
   const [orderData, setOrderData] = useOrderDetails();
   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 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('_', ' ')),
-      value: option.id.toString(),
+      value: option.type,
     })
   );
 
   const radioGroupHandler = (event: React.ChangeEvent<HTMLInputElement>) => {
-    let updatedAssemblyTypeService = {};
-
-    let updatedDisassemblyTypeService = {};
-
-    let updatedOrderServices: any = [];
-
-    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 };
+    const newData: OrdersType = {
+      ...orderData,
+      assembly_type: event.target.value,
+    };
     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)
-    ) {
+    if (orderData?.assemble === false && orderData?.disassemble === false) {
       return true;
     } else {
       return false;
@@ -117,7 +35,7 @@ function AssemblyType() {
   return (
     <Container $isDisable={isServiceDisable()}>
       <RadioButtonGroup
-        selectedValue={assemblyTypeId?.toString() || ''}
+        selectedValue={orderData?.assembly_type || ''}
         heading="Assembly Type"
         options={assemblyTypeOptions || []}
         onChange={radioGroupHandler}

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

@@ -4,16 +4,12 @@ import ServiceSlider from '../../../../../common/services-slider/ServiceSlider';
 import {
   useOrderDetails,
   useOrderStaticData,
-  usePrevOrderDetails,
 } from '../../../store';
-import { OrderServiceType } from '../../../types';
+import { OrdersType } from '../../../types';
 
 function OrderServices() {
   const [orderStaticData] = useOrderStaticData();
   const [orderDetails, setOrderDetails] = useOrderDetails();
-  const [prevOrderDetails] = usePrevOrderDetails();
-  const orderServices = orderDetails?.order_services;
-  const prevOrderServices = prevOrderDetails?.order_services;
 
   const orderServicesOptions = orderStaticData?.order_service_list;
 
@@ -30,190 +26,22 @@ function OrderServices() {
   });
 
   const toggleServices = (id: number) => {
-    const clone = [...orderServices];
-    const selectedService = clone?.find(
-      (s: OrderServiceType) => s?.order_service_list_id === id
+    const selectedService = orderServicesOptions?.find(
+      (item: any) => item.id === id
     );
-    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 = clone?.find(
-      (x: any) => x?.order_service_list_id === assembleOrderService?.id
-    );
-
-    const disassemblyTypeService = clone?.find(
-      (x: any) => x?.order_service_list_id === disassembleOrderService?.id
-    );
-
-    if (selectedService !== undefined) {
-      const isAssembleService =
-        assembleOrderService?.id === selectedService?.order_service_list_id;
-
-      const isDisassembleService =
-        disassembleOrderService?.id === selectedService?.order_service_list_id;
-
-      if (selectedService.new_id) {
-        const updatedOrderServices = clone.filter(
-          (service: OrderServiceType) => service.id !== selectedService.id
-        );
-        const newData = {
-          ...orderDetails,
-          order_services: updatedOrderServices,
-        };
-        setOrderDetails(newData);
-      } else {
-        let updatedSelectedService = {
-          ...selectedService,
-          is_deleted: !selectedService.is_deleted,
-        };
-
-        let updatedOrderServices = [];
-        let newUpdatedOrderServices: any = [];
-
-        updatedOrderServices = clone.filter(
-          (service: OrderServiceType) => service.id !== selectedService.id
-        );
-
-        updatedOrderServices.push(updatedSelectedService);
-        if (
-          (isAssembleService &&
-            updatedSelectedService?.is_deleted === true &&
-            (disassemblyTypeService?.is_deleted === true ||
-              disassemblyTypeService === undefined ||
-              disassemblyTypeService === null)) ||
-          (isDisassembleService &&
-            updatedSelectedService?.is_deleted === true &&
-            (assemblyTypeService?.is_deleted === true ||
-              assemblyTypeService === undefined ||
-              assemblyTypeService === null))
-        ) {
-          const prevSelectedService = prevOrderServices?.find(
-            (s: OrderServiceType) => s?.order_service_list_id === id
-          );
-          updatedSelectedService = {
-            ...selectedService,
-            is_deleted: true,
-            service_category_id: prevSelectedService?.service_category_id,
-          };
-          updatedOrderServices = clone.filter(
-            (service: OrderServiceType) => service.id !== selectedService.id
-          );
-
-          updatedOrderServices.push(updatedSelectedService);
-          // new cases
-          if (
-            isAssembleService &&
-            disassemblyTypeService?.is_deleted === true &&
-            disassemblyTypeService !== undefined &&
-            disassemblyTypeService !== null
-          ) {
-            const newUpdatedSelectedService = {
-              ...disassemblyTypeService,
-              is_deleted: true,
-              service_category_id: prevSelectedService?.service_category_id,
-            };
-            newUpdatedOrderServices = updatedOrderServices?.filter(
-              (service: OrderServiceType) =>
-                service.id !== disassemblyTypeService.id
-            );
-            newUpdatedOrderServices?.push(newUpdatedSelectedService);
-          }
-          // new cases
-          if (
-            isDisassembleService &&
-            assemblyTypeService?.is_deleted === true &&
-            assemblyTypeService !== undefined &&
-            assemblyTypeService !== null
-          ) {
-            const newUpdatedSelectedService = {
-              ...assemblyTypeService,
-              is_deleted: true,
-              service_category_id: prevSelectedService?.service_category_id,
-            };
-            newUpdatedOrderServices = updatedOrderServices?.filter(
-              (service: OrderServiceType) =>
-                service.id !== assemblyTypeService.id
-            );
-            newUpdatedOrderServices?.push(newUpdatedSelectedService);
-          }
-        }
-
-        const newData = {
-          ...orderDetails,
-          order_services:
-            newUpdatedOrderServices.length > 0
-              ? newUpdatedOrderServices
-              : updatedOrderServices,
-        };
-        setOrderDetails(newData);
-      }
-    } else {
-      // service not exist case
-      // if not matched then treat it as an new service
-      let largestId: number;
-      if (clone === undefined || clone.length === 0) {
-        largestId = 0;
-      } else {
-        largestId = Math.max(
-          ...clone?.map((o: OrderServiceType) => +o?.order_service_list_id!)
-        );
-      }
-
-      let service: OrderServiceType = {};
-      // Normal service addition
-      service = {
-        is_deleted: false,
-        order_service_list_id: id,
-        new_id:
-          largestId !== undefined && largestId !== null ? largestId + 1 : 1,
-        id: largestId !== undefined && largestId !== null ? largestId + 1 : 1,
-      };
-      // special case if assembly already exist and we are adding disassemble service and vice-versa
-      if (
-        assemblyTypeService?.is_deleted === false &&
-        disassembleOrderService?.id === id
-      ) {
-        service = {
-          is_deleted: false,
-          order_service_list_id: id,
-          new_id:
-            largestId !== undefined && largestId !== null ? largestId + 1 : 1,
-          id: largestId !== undefined && largestId !== null ? largestId + 1 : 1,
-          service_category_id: assemblyTypeService?.service_category_id,
-        };
-      }
-
-      if (
-        disassemblyTypeService?.is_deleted === false &&
-        assembleOrderService?.id === id
-      ) {
-        service = {
-          is_deleted: false,
-          order_service_list_id: id,
-          new_id:
-            largestId !== undefined && largestId !== null ? largestId + 1 : 1,
-          id: largestId !== undefined && largestId !== null ? largestId + 1 : 1,
-          service_category_id: disassemblyTypeService?.service_category_id,
-        };
-      }
-      clone.push(service);
-      const newData = { ...orderDetails, order_services: clone };
-      setOrderDetails(newData);
-    }
+    const key = selectedService?.type;
+    const value = !orderDetails[key as keyof OrdersType];
+    setOrderDetails(prev => ({
+      ...prev,
+      [key]: value,
+    }));
   };
   const isDisabled = true;
 
   return (
     <Container disabled={isDisabled}>
       {sortedServices?.map((service: any) => {
-        const selected = !!orderServices?.find(
-          (s: OrderServiceType) =>
-            s?.order_service_list_id === service?.id && s.is_deleted === false
-        );
+        const selected = orderDetails[service?.type as keyof OrdersType];
         return (
           <ServiceSlider
             serviceName={service?.type?.replaceAll('_', ' ')}

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

@@ -113,6 +113,12 @@ export const ordersInitialValue: OrdersType = {
   order_type: {
     type: null,
   },
+  assemble: false,
+  disassemble: false,
+  unpack_items: false,
+  take_packaging_away: false,
+  collect_disposal: false,
+  assembly_type: null,
 };
 
 export const orderProductInitialvalue: CreateProduct = {

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

@@ -174,6 +174,12 @@ export interface OrdersType {
   postcode: any;
   carrier_id: number | null;
   order_type: orderType;
+  assemble: boolean;
+  disassemble: boolean;
+  unpack_items: boolean;
+  take_packaging_away: boolean;
+  collect_disposal: boolean;
+  assembly_type: string | null;
 }
 
 export type DeleteProds = {

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

@@ -2,7 +2,6 @@ import {
   OrderRecipientType,
   OrderRouteType,
   OrderServicesDetailType,
-  OrderServiceType,
   OrdersType,
 } from './types';
 
@@ -277,14 +276,12 @@ export const compareOrderDetailsStates = (
     order_recipient: oldOrderRecipient,
     order_routes: oldOrderRoutes,
     order_services_detail: oldOrderServicesDetail,
-    order_services: oldOrderServices,
     ...oldRequiredData
   } = oldData;
   const {
     order_recipient: newOrderRecipient,
     order_routes: newOrderRoutes,
     order_services_detail: newOrderServicesDetail,
-    order_services: newOrderServices,
     ...newRequiredData
   } = newData;
 
@@ -307,33 +304,6 @@ export const compareOrderDetailsStates = (
     newOrderServicesDetail
   );
 
-  // need to remove id and new_id from new order_services
-  const filteredNewOrderServices = newOrderServices?.map((item: any) => {
-    if (item.new_id) {
-      const { id, new_id, ...newItem } = item;
-      return newItem;
-    } else {
-      return item;
-    }
-  });
-
-  const newOrderServicesWithoutId = filteredNewOrderServices.filter(
-    (service: OrderServiceType) => !service.id
-  );
-  const newOrderServicesWithId = filteredNewOrderServices.filter(
-    (service: OrderServiceType) => service.id
-  );
-
-  const payloadOrderServices: OrderServiceType[] = compareArrays(
-    oldOrderServices,
-    newOrderServicesWithId
-  );
-
-  const finalPayloadOrderServices = [
-    ...payloadOrderServices,
-    ...newOrderServicesWithoutId,
-  ];
-
   const finalPayload = {
     ...payloadWithId,
     ...(!isObjectEmpty(payloadOrderRecipient) && {
@@ -345,9 +315,6 @@ export const compareOrderDetailsStates = (
     ...(!isObjectEmpty(payloadOrderServicesDetail) && {
       order_services_detail: payloadOrderServicesDetail,
     }),
-    ...(finalPayloadOrderServices.length > 0 && {
-      order_services: finalPayloadOrderServices,
-    }),
   };
 
   return finalPayload;

package/src/components/order-view/view-reminder/AssigneeDropdown.tsx

@@ -13,8 +13,6 @@ function AssigneeDropdown() {
   const [reminderData] = useReminderById();
   const [reminderPayload, setReminderPayload] = useUpdateReminderData();
   const [departmentData, setDepartmentData] = useDeptData();
-  const [selectedDeptId, setSelectedDeptId] = useState<any | null>(null);
-  const [, setFilteredUsers] = useState<typeof allUsers>([]);
   const [allUsers, setAllUsers] = useState<
     {
       fName: string;
@@ -58,15 +56,7 @@ function AssigneeDropdown() {
       value: item?.value,
     })) || [];
 
-  const handleDepartmentChange = (value: string, option: { label: string }) => {
-    setSelectedDeptId(value);
-
-    setReminderPayload((prevState: any) => ({
-      ...prevState,
-      department: option?.label,
-      assigned_to: null,
-    }));
-  };
+  const [selectedDeptIds, setSelectedDeptIds] = useState<string[]>([]);
 
   // SSO Departments
   const { fetchData: getSSOData, data: fetchData } = useAxios<{
@@ -134,15 +124,22 @@ function AssigneeDropdown() {
   }, []);
 
   useEffect(() => {
-    if (selectedDeptId !== null && allUsers?.length > 0) {
-      const matchedUsers = allUsers?.filter(
-        user => user?.deptId?.toString() === selectedDeptId?.toString()
-      );
-      setFilteredUsers(matchedUsers);
-    } else {
-      setFilteredUsers([]);
+    if (
+      selectedDeptIds.length === 0 &&
+      reminderPayload?.department &&
+      departmentData?.length > 0
+    ) {
+      const deptNames = reminderPayload.department
+        .split(',')
+        .map((d: any) => d.trim());
+
+      const matched = departmentData
+        .filter((dept: any) => deptNames.includes(dept.label))
+        .map((dept: any) => dept.value);
+
+      setSelectedDeptIds(matched);
     }
-  }, [selectedDeptId, allUsers]);
+  }, [reminderPayload?.department, departmentData, selectedDeptIds]);
 
   useEffect(() => {
     if (fetchData && fetchData?.data) {
@@ -155,24 +152,86 @@ function AssigneeDropdown() {
     }
   }, [fetchData]);
 
-  const userOptions = allUsers?.map(user => ({
-    label: `${user?.fName?.trim()} ${user?.lName?.trim()}`, // shown in dropdown
-    value: user?.id, // used internally and stored
-  }));
+  const assignedUserIds = (reminderPayload?.assigned_to ?? []) as string[];
+
+  const selectedUsers = allUsers?.filter(user =>
+    assignedUserIds?.includes(user?.id)
+  );
+
+  const deptUsers = selectedDeptIds.length
+    ? allUsers?.filter(user => selectedDeptIds?.includes(user?.deptId as any))
+    : [];
+
+  const mergedUsersMap = new Map();
+
+  // Add selected users first
+  selectedUsers?.forEach(user => {
+    mergedUsersMap?.set(user.id, {
+      label: `${user?.fName} ${user?.lName}`,
+      value: user?.id,
+    });
+  });
+
+  // Add department users next
+  deptUsers?.forEach(user => {
+    if (!mergedUsersMap?.has(user?.id)) {
+      mergedUsersMap?.set(user?.id, {
+        label: `${user?.fName} ${user?.lName}`,
+        value: user?.id,
+      });
+    }
+  });
+
+  const userOptions = Array.from(mergedUsersMap.values());
+
+  const handleDepartmentChange = (
+    values: string[],
+    options: { label: string }[]
+  ) => {
+    setSelectedDeptIds(values);
+
+    const deptLabels = options?.map(opt => opt.label).join(', ');
+
+    let updatedAssignedTo = reminderPayload?.assigned_to || [];
+
+    if (reminderPayload && reminderPayload?.assigned_to?.length > 0) {
+      const matchedUsers = allUsers?.filter(
+        user => user?.deptId !== null && values?.includes(String(user?.deptId))
+      );
+
+      updatedAssignedTo = reminderPayload?.assigned_to?.filter((id: any) =>
+        matchedUsers?.some(user => user.id === id)
+      );
+    }
+
+    setReminderPayload((prev: any) => ({
+      ...prev,
+      department: deptLabels,
+      assigned_to: updatedAssignedTo,
+    }));
+  };
 
   return (
     <FormContainer>
       <Label label="Department" required />
       <StyledAntSelect
         disabled={disabled}
+        mode="multiple"
         options={deptData}
         placeholder="Select Department"
         onChange={handleDepartmentChange}
+        // {(values: string[], options: { label: string }[]) => {
+        // setSelectedDeptIds(values);
+        // setReminderPayload((prev: any) => ({
+        // ...prev,
+        // department: options?.map(o => o?.label).join(', '),
+        // assigned_to: reminderPayload?.assigned_to,
+        // }));
+        // }}
         style={{ width: '8vw' }}
-        value={reminderPayload?.department || undefined}
-        showSearch
-        dis
+        value={selectedDeptIds}
       />
+
       <Label label="Assigned To" required htmlFor="assigneDropdown" />
       <StyledAntSelect
         disabled={disabled}