@bjsdistribution/dms-client-return 0.0.88 → 0.0.90

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

@@ -9,29 +9,33 @@ import {
   useAtom,
   useCurrentAction,
   useCustomerInfo,
+  useOrderId,
   useOrderStaticData,
 } from '../../../store';
 import {
   selectedCategoryIdAtom,
   selectedDocumentTypeAtom,
   selectedTypeAtom,
+  selectedVisibilityAtom,
   setResourcesCall,
 } from '../../store';
 import OrderActionsDropdown from '../../Dropdown';
 import { notification } from 'antd';
-import useUploadFiles from '../../../hooks/AddResources';
+import { ApiResponse } from '../../../types';
+import { useAxios } from '@bjsdistribution/dms-component-library';
 
 function AddResources() {
   const [, setCurrentAction] = useCurrentAction();
   const [staticOrderData] = useOrderStaticData();
   const [, setSelectedType] = useAtom(selectedTypeAtom);
   const [uploadedFiles, setUploadedFiles] = useAtom(uploadedFilesAtom);
-  const uploadFiles = useUploadFiles();
   const [isFormValid, setIsFormValid] = useState(false);
   const [selectedCategoryId] = useAtom(selectedCategoryIdAtom);
   const [selectedDocumentType] = useAtom(selectedDocumentTypeAtom);
   const [selectedType] = useAtom(selectedTypeAtom);
   const [, setResources] = useAtom(setResourcesCall);
+  const [orderId] = useOrderId();
+  const [selectedVisibility] = useAtom(selectedVisibilityAtom);
 
   const onClose = () => {
     setCurrentAction(undefined);
@@ -54,6 +58,17 @@ function AddResources() {
       setSelectedType(selectedOption.value);
     }
   };
+
+  // upload files
+  const { fetchData: callUploadFile } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/orders/${orderId}/order_resources/?document_type=${selectedDocumentType}&type=${selectedType}&category=${selectedCategoryId}&visibility=${selectedVisibility}`,
+    method: 'POST',
+  });
+
+  //upload files
+
   const handleSubmit = async () => {
     if (!uploadedFiles) {
       notification.error({ message: 'No files selected' });
@@ -68,15 +83,29 @@ function AddResources() {
     }
 
     try {
-      const response = await uploadFiles(formData);
-      console.log('Upload successful:', response);
-      notification.success({ message: 'Files uploaded successfully' });
-      onClose(); // Close modal after successful upload
-      setResources(false);
-
-      setTimeout(() => {
-        setResources(true);
-      }, 1000);
+      let response = (await callUploadFile({
+        payload: formData,
+      })) as {
+        code: number | null;
+        error?: string | null | undefined;
+        [key: string]: any;
+      };
+      if (response?.code == 200 && response?.data?.length > 0) {
+        notification.success({
+          message: 'Success',
+          description: `${response?.message}`,
+        });
+        onClose(); // Close modal after successful upload
+        setResources(false);
+        setTimeout(() => {
+          setResources(true);
+        }, 1000);
+      } else {
+        notification.error({
+          message: 'Error',
+          description: `${response?.error}`,
+        });
+      }
     } catch (error) {
       console.error('Upload failed:', error);
     }

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

@@ -5,7 +5,7 @@ import CustomerInformation from './customer-info';
 import ProductTable from './tables/ProductTable';
 import NotesTable from './tables/NotesTable';
 import SlotAndInstructions from './slot-and-instructions';
-import { useApiHook } from '@bjsdistribution/dms-component-library';
+import { useApiHook, useAxios } from '@bjsdistribution/dms-component-library';
 import {
   useCurrentAction,
   useCustomerInfo,
@@ -23,9 +23,7 @@ import {
 import { ApiResponse } from '../../../types';
 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() {
   const [, setCurrentAction] = useCurrentAction();
@@ -41,13 +39,21 @@ function ConfirmOrder() {
   const [, setRecalling] = useLiveRecalling();
   const [orderId] = useOrderId();
   const [errorState] = useErrorConfirmOrder();
-  const updateOrder = useUpdateOrder();
+  // const updateOrder = useUpdateOrder();
   const [, setRecallOrders] = useGlobalStateHitOrder();
 
   const onClose = () => {
     setCurrentAction(undefined);
   };
 
+  //update Order API
+  const { fetchData: callUpdateOrderAPI } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/orders/update/`,
+    method: 'PUT',
+  });
+
   useEffect(() => {
     const clone = JSON.parse(JSON.stringify(orderDetails));
     setOrderDetailsConfirmOrder(clone);
@@ -129,7 +135,13 @@ function ConfirmOrder() {
 
     const notUpdateOrder = hasOnlyIdKey(payload);
     if (!notUpdateOrder) {
-      const response = await updateOrder([payload]);
+      let response = (await callUpdateOrderAPI({
+        payload: [payload],
+      })) as {
+        code: number | null;
+        error?: string | null | undefined;
+        [key: string]: any;
+      };
       if (response && response?.data?.length > 0) {
         setOrderDetails(response?.data[0]);
         setPrevOrderDetails(response?.data[0]);

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

@@ -3,7 +3,6 @@ import {
   useCategoryData,
   useCreateTaskPayload,
   useNotiifcationLabel,
-  useTaskLoading,
   useTaskTypeData,
   useTaskTypeExtended,
 } from '../../store';
@@ -18,7 +17,6 @@ import RadioButtonGroup from '../../../../../common/radio-group/RadioButtonGroup
 import styled from 'styled-components';
 import { isValid } from 'date-fns';
 import { TextArea } from '@bjsdistribution/dms-component-library';
-import Loader from '../../../../order-daily-overview/header/loader/Loader';
 import { StandardOptionsType } from '../../../../../common/radio-group/types';
 import { DatePicker } from 'antd';
 import dayjs from 'dayjs';
@@ -33,7 +31,6 @@ function CreateTaskModal() {
   const [subCategory] = useTaskTypeExtended();
   const [createTask, setPayload] = useCreateTaskPayload();
   const [, setLabel] = useNotiifcationLabel();
-  const [loading] = useTaskLoading();
 
   const handleSelectChange = () => console.log('');
 
@@ -132,7 +129,6 @@ function CreateTaskModal() {
 
   return (
     <Wrapper>
-      {loading && <Loader />}
       <SplitContainer>
         <FormRow label="Task Type" required>
           <StyledAntSelect

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

@@ -2,6 +2,7 @@ import React, { useEffect } from 'react';
 import {
   RadioButtonGroup,
   useApiHook,
+  useAxios,
 } from '@bjsdistribution/dms-component-library';
 import 'react-datepicker/dist/react-datepicker.css';
 import {
@@ -10,22 +11,20 @@ import {
   useCategoryData,
   useCreateTaskPayload,
   useDepartmentData,
+  useNotificationData,
   useNotiifcationLabel,
-  useTaskLoading,
   useTaskPriority,
   useTaskTypeData,
   useTaskTypeExtended,
 } from '../../store';
-import Loader from '../../../../order-daily-overview/header/loader/Loader';
 import { allTypes } from '../../types';
 import { ContentContainer } from './SharedComponents';
 import { useCurrentAction, useOrderDetails } from '../../../store';
 import OrderActionModal from '../../../../../common/modals/order-action-modal/OrderActionModal';
 import styled from 'styled-components';
-import useFetchUnresolvedTasks from '../../hooks/useAllTaskData';
 import CreateTaskModal from './CreateTaskModal';
-import useCreateTask from '../../hooks/useCreateTask';
 import { CustomOptions } from '../../../../fakeData';
+import { notification } from 'antd';
 
 interface ApiResponse {
   message: string;
@@ -36,17 +35,15 @@ interface ApiResponse {
 }
 
 function TaskModal() {
-  const createTaskAPI = useCreateTask();
   const [, setCurrentAction] = useCurrentAction();
   const [createTask, setPayload] = useCreateTaskPayload();
-  const [loading, setLoading] = useTaskLoading();
   const [staticData, setStaticData] = useAllStaticData();
   const [, setPriority] = useTaskPriority();
   const [, setTaskCategory] = useCategoryData();
   const [, setTaskTypes] = useTaskTypeData();
   const [, setTaskTypeExtended] = useTaskTypeExtended();
   const [, setDepartmentData] = useDepartmentData();
-  const fetchData = useFetchUnresolvedTasks();
+  const [, setNotififcationData] = useNotificationData();
   const [, setLabel] = useNotiifcationLabel();
   const [orderDetails] = useOrderDetails();
 
@@ -56,12 +53,32 @@ function TaskModal() {
     method: 'GET',
   });
 
+  //create task API
+  const { fetchData: createFlagAPI } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/tasks/`,
+    method: 'POST',
+  });
+
+  //Unresolved API
+  const {
+    fetchData: callUnresolvedTaskApi,
+    data: fetchedUnresolvedData,
+    loading: unresolvedLoading,
+  } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/tasks/`,
+    method: 'GET',
+    pagination: { is_pagination: false },
+    filters: [{ field: 'order_id', op: '=', value: orderDetails?.id }],
+  });
+
   useEffect(() => {
-    setLoading(true);
     if (fetchedStaticData) {
       setStaticData(fetchedStaticData.data);
     }
-    setLoading(false);
   }, [fetchedStaticData]);
 
   //extracted types from whole static data
@@ -92,12 +109,36 @@ function TaskModal() {
   };
 
   const handleTaskSubmit = async () => {
-    setLoading(true);
-    await createTaskAPI([createTask]);
-    fetchData();
-    closeModal();
+    let response = (await createFlagAPI({
+      payload: { flags: [createTask] },
+    })) as {
+      code: number | null;
+      error?: string | null | undefined;
+      [key: string]: any;
+    };
+    if (response?.code == 200 && response?.data) {
+      notification.success({
+        message: 'Success',
+        description: `${response.message}`,
+      });
+      callUnresolvedTaskApi();
+      closeModal();
+    }
+    if (response?.code == null && response.error) {
+      return notification.error({
+        message: 'Failure',
+        description: `${response.error}`,
+      });
+    }
   };
 
+  //flags data set
+  useEffect(() => {
+    if (fetchedUnresolvedData && fetchedUnresolvedData.data) {
+      setNotififcationData(fetchedUnresolvedData?.data);
+    }
+  }, [unresolvedLoading]);
+
   const isSubmitDisabled = () => {
     const { description, due_datetime, task_type_id } = createTask;
     return !description || !due_datetime || !task_type_id;
@@ -117,7 +158,6 @@ function TaskModal() {
 
   return (
     <>
-      {loading && <Loader />}
       <OrderModal
         headerTitle={'CREATE TASK'}
         onCloseHeader={closeModal}

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

@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import { useApiHook } from '@bjsdistribution/dms-component-library';
+import { useApiHook, useAxios } from '@bjsdistribution/dms-component-library';
 import 'react-datepicker/dist/react-datepicker.css';
 import CreateReminder from './CreateReminderModal';
 import {
@@ -8,21 +8,17 @@ import {
   useCategoryData,
   useCreateReminderPayload,
   useDepartmentData,
-  useTaskLoading,
+  useReminderNotiData,
   useTaskPriority,
   useTaskTypeData,
   useTaskTypeExtended,
 } from '../../store';
-import Loader from '../../../../order-daily-overview/header/loader/Loader';
-import useCreateReminder from '../../hooks/useCreateReminder';
 import { allTypes } from '../../types';
-
 import { ContentContainer } from './SharedComponents';
-import { useCurrentAction } from '../../../store';
+import { useCurrentAction, useOrderDetails } from '../../../store';
 import OrderActionModal from '../../../../../common/modals/order-action-modal/OrderActionModal';
 import styled from 'styled-components';
-import useFetchUnresolvedTasks from '../../hooks/useAllTaskData';
-import useFetchReminders from '../../hooks/useAllReminderData';
+import { notification } from 'antd';
 
 interface ApiResponse {
   message: string;
@@ -33,19 +29,38 @@ interface ApiResponse {
 }
 
 function TaskReminderModal() {
-  const createReminderAPI = useCreateReminder();
   const [, setCurrentAction] = useCurrentAction();
-  // const [modalType, setModalTypeState] = useState<string>('task');
   const [createReminder, setReminderPayload] = useCreateReminderPayload();
-  const [loading, setLoading] = useTaskLoading();
   const [staticData, setStaticData] = useAllStaticData();
   const [, setPriority] = useTaskPriority();
   const [, setTaskCategory] = useCategoryData();
   const [, setTaskTypes] = useTaskTypeData();
   const [, setTaskTypeExtended] = useTaskTypeExtended();
   const [, setDepartmentData] = useDepartmentData();
-  const fetchData = useFetchUnresolvedTasks();
-  const ReminderData = useFetchReminders();
+  const [, setReminderData] = useReminderNotiData();
+  const [OrderData] = useOrderDetails();
+
+  //create reminder API
+  const { fetchData: createReminderAPI } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/tasks/reminders/create/`,
+    method: 'POST',
+  });
+
+  //reminder get
+  const {
+    fetchData: callReminderApi,
+    data: fetchedReminderData,
+    loading: reminderLoading,
+  } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/tasks/reminder/get/`,
+    method: 'GET',
+    pagination: { is_pagination: false },
+    filters: [{ field: 'order_id', op: '=', value: OrderData.id }],
+  });
 
   // API Call
   const { data: fetchedStaticData } = useApiHook<ApiResponse>({
@@ -54,11 +69,9 @@ function TaskReminderModal() {
   });
 
   useEffect(() => {
-    setLoading(true);
     if (fetchedStaticData) {
-      setStaticData(fetchedStaticData.data);
+      setStaticData(fetchedStaticData?.data);
     }
-    setLoading(false);
   }, [fetchedStaticData]);
 
   //extracted types from whole static data
@@ -81,13 +94,36 @@ function TaskReminderModal() {
   };
 
   const handleReminderSubmit = async () => {
-    setLoading(true);
-    await createReminderAPI([createReminder]);
-    ReminderData();
-    fetchData();
-    closeModal();
+    let response = (await createReminderAPI({
+      payload: { reminder: createReminder },
+    })) as {
+      code: number | null;
+      error?: string | null | undefined;
+      [key: string]: any;
+    };
+    if (response.code == 200 && response.data) {
+      notification.success({
+        message: 'Success',
+        description: `${response.message}`,
+      });
+      callReminderApi();
+      closeModal();
+    }
+    if (response?.code == null && response.error) {
+      return notification.error({
+        message: 'Failure',
+        description: `${response.error}`,
+      });
+    }
   };
 
+  //reminder data set
+  useEffect(() => {
+    if (fetchedReminderData && fetchedReminderData?.data) {
+      setReminderData(fetchedReminderData?.data);
+    }
+  }, [reminderLoading]);
+
   const isSubmitDisabled = () => {
     const { details, due } = createReminder;
     return !details || !due;
@@ -97,7 +133,6 @@ function TaskReminderModal() {
 
   return (
     <>
-      {loading && <Loader />}
       <OrderModal
         headerTitle={'CREATE REMINDER'}
         onCloseHeader={closeModal}

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

@@ -1,6 +1,7 @@
 import {
   CancelAndCompleteAction,
   CancelationModal,
+  useAxios,
 } from '@bjsdistribution/dms-component-library';
 import React from 'react';
 import styled from 'styled-components';
@@ -10,15 +11,23 @@ import {
   useGlobalStateHitOrder,
   useOrderDetails,
 } from '../../../store';
-import useUpdateOrder from '../../../hooks/useUpdateOrder';
+import { notification } from 'antd';
+import { ApiResponse } from '../../../types';
 
 function OrderLock() {
   const [, setCurrentAction] = useCurrentAction();
   const [orderDetails, setOrderdetails] = useOrderDetails();
-  const lockOrder = useUpdateOrder();
   const [, setRecallOrders] = useGlobalStateHitOrder();
   const [, setRecallAuditLog] = useGlobalStateHitAuditLog();
 
+  //update order
+  const { fetchData: callUpdateOrderAPI } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/orders/update/`,
+    method: 'PUT',
+  });
+
   const title =
     orderDetails?.order_locked === true ? 'Unlocking Order' : 'Locking Order';
   const action = orderDetails?.order_locked === true ? 'Unlock' : 'Lock';
@@ -32,13 +41,29 @@ function OrderLock() {
     const isLocked =
       orderDetails?.order_locked === null ? false : orderDetails?.order_locked;
     const payload = [{ id: orderDetails?.id, order_locked: !isLocked }];
-    const response = await lockOrder(payload);
-    if (response.data) {
-      setOrderdetails(response.data[0]);
-      setOrderdetails(response?.data[0]);
-      setRecallAuditLog(true);
-      setRecallOrders(true);
-    }
+    try {
+      let response = (await callUpdateOrderAPI({
+        payload: payload,
+      })) as {
+        code: number | null;
+        error?: string | null | undefined;
+        [key: string]: any;
+      };
+      if (response.code == 200 && response?.data?.length > 0) {
+        notification.success({
+          message: 'Success',
+          description: `${response?.message}`,
+        });
+        setOrderdetails(response?.data[0]);
+        setRecallAuditLog(true);
+        setRecallOrders(true);
+      } else {
+        notification.error({
+          message: 'Error',
+          description: `${response?.error}`,
+        });
+      }
+    } catch (error) {}
     onClose();
   };
   return (

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
 import AllowTracking from './AllowTracking';
-import { Button } from '@bjsdistribution/dms-component-library';
+import { Button, useAxios } from '@bjsdistribution/dms-component-library';
 import {
   useAtom,
   useOrderDetails,
@@ -13,21 +13,28 @@ import {
   useGlobalStateHitAuditLog,
   useGlobalStateHitOrder,
 } from '../../../store';
-import useUpdateOrder from '../../../hooks/useUpdateOrder';
 import { compareOrderDetailsStates, filterObject } from '../../../utils';
-import { OrderServiceType } from '../../../types';
+import { ApiResponse, OrderServiceType } from '../../../types';
+import { notification } from 'antd';
 
 function OrderDetailsFooter() {
   const [orderDetails, setOrderDetails] = useOrderDetails();
   const [prevOrderDetails, setPrevOrderDetails] = usePrevOrderDetails();
   const [, setCustomerInfo] = useCustomerInfo();
-  const updateOrder = useUpdateOrder();
   const [errorState] = useAtom(errorAtom);
   const [, setCallApi] = useUpdateApiCall(); //single detail
   const [, setRecalling] = useLiveRecalling();
   const [, setRecallAuditLog] = useGlobalStateHitAuditLog();
   const [, setRecallOrders] = useGlobalStateHitOrder();
 
+  //update order
+  const { fetchData: callUpdateOrderAPI } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/orders/update/`,
+    method: 'PUT',
+  });
+
   const errorFound = () => {
     const isError =
       errorState?.w3wError.length > 0 ||
@@ -83,11 +90,21 @@ function OrderDetailsFooter() {
     setRecallAuditLog(false);
     setRecallOrders(false);
     const payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
-    const response = await updateOrder([payload]);
+    let response = (await callUpdateOrderAPI({
+      payload: [payload],
+    })) as {
+      code: number | null;
+      error?: string | null | undefined;
+      [key: string]: any;
+    };
     setCallApi(false);
     setRecallOrders(true);
     // setLogsCallAPi(prev => !prev);
     if (response && response?.data?.length > 0) {
+      notification.success({
+        message: 'Success',
+        description: `${response?.message}`,
+      });
       setOrderDetails(response?.data[0]);
       setPrevOrderDetails(response?.data[0]);
       setCustomerInfo({

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

@@ -13,7 +13,6 @@ function DeliveryDate() {
   const [orderDetails, setOrderDetails] = useOrderDetails();
   const [prevOrderDetails] = usePrevOrderDetails();
   const [orderStatus] = useStatusDetails();
-
   const routedStatus = orderStatus?.[0]?.routed;
 
   const actionDate = orderDetails?.action_date
@@ -53,15 +52,14 @@ function DeliveryDate() {
       });
     }
   };
-
   return (
     <MainContainer>
-      <Label label="Delivery Date next" />
+      <Label label="Delivery Date" />
       <DatePicker
         onChange={onChange}
         value={actionDate === null ? actionDate : dayjs(actionDate)}
         format="DD/MM/YY"
-        style={{ borderRadius: '25px' }}
+        disabledDate={current => current && current < dayjs().startOf('day')}
         allowClear={false}
         disabled={routedStatus}
       />

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

@@ -5,7 +5,7 @@ import styled from 'styled-components';
 import { atom } from 'jotai';
 import { useOrderProductsResources } from '../../../store';
 import { notification } from 'antd';
-import DownIcon from '../../../../../assets/icons/DownIcon';
+import DownloadIcon from '../../../../../assets/icons/DownloadIcon';
 
 export const selectedOrderIdAtom = atom<number[]>([]);
 
@@ -48,7 +48,7 @@ function Action({ row }: ActionProps) {
       message: 'Info',
       description: `Download is in progress. Please wait`,
     });
-
+    //to change
     fetch(resourceUrl, {
       method: 'GET',
       headers: {},
@@ -114,7 +114,7 @@ function Action({ row }: ActionProps) {
               opacity: isDownloading ? 0.6 : 1,
             }}
           >
-            <DownIcon />
+            <DownloadIcon />
           </TippyContainer>
         </Tippy>
       </Row>

package/src/components/order-view/return-client-products/product-table/ReturnProductTable.tsx

@@ -8,7 +8,6 @@ import ActionIcon from '../../../../assets/icons/ActionIcon';
 // import { useSelectedOrders } from '../../../store';
 import { useOrderId, useOrderStaticData, useProductDetails } from '../../store';
 import { ApiResponse } from '../../types';
-import Loader from '../../../order-daily-overview/header/loader/Loader';
 import { notification } from 'antd';
 import { useNewReturnOrderData, useSelectedProducts } from '../../../store';
 import styled from 'styled-components';
@@ -25,11 +24,7 @@ const ReturnProductTable = () => {
     setSelectedRowId(id);
   };
 
-  const {
-    data: isresponse,
-    setShouldPerformAction: setAction,
-    loading,
-  } = useApiHook<{
+  const { data: isresponse, setShouldPerformAction: setAction } = useApiHook<{
     data: ApiResponse[];
   }>({
     endpoint: `order/order_products/delete/`,
@@ -100,7 +95,6 @@ const ReturnProductTable = () => {
 
   return (
     <div>
-      {loading && <Loader title="Deleting" />}
       <StyledTableWrapper id="tableScrolling" className="orderProductTable">
         <StyledTable>
           <thead>