@bjsdistribution/dms-client-return 0.0.64 → 0.0.66

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.64",
+  "version": "0.0.66",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/order-daily-overview/return-after-table/table-filters/ReturnOrderFilter.tsx

@@ -95,6 +95,11 @@ const ReturnOrderFilter = () => {
     });
   };
 
+  const assigneeOptions = assignData?.map(client => ({
+    label: client.type,
+    value: client.id,
+  }));
+
   const handleAssigneeChange = (value: any) => {
     const bjsDeliveryValue = assignData.find(client => client.id === value)
       ?.bjs_delivery;
@@ -189,7 +194,7 @@ const ReturnOrderFilter = () => {
                   className="custom-select"
                   placeholder="Status of Order"
                   onChange={handleStatusOfOrder}
-                  style={{ minWidth: '130px' }}
+                  style={{ width: '145px' }}
                   value={statusOrder}
                   onClear={handleClear}
                   allowClear
@@ -220,15 +225,12 @@ const ReturnOrderFilter = () => {
               </div>
               <StyledAntSelect>
                 <Select
-                  options={assignData?.map(client => ({
-                    label: client.type,
-                    value: client.id,
-                  }))}
+                  options={assigneeOptions}
                   className="custom-select"
                   placeholder="Assignee"
                   onChange={handleAssigneeChange}
                   value={selectedAssignee}
-                  style={{ minWidth: '120px' }}
+                  style={{ minWidth: '140px' }}
                   allowClear
                   onClear={handleClearAssignee}
                 />

package/src/components/order-view/details-filters/right-side-filters/Details.tsx

@@ -1,11 +1,12 @@
 import React from 'react';
 import styled from 'styled-components';
-import { useOrderDetails } from '../../store';
+import { useCustomerInfo } from '../../store';
 
 const Details = () => {
-  const [orderDetails] = useOrderDetails();
-  const recipient = orderDetails?.order_recipient?.recipient_name || '';
-  const postcodeShow = orderDetails?.order_recipient?.postcode || '';
+  // const [orderDetails] = useOrderDetails();
+  const [customerInfo] = useCustomerInfo();
+  const recipient = customerInfo?.recipient_name || '';
+  const postcodeShow = customerInfo?.postcode || '';
 
   return (
     <DetailsContainer>

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

@@ -16,7 +16,7 @@ import {
   useDepotOptions,
   usePrevOrderDetails,
   useOrderProductsResources,
-  useOrderProductsToolbox,
+  // useOrderProductsToolbox,
   useCustomerInfo,
   useLocationOptions,
   useOrderProductSystemLogs,
@@ -31,7 +31,7 @@ import { OrdersType } from './types';
 import { useLocation } from 'react-router-dom';
 import useSystemLogs from './hooks/useGetSystemLogs';
 import { notification } from 'antd';
-import { useAssignData } from '../store';
+// import { useAssignData } from '../store';
 import DetailsFilters from './details-filters/DetailsFilters';
 
 interface ApiResponse {
@@ -59,14 +59,14 @@ function OrderView() {
   const [, setCustomerInfo] = useCustomerInfo();
   const [, setLocationOptions] = useLocationOptions();
   const [orderResources, setOrderResources] = useOrderProductsResources();
-  const [orderToolbox, setOrderToolbox] = useOrderProductsToolbox();
+  // const [orderToolbox, setOrderToolbox] = useOrderProductsToolbox();
   const [GsitCUstomerId, setGsitCUstomerId] = useGsitCUstomerId();
   const [, setOrderProductId] = useOrderProductId();
   const [, setCUstomerId] = useCUstomerId();
   const [, setRouteId] = useRouteId();
   const [liveRecalling] = useLiveRecalling();
   const systemLogsData = useSystemLogs();
-  const [, setAssignData] = useAssignData();
+  // const [, setAssignData] = useAssignData();
 
   // query param
   const location = useLocation();
@@ -173,11 +173,11 @@ function OrderView() {
     if (fetchedStaticData && fetchedStaticData.data) {
       const result = fetchedStaticData?.data;
       setOrderStaticData(result[0]);
-      setAssignData(
-        fetchedStaticData?.data?.flatMap(
-          (i: any) => i?.resource_visibility_type
-        )
-      );
+      // setAssignData(
+      //   fetchedStaticData?.data?.flatMap(
+      //     (i: any) => i?.resource_visibility_type
+      //   )
+      // );
     }
   }, [staticDataLoading]);
 
@@ -194,9 +194,11 @@ function OrderView() {
       //@ts-ignore
       setOrderProductId(requiredData[0]?.id);
       setCustomerInfo({
-        recipient_name: requiredData[0]?.order_recipient?.recipient_name,
-        postcode: requiredData[0]?.order_recipient?.postcode,
+        recipient_name:
+          requiredData[0]?.order_recipient?.recipient_name ?? null,
+        postcode: requiredData[0]?.order_recipient?.postcode ?? null,
       });
+
       setPrevOrderDetails(requiredData[0]);
     }
   }, [loading]);
@@ -219,9 +221,10 @@ function OrderView() {
   useEffect(() => {
     setLoading(depotDataLoading);
     if (fetchedDepotData && fetchedDepotData.data) {
+      console.log(fetchedDepotData, 'fetchedDepotData');
       const requiredData = fetchedDepotData?.data;
       if (requiredData.length > 0) {
-        const options = requiredData.map((x: any) => {
+        const options = requiredData?.map((x: any) => {
           return {
             label: x.name,
             value: x.id,
@@ -264,32 +267,32 @@ function OrderView() {
     };
   }, [fetchedResourcesData, orderResources, setOrderResources]);
 
-  // Toolbox resources
-  const {
-    data: fetchedToolboxData,
-    setShouldPerformAction: setAction,
-  } = useApiHook<{
-    data: ApiResponse[];
-  }>({
-    endpoint: `/orders/${orderId}/toolbox_resources/`,
-    method: 'GET',
-    performAction: false,
-  });
-
-  useEffect(() => {
-    if (orderId) {
-      setAction(true);
-    }
-  }, [orderId, setAction]);
-
-  useEffect(() => {
-    if (orderId) {
-      setOrderToolbox(fetchedToolboxData);
-    }
-    return () => {
-      // setOrderId(undefined);
-    };
-  }, [fetchedToolboxData, orderToolbox, setOrderToolbox]);
+  // // Toolbox resources
+  // const {
+  //   data: fetchedToolboxData,
+  //   setShouldPerformAction: setAction,
+  // } = useApiHook<{
+  //   data: ApiResponse[];
+  // }>({
+  //   endpoint: `/orders/${orderId}/toolbox_resources/`,
+  //   method: 'GET',
+  //   performAction: false,
+  // });
+
+  // useEffect(() => {
+  //   if (orderId) {
+  //     setAction(true);
+  //   }
+  // }, [orderId, setAction]);
+
+  // useEffect(() => {
+  //   if (orderId) {
+  //     setOrderToolbox(fetchedToolboxData);
+  //   }
+  //   return () => {
+  //     // setOrderId(undefined);
+  //   };
+  // }, [fetchedToolboxData, orderToolbox, setOrderToolbox]);
 
   useEffect(() => {
     return () => {

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

@@ -24,6 +24,7 @@ import { useLoading } from '../../../../order-daily-overview/store/store';
 import { notification } from 'antd';
 import { compareOrderDetailsStates, filterObject } from '../../../utils';
 import useUpdateOrder from '../../../hooks/useUpdateOrder';
+import { format } from 'date-fns';
 // import { filterObject } from '../../../utils';
 
 function ConfirmOrder() {
@@ -37,7 +38,7 @@ function ConfirmOrder() {
   const [, setLoading] = useLoading();
   const [customerInfo] = useCustomerInfo();
   const infoText = `${customerInfo?.recipient_name}, ${customerInfo?.postcode}`;
-  const [deliveryDate] = useConfirmOrderDate();
+  const [deliveryDate, setDeliveryDate] = useConfirmOrderDate();
   const [liveRecalling, setRecalling] = useLiveRecalling();
   const [orderId] = useOrderId();
   const [errorState] = useErrorConfirmOrder();
@@ -164,6 +165,9 @@ function ConfirmOrder() {
     }
     if (orderId && deliveryDate) {
       //call order update api then call confirm order if required
+      const formattedDate = format(new Date(deliveryDate), 'yyyy-MM-dd');
+
+      setDeliveryDate(formattedDate);
       setPerformAction(true);
     }
   };

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

@@ -18,10 +18,16 @@ const date = atom(new Date());
 
 const orderStaticDataAtom = atom<any>({});
 
-const customerInfoAtom = atom<{
-  recipient_name: string | null | undefined;
-  postcode: string | null | undefined;
-}>({ recipient_name: '', postcode: '' });
+interface OrderRecipient {
+  recipient_name: string | null;
+  postcode: string | null;
+}
+
+const customerInfoAtom = atom<OrderRecipient>({
+    recipient_name: '',
+    postcode: '',
+});
+
 
 export const ordersInitialValue: OrdersType = {
   depot_id: null,