@bjsdistribution/dms-client-return 0.0.73 → 0.0.75

package/src/components/order-view/order-details/expanded-content/customer-section/location-info/What3words.tsx

@@ -27,11 +27,18 @@ function What3words() {
   };
 
   const validateInput = (value: string) => {
-    const isValid = w3wRegex.test(value);
-    setErrors(prev => ({
-      ...prev,
-      w3wError: isValid ? '' : 'Please enter a valid input (word.word.word)',
-    }));
+    if (value.trim()) {
+      const isValid = w3wRegex.test(value);
+      setErrors(prev => ({
+        ...prev,
+        w3wError: isValid ? '' : 'Please enter a valid input (word.word.word)',
+      }));
+    } else {
+      setErrors(prev => ({
+        ...prev,
+        w3wError: '',
+      }));
+    }
   };
 
   return (

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

@@ -8,9 +8,7 @@ import {
   usePrevOrderDetails,
   errorAtom,
   useCustomerInfo,
-  // useLogsCallAPi,
   useUpdateApiCall,
-  // UseNotesLoading,
 } from '../../../store';
 import useUpdateOrder from '../../../hooks/useUpdateOrder';
 import { compareOrderDetailsStates, filterObject } from '../../../utils';
@@ -22,18 +20,15 @@ function OrderDetailsFooter() {
   const [, setCustomerInfo] = useCustomerInfo();
   const updateOrder = useUpdateOrder();
   const [errorState] = useAtom(errorAtom);
-  // const [, setLogsCallAPi] = useLogsCallAPi();
   const [, setCallApi] = useUpdateApiCall(); //single detail
-  // const [, setNoteLoadingStore] = UseNotesLoading();
-
   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;
+      errorState?.w3wError.length > 0 ||
+      errorState?.emailError.length > 0 ||
+      errorState?.homeContactError.length > 0 ||
+      errorState?.workCOntanctError.length > 0 ||
+      errorState?.mobileError.length > 0 ||
+      errorState?.postCodeError.length > 0;
 
     return isError;
   };
@@ -116,11 +111,10 @@ const Container = styled.div`
   justify-content: space-between;
   padding: 10px 15px;
   align-items: flex-start;
-  border: 1px solid #edebe8;
+  border-top: 1px solid #edebe8;
   background: #f8fafc;
-  margin: 0px;
+  margin: 0px -15px -15px -15px;
   border-radius: 0px 0px 8px 8px;
-  align-items: center;
 `;
 
 export default OrderDetailsFooter;

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

@@ -2,12 +2,19 @@ import React from 'react';
 import styled from 'styled-components';
 import { Label } from '@bjsdistribution/dms-component-library';
 import { DatePicker, DatePickerProps } from 'antd';
-import { useOrderDetails, usePrevOrderDetails } from '../../../store';
+import {
+  useOrderDetails,
+  usePrevOrderDetails,
+  useStatusDetails,
+} from '../../../store';
 import dayjs from 'dayjs';
 
 function DeliveryDate() {
   const [orderDetails, setOrderDetails] = useOrderDetails();
   const [prevOrderDetails] = usePrevOrderDetails();
+  const [orderStatus] = useStatusDetails();
+
+  const routedStatus = orderStatus?.[0]?.routed;
 
   const actionDate = orderDetails?.action_date
     ? new Date(orderDetails?.action_date)
@@ -56,6 +63,7 @@ function DeliveryDate() {
         format="DD/MM/YY"
         style={{ borderRadius: '25px' }}
         allowClear={false}
+        disabled={routedStatus}
       />
     </MainContainer>
   );

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

@@ -1,6 +1,10 @@
 import React from 'react';
 import { useOrderDetails, useOrderStaticData } from '../../../store';
-import { Label, SelectDropdown } from '@bjsdistribution/dms-component-library';
+import {
+  dropdownStyles,
+  Label,
+  SelectDropdown,
+} from '@bjsdistribution/dms-component-library';
 import styled from 'styled-components';
 import { capitalize } from '../../../utils';
 
@@ -46,6 +50,14 @@ function TimedServiceDropdown() {
     <Container>
       <Label label="Timed Service" htmlFor="timedServiceDropdown" />
       <StyledSelectDropdown
+        styles={{
+          ...dropdownStyles,
+
+          control: (styles: any) => ({
+            ...styles,
+            width: 'max-content',
+          }),
+        }}
         placeholder="Select Timed Service"
         options={timedServicesOptions || []}
         value={timedServicesOptions?.filter(