@bjsdistribution/dms-client-return 0.0.89 → 0.0.91

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-resources/columns/actions/index.tsx

@@ -48,7 +48,7 @@ function Action({ row }: ActionProps) {
       message: 'Info',
       description: `Download is in progress. Please wait`,
     });
-
+    //to change
     fetch(resourceUrl, {
       method: 'GET',
       headers: {},

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>

package/src/components/order-view/system-event-logs/expanded-content/index.tsx

@@ -3,40 +3,37 @@ import CollapsedContent from '../collapsed-content';
 import styled from 'styled-components';
 import CollapsableForm from '../../../../common/expand-collapse';
 import DynamicTable from '../../DynamicTable';
-import {
-  useEventNotesData,
-  // useOrderDetails,
-  useOrderProductSystemLogs,
-} from '../../store';
+import { useEventNotesData, useOrderProductSystemLogs } from '../../store';
 import { tableColumns } from '../helper';
-import useGetEventNotes from '../../hooks/useGetEventNotes';
-import { notification } from 'antd';
+import { useAxios } from '@bjsdistribution/dms-component-library';
+import { ApiResponse } from '../../types';
 
 function SystemLogs() {
   const [systemLogs] = useOrderProductSystemLogs();
-
-  // const [orderDetails] = useOrderDetails();
-  const systemLogsData = useGetEventNotes();
   const [, setNotesData] = useEventNotesData();
-  // const gsitId = orderDetails?.gsit_order_id;
 
-  const fetchReminderData = async () => {
-    try {
-      const result = await systemLogsData();
-      if (result) {
-        setNotesData(result);
-      }
-    } catch (error) {
-      notification.error({
-        message: 'Error',
-        description: `${error}` || 'Error fetching event notes:',
-      });
-    }
-  };
+  //event API
+  const {
+    data: systemLogsData,
+    fetchData: callSystemLogAPI,
+    loading,
+  } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/events/get/event_information/`,
+    method: 'GET',
+    pagination: { is_pagination: false },
+  });
 
   useEffect(() => {
-    fetchReminderData();
-  }, [setNotesData]);
+    callSystemLogAPI();
+  }, []);
+
+  useEffect(() => {
+    if (systemLogsData && systemLogsData?.data) {
+      setNotesData(systemLogsData?.data);
+    }
+  }, [loading]);
 
   return (
     <Table>

package/src/components/order-view/view-reminder/ViewReminder.tsx

@@ -3,17 +3,14 @@ import OrderActionModal from '../../../common/modals/order-action-modal/OrderAct
 import { useCurrentAction } from '../store';
 import { DatePickerWrap, Label } from '../order-actions/actions/modalstyle';
 import {
-  useFlagsLoading,
   useReminderRefId,
   useSingleReminderData,
   useUpdateReminderData,
 } from '../order-actions/store';
-import Loader from '../../order-daily-overview/header/loader/Loader';
 import StatusIndicator from '../flags-action-modal/StatusIndicator';
 import styled from 'styled-components';
 import { format, isValid } from 'date-fns';
-import useFetchReminders from '../order-actions/hooks/useAllReminderData';
-import { DatePicker } from 'antd';
+import { DatePicker, notification } from 'antd';
 import dayjs from 'dayjs';
 import {
   ReferenceContainer,
@@ -29,35 +26,53 @@ import {
   MiniContainer,
   TimeWrapper,
 } from './reminder-styles';
-import useFetchSingleReminderData from '../order-actions/hooks/useFetchSingleReminder';
-import useUpdateReminder from '../order-actions/hooks/useUpdateReminder';
 import AssigneeDropdown from './AssigneeDropdown';
+import { useAxios } from '@bjsdistribution/dms-component-library';
+import { ApiResponse } from '../types';
 
 const ViewReminderModal = () => {
   const [, setCurrentAction] = useCurrentAction();
-  const fetchData = useFetchSingleReminderData();
-  const fetchRemindersData = useFetchReminders();
-
-  const updateReminder = useUpdateReminder();
   const [, setDueDate] = useState<any | null>(null);
   const [reminderData, setReminderData] = useSingleReminderData();
   const [reminderRefId] = useReminderRefId();
-  const [loading, setLoading] = useFlagsLoading();
   const [reminderPayload, setPayload] = useUpdateReminderData();
 
+  //reminder get
+  const {
+    data: fetchedReminderData,
+    loading: reminderLoading,
+    fetchData: callReminderApi,
+  } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/tasks/reminder/${reminderRefId}`,
+    method: 'GET',
+    pagination: { is_pagination: false },
+    filters: [{ field: 'order_id', op: '=', value: reminderRefId }],
+  });
+
+  //use Axios Reminder
+  const { fetchData: callReminderEditAPI } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/tasks/reminder/update/`,
+    method: 'PUT',
+  });
+
   const closeModal = () => {
     setCurrentAction(undefined);
   };
 
-  const fetchReminderData = async () => {
-    setLoading(true);
-    const result = await fetchData();
-    setReminderData(result);
-    setLoading(false);
-  };
+  useEffect(() => {
+    if (fetchedReminderData && fetchedReminderData?.data) {
+      setReminderData(fetchedReminderData?.data);
+    }
+  }, [reminderLoading]);
 
   useEffect(() => {
-    fetchReminderData();
+    if (reminderRefId) {
+      callReminderApi();
+    }
   }, [reminderRefId]);
 
   useEffect(() => {
@@ -116,10 +131,33 @@ const ViewReminderModal = () => {
   };
 
   const handleEditReminder = async () => {
-    setLoading(true);
-    await updateReminder([reminderPayload]);
-    fetchRemindersData();
-    closeModal();
+    try {
+      const apiResponse = (await callReminderEditAPI({
+        payload: [reminderPayload],
+      })) as {
+        code: number | null;
+        error?: string | null | undefined;
+        [key: string]: any;
+      };
+      if (apiResponse?.code === 200 && apiResponse?.data) {
+        notification.success({
+          message: 'Success',
+          description: apiResponse.message,
+        });
+        callReminderApi();
+        closeModal();
+      } else {
+        notification.error({
+          message: 'Failure',
+          description: apiResponse?.error || 'An error occurred.',
+        });
+      }
+    } catch (error) {
+      notification.error({
+        message: 'Error',
+        description: 'Failed to update the reminder. Please try again later.',
+      });
+    }
   };
 
   const isDisabled = reminderData?.reminder_status?.name_alias === 'resolved';
@@ -131,104 +169,105 @@ const ViewReminderModal = () => {
 
   return (
     <>
-      {reminderData && loading && <Loader />}
-      <OrderActionModal
-        headerTitle="View Reminder"
-        onCloseHeader={closeModal}
-        onSubmit={handleEditReminder}
-        submitBtnTitle="Save Details"
-        isSubmitDisabled={isDisabled}
-        showAdditionalInfo
-        infoText={additional || 'NA'}
-        headerActions={
-          <OuterDiv>
-            {reminderData?.reminder_status?.name_alias === 'pending' ||
-            reminderData?.reminder_status?.name_alias === 'unresolved' ? (
-              <>
-                <StyledWrapper>
-                  <StyledLabel>
-                    <StyledCheckbox>
-                      <input
-                        type="checkbox"
-                        onChange={() => handleResolved(2)}
-                      />
-                      <RoundCheckbox />
-                    </StyledCheckbox>
-                    <StyledSpan>Mark As Complete</StyledSpan>
-                  </StyledLabel>
-                </StyledWrapper>
-              </>
-            ) : null}
-          </OuterDiv>
-        }
-      >
-        <ReferenceContainer style={{ marginTop: '20px' }}>
-          <InnerContainer>
-            <MiniContainer>
-              {' '}
-              <Label>Reference {} </Label>
-              <LabelText>{reminderData?.reference || 'N/A'}</LabelText>
-            </MiniContainer>
-            <MiniContainer>
-              {' '}
-              <Label>Status </Label>
-              <LabelText>
-                {reminderData?.reminder_status?.name_alias === 'pending' ||
-                reminderData?.reminder_status?.name_alias === 'unresolved' ? (
-                  <StatusIndicator text="Incomplete" status="AD" />
-                ) : (
-                  <StatusIndicator
-                    text={`Completed on ${reminderData?.completed} by ${reminderData?.completed_by}`}
-                    status="SD"
-                  />
-                )}
-              </LabelText>
-            </MiniContainer>
-          </InnerContainer>
-        </ReferenceContainer>
-        <ContentsContainer>
-          <Left>
-            <AssigneeDropdown />
-            <DateTimeContainer>
-              <Label>Due </Label>
-              <Row>
-                <StyleContainer>
-                  <DatePickerWrap>
-                    <DatePicker
-                      format="DD/MM/YYYY"
-                      value={
-                        reminderPayload?.due_date
-                          ? dayjs(reminderPayload?.due_date)
-                          : null
-                      }
-                      onChange={handleDateChange}
+      {reminderData && (
+        <OrderActionModal
+          headerTitle="View Reminder"
+          onCloseHeader={closeModal}
+          onSubmit={handleEditReminder}
+          submitBtnTitle="Save Details"
+          isSubmitDisabled={isDisabled}
+          showAdditionalInfo
+          infoText={additional || 'NA'}
+          headerActions={
+            <OuterDiv>
+              {reminderData?.reminder_status?.name_alias === 'pending' ||
+              reminderData?.reminder_status?.name_alias === 'unresolved' ? (
+                <>
+                  <StyledWrapper>
+                    <StyledLabel>
+                      <StyledCheckbox>
+                        <input
+                          type="checkbox"
+                          onChange={() => handleResolved(2)}
+                        />
+                        <RoundCheckbox />
+                      </StyledCheckbox>
+                      <StyledSpan>Mark As Complete</StyledSpan>
+                    </StyledLabel>
+                  </StyledWrapper>
+                </>
+              ) : null}
+            </OuterDiv>
+          }
+        >
+          <ReferenceContainer style={{ marginTop: '20px' }}>
+            <InnerContainer>
+              <MiniContainer>
+                {' '}
+                <Label>Reference {} </Label>
+                <LabelText>{reminderData?.reference || 'N/A'}</LabelText>
+              </MiniContainer>
+              <MiniContainer>
+                {' '}
+                <Label>Status </Label>
+                <LabelText>
+                  {reminderData?.reminder_status?.name_alias === 'pending' ||
+                  reminderData?.reminder_status?.name_alias === 'unresolved' ? (
+                    <StatusIndicator text="Incomplete" status="AD" />
+                  ) : (
+                    <StatusIndicator
+                      text={`Completed on ${reminderData?.completed} by ${reminderData?.completed_by}`}
+                      status="SD"
                     />
-                  </DatePickerWrap>
-                </StyleContainer>
+                  )}
+                </LabelText>
+              </MiniContainer>
+            </InnerContainer>
+          </ReferenceContainer>
+          <ContentsContainer>
+            <Left>
+              <AssigneeDropdown />
+              <DateTimeContainer>
+                <Label>Due </Label>
+                <Row>
+                  <StyleContainer>
+                    <DatePickerWrap>
+                      <DatePicker
+                        format="DD/MM/YYYY"
+                        value={
+                          reminderPayload?.due_date
+                            ? dayjs(reminderPayload?.due_date)
+                            : null
+                        }
+                        onChange={handleDateChange}
+                      />
+                    </DatePickerWrap>
+                  </StyleContainer>
 
-                <TimeWrapper>
-                  <StyledTime
-                    onChange={handleTime}
-                    value={reminderPayload?.due_time}
-                    type="time"
-                  />
-                </TimeWrapper>
-              </Row>
-            </DateTimeContainer>
-          </Left>
-          <Right>
-            <DetailedContainer>
-              <Label>Details</Label>
-              <StyledText
-                name="text"
-                required
-                value={reminderPayload?.details}
-                onChange={onChangeDetails}
-              />
-            </DetailedContainer>
-          </Right>
-        </ContentsContainer>
-      </OrderActionModal>
+                  <TimeWrapper>
+                    <StyledTime
+                      onChange={handleTime}
+                      value={reminderPayload?.due_time}
+                      type="time"
+                    />
+                  </TimeWrapper>
+                </Row>
+              </DateTimeContainer>
+            </Left>
+            <Right>
+              <DetailedContainer>
+                <Label>Details</Label>
+                <StyledText
+                  name="text"
+                  required
+                  value={reminderPayload?.details}
+                  onChange={onChangeDetails}
+                />
+              </DetailedContainer>
+            </Right>
+          </ContentsContainer>
+        </OrderActionModal>
+      )}
     </>
   );
 };

package/dist/components/order-view/hooks/AddResources.d.ts

@@ -1,2 +0,0 @@
-declare function useUploadFiles(): (formData: FormData) => Promise<any>;
-export default useUploadFiles;

package/dist/components/order-view/hooks/useGetEventNotes.d.ts

@@ -1,2 +0,0 @@
-declare function useGetEventNotes(): () => Promise<any>;
-export default useGetEventNotes;

package/dist/components/order-view/hooks/useGetSystemLogs.d.ts

@@ -1,2 +0,0 @@
-declare function useSystemLogs(): () => Promise<any>;
-export default useSystemLogs;

package/dist/components/order-view/hooks/useUpdateOrder.d.ts

@@ -1,2 +0,0 @@
-declare function useUpdateOrder(): (data: any) => Promise<any>;
-export default useUpdateOrder;

package/dist/components/order-view/order-actions/hooks/useAllReminderData.d.ts

@@ -1,2 +0,0 @@
-declare function useFetchReminders(): () => Promise<any>;
-export default useFetchReminders;

package/dist/components/order-view/order-actions/hooks/useAllTaskData.d.ts

@@ -1,2 +0,0 @@
-declare function useFetchUnresolvedTasks(): () => Promise<any>;
-export default useFetchUnresolvedTasks;

package/dist/components/order-view/order-actions/hooks/useCreateReminder.d.ts

@@ -1,3 +0,0 @@
-import { CreateReminderPayload } from '../types';
-declare function useCreateReminder(): (data: CreateReminderPayload[]) => Promise<any>;
-export default useCreateReminder;

package/dist/components/order-view/order-actions/hooks/useCreateTask.d.ts

@@ -1,3 +0,0 @@
-import { CreateTaskPayload } from '../types';
-declare function useCreateTask(): (data: CreateTaskPayload[]) => Promise<any>;
-export default useCreateTask;

package/dist/components/order-view/order-actions/hooks/useFetchSingleFlagData.d.ts

@@ -1,2 +0,0 @@
-declare function useFetchSingleFlagsData(): () => Promise<any>;
-export default useFetchSingleFlagsData;

package/dist/components/order-view/order-actions/hooks/useFetchSingleReminder.d.ts

@@ -1,2 +0,0 @@
-declare function useFetchSingleReminderData(): () => Promise<any>;
-export default useFetchSingleReminderData;

package/dist/components/order-view/order-actions/hooks/useUpdateFlag.d.ts

@@ -1,3 +0,0 @@
-import { SingleFlagPayload } from '../types';
-declare function useUpdateFlag(): (data: SingleFlagPayload[]) => Promise<any>;
-export default useUpdateFlag;

package/dist/components/order-view/order-actions/hooks/useUpdateReminder.d.ts

@@ -1,3 +0,0 @@
-import { UpdateReminderPayload } from '../types';
-declare function useUpdateReminder(): (data: UpdateReminderPayload[]) => Promise<any>;
-export default useUpdateReminder;