@bjsdistribution/dms-client-return 0.0.11 → 0.0.13

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

@@ -109,28 +109,25 @@ export const getCookie = (name: string): string | null => {
 };
 
 export const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
-  // Allowed keys: numbers (0-9), '.', '-'
-  const allowedKeys = [
-    '0',
-    '1',
-    '2',
-    '3',
-    '4',
-    '5',
-    '6',
-    '7',
-    '8',
-    '9',
-    '.',
-    '-',
-    '+',
-  ];
+  // Allowed keys: numbers (0-9), '.', '-', '+'
+  const allowedKeys = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.', '-', '+'];
 
-  // Allow backspace, delete and Tab keys
+  // Allow backspace, delete, and Tab keys
   if (e.key === 'Backspace' || e.key === 'Delete' || e.key === 'Tab') {
     return;
   }
 
+  const input = e.currentTarget;
+
+  // Check if '+' is allowed only at the start and not duplicated
+  if (e.key === '+') {
+    // Prevent if '+' is not at the start or there is already a '+' in the input
+    if (input.selectionStart !== 0 || input.value.includes('+')) {
+      e.preventDefault();
+      return;
+    }
+  }
+
   // Prevent input if key is not in allowedKeys
   if (!allowedKeys.includes(e.key)) {
     e.preventDefault();
@@ -148,6 +145,11 @@ export const generateObj = (keys: string[], sourceObj: any) => {
 };
 
 export const findDifference = (obj1: any, obj2: any) => {
+  // Check if obj1 or obj2 is null or undefined and return an empty object if so
+  if (!obj1 || !obj2) {
+    return {};
+  }
+
   const diffKeys = Object.keys(obj1).reduce((acc: any, key) => {
     if (!(key in obj2) || obj1[key] !== obj2[key]) {
       acc.push(key);
@@ -162,6 +164,7 @@ export const findDifference = (obj1: any, obj2: any) => {
       }
     }
   });
+
   const newObj = generateObj(diffKeys, obj2);
   return newObj;
 };

package/src/components/store.ts

@@ -41,6 +41,16 @@ const newPayload = atom<any>([]);
 
 const grpPayload = atom<any>([]);
 
+const statusOfOrder = atom<any>([]);
+
+const selectedLocationConfirm = atom<any[]>([]);
+
+const selectAll = atom<boolean>(false);
+
+const postLoading = atom<boolean>(false);
+
+const final = atom<any[]>([]);
+
 function useReminderData() {
   return useAtom(reminderTableData);
 }
@@ -105,6 +115,26 @@ function useGroupedPayload() {
   return useAtom(grpPayload);
 }
 
+function useStatusOrderData() {
+  return useAtom(statusOfOrder);
+}
+
+function useSelectedConfirmLoc() {
+  return useAtom(selectedLocationConfirm);
+}
+
+function useSelectAll() {
+  return useAtom(selectAll);
+}
+
+function usePostLoading() {
+  return useAtom(postLoading);
+}
+
+function useFinalPayload() {
+  return useAtom(final);
+}
+
 export {
   useAtom,
   useFilter,
@@ -122,4 +152,9 @@ export {
   useReturnPayload,
   useNewReturnPayload,
   useGroupedPayload,
+  useStatusOrderData,
+  useSelectedConfirmLoc,
+  useSelectAll,
+  usePostLoading,
+  useFinalPayload,
 };

package/src/index.tsx

@@ -9,6 +9,7 @@ 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';
+import RouterHeader from './components/order-daily-overview/header/route-header/RouterHeader';
 
 function ReturnClient() {
   notification.config({
@@ -38,14 +39,16 @@ function ReturnClient() {
   }, [selectedClient]);
 
   return (
-    <Suspense fallback={<LoadingMessage />}>
-      <Routes>
-        <Route path="" element={<ReturnMainTable />} />
-        <Route path="order-return" element={<ReturnAfterTable />} />
-        <Route path="order-return/:id" element={<OrderView />} />
-        <Route path="filter/:clientName" element={<ReturnTable />} />
+    <>
+      <RouterHeader />
+      <Suspense fallback={<LoadingMessage />}>
+        <Routes>
+          <Route path="" element={<ReturnMainTable />} />
+          <Route path="order-return" element={<ReturnAfterTable />} />
+          <Route path="order-return/:id" element={<OrderView />} />
+          <Route path="filter/:clientName" element={<ReturnTable />} />
 
-        {/* <Route
+          {/* <Route
           path=""
           element={
             selectedClientString ? (
@@ -55,8 +58,9 @@ function ReturnClient() {
             )
           }
         /> */}
-      </Routes>
-    </Suspense>
+        </Routes>
+      </Suspense>
+    </>
   );
 }