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

package/src/components/order-view/notification/ReminderTemplate.tsx

@@ -56,11 +56,19 @@ function ReminderTemplate({ data, dismissReminder }: any) {
                 {`${formatUtcToLocal(data?.due_datetime)?.date}  ${
                   formatUtcToLocal(data?.due_datetime)?.time
                 }`}
-                ), Assigned to: {data?.assigned_to} Completed On:{' '}
-                {`${formatUtcToLocal(data?.completed_at)?.date}  ${
-                  formatUtcToLocal(data?.completed_at)?.time
-                }`}
-                , By: {data?.completed_by}
+                )
+                {data?.assigned_to && (
+                  <div>Assigned to: {data.assigned_to}</div>
+                )}
+                {data?.completed_at && (
+                  <div>
+                    Completed On:{' '}
+                    {`${formatUtcToLocal(data.completed_at)?.date} ${
+                      formatUtcToLocal(data.completed_at)?.time
+                    }`}
+                  </div>
+                )}
+                {data?.completed_by && <div>By: {data.completed_by}</div>}
               </StyledTitle>
             </>
           }

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

@@ -314,35 +314,6 @@ function ConfirmOrder(props: IProps) {
     setCurrentAction(undefined);
   };
 
-  // const isDifferent = () => {
-  // const keysToRemovefromOrders = [
-  // 'order_locked',
-  // 'order_communications',
-  // 'updated_at',
-  // 'updated_by',
-  // 'order_services',
-  // ];
-  // const filteredOrderDetails = filterObject(
-  // orderDetailsConfirmOrder,
-  // keysToRemovefromOrders
-  // );
-  // const filteredPrevOrderDetails = filterObject(
-  // prevOrderDetails,
-  // keysToRemovefromOrders
-  // );
-  //
-  // const orderDetailsSorted = JSON.stringify(filteredOrderDetails);
-  // const prevOrderDetailsSorted = JSON.stringify(filteredPrevOrderDetails);
-  // const isSame = orderDetailsSorted === prevOrderDetailsSorted;
-  //
-  // console.log(orderDetailsSorted, 'orderDetailsSorted');
-  // console.log(prevOrderDetailsSorted, 'prevOrderDetailsSorted');
-  // console.log(isSame, 'isSameisSame');
-  //
-  // newOrderServicesSorted === prevOrderServicesSorted;
-  // return !isSame;
-  // };
-
   const errorFound = () => {
     const isError =
       errorState.emailError.length > 0 ||

package/src/components/order-view/order-actions/actions/create-task-reminder/CreateReminderModal.tsx

@@ -29,7 +29,7 @@ function CreateReminderModal() {
   const [displayDate, setDisplayDate] = useState<Date | null>();
   const [staticData] = useStaticData();
   const [departmentData, setDepartmentData] = useDeptData();
-  const [selectedDeptId, setSelectedDeptId] = useState<any | null>(null);
+  const [selectedDeptId, setSelectedDeptId] = useState<string[]>([]);
   const [allUsers, setAllUsers] = useState<
     {
       fName: string;
@@ -58,21 +58,40 @@ function CreateReminderModal() {
     return staticData?.[0]?.priorities?.map((option: any) => {
       const colorMatch = priorityData?.find(p => p.id === option.id);
       return {
-        label: option.name,
-        value: option.id,
+        label: option?.name,
+        value: option?.id,
         color: colorMatch?.color || '#ccc',
       };
     });
   };
   const priorityOptions = getPriorityOptions(staticData);
 
-  //subcategory change
-  const handleDepartmentChange = (value: string, option: { label: string }) => {
-    setSelectedDeptId(value);
-    setReminderPayload((prevState: any) => ({
-      ...prevState,
-      department: option?.label,
-      assigned_to: null,
+  const handleDepartmentChange = (
+    values: string[],
+    options: { label: string }[]
+  ) => {
+    setSelectedDeptId(values);
+
+    if (reminderPayload && reminderPayload?.assigned_to!?.length > 0) {
+      const matchedUsers = allUsers?.filter(
+        user => user?.deptId !== null && values?.includes(String(user?.deptId))
+      );
+
+      const filteredAssignedTo = reminderPayload?.assigned_to?.filter(
+        (id: any) => matchedUsers?.some(user => user.id === id)
+      );
+
+      setReminderPayload((prev: any) => ({
+        ...prev,
+        assigned_to: filteredAssignedTo,
+      }));
+    }
+
+    const deptLabels = options?.map(opt => opt.label);
+
+    setReminderPayload(prev => ({
+      ...prev,
+      department: deptLabels.join(', '),
     }));
   };
 
@@ -113,11 +132,16 @@ function CreateReminderModal() {
   };
 
   // sso Data get
-  const { fetchData: getSSOData, data: fetchData } = useAxios<{
+  const {
+    fetchData: getSSOData,
+    data: fetchData,
+    loading: deptLoading,
+  } = useAxios<{
     data: ApiResponse[];
   }>({
     endpoint: `/sso/departments/`,
     method: 'GET',
+    showLoader: false,
   });
 
   useEffect(() => {
@@ -131,9 +155,12 @@ function CreateReminderModal() {
     fetchAllSSOData();
   }, []);
 
-  const { fetchData: getUsersData } = useAxios<{ data: any }>({
+  const { fetchData: getUsersData, loading: userDataLoading } = useAxios<{
+    data: any;
+  }>({
     endpoint: `/sso/users/`,
     method: 'GET',
+    showLoader: false,
   });
 
   useEffect(() => {
@@ -207,24 +234,22 @@ function CreateReminderModal() {
   }));
 
   const handleAssignToMe = () => {
+    const storedUserJSON = localStorage.getItem('user_type');
+    if (!storedUserJSON) return;
+
     let storedUserID: string | null = null;
 
-    const storedUserJSON = localStorage.getItem('User_iD');
-    if (storedUserJSON) {
-      try {
-        const parsed = JSON.parse(storedUserJSON);
-        storedUserID = parsed.user_id || null;
-      } catch (e) {
-        console.error('Failed to parse stored user ID', e);
-      }
+    try {
+      const parsed = JSON.parse(storedUserJSON);
+      storedUserID = parsed?.user_id ?? null;
+    } catch (e) {
+      console.error('Failed to parse stored user_type from localStorage', e);
+      return;
     }
 
     if (!storedUserID) return;
-    console.log(allUsers, 'allUsersallUsersallUsers');
-    const matchedUser: any = allUsers?.find(user => user?.id === storedUserID);
 
-    console.log(storedUserID, 'storedUserID');
-    console.log(matchedUser, 'matchedUser');
+    const matchedUser: any = allUsers?.find(user => user?.id === storedUserID);
 
     const deptMatched =
       departmentData?.find((dept: any) => dept.value === matchedUser?.deptId)
@@ -244,9 +269,39 @@ function CreateReminderModal() {
       department: deptMatched,
     }));
 
-    matchedUser && setSelectedDeptId(matchedUser?.department_id);
+    if (matchedUser?.deptId) {
+      setSelectedDeptId(matchedUser.deptId.toString());
+    }
   };
 
+  useEffect(() => {
+    if (
+      Array.isArray(selectedDeptId) &&
+      selectedDeptId?.length > 0 &&
+      allUsers?.length > 0
+    ) {
+      const matchedUsers = allUsers?.filter(
+        user =>
+          user?.deptId !== null &&
+          selectedDeptId?.includes(String(user?.deptId))
+      );
+      const currentAssigned = (reminderPayload?.assigned_to || []) as string[];
+
+      const currentAssignedUsers = allUsers?.filter(user =>
+        currentAssigned?.includes(user?.id || '')
+      );
+
+      const mergedUsers = [...matchedUsers, ...currentAssignedUsers];
+      const uniqueUsers = Array.from(
+        new Map(mergedUsers?.map(u => [u?.id, u]))?.values()
+      );
+
+      setFilteredUsers(uniqueUsers);
+    } else {
+      setFilteredUsers(allUsers);
+    }
+  }, [selectedDeptId, allUsers]);
+
   return (
     <Wrapper>
       <SplitContainer>
@@ -254,11 +309,13 @@ function CreateReminderModal() {
           <DoubleDropdownContainer>
             <StyledAntSelect
               options={deptData}
-              style={{ width: '10vw' }}
-              placeholder="Select Department"
+              style={{ width: '20vw' }}
+              placeholder="Select Department(s)"
               onChange={handleDepartmentChange}
-              value={reminderPayload?.department || undefined}
+              value={selectedDeptId || []}
+              loading={deptLoading}
               showSearch
+              mode="multiple"
             />
           </DoubleDropdownContainer>
         </FormRow>
@@ -271,6 +328,7 @@ function CreateReminderModal() {
             value={reminderPayload?.assigned_to || []}
             showSearch
             mode="multiple"
+            loading={userDataLoading}
             filterOption={(input: string, option?: { label: string }) =>
               option?.label.toLowerCase().includes(input.toLowerCase())
             }

package/src/components/order-view/order-actions/actions/force-debrief/ForceDebriefModal.tsx

@@ -29,7 +29,6 @@ import BaseCharges from './charges/base-charge';
 import DeliveryAddOns from './charges/delivery-add-ons';
 import AdhocSection from './charges/adhoc';
 import OrderInfo from './order-info';
-import {} from '../../store';
 import ForceDebriefSelector from './Selector';
 import {
   Checkbox,
@@ -41,7 +40,7 @@ import Escalation from './escalation';
 import FDNotification from './notifications';
 
 import { compareOrderDetailsStates, filterObject } from '../../../utils';
-import { AdhocCharge, ApiResponse, OrderServiceType } from '../../../types';
+import { AdhocCharge, ApiResponse, OrdersType } from '../../../types';
 import { notification } from 'antd';
 import BaseChargeConfirmationModal from './BaseChargeConfirmationModal';
 import { v4 as uuidv4 } from 'uuid';
@@ -223,7 +222,6 @@ function ForceDebriefModal(props: IProps) {
       'order_communications',
       'updated_at',
       'updated_by',
-      'order_services',
     ];
     const filteredOrderDetails = filterObject(
       orderDetails,
@@ -234,25 +232,9 @@ function ForceDebriefModal(props: IProps) {
       keysToRemovefromOrders
     );
 
-    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 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;
+    const isSame = orderDetailsSorted === prevOrderDetailsSorted;
     return !isSame;
   };
 
@@ -285,6 +267,39 @@ function ForceDebriefModal(props: IProps) {
       orderDetails
     );
 
+    const serviceKeys = [
+      'assemble',
+      'disassemble',
+      'unpack_items',
+      'collect_disposal',
+      'take_packaging_away',
+      'assembly_type',
+    ];
+
+    let orderServicesPayload: Record<string, any> = {};
+
+    const includesKey = serviceKeys.some(key => key in ordersApiPayload);
+
+    if (includesKey) {
+      for (const key of serviceKeys) {
+        orderServicesPayload[key as keyof typeof ordersApiPayload] =
+          key in ordersApiPayload
+            ? ordersApiPayload[key as keyof typeof ordersApiPayload]
+            : orderDetails[key as keyof OrdersType];
+        delete ordersApiPayload[key as keyof typeof ordersApiPayload];
+        if (
+          orderServicesPayload?.assemble === false &&
+          orderServicesPayload?.disassemble === false
+        ) {
+          orderServicesPayload.assembly_type = null;
+        }
+      }
+    }
+
+    if (Object.keys(orderServicesPayload).length > 0) {
+      ordersApiPayload.order_services = [orderServicesPayload];
+    }
+
     try {
       let response = (await callUpdateOrderAPI({
         payload: [ordersApiPayload],

package/src/components/order-view/order-actions/actions/force-debrief/order-info/RadioButtons.tsx

@@ -2,7 +2,7 @@ import { RadioButtonGroup } from '@bjsdistribution/dms-component-library';
 import React from 'react';
 import styled from 'styled-components';
 import { useOrderDetails, useOrderStaticData } from '../../../../store';
-import { OrderServiceType } from '../../../../types';
+import { OrdersType } from '../../../../types';
 import { capitalize } from '../../../../utils';
 
 export const radioButtonFilterOptions = [
@@ -36,7 +36,6 @@ function RadioButtonGroups() {
   );
 
   const orderServicesOptions = orderStaticData?.order_service_list;
-  const orderServices = orderDetails?.order_services;
   const deliveryPointId = orderDetails?.order_services_detail?.order_delivery_point_id?.toString();
   const serviceLevelId = orderDetails?.order_services_detail?.order_service_level_id?.toString();
   const orderTypeId = orderDetails?.order_type_id?.toString();
@@ -68,61 +67,15 @@ function RadioButtonGroups() {
   };
 
   const onChangeServices = (id: number) => {
-    const clone = [...orderServices];
-
-    // Check if the service already exists in the order
-    const selectedService = clone.find(
-      (s: OrderServiceType) => s.order_service_list_id === id
+    const selectedService = orderServicesOptions?.find(
+      (item: any) => item.id === id
     );
-
-    if (selectedService !== undefined) {
-      if (selectedService.new_id) {
-        // It's a newly added service, just remove it
-        const updatedOrderServices = clone.filter(
-          (service: OrderServiceType) => service.id !== selectedService.id
-        );
-        const newData = {
-          ...orderDetails,
-          order_services: updatedOrderServices,
-        };
-        setOrderDetails(newData);
-      } else {
-        // It's an existing (persisted) service, toggle its `is_deleted` flag
-        const updatedSelectedService = {
-          ...selectedService,
-          is_deleted: !selectedService.is_deleted,
-        };
-
-        const updatedOrderServices = clone
-          .filter(
-            (service: OrderServiceType) => service.id !== selectedService.id
-          )
-          .concat(updatedSelectedService);
-
-        const newData = {
-          ...orderDetails,
-          order_services: updatedOrderServices,
-        };
-        setOrderDetails(newData);
-      }
-    } else {
-      // Case 2: Service doesn't exist — add it as a new one
-      const newService: OrderServiceType = {
-        is_deleted: false,
-        order_service_list_id: id,
-        new_id: id,
-        id: id,
-      };
-
-      clone.push(newService);
-
-      const newData = {
-        ...orderDetails,
-        order_services: clone,
-      };
-
-      setOrderDetails(newData);
-    }
+    const key = selectedService?.type;
+    const value = !orderDetails[key as keyof OrdersType];
+    setOrderDetails(prev => ({
+      ...prev,
+      [key]: value,
+    }));
   };
 
   return (
@@ -162,18 +115,14 @@ function RadioButtonGroups() {
       </Group>
 
       {orderServicesOptions?.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 (
           <Group>
             <RadioButtonGroup
               heading={service?.type?.replaceAll('_', ' ')}
               onChange={() => onChangeServices(service?.id)}
               options={radioButtonFilterOptions || []}
-              selectedValue={selected === false ? 'false' : 'true'}
+              selectedValue={selected ? 'true' : 'false'}
               direction="vertical"
               required={false}
               isDisabled

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

@@ -12,7 +12,6 @@ import {
   useStatusDetails,
 } from '../store';
 import SplitOrder from './actions/split-order';
-import LogServiceRefusal from './actions/log-service-refusal';
 import CancelOrder from './actions/cancel-order';
 import ConfirmOrder from './actions/confirm-order';
 import SendSmsModal from './actions/send-sms/SendSmsModal';
@@ -213,10 +212,7 @@ function OrderActions() {
         return <SplitOrder />;
       case 'release-order':
         return <ReleaseOrder />;
-      // case 'unrelease-order':
-      //   return <UnreleaseOrder />;
-      case 'log-service-refusal':
-        return <LogServiceRefusal callOrdersApi={callOrdersApi} />;
+
       case 'cancel-order':
         return (
           <CancelOrder

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

@@ -31,7 +31,7 @@ export interface resolveTaskPayload {
 export interface CreateReminderPayload {
   due_datetime: Date | null;
   description: string | null;
-  assigned_to: string | null;
+  assigned_to: any | null;
   order_id: number | null;
   priority: number | null;
   department: string | null;
@@ -49,7 +49,7 @@ export interface SingleResolvedPayload {
 export interface UpdateReminderPayload {
   due_datetime: any | null;
   description: any | null;
-  assigned_to: string | null;
+  assigned_to: any | null;
   order_id: number | null;
   priority: number | null;
   department: any | null;

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

@@ -9,12 +9,12 @@ import {
   errorAtom,
   useCustomerInfo,
   useGlobalStateHitAuditLog,
-  useOrderStaticData,
   useGlobalStateHitOrder,
+  useLiveRecalling,
 } from '../../../store';
 // import useUpdateOrder from '../../../hooks/useUpdateOrder';
 import { compareOrderDetailsStates, filterObject } from '../../../utils';
-import { ApiResponse, OrderServiceType } from '../../../types';
+import { ApiResponse, OrdersType } from '../../../types';
 import { notification } from 'antd';
 import { useClientPortal } from '../../../../store';
 
@@ -25,10 +25,9 @@ function OrderDetailsFooter() {
   // const updateOrder = useUpdateOrder();
   const [errorState] = useAtom(errorAtom);
   const [, setRecallAuditLog] = useGlobalStateHitAuditLog();
-  const [orderStaticData] = useOrderStaticData();
   const [, setRecallOrders] = useGlobalStateHitOrder();
   const [isClientPortal] = useClientPortal();
-
+  const [, setRecalling] = useLiveRecalling();
   //update order
   const { fetchData: callUpdateOrderAPI } = useAxios<{
     data: ApiResponse[];
@@ -55,7 +54,6 @@ function OrderDetailsFooter() {
       'order_communications',
       'updated_at',
       'updated_by',
-      'order_services',
     ];
     const filteredOrderDetails = filterObject(
       orderDetails,
@@ -66,97 +64,74 @@ function OrderDetailsFooter() {
       keysToRemovefromOrders
     );
 
-    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 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;
+    const isSame = orderDetailsSorted === prevOrderDetailsSorted;
     return !isSame;
   };
 
   const onSave = async () => {
     setRecallAuditLog(false);
     setRecallOrders(false);
+    setRecalling(false);
     const payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
-    const clone = [...orderDetails?.order_services];
 
-    // ASSEMBLE AND DISASSEMBLE SERVICES CHECK FOR ASSEMBLE TYPE
-    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 serviceKeys = [
+      'assemble',
+      'disassemble',
+      'unpack_items',
+      'collect_disposal',
+      'take_packaging_away',
+      'assembly_type',
+    ];
 
-    const assemblyTypeService = clone?.find(
-      (x: any) => x?.order_service_list_id === assembleOrderService?.id
-    );
+    let orderServicesPayload: Record<string, any> = {};
+
+    const includesKey = serviceKeys.some(key => key in payload);
+
+    if (includesKey) {
+      for (const key of serviceKeys) {
+        orderServicesPayload[key as keyof typeof payload] =
+          key in payload
+            ? payload[key as keyof typeof payload]
+            : orderDetails[key as keyof OrdersType];
+        delete payload[key as keyof typeof payload];
+        if (
+          orderServicesPayload?.assemble === false &&
+          orderServicesPayload?.disassemble === false
+        ) {
+          orderServicesPayload.assembly_type = null;
+        }
+      }
+    }
 
-    const disassemblyTypeService = clone?.find(
-      (x: any) => x?.order_service_list_id === disassembleOrderService?.id
-    );
+    if (Object.keys(orderServicesPayload).length > 0) {
+      payload.order_services = [orderServicesPayload];
+    }
 
-    if (
-      assemblyTypeService !== undefined &&
-      assemblyTypeService?.is_deleted === false &&
-      (assemblyTypeService?.service_category_id === undefined ||
-        assemblyTypeService?.service_category_id === null)
-    ) {
-      notification.info({
-        message: 'Info',
-        description: 'Assembly Type is required',
+    let response = (await callUpdateOrderAPI({
+      payload: [payload],
+    })) as {
+      code: number | null;
+      error?: string | null | undefined;
+      [key: string]: any;
+    };
+    // const response = await updateOrder([payload]);
+    setRecallOrders(true);
+    if (response.code == 200 && response?.data?.length > 0) {
+      notification.success({
+        message: 'Success',
+        description: `${response?.message}`,
       });
-      return;
-    } else if (
-      disassemblyTypeService !== undefined &&
-      disassemblyTypeService?.is_deleted === false &&
-      (disassemblyTypeService?.service_category_id === undefined ||
-        disassemblyTypeService?.service_category_id === null)
-    ) {
-      notification.info({
-        message: 'Info',
-        description: 'Assembly Type is required',
+      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,
       });
-      return;
+      setRecallAuditLog(true);
     } else {
-      let response = (await callUpdateOrderAPI({
-        payload: [payload],
-      })) as {
-        code: number | null;
-        error?: string | null | undefined;
-        [key: string]: any;
-      };
-      // const response = await updateOrder([payload]);
-      setRecallOrders(true);
-      if (response.code == 200 && response?.data?.length > 0) {
-        notification.success({
-          message: 'Success',
-          description: `${response?.message}`,
-        });
-        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,
-        });
-        setRecallAuditLog(true);
-      } else {
-        setOrderDetails(prevOrderDetails);
-      }
+      setOrderDetails(prevOrderDetails);
     }
   };