@bjsdistribution/dms-client-return 0.0.84 → 0.0.86

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import OrderActionModal from '../../../../../common/modals/order-action-modal/OrderActionModal';
 import styled from 'styled-components';
 import SplitOrderTable from './SplitOrderTable';
@@ -37,28 +37,23 @@ function SplitOrder() {
   const onSubmitSplitOrder = () => {
     if (orderId) {
       setPerformAction(true);
-      //@ts-ignore
-      if (response?.data && response?.code === 200) {
-        notification.success({
-          message: 'Success',
-          description:
-            //@ts-ignore
-            response?.message || 'Sucess',
-        });
-      } else {
-        // alert(response?.error_traceback);
-        notification.error({
-          message: 'Error',
-          description:
-            //@ts-ignore
-            response?.message ||
-            'An error has occurred. Please try again later.',
-        });
-      }
-      setSelectedSplit([]);
     }
   };
 
+  useEffect(() => {
+    //@ts-ignore
+    if (response?.code === 200) {
+      notification.success({
+        message: 'Success',
+        description:
+          //@ts-ignore
+          response?.message || 'Sucess',
+      });
+      setCurrentAction(undefined);
+      setSelectedSplit([]);
+    }
+  }, [response]);
+
   const isSubmitDisabled = () => {
     if (seledtedSplitOrder?.length > 0) {
       return !seledtedSplitOrder;

package/src/components/order-view/order-actions/actions/uncancel-order/UncancelOrder.tsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import {
   AntSelect,
+  Label,
   TextArea,
   useApiHook,
 } from '@bjsdistribution/dms-component-library';
@@ -13,7 +14,7 @@ import {
   usePrevOrderDetails,
 } from '../../../store';
 import OrderActionModal from '../../../../../common/modals/order-action-modal/OrderActionModal';
-import { HoldContentContainer, HoldRow, Label, SplitText } from '../modalstyle';
+import { HoldContentContainer, HoldRow, SplitText } from '../modalstyle';
 import { ApiResponse, OrdersType } from '../../../types';
 import styled from 'styled-components';
 import { useLoading } from '../../../../order-daily-overview/store/store';
@@ -136,7 +137,7 @@ function UncancelOrder() {
       <HoldContentContainer>
         <SplitText>
           <HoldRow>
-            <Label>Un-cancel Reason</Label>
+            <Label label="Un-cancel Reason" required></Label>
             <AntSelect
               options={unCancelReasonOptions || []}
               placeholder="Select un-cancel Reason"
@@ -150,7 +151,7 @@ function UncancelOrder() {
             />
           </HoldRow>
           <HoldRow>
-            <Label>Un-cancel Note</Label>
+            <Label label="Un-cancel Note"></Label>
             <CustomTextArea rows={5} onChange={onChange} />
           </HoldRow>
         </SplitText>

package/src/components/order-view/order-actions/actions/unhold-order/UnholdOrder.tsx

@@ -28,7 +28,7 @@ const UnholdOrder = () => {
   } = useApiHook<{
     data: ApiResponse[];
   }>({
-    endpoint: `orders/${orderId}/unhold/?unhold_reason="unhold"`,
+    endpoint: `orders/${orderId}/unhold/`,
     method: 'POST',
     performAction: false,
   });

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

@@ -258,6 +258,12 @@ export function useUpdateReminderData() {
 export function useRouteDetails() {
   return useAtom(routeDetails);
 }
+const allOrderStatus = atom<string | null>(null);
+
+export function useAllOrderStatus() {
+  return useAtom(allOrderStatus);
+}
+
 
 export const selectedCategoryIdAtom = atom<any>(null);
 export const selectedDocumentTypeAtom = atom<any>(null);

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

@@ -38,7 +38,7 @@ export function formatDate(dateString: any) {
     const date = new Date(dateString);
 
     if (!isNaN(date.getTime())) {
-      return format(date, 'MM/dd/yyyy HH:mm:ss');
+      return format(date, 'dd/MM/yyyy HH:mm:ss');
     }
   }
   return 'Invalid date';

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

@@ -11,6 +11,7 @@ import {
   useUpdateApiCall,
   useLiveRecalling,
   useGlobalStateHitAuditLog,
+  useGlobalStateHitOrder,
 } from '../../../store';
 import useUpdateOrder from '../../../hooks/useUpdateOrder';
 import { compareOrderDetailsStates, filterObject } from '../../../utils';
@@ -25,6 +26,8 @@ function OrderDetailsFooter() {
   const [, setCallApi] = useUpdateApiCall(); //single detail
   const [, setRecalling] = useLiveRecalling();
   const [, setRecallAuditLog] = useGlobalStateHitAuditLog();
+  const [, setRecallOrders] = useGlobalStateHitOrder();
+
   const errorFound = () => {
     const isError =
       errorState?.w3wError.length > 0 ||
@@ -77,9 +80,12 @@ function OrderDetailsFooter() {
   };
 
   const onSave = async () => {
+    setRecallAuditLog(false);
+    setRecallOrders(false);
     const payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
     const response = await updateOrder([payload]);
     setCallApi(false);
+    setRecallOrders(true);
     // setLogsCallAPi(prev => !prev);
     if (response && response?.data?.length > 0) {
       setOrderDetails(response?.data[0]);

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

@@ -16,7 +16,7 @@ function Carrier() {
   const onChange = (selectedOption: any) => {
     setOrderDetails(prev => ({
       ...prev,
-      carrier_id: selectedOption.value,
+      carrier_id: selectedOption?.value,
     }));
   };
 

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

@@ -21,7 +21,7 @@ function DepotDropdown() {
   return (
     <FormContainer>
       <Label label="Depot" htmlFor="depotDropdown" />
-      <SelectDropdown
+      <StyledSelectDropdown
         placeholder="Select Depot"
         inputId="depotDropdown"
         openMenuOnFocus={false}
@@ -33,7 +33,7 @@ function DepotDropdown() {
         styles={{
           ...dropdownStyles,
 
-          control: styles => ({
+          control: (styles: any) => ({
             ...styles,
             borderRadius: '25px',
             cursor: 'pointer',
@@ -50,5 +50,7 @@ const FormContainer = styled.div`
   gap: 6px;
   flex: 1;
 `;
-
+export const StyledSelectDropdown = styled(SelectDropdown)`
+  min-width: 160px;
+`;
 export default DepotDropdown;

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

@@ -52,7 +52,8 @@ function ScheduleAfter() {
         onChange={onChange}
         value={scheduleDate === null ? scheduleDate : dayjs(scheduleDate)}
         format="DD/MM/YY"
-        style={{ borderRadius: '25px' }}
+        disabledDate={current => current && current < dayjs().startOf('day')}
+        allowClear={false}
       />
     </MainContainer>
   );

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

@@ -1,8 +1,9 @@
-import { Label, SelectDropdown } from '@bjsdistribution/dms-component-library';
+import { Label } from '@bjsdistribution/dms-component-library';
 import React from 'react';
 import styled from 'styled-components';
 import { vehicleTypeOptions } from '../../helper';
 import { useOrderDetails } from '../../../store';
+import { StyledSelectDropdown } from './Depot';
 
 function VehicleTypeDropdown() {
   const [orderDetails, setOrderDetails] = useOrderDetails();
@@ -18,7 +19,7 @@ function VehicleTypeDropdown() {
   return (
     <FormContainer>
       <Label label="Vehicle Type" htmlFor="vehicleType" />
-      <SelectDropdown
+      <StyledSelectDropdown
         placeholder="Select vehicle type"
         options={vehicleTypeOptions}
         inputId="vehicleType"

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

@@ -31,7 +31,7 @@ function DeliveryPointDropdown() {
 
   return (
     <Container>
-      <Label label="Delivery Point" htmlFor="deliveryPointDropdown" />
+      <Label label="Delivery Point" />
       <StyledSelectDropdown
         placeholder="Select Delivery Point"
         options={deliveryPointOptions || []}

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

@@ -48,7 +48,7 @@ function TimedServiceDropdown() {
 
   return (
     <Container>
-      <Label label="Timed Service" htmlFor="timedServiceDropdown" />
+      <Label label="Timed Service" />
       <StyledSelectDropdown
         styles={{
           ...dropdownStyles,

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

@@ -477,6 +477,13 @@ export function useGlobalStateHitAuditLog() {
   return useAtom(globalStateHitAuditLog);
 }
 
+const globalOrderGetApi = atom<boolean>(true);
+
+export function useGlobalStateHitOrder() {
+  return useAtom(globalOrderGetApi);
+}
+
+
 // Popup state Manage
 const initialState = null;