@bjsdistribution/dms-client-return 0.0.25 → 0.0.27

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.25",
+  "version": "0.0.27",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/order-daily-overview/header-filters/SelectionFilter.tsx

@@ -11,6 +11,7 @@ import {
 import { atom, useAtom } from 'jotai';
 import {
   useActionType,
+  useClearState,
   useCustomerData,
   useGroupedPayload,
   useLocationData,
@@ -57,6 +58,7 @@ function SelectionFilter() {
   const [, setSelectedReturnOrder] = useSelectedOrders();
   const [, setSelectAll] = useSelectAll();
   const [, setCheck] = useSelectedConfirmLoc();
+  const [clearState, setClear] = useClearState();
 
   //client options
   const clientOptions = customers?.map((option: any) => ({
@@ -81,9 +83,8 @@ function SelectionFilter() {
   }));
 
   //client change
-  const handleSelectChange = (value: unknown, option: DefaultOptionType) => {
+  const handleSelectChange = (_value: unknown, option: DefaultOptionType) => {
     setNewPayload([]);
-    console.log(value, 'value');
     const selectedLabel = option?.label as string;
     const selectedValue = option?.id as number;
     const selectedUuids = option?.uuid as string;
@@ -91,6 +92,8 @@ function SelectionFilter() {
     const selectedCustomerId = option.gsit_customer_id as number;
     setSelectedClient(selectedValue);
     setName(selectedLabel);
+    // storedName(selectedLabel);
+    //set items in local storage
     localStorage.setItem('clientName', selectedLabel);
     localStorage.setItem('clientId', selectedValue.toString());
     localStorage.setItem('account_number', selectAccountNumber);
@@ -100,11 +103,15 @@ function SelectionFilter() {
     const storedCustomerId = localStorage.getItem('customer_id');
     const storedUuid = localStorage.getItem('uuid');
     setUuid(storedUuid);
+
+    //set payload
     setReturnPayload((prevState: any) => ({
       ...prevState,
       account_number: storedAccNo,
       customer_id: storedCustomerId,
     }));
+
+    //filtering locations
     const filteredSubLocations = locationData
       ?.filter((subCat: any) => subCat?.customer_id === storedUuid)
       .map((subCat: any) => ({
@@ -113,6 +120,8 @@ function SelectionFilter() {
       }));
 
     setFilteredLocationOptions(filteredSubLocations);
+
+    //clearing states
     setUuid('');
     setSelectedReturnOrder([]);
     setNewPayload([]);
@@ -163,8 +172,6 @@ function SelectionFilter() {
   const handleActionClick = (value: any) => {
     setSelectedFilterValue(value);
   };
-  const storedName = localStorage.getItem('clientName');
-  const storedClientId = localStorage.getItem('clientId');
 
   //Apply filters
   const applyFilters = () => {
@@ -211,6 +218,9 @@ function SelectionFilter() {
     }
   };
 
+  const storedName = localStorage.getItem('clientName');
+  const storedClientId = localStorage.getItem('clientId');
+
   useEffect(() => {
     if (storedClientId) {
       dispatch({
@@ -243,7 +253,19 @@ function SelectionFilter() {
     }
   }, [selectedFilterValue, selectedLocationValue]);
 
-  console.log(storedName, 'storedName');
+  const handleClear = () => {
+    setClear(false);
+    localStorage.removeItem('clientName');
+    localStorage.removeItem('clientId');
+    setClear(true);
+  };
+
+  useEffect(() => {
+    if (clearState) {
+      dispatch({ type: 'CLEAR_CLIENT' });
+      window.location.href = '/returnclient';
+    }
+  }, [clearState]);
 
   return (
     <Wrapper>
@@ -257,6 +279,8 @@ function SelectionFilter() {
               onChange={handleSelectChange}
               style={{ minWidth: '14vw' }}
               value={storedName}
+              allowClear
+              onClear={handleClear}
             />
           </FilterColumn>
 

package/src/components/order-daily-overview/header-filters/filterStore.ts

@@ -98,13 +98,13 @@ const filterReducer = (state: FilterState, action: any): FilterState => {
         ],
       };
 
-    // case 'CLEAR_CLIENT':
-    //   return {
-    //     ...state,
-    //     'x-filters': state['x-filters'].filter(
-    //       f => f.field !== 'order.customer_id'
-    //     ),
-    //   };
+    case 'CLEAR_CLIENT':
+      return {
+        ...state,
+        'x-filters': state['x-filters'].filter(
+          f => f.field !== 'order.customer_id'
+        ),
+      };
 
     case 'CLEAR_ACTION':
       return {

package/src/components/order-daily-overview/shared/utlis.ts

@@ -69,7 +69,9 @@ export const formatDate = (date: any) => {
   // const minutes = padZero(date.getMinutes());
   // const seconds = padZero(date.getSeconds());
 
-  return `${year}-${month}-${day}`;
+  return `
+  ${day}/${month}/${year}
+  `;
 };
 
 export const displayValueOrNA = (value: any) => {

package/src/components/order-view/hooks/useGetSystemLogs.tsx

@@ -18,8 +18,7 @@ function useSystemLogs() {
         'Content-Type': 'application/json',
         Authorization: `Bearer ${ssoToken}`,
         'x-pagination': JSON.stringify({
-          page: 1,
-          per_page: 100,
+          is_pagination: false,
         }),
         'x-filters': JSON.stringify([
           {

package/src/components/order-view/index.tsx

@@ -136,13 +136,13 @@ function OrderView() {
   }, [apiCalling]);
 
   useEffect(() => {
-    // if (paths.length > 1) {
-    //   setOrderId(paths[2]);
-    // }
-    // for local
-    if (paths.length >= 0) {
-      setOrderId(paths[1]);
+    if (paths.length > 1) {
+      setOrderId(paths[2]);
     }
+    // for local
+    // if (paths.length >= 0) {
+    //   setOrderId(paths[1]);
+    // }
   }, [paths]);
 
   useEffect(() => {

package/src/components/order-view/modalsPopup/ModalManager.tsx

@@ -219,6 +219,11 @@ const ModalManager = () => {
       setShouldPerformAction(false);
       setSelectAll(false);
       setError(null);
+
+      // for local
+      // navigate('/order-return');
+
+      // for dev
       navigate('returnclient/order-return');
     }
   }, [response, apiError, postLoading]);

package/src/components/order-view/order-details/expanded-content/services-section/DeliveryPoint.tsx

@@ -26,10 +26,13 @@ function DeliveryPointDropdown() {
     const newData = { ...orderData, order_services_detail: updatedServices };
     setOrderData(newData);
   };
+
+  const isDisabled = true;
+
   return (
     <Container>
       <Label label="Delivery Point" htmlFor="deliveryPointDropdown" />
-      <SelectDropdown
+      <StyledSelectDropdown
         placeholder="Select Delivery Point"
         options={deliveryPointOptions || []}
         inputId="deliveryPointDropdown"
@@ -38,7 +41,8 @@ function DeliveryPointDropdown() {
         )}
         openMenuOnFocus
         onChange={onChange}
-        isDisabled={true}
+        // isDisabled={true}
+        className={isDisabled ? 'disabled' : ''}
       />
     </Container>
   );
@@ -50,5 +54,10 @@ const Container = styled.div`
   gap: 6px;
   flex: 1;
 `;
-
+const StyledSelectDropdown = styled(SelectDropdown)`
+  &.disabled {
+    pointer-events: none;
+    opacity: 0.7;
+  }
+`;
 export default DeliveryPointDropdown;

package/src/components/order-view/order-details/expanded-content/services-section/OrderServices.tsx

@@ -193,9 +193,10 @@ function OrderServices() {
       setOrderDetails(newData);
     }
   };
+  const isDisabled = true;
 
   return (
-    <Container>
+    <Container disabled={isDisabled}>
       {orderServicesOptions?.map((service: any) => {
         const selected = !!orderServices?.find(
           (s: OrderServiceType) =>
@@ -216,12 +217,22 @@ function OrderServices() {
   );
 }
 
-const Container = styled.div`
+const Container = styled.div<{ disabled: boolean }>`
   display: flex;
   gap: 30px;
   flex: 1;
   @media screen and (max-width: 1170px) {
     flex-wrap: wrap;
+
+    ${({ disabled }) =>
+      disabled &&
+      `
+    pointer-events: none;
+
+    > * {
+    pointer-events: none;
+    }
+  `}
   }
 `;
 

package/src/components/order-view/order-details/expanded-content/services-section/ServiceLevel.tsx

@@ -26,26 +26,40 @@ function ServiceLevel() {
     const newData = { ...orderData, order_services_detail: updatedServices };
     setOrderData(newData);
   };
+
+  const isDisabled = true; // Example value
+
   return (
-    <Container>
+    <Container disabled={isDisabled}>
       <RadioButtonGroup
         selectedValue={serviceLevelId?.toString() || ''}
         heading="Service Level"
         options={serviceLevelOptions || []}
         onChange={radioGroupHandler}
         required={true}
-        isDisabled={true}
+        isDisabled={isDisabled}
       />
     </Container>
   );
 }
 
-const Container = styled.div`
+const Container = styled.div<{ disabled: boolean }>`
   display: flex;
   flex-direction: column;
   gap: 6px;
   flex: 1;
-  /* temporary change will add this in library */
+
+  ${({ disabled }) =>
+    disabled &&
+    `
+    cursor: not-allowed;
+    pointer-events: none;
+
+    > * {
+      cursor: not-allowed;
+    }
+  `}
+
   > fieldset {
     > div {
       > div {

package/src/components/order-view/order-details/expanded-content/services-section/ServiceType.tsx

@@ -21,11 +21,12 @@ function ServiceTypeDropdown() {
     const newData = { ...orderData, order_type_id: event.value };
     setOrderData(newData);
   };
+  const isDisabled = true;
 
   return (
     <Container>
       <Label label="Service Type" htmlFor="serviceTypeDropdown" />
-      <SelectDropdown
+      <StyledSelectDropdown
         placeholder="Select Service Type"
         options={serviceTypeOptions || []}
         value={serviceTypeOptions?.filter((f: any) => f.value === orderTypeId)}
@@ -33,6 +34,7 @@ function ServiceTypeDropdown() {
         openMenuOnFocus
         onChange={onChange}
         isDisabled={true}
+        className={isDisabled ? 'disabled' : ''}
       />
     </Container>
   );
@@ -45,4 +47,11 @@ const Container = styled.div`
   flex: 1;
 `;
 
+const StyledSelectDropdown = styled(SelectDropdown)`
+  &.disabled {
+    cursor: not-allowed !important;
+    opacity: 0.7;
+  }
+`;
+
 export default ServiceTypeDropdown;

package/src/components/order-view/order-details/expanded-content/services-section/TimedService.tsx

@@ -40,10 +40,12 @@ function TimedServiceDropdown() {
     setOrderData(newData);
   };
 
+  const isDisabled = true;
+
   return (
     <Container>
       <Label label="Timed Service" htmlFor="timedServiceDropdown" />
-      <SelectDropdown
+      <StyledSelectDropdown
         placeholder="Select Timed Service"
         options={timedServicesOptions || []}
         value={timedServicesOptions?.filter(
@@ -51,7 +53,8 @@ function TimedServiceDropdown() {
         )}
         inputId="timedServiceDropdown"
         onChange={onChange}
-        isDisabled={true}
+        // isDisabled={isDisabled}
+        className={isDisabled ? 'disabled' : ''}
       />
     </Container>
   );
@@ -64,4 +67,11 @@ const Container = styled.div`
   flex: 1;
 `;
 
+const StyledSelectDropdown = styled(SelectDropdown)`
+  &.disabled {
+    pointer-events: none;
+    opacity: 0.7;
+  }
+`;
+
 export default TimedServiceDropdown;

package/src/components/order-view/order-details/expanded-content/services-section/index.tsx

@@ -66,6 +66,11 @@ const CustomFormSection = styled(FormSection)`
   border-radius: 8px;
   background: #f8fafc;
   box-shadow: 0px 1px 3px 0px rgba(16, 24, 40, 0.1);
+  label,
+  input,
+  span {
+    cursor: default !important;
+  }
 `;
 
 export default ServicesSection;

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

@@ -1,109 +1,28 @@
 import { SectionHeader } from '@bjsdistribution/dms-component-library';
 import React from 'react';
 import styled from 'styled-components';
-// import ModalManager from '../../modalsPopup/ModalManager';
-// import { countReducerAtom, useProductDetails } from '../../store';
-// import { useAtom } from 'jotai';
 
 function CollapsedContent() {
-  // const [, dispatch] = useAtom(countReducerAtom);
-  // const [productdata] = useProductDetails();
-  // const totalItems = productdata?.length;
-
-  // const totalCube = () => {
-  //   let cubeData = 0;
-  //   for (let i = 0; i < productdata?.length; i++) {
-  //     cubeData += parseFloat(productdata[i].cube);
-  //   }
-  //   return `${cubeData.toFixed(2)}m³`;
-  // };
-
-  // const totalWeight = () => {
-  //   let weightData = 0;
-  //   for (let i = 0; i < productdata?.length; i++) {
-  //     weightData += parseFloat(productdata[i].weight);
-  //   }
-  //   return `${weightData.toFixed(2)} KG`;
-  // };
   return (
     <Container>
       <SectionHeader label="Products" />
-      {/* <Left>
-        <Items>{totalItems} Delivery Items</Items>
-        <Dimensions>
-          {totalWeight()}/ {totalCube()}
-        </Dimensions>
-      </Left>
-      <Right>
-        <ActionContainer onClick={() => dispatch({ type: 'bulkUpdate' })}>
-          <Action>Bulk Update</Action>
-        </ActionContainer>
-        <ActionContainer onClick={() => dispatch({ type: 'addProduct' })}>
-          <Action>ADD NEW PRODUCT(S)</Action>
-        </ActionContainer>
-        <ActionContainer onClick={() => dispatch({ type: 'deleteProduct' })}>
-          <Action>DELETE PRODUCT(S)</Action>
-        </ActionContainer>
-      </Right>
-      <ModalManager /> */}
+      <Dimensions>Products to be Returned</Dimensions>
     </Container>
   );
 }
 
-// const Dimensions = styled.span`
-//   font-family: 'Lato', sans-serif;
-//   font-size: 13px;
-//   font-weight: 500;
-//   line-height: 16px;
-//   color: #8e8a85;
-// `;
-
-// const Right = styled.div`
-//   margin-left: auto;
-//   display: flex;
-//   gap: 10px;
-//   margin-right: 10px;
-// `;
-
-// const Action = styled.span`
-//   color: #3a3630;
-//   font-family: 'Lato', sans-serif;
-//   font-size: 12px;
-//   font-style: normal;
-//   font-weight: 600;
-//   line-height: 20px;
-//   text-transform: uppercase;
-// `;
-
-// const ActionContainer = styled.div`
-//   padding: 5px 10px;
-//   border-radius: 4px;
-//   border: 1px solid #edebe8;
-//   background: #edebe8;
-//   box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
-//   cursor: pointer;
-// `;
-
-// const Items = styled.span`
-//   font-family: 'Roboto', sans-serif;
-//   font-size: 14px;
-//   font-weight: 500;
-//   line-height: 24px;
-//   color: #8e8a85;
-//   text-transform: capitalize;
-//   color: #aea9a1;
-// `;
-
-// const Left = styled.div`
-//   display: flex;
-//   align-items: center;
-//   gap: 30px;
-// `;
+const Dimensions = styled.span`
+  color: #6a7378;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 600;
+  line-height: 24px; /* 171.429% */
+`;
 
 const Container = styled.div`
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  /* justify-content: space-between; */
   width: 100%;
   gap: 30px;
 `;

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

@@ -8,6 +8,8 @@ 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';
 
 const ReturnProductTable = () => {
   const [selectedInvoices] = useSelectedOrders();
@@ -20,7 +22,11 @@ const ReturnProductTable = () => {
     setSelectedRowId(id);
   }, []);
 
-  const { data: isresponse, setShouldPerformAction: setaction } = useApiHook<{
+  const {
+    data: isresponse,
+    setShouldPerformAction: setaction,
+    loading,
+  } = useApiHook<{
     data: ApiResponse[];
   }>({
     endpoint: `order/order_products/delete/`,
@@ -31,6 +37,13 @@ const ReturnProductTable = () => {
 
   useEffect(() => {
     if (isresponse && isresponse.data) {
+      notification.success({
+        message: 'Success',
+        description:
+          //@ts-ignore
+          isresponse?.message ||
+          'An error has occurred. Please try again later.',
+      });
       handleRemoveRow();
       setSelectedRowId(null);
     }
@@ -71,6 +84,7 @@ const ReturnProductTable = () => {
 
   return (
     <div>
+      {loading && <Loader title="Deleting" />}
       <StyledTableWrapper id="tableScrolling">
         <StyledTable>
           <thead>

package/src/components/store.ts

@@ -51,6 +51,8 @@ const postLoading = atom<boolean>(false);
 
 const final = atom<any[]>([]);
 
+const clearState = atom<boolean>(false);
+
 function useReminderData() {
   return useAtom(reminderTableData);
 }
@@ -135,6 +137,10 @@ function useFinalPayload() {
   return useAtom(final);
 }
 
+function useClearState() {
+  return useAtom(clearState);
+}
+
 export {
   useAtom,
   useFilter,
@@ -157,4 +163,5 @@ export {
   useSelectAll,
   usePostLoading,
   useFinalPayload,
+  useClearState,
 };

package/src/index.tsx

@@ -1,19 +1,15 @@
 import React, { Suspense, useEffect } from 'react';
 import { Route, Routes, useNavigate } from 'react-router-dom';
-// import AddOrder from './components/add-order';
 import OrderView from './components/order-view';
-// import AllReminder from './components/order-view/all-reminder/AllReminder';
 import ReturnTable from './components/order-daily-overview/return-order-table/ReturnTable';
 import ReturnAfterTable from './components/order-daily-overview/return-after-table/ReturnAfterTable';
 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';
 import {
   useActionType,
   // useAtom,
-  // useAtom,
   useCustomerData,
   useLocationData,
   useStatusOrderData,
@@ -35,18 +31,19 @@ function ReturnClient() {
   const [, setActionType] = useActionType();
   const [, setLocationData] = useLocationData();
   const [, setStatusOfOrders] = useStatusOrderData();
+  // const [dispatchvalue] = useAtom(filtersReducerAtom);
 
   const splitPath = (str: any) => {
     const parts = str?.split('/')?.filter((part: any) => part !== ''); // Filter out empty parts
     return parts;
   };
   const paths = splitPath(location.pathname);
-
   useEffect(() => {
     if (paths[paths.length - 1] === 'returnclient') {
       localStorage.removeItem('clientName');
       localStorage.removeItem('clientId');
       localStorage.removeItem('uuid');
+      // dispatch({ type: 'CLEAR_CLIENT' });
     }
   }, [location.pathname]);