@bjsdistribution/dms-client-return 0.1.9-prod → 0.1.10-prod

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

@@ -2,6 +2,7 @@ import { atom, useAtom } from 'jotai';
 import { atomWithReducer } from 'jotai/utils';
 import {
   CancelOrderProductsType,
+  ChargesType,
   CreateProduct,
   OrderActionsType,
   OrdersType,
@@ -109,6 +110,9 @@ export const ordersInitialValue: OrdersType = {
   id: null,
   name: '',
   carrier_id: null,
+  order_type: {
+    type: null,
+  },
 };
 
 export const orderProductInitialvalue: CreateProduct = {
@@ -140,6 +144,42 @@ export const updateOrderProducts: UpdateOrderProduct = {
   return_reason_id: 0,
 };
 
+//force debrief
+const chargesIntialValue: ChargesType = {
+  base_charge_type: 1,
+  base_charge: 0,
+  weight: 0,
+  drop_time: 0,
+  timed_service: 0,
+  wait_time: 0,
+  extra_floor: 0,
+  bulky_items: 0,
+  re_label: 0,
+  extra_cube: 0,
+  additional_box: 0,
+  additional_item: 0,
+  weekend: 0,
+  re_allocation: 0,
+  pre_dated: 0,
+  re_package: 0,
+  disassemble: 0,
+  qc: 0,
+  collection_qc: 0,
+  return_to_client: 0,
+  roc: 0,
+  unpack: 0,
+  packaging_disposal: 0,
+  assembly: 0,
+  debrief_notes: '',
+  recycle: 0,
+  admin: 0,
+  disposal: 0,
+  disposal_recycling: 0,
+  debrief_status: '',
+  new_order_status: '',
+  adhoc_charges: [],
+};
+
 export const usedate = () => {
   return useAtom(date);
 };
@@ -243,6 +283,11 @@ export function useOrderAlertsData() {
   return useAtom(orderAlertsData);
 }
 
+const customerList = atom<any>([]);
+export function useOrderCustomersList() {
+  return useAtom(customerList);
+}
+
 export {
   useTabType,
   useInfoType,
@@ -558,6 +603,67 @@ export function useGlobalStateHitOrder() {
   return useAtom(globalOrderGetApi);
 }
 
+//force debrief states
+const globalEscData = atom<any>([]);
+export function useGlobalEscData() {
+  return useAtom(globalEscData);
+}
+
+const activeTab = atom<any>('success');
+
+export function useActiveTab() {
+  return useAtom(activeTab);
+}
+
+const chargesStateAtom = atom<ChargesType>(chargesIntialValue);
+
+export function useChargesState() {
+  return useAtom(chargesStateAtom);
+}
+
+const failureReasonAtom = atom<any>('');
+export function useFailureReason() {
+  return useAtom(failureReasonAtom);
+}
+
+const escalationCategoryAtom = atom<any>('');
+
+export function useEscalationCategory() {
+  return useAtom(escalationCategoryAtom);
+}
+
+const escalationLevelAtom = atom<any>('');
+
+export function useEscalationLevel() {
+  return useAtom(escalationLevelAtom);
+}
+
+const escalationReasonAtom = atom<any>('');
+
+export function useEscalationReason() {
+  return useAtom(escalationReasonAtom);
+}
+
+const newStatusAtom = atom<any>('');
+export function useNewStatus() {
+  return useAtom(newStatusAtom);
+}
+
+const orderCancelReasonAtom = atom<any>('');
+export function useOrderCancelReason() {
+  return useAtom(orderCancelReasonAtom);
+}
+
+const orderHoldReasonAtom = atom<any>('');
+export function useOrderHoldReason() {
+  return useAtom(orderHoldReasonAtom);
+}
+
+const isFailureReasonChangedAtom = atom<boolean>(false);
+export function useIsFailureReasonChanged() {
+  return useAtom(isFailureReasonChangedAtom);
+}
+
 // Popup state Manage
 const initialState = null;
 

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

@@ -50,7 +50,8 @@ export type OrderActionsType =
   | 'unrelease-order'
   | 'clear-date'
   | 'uncancel-order'
-  | 'remove-from-route';
+  | 'remove-from-route'
+  | 'force-debrief';
 
 export interface ChargeLogData {
   id: number;
@@ -127,6 +128,10 @@ export interface OrderRouteType {
   feedback_received?: boolean;
   is_active?: boolean;
 }
+
+export interface orderType {
+  type: string | null;
+}
 export interface OrdersType {
   depot_id: number | null;
   gsit_order_id: number | null;
@@ -168,6 +173,7 @@ export interface OrdersType {
   recipient_name: any;
   postcode: any;
   carrier_id: number | null;
+  order_type: orderType;
 }
 
 export type DeleteProds = {
@@ -269,3 +275,50 @@ export interface CancelOrderProductsType {
   product_type?: string;
   previous_product_type?: string;
 }
+
+//force debrief
+export interface AdhocCharge {
+  adhoc_charges_description: string;
+  adhoc_charges: number;
+  id: string; // required for state updations only
+}
+export interface ChargesType {
+  base_charge_type: number;
+  base_charge: number;
+  weight: number;
+  drop_time: number;
+  timed_service: number;
+  wait_time: number;
+  extra_floor: number;
+  bulky_items: number;
+  re_label: number;
+  extra_cube: number;
+  additional_box: number;
+  additional_item: number;
+  weekend: number;
+  re_allocation: number;
+  pre_dated: number;
+  re_package: number;
+  disassemble: number;
+  qc: number;
+  collection_qc: number;
+  return_to_client: number;
+  roc: number;
+  unpack: number;
+  packaging_disposal: number;
+  assembly: number;
+  debrief_notes: string;
+  recycle: number;
+  admin: number;
+  disposal: number;
+  disposal_recycling: number;
+  debrief_status: string;
+  new_order_status: string;
+  adhoc_charges: AdhocCharge[];
+}
+
+export interface AdhocCharge {
+  adhoc_charges_description: string;
+  adhoc_charges: number;
+  id: string; // required for state updations only
+}

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

@@ -14,7 +14,44 @@ export const capitalize = (input: string) => {
     return char.toUpperCase();
   });
 };
+export const getBaseUrlSymbol = (): string => {
+  const storedSymbol = localStorage.getItem('baseUrlSymbol');
+  if (!storedSymbol) {
+    localStorage.setItem('baseUrlSymbol', '£');
+    return '£';
+  }
+  return storedSymbol;
+};
+export const handleKeyDownDebrief = (
+  e: React.KeyboardEvent<HTMLInputElement>
+) => {
+  // Allowed keys: numbers (0-9), '.'
+  const allowedKeys = [
+    '0',
+    '1',
+    '2',
+    '3',
+    '4',
+    '5',
+    '6',
+    '7',
+    '8',
+    '9',
+    '.',
+    'ArrowLeft',
+    'ArrowRight',
+  ];
 
+  // Allow backspace, delete and Tab keys
+  if (e.key === 'Backspace' || e.key === 'Delete' || e.key === 'Tab') {
+    return;
+  }
+
+  // Prevent input if key is not in allowedKeys
+  if (!allowedKeys.includes(e.key)) {
+    e.preventDefault();
+  }
+};
 export const RepackData = [
   {
     packaging_type: 'Recycled Cardboard',

package/src/components/store.ts

@@ -4,6 +4,7 @@ import {
   CreateReturnPayload,
   SelectDateType,
 } from './types';
+import dayjs from 'dayjs';
 
 export const filtersInitialValue = {
   date: {
@@ -118,12 +119,65 @@ function useSelectedOrders() {
   return useAtom(selectedOrderlList);
 }
 
+const selectedCPOrderlList = atom<any[]>([]);
+
+function useSelectedClientPortOrders() {
+  return useAtom(selectedCPOrderlList);
+}
+
+const selectedCPOrderAfterlList = atom<any[]>([]);
+
+function useSelectedClientAfterOrders() {
+  return useAtom(selectedCPOrderAfterlList);
+}
+
+//start date and end date
+const startCPDate = atom<dayjs.Dayjs | null>(dayjs());
+
+function useStartDate() {
+  return useAtom(startCPDate);
+}
+
+const endCPDate = atom<dayjs.Dayjs | null>(null);
+
+function useEndDate() {
+  return useAtom(endCPDate);
+}
+
 // Sticky menu state
 const stickyStatus = atom<boolean>(false);
 export const useStickyStatus = () => {
   return useAtom(stickyStatus);
 };
 
+//search for pending
+// Sticky menu state
+const search = atom<any>('');
+export const useSearchText = () => {
+  return useAtom(search);
+};
+
+const searchAfter = atom<any>('');
+export const useSearchAfterText = () => {
+  return useAtom(searchAfter);
+};
+
+const rclientReturnDataAtom = atom<any[]>([]);
+export function useClientOutstandingReturnData() {
+  return useAtom(rclientReturnDataAtom);
+}
+
+const returnConfirmedOrderAtom = atom<any[]>([]);
+
+export function useReturnConfirmedOrderData() {
+  return useAtom(returnConfirmedOrderAtom);
+}
+const statsCPCount = atom<any>(null);
+
+export function useStatsCPCount() {
+  return useAtom(statsCPCount);
+}
+
 function useCustomerData() {
   return useAtom(customerData);
 }
@@ -213,7 +267,10 @@ const isClientPortalAtom = atom<boolean>(false);
 function useClientPortal() {
   return useAtom(isClientPortalAtom);
 }
-
+const activeCardIdAtom = atom<number>(1);
+export const useActiveCardId = () => {
+  return useAtom(activeCardIdAtom);
+};
 export {
   useAtom,
   useFilter,
@@ -245,4 +302,8 @@ export {
   useSelectedProducts,
   useVisibilityData,
   useClientPortal,
+  useSelectedClientPortOrders,
+  useStartDate,
+  useEndDate,
+  useSelectedClientAfterOrders,
 };

package/src/components/utils.ts

@@ -1,4 +1,4 @@
-import { format } from "date-fns";
+import { format } from 'date-fns';
 
 export const EscalationCategory = [
   {
@@ -98,7 +98,6 @@ export const EscalationStatus = [
   },
 ];
 
-
 export const getIntegerValue = (value: number) => {
   return value ?? 0;
 };
@@ -110,4 +109,15 @@ export const getStringValue = (value: string) => {
 export const FormattedDate = ({ date }: any) => {
   const formattedDate = format(new Date(date), 'dd/MM/yyyy');
   return formattedDate;
-}
+};
+
+export const javascriptStringDumpToJSON = function(data: string) {
+  let d = data.replace(new RegExp(`(?<=[a-zA-Z])'(?=[a-zA-Z ])`, 'g'), '__');
+  d = d.replace(new RegExp("'", 'g'), '"');
+  d = d.replace(new RegExp('__', 'g'), "'");
+  d = d.replace(new RegExp('None', 'g'), 'null');
+  d = d.replace(new RegExp('False', 'g'), 'false');
+  d = d.replace(new RegExp('True', 'g'), 'true');
+  d = d.replace(new RegExp(/(\d+)\s*[a-zA-Z]/gm), '$1');
+  return JSON.parse(d);
+};

package/src/index.tsx

@@ -1,5 +1,5 @@
 import React, { Suspense, useEffect } from 'react';
-import { Route, Routes, useSearchParams } from 'react-router-dom';
+import { Navigate, Route, Routes, useSearchParams } from 'react-router-dom';
 import ReturnTable from './components/order-daily-overview/return-order-table/ReturnTable';
 import ReturnAfterTable from './components/order-daily-overview/return-after-table/ReturnAfterTable';
 import {
@@ -8,7 +8,7 @@ import {
   useSelectedLocation,
 } from './components/order-daily-overview/store/store';
 import { notification } from 'antd';
-import RouterHeader from './components/order-daily-overview/header/route-header/RouterHeader';
+// import RouterHeader from './components/order-daily-overview/header/route-header/RouterHeader';
 import {
   useActionType,
   useActionTypeOptions,
@@ -26,6 +26,8 @@ import {
 } from './components/order-view/store';
 import OrderViewQueryHandler from './OrderViewQueryHandler';
 import OrderView from './components/order-view';
+import ReturnOverview from './components/client-portal/ReturnOverview';
+import RouterHeader from './components/order-daily-overview/header/route-header/RouterHeader';
 function ReturnClient() {
   notification.config({
     top: 80,
@@ -43,7 +45,7 @@ function ReturnClient() {
   const [, setSelectedLocationValue] = useSelectedLocation();
   const [, setVisibilityData] = useVisibilityData();
   const [, setOrderStaticData] = useOrderStaticData();
-  const [, setClientPortal] = useClientPortal();
+  const [clientPortal, setClientPortal] = useClientPortal();
 
   const userType = JSON.parse(localStorage.getItem('user_type')!);
 
@@ -114,25 +116,33 @@ function ReturnClient() {
       setLocationData(fetchedLocationData?.data);
     }
   }, [locationloading]);
+
   return (
     <>
-      <RouterHeader />
+      {!clientPortal && <RouterHeader />}
       <Suspense fallback={<LoadingMessage />}>
-        <Routes>
-          {/* for local */}
-          {/* <Route
+        {clientPortal ? (
+          <Routes>
+            <Route path="" element={<Navigate to={'outstanding_return'} />} />
+            <Route path=":status" element={<ReturnOverview />} />
+          </Routes>
+        ) : (
+          <Routes>
+            {/* for local */}
+            {/* <Route
             path="/orders/view/return/*"
             element={<OrderViewQueryHandler />}
           /> */}
-          {/* for dev */}
-          <Route path="" element={<OrderViewQueryHandler />} />
-          <Route path="overview" element={<ReturnAfterTable />} />
-          <Route path="/:id" element={<OrderView />} />
-          {/* for local */}
-          {/* <Route path="/orders/view/return/filter" element={<ReturnTable />} /> */}
-          {/* for dev */}
-          <Route path="filter" element={<ReturnTable />} />
-        </Routes>
+            {/* for dev */}
+            <Route path="" element={<OrderViewQueryHandler />} />
+            <Route path="overview" element={<ReturnAfterTable />} />
+            <Route path="/:id" element={<OrderView />} />
+            {/* for local */}
+            {/* <Route path="/orders/view/return/filter" element={<ReturnTable />} /> */}
+            {/* for dev */}
+            <Route path="filter" element={<ReturnTable />} />
+          </Routes>
+        )}
       </Suspense>
     </>
   );