@bjsdistribution/dms-client-return 0.0.9 → 0.0.11

package/src/components/order-view/notes/AddNote.tsx

@@ -92,8 +92,13 @@ function AddNote() {
         });
       }
     } catch (error) {
-      console.error('Error saving note:', error);
-      alert('Failed to save note');
+      // console.error('Error saving note:', error);
+      // alert('Failed to save note');
+      notification.error({
+        message: 'Error',
+        description:
+          `${error}` || 'An error has occurred. Please try again later.',
+      });
     }
   };
 

package/src/components/order-view/order-actions/actions/change-customer-account/ChangeCustomerAccModal.tsx

@@ -4,9 +4,9 @@ import OrderActionModal from '../../../../../common/modals/order-action-modal/Or
 import { ContentContainer, Label, Row, SplitLayout } from '../modalstyle';
 import { OptionsMenu } from '../../../fakedata';
 import { useCurrentAction } from '../../../store';
+import { notification } from 'antd';
 
 function ChangeCustomerAccModal() {
-
   const [, setCurrentAction] = useCurrentAction();
 
   const closeModal = () => {
@@ -14,7 +14,11 @@ function ChangeCustomerAccModal() {
   };
 
   const handleSelectChange = () => {
-    alert('hello');
+    // alert('hello');
+    notification.success({
+      message: 'Success',
+      description: 'Saved successfully.',
+    });
   };
   return (
     <OrderActionModal

package/src/components/order-view/order-actions/actions/escalation/Dropdowns.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { AntSelect, Label } from '@bjsdistribution/dms-component-library';
 import styled from 'styled-components';
+import { notification } from 'antd';
 // import {
 //   EscalationCategory,
 //   EscalationLevel,
@@ -29,6 +30,10 @@ const StyledAntSelect = styled(AntSelect)`
 const Dropdowns = () => {
   const handleSelectChange = () => {
     // alert('hello');
+    notification.success({
+      message: 'Success',
+      description: 'Saved successfully.',
+    });
   };
   return (
     <FlexContainer>

package/src/components/order-view/order-actions/actions/escalation/upgrade/index.tsx

@@ -5,10 +5,16 @@ import {
   Switch,
 } from '@bjsdistribution/dms-component-library';
 import styled from 'styled-components';
+import { notification } from 'antd';
 
 const Upgrade = () => {
   const handleSelectChange = () => {
-    alert('hello');
+    // alert('hello');
+
+    notification.success({
+      message: 'Success',
+      description: 'Upgrade successfully.',
+    });
   };
 
   return (

package/src/components/order-view/order-actions/hooks/useAllReminderData.ts

@@ -2,6 +2,7 @@ import { getBaseEndpoint } from '@bjsdistribution/dms-component-library';
 import { useOrderDetails } from '../../store';
 import { getCookie } from '../../utils';
 import { useReminderNotiData } from '../store';
+import { notification } from 'antd';
 
 function useFetchReminders() {
   const ssoToken = getCookie('id_token');
@@ -35,7 +36,12 @@ function useFetchReminders() {
         const json = await response.json();
         const detail = json?.detail;
         const msg = detail[0]?.msg;
-        console.error('Error response:', msg);
+        // console.error('Error response:', msg);
+        notification.error({
+          message: 'Error',
+          description:
+            `${msg}` || 'An error has occurred. Please try again later.',
+        });
         // setLoading(false);
         return [];
       }
@@ -47,7 +53,12 @@ function useFetchReminders() {
       }
       return [];
     } catch (err) {
-      console.error('Error fetching data:', err);
+      // console.error('Error fetching data:', err);
+      notification.error({
+        message: 'Error',
+        description:
+          `${err}` || 'An error has occurred. Please try again later.',
+      });
       return [];
     } finally {
       //   setLoading(false);

package/src/components/order-view/order-actions/hooks/useAllTaskData.ts

@@ -1,7 +1,8 @@
 import { getBaseEndpoint } from '@bjsdistribution/dms-component-library';
-import {  useNotificationData, useTaskLoading } from '../store';
+import { useNotificationData, useTaskLoading } from '../store';
 import { useOrderDetails } from '../../store';
 import { getCookie } from '../../utils';
+import { notification } from 'antd';
 
 function useFetchUnresolvedTasks() {
   const ssoToken = getCookie('id_token');
@@ -36,7 +37,12 @@ function useFetchUnresolvedTasks() {
         const json = await response.json();
         const detail = json?.detail;
         const msg = detail[0]?.msg;
-        console.error('Error response:', msg);
+        // console.error('Error response:', msg);
+        notification.error({
+          message: 'Error',
+          description:
+            `${msg}` || 'An error has occurred. Please try again later.',
+        });
         setLoading(false);
         return [];
       }
@@ -48,11 +54,15 @@ function useFetchUnresolvedTasks() {
       }
       return [];
     } catch (err) {
-      console.error('Error fetching data:', err);
+      // console.error('Error fetching data:', err);
+      notification.error({
+        message: 'Error',
+        description:
+          `${err}` || 'An error has occurred. Please try again later.',
+      });
       setLoading(false);
       return [];
-    }
-    finally{
+    } finally {
       setLoading(false);
     }
   };

package/src/components/order-view/order-actions/hooks/useCreateReminder.ts

@@ -2,6 +2,7 @@ import { getBaseEndpoint } from '@bjsdistribution/dms-component-library';
 import { useFlagsLoading } from '../store';
 import { CreateReminderPayload } from '../types';
 import { getCookie } from '../../utils';
+import { notification } from 'antd';
 
 function useCreateReminder() {
   const ssoToken = getCookie('id_token');
@@ -25,16 +26,31 @@ function useCreateReminder() {
 
       if (!response.ok) {
         setLoading(false);
-        alert('response is not ok');
+        // alert('response is not ok');
+        notification.error({
+          message: 'Error',
+          description: 'response is not ok',
+        });
       }
-      alert('Reminder Created Successfully');
+      // alert('Reminder Created Successfully');
+
+      notification.success({
+        message: 'Success',
+        description: 'Reminder Created Successfully',
+      });
 
       const json = await response.json();
       return json;
     } catch (err) {
       setLoading(false);
-      alert(err);
-      console.error('Error:', err);
+      // alert(err);
+      // console.error('Error:', err);
+
+      notification.error({
+        message: 'Error',
+        description:
+          `${err}` || 'An error has occurred. Please try again later.',
+      });
     } finally {
       setLoading(false);
     }

package/src/components/order-view/order-actions/hooks/useCreateTask.ts

@@ -2,6 +2,7 @@ import { getBaseEndpoint } from '@bjsdistribution/dms-component-library';
 import { useFlagsLoading } from '../store';
 import { CreateTaskPayload } from '../types';
 import { getCookie } from '../../utils';
+import { notification } from 'antd';
 
 function useCreateTask() {
   const ssoToken = getCookie('id_token');
@@ -27,14 +28,24 @@ function useCreateTask() {
         setLoading(false);
         throw new Error('response is not ok');
       }
-      alert('Task Created Successfully');
+      // alert('Task Created Successfully');
+
+      notification.success({
+        message: 'Success',
+        description: 'Task Created Successfully',
+      });
 
       const json = await response.json();
       return json;
     } catch (err) {
       setLoading(false);
-      alert(err);
-      console.error('Error:', err);
+      // alert(err);
+      // console.error('Error:', err);
+      notification.error({
+        message: 'Error',
+        description:
+          `${err}` || 'An error has occurred. Please try again later.',
+      });
     } finally {
       setLoading(false);
     }

package/src/components/order-view/order-actions/hooks/useFetchSingleFlagData.ts

@@ -2,12 +2,13 @@ import { getBaseEndpoint } from '@bjsdistribution/dms-component-library';
 
 import { useFlagRefId, useFlagsLoading } from '../store';
 import { getCookie } from '../../utils';
+import { notification } from 'antd';
 
 function useFetchSingleFlagsData() {
   const [selectedFlagId] = useFlagRefId();
   const [loading, setLoading] = useFlagsLoading();
   const ssoToken = getCookie('id_token');
-  console.log(loading,"loading loading")
+  console.log(loading, 'loading loading');
   const res = async () => {
     const endpoint = `${getBaseEndpoint()}/tasks/${selectedFlagId}`;
     try {
@@ -24,7 +25,12 @@ function useFetchSingleFlagsData() {
         const json = await response.json();
         const detail = json?.detail;
         const msg = detail[0]?.msg;
-        alert(`${msg}`);
+        // alert(`${msg}`);
+        notification.error({
+          message: 'Error',
+          description:
+            `${msg}` || 'An error has occurred. Please try again later.',
+        });
         setLoading(false);
         return [];
       }
@@ -36,7 +42,13 @@ function useFetchSingleFlagsData() {
       return [];
     } catch (err) {
       setLoading(false);
-      console.error('Error fetching data:', err);
+      // console.error('Error fetching data:', err);
+
+      notification.error({
+        message: 'Error',
+        description:
+          `${err}` || 'An error has occurred. Please try again later.',
+      });
       return [];
     }
   };

package/src/components/order-view/order-actions/hooks/useFetchSingleReminder.ts

@@ -1,6 +1,7 @@
 import { getBaseEndpoint } from '@bjsdistribution/dms-component-library';
 import { useFlagsLoading, useReminderRefId } from '../store';
 import { getCookie } from '../../utils';
+import { notification } from 'antd';
 
 function useFetchSingleReminderData() {
   const [reminderRefId] = useReminderRefId();
@@ -25,7 +26,12 @@ function useFetchSingleReminderData() {
         const json = await response.json();
         const detail = json?.detail;
         const msg = detail[0]?.msg;
-        alert(`${msg}`);
+        // alert(`${msg}`);
+        notification.error({
+          message: 'Error',
+          description:
+            `${msg}` || 'An error has occurred. Please try again later.',
+        });
         setLoading(false);
         return [];
       }
@@ -39,7 +45,12 @@ function useFetchSingleReminderData() {
     } catch (err) {
       //setloading(false);
 
-      console.error('Error fetching data:', err);
+      // console.error('Error fetching data:', err);
+      notification.error({
+        message: 'Error',
+        description:
+          `${err}` || 'An error has occurred. Please try again later.',
+      });
       return [];
     }
   };

package/src/components/order-view/order-actions/hooks/useUpdateFlag.ts

@@ -2,6 +2,7 @@ import { getBaseEndpoint } from '@bjsdistribution/dms-component-library';
 import { useFlagsLoading } from '../store';
 import { SingleFlagPayload } from '../types';
 import { getCookie } from '../../utils';
+import { notification } from 'antd';
 
 function useUpdateFlag() {
   const ssoToken = getCookie('id_token');
@@ -28,10 +29,19 @@ function useUpdateFlag() {
       }
 
       const json = await response.json();
-      alert('Flag has been updated');
+      // alert('Flag has been updated');
+      notification.success({
+        message: 'Success',
+        description: 'Flag has been updated',
+      });
       return json;
     } catch (err) {
-      console.error('Error:', err);
+      // console.error('Error:', err);
+      notification.error({
+        message: 'Error',
+        description:
+          `${err}` || 'An error has occurred. Please try again later.',
+      });
     } finally {
       setLoading(false);
     }

package/src/components/order-view/order-actions/hooks/useUpdateReminder.ts

@@ -2,6 +2,7 @@ import { getBaseEndpoint } from '@bjsdistribution/dms-component-library';
 import { useFlagsLoading } from '../store';
 import { UpdateReminderPayload } from '../types';
 import { getCookie } from '../../utils';
+import { notification } from 'antd';
 
 function useUpdateReminder() {
   const ssoToken = getCookie('id_token');
@@ -28,10 +29,19 @@ function useUpdateReminder() {
       }
 
       const json = await response.json();
-      alert('Reminder has been updated');
+      // alert('Reminder has been updated');
+      notification.success({
+        message: 'Success',
+        description: 'Reminder has been updated',
+      });
       return json;
     } catch (err) {
-      console.error('Error:', err);
+      // console.error('Error:', err);
+      notification.error({
+        message: 'Error',
+        description:
+          `${err}` || 'An error has occurred. Please try again later.',
+      });
     } finally {
       setLoading(false);
     }

package/src/components/order-view/products-info/expanded-content/index.tsx

@@ -4,10 +4,15 @@ import ProductTable from '../../return-client-products/ProductTable';
 // import OrderDetailsFooter from '../../order-details/expanded-content/footer';
 // import NewReturnDropdown from '../../notes/order-dropdown/NewReturnDropdown';
 import { Button } from '@bjsdistribution/dms-component-library';
+import { notification } from 'antd';
 
 function ExpandedContent() {
   const SaveNote = () => {
-    alert('saved');
+    // alert('saved');
+    notification.success({
+      message: 'Success',
+      description: ' Saved successfully.',
+    });
   };
   return (
     <Container>

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

@@ -2,10 +2,15 @@ import React from 'react';
 import styled from 'styled-components';
 import { Button } from '@bjsdistribution/dms-component-library';
 import NewReturnDropdown from '../../notes/order-dropdown/NewReturnDropdown';
+import { notification } from 'antd';
 
 function OrderDetailsFooter() {
   const onSave = () => {
-    alert('saved');
+    // alert('saved');
+    notification.success({
+      message: 'Success',
+      description: ' Saved successfully.',
+    });
   };
 
   return (

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

@@ -10,6 +10,7 @@ import {
 } from '../../store';
 import { tableColumns } from '../helper';
 import useGetEventNotes from '../../hooks/useGetEventNotes';
+import { notification } from 'antd';
 
 function SystemLogs() {
   const [systemLogs] = useOrderProductSystemLogs();
@@ -26,7 +27,12 @@ function SystemLogs() {
         setNotesData(result);
       }
     } catch (error) {
-      console.error('Error fetching event notes:', error);
+      // console.error('Error fetching event notes:', error);
+      notification.error({
+        message: 'Error',
+        description:
+          `${error}` || 'An error has occurred. Please try again later.',
+      });
     }
   };
 

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

@@ -1,10 +1,15 @@
 import { Label, AntSelect } from '@bjsdistribution/dms-component-library';
+import { notification } from 'antd';
 import React from 'react';
 import styled from 'styled-components';
 
 function AssigneeDropdown() {
   const handleSelectChange = () => {
-    alert('hello');
+    // alert('hello');
+    notification.success({
+      message: 'Success',
+      description: 'Order has been saved successfully.',
+    });
   };
   return (
     <FormContainer>

package/src/components/store.ts

@@ -1,5 +1,5 @@
 import { atom, useAtom } from 'jotai';
-import { SelectDateType } from './types';
+import { CreateReturnPayload, SelectDateType } from './types';
 
 export const filtersInitialValue = {
   date: {
@@ -8,6 +8,14 @@ export const filtersInitialValue = {
   },
 };
 
+export const CreateReturnInitial = {
+  customer_id: 0,
+  account_number: '',
+  return_location_token: '',
+  products: [],
+  return_action: [],
+};
+
 export const triggerApiCallAtom = atom(false);
 
 const staticData = atom<any>({});
@@ -27,6 +35,12 @@ const actionTypeData = atom<any>([]);
 
 const locationData = atom<any>([]);
 
+const createReturnPayload = atom<CreateReturnPayload>(CreateReturnInitial);
+
+const newPayload = atom<any>([]);
+
+const grpPayload = atom<any>([]);
+
 function useReminderData() {
   return useAtom(reminderTableData);
 }
@@ -79,6 +93,18 @@ function useLocationData() {
   return useAtom(locationData);
 }
 
+function useReturnPayload() {
+  return useAtom(createReturnPayload);
+}
+
+function useNewReturnPayload() {
+  return useAtom(newPayload);
+}
+
+function useGroupedPayload() {
+  return useAtom(grpPayload);
+}
+
 export {
   useAtom,
   useFilter,
@@ -93,4 +119,7 @@ export {
   useActionType,
   useLocationData,
   useSelectedOrders,
+  useReturnPayload,
+  useNewReturnPayload,
+  useGroupedPayload,
 };

package/src/components/types.ts

@@ -219,3 +219,11 @@ export type InvoiceOverviewType = {
   total_orders: number;
   vat_rate: number;
 };
+
+export type CreateReturnPayload = {
+  customer_id: number;
+  account_number: string;
+  return_location_token: string;
+  products: number[];
+  return_action: string[];
+};

package/src/index.tsx

@@ -8,8 +8,12 @@ import ReturnAfterTable from './components/order-daily-overview/return-after-tab
 import { useTableName } from './components/order-daily-overview/store/store';
 // import ReturnOrderTable from './components/order-daily-overview/return-order-table/return-orders-filters/ReturnOrderTable';
 import ReturnMainTable from './components/order-daily-overview';
+import { notification } from 'antd';
 
 function ReturnClient() {
+  notification.config({
+    top: 80,
+  });
   const LoadingMessage = () => <div>Loading...</div>;
   const [selectedClient] = useTableName();
   const navigate = useNavigate();
@@ -17,10 +21,10 @@ function ReturnClient() {
   selectedClientString = selectedClientString?.toLowerCase();
 
   console.log(selectedClientString, 'selectedClient');
-  console.log(`../return/:${selectedClientString}`);
+  console.log(`../filter/:${selectedClientString}`);
 
   useEffect(() => {
-    if (!location.pathname.includes('/return')) {
+    if (!location.pathname.includes('/filter')) {
       localStorage.removeItem('clientName');
       localStorage.removeItem('clientId');
     }
@@ -29,7 +33,7 @@ function ReturnClient() {
   useEffect(() => {
     if (selectedClient) {
       const selectedClientString = selectedClient.replace(/\s+/g, '-');
-      navigate(`return/${selectedClientString}`);
+      navigate(`filter/${selectedClientString}`);
     }
   }, [selectedClient]);
 
@@ -39,7 +43,7 @@ function ReturnClient() {
         <Route path="" element={<ReturnMainTable />} />
         <Route path="order-return" element={<ReturnAfterTable />} />
         <Route path="order-return/:id" element={<OrderView />} />
-        <Route path="return/:name" element={<ReturnTable />} />
+        <Route path="filter/:clientName" element={<ReturnTable />} />
 
         {/* <Route
           path=""