@bjsdistribution/dms-client-return 0.0.27 → 0.0.29

package/package.json

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

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

@@ -88,8 +88,8 @@ function SelectionFilter() {
     const selectedLabel = option?.label as string;
     const selectedValue = option?.id as number;
     const selectedUuids = option?.uuid as string;
-    const selectAccountNumber = option.account_number as string;
-    const selectedCustomerId = option.gsit_customer_id as number;
+    const selectAccountNumber = option?.account_number as string;
+    const selectedCustomerId = option?.gsit_customer_id as number;
     setSelectedClient(selectedValue);
     setName(selectedLabel);
     // storedName(selectedLabel);
@@ -263,7 +263,8 @@ function SelectionFilter() {
   useEffect(() => {
     if (clearState) {
       dispatch({ type: 'CLEAR_CLIENT' });
-      window.location.href = '/returnclient';
+      // window.location.href = '/returnclient';
+      window.location.replace('/returnclient');
     }
   }, [clearState]);
 

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

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

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

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

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

@@ -224,7 +224,7 @@ const ModalManager = () => {
       // navigate('/order-return');
 
       // for dev
-      navigate('returnclient/order-return');
+      navigate('/returnclient/order-return');
     }
   }, [response, apiError, postLoading]);
 

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

@@ -26,13 +26,10 @@ function DeliveryPointDropdown() {
     const newData = { ...orderData, order_services_detail: updatedServices };
     setOrderData(newData);
   };
-
-  const isDisabled = true;
-
   return (
     <Container>
       <Label label="Delivery Point" htmlFor="deliveryPointDropdown" />
-      <StyledSelectDropdown
+      <SelectDropdown
         placeholder="Select Delivery Point"
         options={deliveryPointOptions || []}
         inputId="deliveryPointDropdown"
@@ -41,8 +38,7 @@ function DeliveryPointDropdown() {
         )}
         openMenuOnFocus
         onChange={onChange}
-        // isDisabled={true}
-        className={isDisabled ? 'disabled' : ''}
+        isDisabled={true}
       />
     </Container>
   );
@@ -54,10 +50,5 @@ 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,10 +193,9 @@ function OrderServices() {
       setOrderDetails(newData);
     }
   };
-  const isDisabled = true;
 
   return (
-    <Container disabled={isDisabled}>
+    <Container>
       {orderServicesOptions?.map((service: any) => {
         const selected = !!orderServices?.find(
           (s: OrderServiceType) =>
@@ -217,22 +216,12 @@ function OrderServices() {
   );
 }
 
-const Container = styled.div<{ disabled: boolean }>`
+const Container = styled.div`
   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,40 +26,26 @@ function ServiceLevel() {
     const newData = { ...orderData, order_services_detail: updatedServices };
     setOrderData(newData);
   };
-
-  const isDisabled = true; // Example value
-
   return (
-    <Container disabled={isDisabled}>
+    <Container>
       <RadioButtonGroup
         selectedValue={serviceLevelId?.toString() || ''}
         heading="Service Level"
         options={serviceLevelOptions || []}
         onChange={radioGroupHandler}
         required={true}
-        isDisabled={isDisabled}
+        isDisabled={true}
       />
     </Container>
   );
 }
 
-const Container = styled.div<{ disabled: boolean }>`
+const Container = styled.div`
   display: flex;
   flex-direction: column;
   gap: 6px;
   flex: 1;
-
-  ${({ disabled }) =>
-    disabled &&
-    `
-    cursor: not-allowed;
-    pointer-events: none;
-
-    > * {
-      cursor: not-allowed;
-    }
-  `}
-
+  /* temporary change will add this in library */
   > fieldset {
     > div {
       > div {

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

@@ -21,12 +21,11 @@ function ServiceTypeDropdown() {
     const newData = { ...orderData, order_type_id: event.value };
     setOrderData(newData);
   };
-  const isDisabled = true;
 
   return (
     <Container>
       <Label label="Service Type" htmlFor="serviceTypeDropdown" />
-      <StyledSelectDropdown
+      <SelectDropdown
         placeholder="Select Service Type"
         options={serviceTypeOptions || []}
         value={serviceTypeOptions?.filter((f: any) => f.value === orderTypeId)}
@@ -34,7 +33,6 @@ function ServiceTypeDropdown() {
         openMenuOnFocus
         onChange={onChange}
         isDisabled={true}
-        className={isDisabled ? 'disabled' : ''}
       />
     </Container>
   );
@@ -47,11 +45,4 @@ 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,12 +40,10 @@ function TimedServiceDropdown() {
     setOrderData(newData);
   };
 
-  const isDisabled = true;
-
   return (
     <Container>
       <Label label="Timed Service" htmlFor="timedServiceDropdown" />
-      <StyledSelectDropdown
+      <SelectDropdown
         placeholder="Select Timed Service"
         options={timedServicesOptions || []}
         value={timedServicesOptions?.filter(
@@ -53,8 +51,7 @@ function TimedServiceDropdown() {
         )}
         inputId="timedServiceDropdown"
         onChange={onChange}
-        // isDisabled={isDisabled}
-        className={isDisabled ? 'disabled' : ''}
+        isDisabled={true}
       />
     </Container>
   );
@@ -67,11 +64,4 @@ 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,11 +66,6 @@ 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,28 +1,109 @@
 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" />
-      <Dimensions>Products to be Returned</Dimensions>
+      {/* <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 /> */}
     </Container>
   );
 }
 
-const Dimensions = styled.span`
-  color: #6a7378;
-  font-size: 14px;
-  font-style: normal;
-  font-weight: 600;
-  line-height: 24px; /* 171.429% */
-`;
+// 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 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,8 +8,6 @@ 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();
@@ -22,11 +20,7 @@ const ReturnProductTable = () => {
     setSelectedRowId(id);
   }, []);
 
-  const {
-    data: isresponse,
-    setShouldPerformAction: setaction,
-    loading,
-  } = useApiHook<{
+  const { data: isresponse, setShouldPerformAction: setaction } = useApiHook<{
     data: ApiResponse[];
   }>({
     endpoint: `order/order_products/delete/`,
@@ -37,13 +31,6 @@ 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);
     }
@@ -84,7 +71,6 @@ const ReturnProductTable = () => {
 
   return (
     <div>
-      {loading && <Loader title="Deleting" />}
       <StyledTableWrapper id="tableScrolling">
         <StyledTable>
           <thead>