@bjsdistribution/dms-client-return 0.1.21-dev → 0.1.21-prod

package/src/components/order-daily-overview/header-filters/SelectionFilter.tsx

@@ -12,6 +12,7 @@ import { atom, useAtom } from 'jotai';
 import {
   useActionTypeOptions,
   useClearState,
+  useClientPortal,
   useCustomerData,
   useReturnPayload,
 } from '../../store';
@@ -47,8 +48,8 @@ function SelectionFilter() {
   const [actionTypeOptions, setActionTypeOptions] = useActionTypeOptions();
   const [locationOptions, setLocationOptions] = useLocationOptions();
   const [searchParams] = useSearchParams();
+  const [clientPortal] = useClientPortal();
   const navigate = useNavigate();
-
   //API for client data
   const { data: fetchedCustomerData, loading: loading, fetchData } = useAxios<
     ApiResponse
@@ -60,7 +61,9 @@ function SelectionFilter() {
   });
 
   useEffect(() => {
-    fetchData();
+    if (!clientPortal && clientPortal !== undefined) {
+      fetchData();
+    }
   }, []);
 
   useEffect(() => {

package/src/components/order-daily-overview/index.tsx

@@ -57,8 +57,9 @@ function ReturnMainTable() {
     pagination: { is_pagination: false },
     showLoader: false,
   });
+
   useEffect(() => {
-    if (!clientPortal) {
+    if (!clientPortal && clientPortal !== undefined) {
       fetchData();
     }
   }, []);
@@ -84,9 +85,8 @@ function ReturnMainTable() {
     filters: filters,
     showLoader: false,
   });
-
   useEffect(() => {
-    if (!clientPortal) {
+    if (!clientPortal && clientPortal !== undefined) {
       fetchProductStats();
     }
   }, []);

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/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-details/expanded-content/customer-section/contact-info/ContactHome.tsx

@@ -1,25 +1,48 @@
 import { Input, Label } from '@bjsdistribution/dms-component-library';
 import React from 'react';
 import styled from 'styled-components';
-import { errorAtom, useAtom, useOrderDetails } from '../../../../store';
+import {
+  errorAtom,
+  useAtom,
+  useOrderDetails,
+  usePrevOrderDetails,
+} from '../../../../store';
 import { handleKeyDown } from '../../../../utils';
+import { useClientPortal } from '../../../../../store';
 
-// const LANDLINE_REGEX = /^\(?(?:(?:0(?:0|11)\)?[\s-]?\(?|\+)44\)?[\s-]?\(?(?:0\)?[\s-]?\(?)?|0)(?:\d{2}\)?[\s-]?\d{4}[\s-]?\d{4}|\d{3}\)?[\s-]?\d{3}[\\s-]?\d{3,4}|\d{4}\)?[\s-]?(?:\d{5}|\d{3}[\s-]?\d{3})|\d{5}\)?[\s-]?\d{4,5}|8(?:00[\s-]?11[\s-]?11|45[\s-]?46[\s-]?4\d))(?:(?:[\s-]?(?:x|ext\.?\s?|\#)\d+)?)$/;
+//import { VALIDATE_UK_IRISH_NUMBER_REGEX } from '../../../helper';
+import CallCustomer from './CallCustomer';
 
 function ContactHome() {
   const [errors, setErrors] = useAtom(errorAtom);
-
-  // Show call icons only if number is valid
-  // show copy icon if there is input value
+  const [isClientPortal] = useClientPortal();
   const [orderDetails, setOrderDetails] = useOrderDetails();
+  const [prevOrderDetails] = usePrevOrderDetails();
+  const apiContactHome = prevOrderDetails?.order_recipient?.contact_home;
   const orderRecipient = orderDetails?.order_recipient;
 
   const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const val = e.target.value;
+    let val = e.target.value.replace(/\s+/g, '');
+    console.log(val, 'valuee');
+
+    if (!/^\+?\d*$/.test(val)) return;
+
+    const validPrefixes = ['+44', '44', '0', '+353', '353'];
+
+    let matchedPrefix = validPrefixes.find(prefix => val.startsWith(prefix));
+    let prefix = matchedPrefix || '';
+    let numberPart = val.slice(prefix.length);
+
+    const digitLimit = prefix === '+353' || prefix === '353' ? 9 : 10;
+
+    if (numberPart.length > digitLimit) return;
+
+    const contactValue = val;
+
     const updatedOrderRecipient = {
       ...(orderRecipient === null
-        ? { contact_home: val }
-        : { ...orderRecipient, contact_home: val }),
+        ? { contact_home: contactValue }
+        : { ...orderRecipient, contact_home: contactValue }),
     };
 
     setOrderDetails(prev => ({
@@ -27,58 +50,100 @@ function ContactHome() {
       order_recipient: updatedOrderRecipient,
     }));
 
-    if (val) {
-      if (val.length < 10) {
-        setErrors(prevErrors => ({
-          ...prevErrors,
-          homeContactError: 'Phone number must be at least 10 digits.',
-        }));
-      } else if (val.length > 11) {
-        setErrors(prevErrors => ({
-          ...prevErrors,
-          homeContactError: 'Phone number must not exceed 11 digits.',
-        }));
-      } else {
-        setErrors(prevErrors => ({
-          ...prevErrors,
-          homeContactError: '',
-        }));
-      }
-    } else {
-      setErrors(prevErrors => ({
-        ...prevErrors,
-        homeContactError: '',
+    if (!numberPart) {
+      setErrors(prev => ({ ...prev, homeContactError: '' }));
+    } else if (numberPart.length !== digitLimit) {
+      setErrors(prev => ({
+        ...prev,
+        homeContactError: `Number must have exactly ${digitLimit} digits after the prefix.`,
       }));
+    } else {
+      setErrors(prev => ({ ...prev, homeContactError: '' }));
     }
   };
 
   return (
-    <MainContainer>
+    <Container>
       <Wrapper>
         <Label label="Contact Home" htmlFor="contact-home" />
-        {/* {showCopyIcon && <CopyText text={orderRecipient?.contact_home!} />} */}
       </Wrapper>
       <InputContainer>
         <CustomInput
           name="contact-home"
+          // maxLength={12}
           type="text"
           placeholder="Home Number"
           onKeyDown={handleKeyDown}
-          minLength={10}
-          maxLength={10}
           value={orderRecipient?.contact_home || ''}
           onChange={onChange}
+          disabled={isClientPortal}
         />
+        {/* 
+        <CallCustomer /> */}
+        {apiContactHome &&
+          (() => {
+            const rawNumber = apiContactHome.replace(/\s+/g, '');
+
+            let formattedNumber = rawNumber.replace(/\D/g, ''); // digits only
+            let prefix = '';
+            let numberPart = '';
+
+            if (rawNumber.startsWith('+44')) {
+              prefix = '+44';
+              numberPart = formattedNumber.slice(2);
+            } else if (rawNumber.startsWith('44')) {
+              prefix = '44';
+              numberPart = formattedNumber.slice(2);
+            } else if (rawNumber.startsWith('0')) {
+              prefix = '0';
+              numberPart = formattedNumber.slice(1);
+            } else if (rawNumber.startsWith('+353')) {
+              prefix = '+353';
+              numberPart = formattedNumber.slice(3);
+            } else if (rawNumber.startsWith('353')) {
+              prefix = '353';
+              numberPart = formattedNumber.slice(3);
+            } else {
+              numberPart = formattedNumber;
+            }
+
+            // Set digit limit based on prefix
+            const digitLimit = prefix === '+353' || prefix === '353' ? 9 : 10;
+
+            if (numberPart.length !== digitLimit) return null;
+
+            let hrefPrefix = '';
 
-        {/* <CallCustomer /> */}
+            if (prefix === '0' || prefix === '44' || prefix === '+44') {
+              hrefPrefix = '+44';
+            } else if (prefix === '353' || prefix === '+353') {
+              hrefPrefix = '+353';
+            } else {
+              hrefPrefix = '+44';
+            }
+
+            const finalHref = `tel:${hrefPrefix}${numberPart}`;
+
+            return (
+              <a href={finalHref} style={{ cursor: 'pointer' }}>
+                <CallCustomer />
+              </a>
+            );
+          })()}
       </InputContainer>
       {errors.homeContactError && (
         <ErrorText>{errors.homeContactError}</ErrorText>
       )}
-    </MainContainer>
+    </Container>
   );
 }
 
+const InputContainer = styled.div`
+  display: flex;
+  gap: 7px;
+  align-items: center;
+`;
+
 const Wrapper = styled.div`
   display: flex;
   align-items: center;
@@ -87,9 +152,6 @@ const Wrapper = styled.div`
 
 const CustomInput = styled(Input)`
   width: 80%;
-  // @media (max-width: 1024px) {
-  //   width: 80%;
-  // }
 
   &::-webkit-outer-spin-button,
   &::-webkit-inner-spin-button {
@@ -101,13 +163,7 @@ const CustomInput = styled(Input)`
   }
 `;
 
-const InputContainer = styled.div`
-  display: flex;
-  gap: 7px;
-  align-items: center;
-`;
-
-const MainContainer = styled.div`
+const Container = styled.div`
   display: flex;
   flex-direction: column;
   gap: 6px;
@@ -119,4 +175,5 @@ const ErrorText = styled.span`
   font-size: 0.85rem;
   margin-top: 4px;
 `;
+
 export default ContactHome;