@bjsdistribution/dms-client-return 0.0.11 → 0.0.13

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

@@ -2,15 +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';
+// import { notification } from 'antd';
 
 function OrderDetailsFooter() {
   const onSave = () => {
     // alert('saved');
-    notification.success({
-      message: 'Success',
-      description: ' Saved successfully.',
-    });
+    // notification.success({
+    //   message: 'Success',
+    //   description: ' Saved successfully.',
+    // });
   };
 
   return (

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

@@ -18,10 +18,10 @@ const date = atom(new Date());
 
 const orderStaticDataAtom = atom<any>({});
 
-const clientDataAtom = atom<ClientData[]>([]);
-const returnDataAtom = atom<any[]>([]);
-
-const returnAfterOrderAtom = atom<any[]>([]);
+const customerInfoAtom = atom<{
+  recipient_name: string | null | undefined;
+  postcode: string | null | undefined;
+}>({ recipient_name: '', postcode: '' });
 
 export const ordersInitialValue: OrdersType = {
   depot_id: null,
@@ -47,6 +47,9 @@ export const ordersInitialValue: OrdersType = {
   other_instructions: null,
   schedule_after: null,
   vehicle_type: null,
+  order_locked_by: null,
+  delivery_instructions: null,
+  drop_time: null,
   order_recipient: {
     id: null,
     order_id: null,
@@ -91,6 +94,7 @@ export const ordersInitialValue: OrdersType = {
   order_delivery_declined_dates: [],
   order_communications: [],
   id: null,
+  name: '',
 };
 
 export const orderProductInitialvalue: CreateProduct = {
@@ -100,7 +104,11 @@ export const orderProductInitialvalue: CreateProduct = {
   weight: 0,
   cube: 0,
   order_id: 0,
-  product_type_id: 0,
+  order_product_type_id: 0,
+  return_reason_id: 0,
+  collection_reason_id: 0,
+  product_return_action_id: 0,
+  return_location: '',
 };
 
 export const unrecieveOrderProducts: UnRecieveOrderProduct = {
@@ -138,17 +146,10 @@ function useOrderStaticData() {
   return useAtom(orderStaticDataAtom);
 }
 
-function useClientData() {
-  return useAtom(clientDataAtom);
+export function useCustomerInfo() {
+  return useAtom(customerInfoAtom);
 }
 
-function useReturnData() {
-  return useAtom(returnDataAtom);
-}
-
-function useReturnAfterOrderData() {
-  return useAtom(returnAfterOrderAtom);
-}
 // Define initial modal state
 export const initialModalState = {
   openModalType: null,
@@ -157,11 +158,22 @@ function useIsOnHoldOrder() {
   return useAtom(isOnHold);
 }
 //value
-const orderId = atom<number | undefined>(undefined);
+const orderId = atom<any>([]);
 export const useOrderId = () => {
   return useAtom(orderId);
 };
 
+const escalationIds = atom<number[]>([]);
+
+function useEscalationIDs() {
+  return useAtom(escalationIds);
+}
+
+const bulkUpdateSelectedRow = atom<any[]>([]);
+export const useBulkUpdateSelectedRow = () => {
+  return useAtom(bulkUpdateSelectedRow);
+};
+
 export {
   useTabType,
   useInfoType,
@@ -169,6 +181,7 @@ export {
   useCurrentAction,
   useIsOnHoldOrder,
   useOrderStaticData,
+  useEscalationIDs,
 };
 // Remainder count
 const OrderDetails = atom<OrdersType>(ordersInitialValue);
@@ -181,7 +194,7 @@ function usePrevOrderDetails() {
   return useAtom(prevOrderDetails);
 }
 
-const customerDetails = atom<any>(0);
+const customerDetails = atom<any>({});
 function useCustomerDetails() {
   return useAtom(customerDetails);
 }
@@ -194,6 +207,12 @@ const productDetails = atom<any>([]);
 function useProductDetails() {
   return useAtom(productDetails);
 }
+
+const productDetailsCopy = atom<any>([]);
+export function useProductDetailsCopy() {
+  return useAtom(productDetailsCopy);
+}
+
 const StatusDeatils = atom<any>(0);
 function useStatusDetails() {
   return useAtom(StatusDeatils);
@@ -204,12 +223,16 @@ function useDepotOptions() {
   return useAtom(depotOptions);
 }
 
+const depotEscData = atom<any>([]);
+function useEscData() {
+  return useAtom(depotEscData);
+}
 const deleteProdId = atom<any[]>([]);
 function useDeleteProdsID() {
   return useAtom(deleteProdId);
 }
 
-const createOrderProduct = atom<any>(orderProductInitialvalue);
+const createOrderProduct = atom<any[]>([]);
 function useCreateOrderProducts() {
   return useAtom(createOrderProduct);
 }
@@ -225,53 +248,92 @@ const updateOrderProduct = atom<UpdateOrderProduct>(updateOrderProducts);
 function useUpdateOrderProducts() {
   return useAtom(updateOrderProduct);
 }
+const CallAPi = atom(false);
 
-export const selectedProductIdAtom = atom<number | null>(null);
+export function useCallAPi() {
+return useAtom(CallAPi);
+}
+// export const selectedProductIdAtom = atom<number | null>(null);
 
-export const selectedTabKeyAtom = atom<string>('1');
+export const selectedProductActionTabKeyAtom = atom<string>(
+  'update_product_type_tab'
+);
+function useSelectedProductActionTabKey() {
+  return useAtom(selectedProductActionTabKeyAtom);
+}
 
-const eventNotesData = atom<any>([]);
-function useEventNotesData() {
-  return useAtom(eventNotesData);
+export const errorAtom = atom({
+  homeContactError: '',
+  workCOntanctError: '',
+  mobileError: '',
+  emailError: '',
+  w3wError: '',
+  postCodeError: '',
+});
+
+const orderProductResources = atom<any>([]);
+function useOrderProductsResources() {
+  return useAtom(orderProductResources);
 }
 
-const orderProductSystemLogs = atom<any>([]);
-function useOrderProductSystemLogs() {
-  return useAtom(orderProductSystemLogs);
+const orderProductToolbox = atom<any>([]);
+function useOrderProductsToolbox() {
+  return useAtom(orderProductToolbox);
 }
 
-const moduleIds = atom<{
-  id?: string;
-  parentId?: string;
-} | null>(null);
+export const initialBulkReasonValues = {
+  collection_reason_id: 0,
+  return_reason_id: 0,
+  product_return_action_id: 0,
+  return_location: '',
+};
 
-export function usemoduleIds() {
-  return useAtom(moduleIds);
+const bulkReasonsAtom = atom<any>(initialBulkReasonValues);
+export function useBulkReasons() {
+  return useAtom(bulkReasonsAtom);
 }
 
-const CallAPi = atom(false);
+const bulkUpdatePayloadAtom = atom<any>([]);
+export function useBulkUpdatePayload() {
+  return useAtom(bulkUpdatePayloadAtom);
+}
 
-export function useCallAPi() {
-  return useAtom(CallAPi);
+const singleProductTypeUpdateAtom = atom<any>({
+  order_product_type_id: 0,
+  order_product_type: '',
+});
+export function useSingleProductTypeUpdate() {
+  return useAtom(singleProductTypeUpdateAtom);
 }
 
-const NotesLoading = atom<boolean>(true);
-export const UseNotesLoading = () => {
-  return useAtom(NotesLoading);
-};
+const locationOptions = atom<any>([]);
+export function useLocationOptions() {
+  return useAtom(locationOptions);
+}
+const orderProductSystemLogs = atom<any>([]);
+function useOrderProductSystemLogs() {
+  return useAtom(orderProductSystemLogs);
+}
 
-const notes = atom<any>([]);
+const eventNotesData = atom<any>([]);
+function useEventNotesData() {
+  return useAtom(eventNotesData);
+}
 
-export function usegetNotes() {
-  return useAtom(notes);
+const selectedProductIdAtom = atom<number | undefined>(undefined);
+function useSelectedProductId() {
+  return useAtom(selectedProductIdAtom);
 }
+const returnAfterOrderAtom = atom<any[]>([]);
 
-export const errorAtom = atom({
-  homeError: '',
-  mobileError: '',
-  emailError: '',
-  w3wError: '',
-});
+export function useReturnAfterOrderData() {
+  return useAtom(returnAfterOrderAtom);
+  }
+  const clientDataAtom = atom<ClientData[]>([]);
+  function useClientData() {
+    return useAtom(clientDataAtom);
+    }
+    
 
 export {
   useAtom,
@@ -282,21 +344,121 @@ export {
   useStatusDetails,
   useDepotOptions,
   usePrevOrderDetails,
+  useEscData,
   useDeleteProdsID,
   useCreateOrderProducts,
   useRecieveOrderProducts,
   useUpdateOrderProducts,
-  useClientData,
-  useReturnData,
-  useReturnAfterOrderData,
-  useEventNotesData,
+  useOrderProductsResources,
+  useOrderProductsToolbox,
   useOrderProductSystemLogs,
+  useEventNotesData,
+  useSelectedProductId,
+  useSelectedProductActionTabKey,
+  useClientData
+};
+
+const NotesLoading = atom<boolean>(true);
+export const UseNotesLoading = () => {
+  return useAtom(NotesLoading);
+};
+
+const notes = atom<any>([]);
+
+export function usegetNotes() {
+  return useAtom(notes);
+}
+
+const moduleIds = atom<{
+  id?: string;
+  parentId?: string;
+} | null>(null);
+
+export function usemoduleIds() {
+  return useAtom(moduleIds);
+}
+
+const callAPi = atom(false);
+
+export function useLogsCallAPi() {
+  return useAtom(callAPi);
+}
+
+const callOrderProductsApi = atom<boolean>(false);
+
+export function usecallOrderProductsApi() {
+  return useAtom(callOrderProductsApi);
+}
+
+const selectedProductId = atom<any>([]);
+
+export function useSelectUpdateOP() {
+  return useAtom(selectedProductId);
+}
+
+const gsitCUstomerId = atom<any>({});
+
+export function useGsitCUstomerId() {
+  return useAtom(gsitCUstomerId);
+}
+
+const CUstomerId = atom<number | undefined>(undefined);
+
+export function useCUstomerId() {
+  return useAtom(CUstomerId);
+}
+
+const RouteId = atom<number | undefined>(undefined);
+
+export function useRouteId() {
+  return useAtom(RouteId);
+}
+
+const gsitOrderId = atom<number | undefined>(undefined);
+
+export function useGsitOrderId() {
+  return useAtom(gsitOrderId);
+}
+
+const orderProductId = atom<number | undefined>(undefined);
+
+export function useOrderProductId() {
+  return useAtom(orderProductId);
+}
+const returnDataAtom = atom<any[]>([]);
+export function useReturnData() {
+  return useAtom(returnDataAtom);
+  }
+  const apiCalling = atom<boolean>(false);
+
+  export function useApiCalling() {
+    return useAtom(apiCalling);
+  }
+  const liveRecalling = atom<boolean>(false);
+
+//re api call of live status
+export function useLiveRecalling() {
+  return useAtom(liveRecalling);
+}
+export const selectedTabKeyAtom = atom<string>('1');
+export const letselectedProductIdAtom = atom<number | null>(null);
+
+// const BulkUPdateDisabledState = atom<boolean>(false);
+// export const useBulkUPdateDisabledState = () => {
+//   return useAtom(BulkUPdateDisabledState);
+// };
+
+const auditLogToggle = atom<boolean>(true);
+export const SeteauditLogToggle= () => {
+  return useAtom(auditLogToggle);
 };
+
+
 // Popup state Manage
 const initialState = null;
 const popupReducer = (state: any, action: any) => {
-  if (action.type === 'create-return') {
-    state = 'create-return';
+  if (action.type === 'bulkUpdate') {
+    state = 'bulkUpdate';
     return { state };
   } else if (action.type === 'addProduct') {
     state = 'addProduct';

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

@@ -5,7 +5,7 @@ import CollapsableForm from '../../../../common/expand-collapse';
 import DynamicTable from '../../DynamicTable';
 import {
   useEventNotesData,
-  useOrderDetails,
+  // useOrderDetails,
   useOrderProductSystemLogs,
 } from '../../store';
 import { tableColumns } from '../helper';
@@ -15,10 +15,10 @@ import { notification } from 'antd';
 function SystemLogs() {
   const [systemLogs] = useOrderProductSystemLogs();
 
-  const [orderDetails] = useOrderDetails();
+  // const [orderDetails] = useOrderDetails();
   const systemLogsData = useGetEventNotes();
   const [, setNotesData] = useEventNotesData();
-  const gsitId = orderDetails?.gsit_order_id;
+  // const gsitId = orderDetails?.gsit_order_id;
 
   const fetchReminderData = async () => {
     try {
@@ -27,20 +27,16 @@ function SystemLogs() {
         setNotesData(result);
       }
     } catch (error) {
-      // console.error('Error fetching event notes:', error);
       notification.error({
         message: 'Error',
-        description:
-          `${error}` || 'An error has occurred. Please try again later.',
+        description: `${error}` || 'Error fetching event notes:',
       });
     }
   };
 
   useEffect(() => {
-    if (gsitId) {
-      fetchReminderData();
-    }
-  }, [gsitId, setNotesData]);
+    fetchReminderData();
+  }, [setNotesData]);
 
   return (
     <Table>

package/src/components/order-view/toolbox-resources/expanded-content/index.tsx

@@ -2,21 +2,83 @@ import React from 'react';
 import CollapsedContent from '../collapsed-content';
 import styled from 'styled-components';
 import CollapsableForm from '../../../../common/expand-collapse';
-import DynamicTable from '../../DynamicTable';
-import { toolboxColumns, toolboxResources } from '../../../fakeData';
+import { useOrderProductsToolbox } from '../../store';
 
 function Toolbox() {
+  const [orderToolbox] = useOrderProductsToolbox();
+
+  const htmlContent =
+    orderToolbox?.data && orderToolbox?.data?.length > 0
+      ? orderToolbox?.data[0]?.html
+      : '';
+
   return (
-    <Table>
+    <StyledTable>
       <CollapsableForm collapsedContent={<CollapsedContent />}>
-        <DynamicTable columns={toolboxColumns} data={toolboxResources} />
+        <div style={{ overflow: 'auto' }}></div>
+        <div
+          className="tableStyle"
+          dangerouslySetInnerHTML={{ __html: htmlContent }}
+        ></div>
       </CollapsableForm>
-    </Table>
+    </StyledTable>
   );
 }
 
-const Table = styled.div`
+const StyledTable = styled.table`
   width: 100%;
+  border: none;
+
+  .tableStyle {
+    border-spacing: 0;
+    width: 100%;
+    table {
+      border-spacing: 0;
+      border: none !important;
+      max-height: 400px !important;
+      min-height: 100px !important;
+      thead {
+        background: #f8f8f8 !important;
+        tr {
+          border-spacing: 0;
+          border-bottom: 1px solid rgb(215, 214, 213);
+          th {
+            padding: 10px;
+            font-family: Roboto, sans-serif;
+            font-size: 14px;
+            font-weight: 500;
+            line-height: 24px;
+            letter-spacing: 0px;
+            /* min-width: 130px; */
+            &:first-child {
+              border-radius: 10px 0px 0px 0px;
+            }
+            &:last-child {
+              border-radius: 0px 10px 0px 0px;
+            }
+          }
+        }
+      }
+      tbody {
+        tr {
+          td {
+            color: #3a3630;
+            font-size: 13px;
+            font-style: normal;
+            font-weight: 400;
+            line-height: normal;
+            padding: 10px 5px;
+            background: #fff;
+            border-bottom: 1px solid rgba(0, 0, 0, 0.08);
+            border-right: none;
+            border-left: none;
+            word-wrap: break-word;
+            max-width: 200px;
+          }
+        }
+      }
+    }
+  }
 `;
 
 export default Toolbox;

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

@@ -45,7 +45,10 @@ export type OrderActionsType =
   | 'view-reminder'
   | 'order-lock'
   | 'view-flag'
-  | 'release-order';
+  | 'release-order'
+  | 'unrelease-order'
+  | 'clear-date'
+  | 'uncancel-order';
 
 export interface ChargeLogData {
   id: number;
@@ -101,7 +104,7 @@ export interface OrderServiceType {
   id?: number | null;
   service_category_id?: number;
   is_deleted?: boolean;
-  new_id?: number; // only required while creating new service 
+  new_id?: number; // only required while creating new service
 }
 
 export interface OrderRouteType {
@@ -109,12 +112,12 @@ export interface OrderRouteType {
   order_id?: number;
   route_id?: number;
   drop_no?: number;
-  drop_time?: number;
+  // drop_time?: number;
   slot_date?: string;
   slot_fixed?: string;
   est_arrival?: string;
   est_departure?: string;
-  delivery_instructions?: string;
+  // delivery_instructions?: string;
   complete_time?: string;
   complete_notes?: string;
   signee?: string;
@@ -153,42 +156,95 @@ export interface OrdersType {
   order_communications: any[];
   id: number | null;
   status_value: string | null;
+  name: string
+  order_locked_by: string | null;
+  delivery_instructions: string | null;
+  drop_time: string | null
 }
 
 export type DeleteProds = {
   id: number | null | undefined;
   order_id: number;
-  };
+};
 
-  export interface ApiResponse {
-    message: string;
-    code: number;
-    error: string | null;
-    error_traceback: string | null;
-    data: any;
-  }
+export interface ApiResponse {
+  message: string;
+  code: number;
+  error: string | null;
+  error_traceback: string | null;
+  data: any;
+  location_name: any;
+}
 
-  export interface CreateProduct  {
-    code: string,
-    description: string,
-    sku: string,
-    weight: number,
-    cube: number,
-    order_id: number,
-    product_type_id: number,
-  }
+export interface CreateProduct {
+  code: string;
+  description: string;
+  sku: string;
+  weight: number | null;
+  cube: number | null;
+  order_id: number | null;
+  order_product_type_id: number | null;
+  return_reason_id: number | null;
+  collection_reason_id: number | null;
+  product_return_action_id: number | null;
+  return_location: string | null;
+}
 
-  export interface UnRecieveOrderProduct  {
-    unrecieve_reason_id: number,
-    unrecieve_note: string,
-    // id: number
-  }
+export interface UnRecieveOrderProduct {
+  unrecieve_reason_id: number;
+  unrecieve_note: string;
+  // id: number
+}
 
 export interface UpdateOrderProduct {
-  id: number,
-  order_id: number,
-  product_type_id: number,
-  product_return_action_id: number,
-  return_location: string,
-  return_reason_id: number
-}
+  id: number;
+  order_id: number;
+  product_type_id?: number;
+  order_product_type_id?: number;
+  product_return_action_id?: number;
+  return_location?: string;
+  return_reason_id?: number;
+  collection_reason_id?: number;
+}
+
+export type CustomersType = {
+  client_id: number;
+  shared_id_list: string;
+  customer_name: string;
+  trading_as: string;
+  account_number: string;
+  company_name: any;
+  parent_id: number;
+  gsit_customer_id: number;
+  comms_name: any;
+  status: boolean;
+  fax: any;
+  api_customer: any;
+  api_key: string;
+  events_path: any;
+  api_ip_whitelist: any;
+  review_date: any;
+  account_type_id: number;
+  injection_type_id: any;
+  injection_method_id: any;
+  injection_days: any;
+  eta_alert_comms_to_customer: any;
+  allow_live_tracking: boolean;
+  amazon_tracking_enabled: boolean;
+  tracking_domain: string;
+  tracking_order_identifier_id: number;
+  restricted_verification_id: any;
+  id: number;
+  uuid: string;
+  customer_address_book: any[];
+  customer_phone_book: any[];
+  customer_emails: any[];
+  customer_default_services: any;
+  service_level_configs: any[];
+  review_service_enable_days: any[];
+  customer_invoice_details: any;
+  customer_retailer_details: any[];
+  customer_order_services: any[];
+  exceptional_days: any[];
+  customer_users: any[];
+};