@bjsdistribution/dms-client-return 0.0.10 → 0.0.11

package/package.json

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

package/src/components/order-daily-overview/return-after-table/table-filters/ReturnOrderFilter.tsx

@@ -7,9 +7,9 @@ import {
 import TableFilters from './TableFilters';
 import FilterIcon from '../../../../assets/icons/FilterIcon';
 import DateIcon from '../../../../assets/icons/DateIcon';
-import StatusIcon from '../../../../assets/icons/StatusIcon';
+// import StatusIcon from '../../../../assets/icons/StatusIcon';
 import ClientIcon from '../../../../assets/icons/ClientIcon';
-import AssigneIcon from '../../../../assets/icons/AssigneIcon';
+// import AssigneIcon from '../../../../assets/icons/AssigneIcon';
 import { DatePicker, Select, Tooltip } from 'antd';
 import { useAtom } from '../../../order-view/store';
 import styled from 'styled-components';
@@ -21,13 +21,13 @@ const ReturnOrderFilter = () => {
   const [, dispatch] = useAtom(filtersReducerAtom);
   const [customers] = useCustomerData();
   const [selectedDate, setSelectedDate] = useState();
-  const zoneOptions = [
-    { label: 'Zone 1', value: 'zone1' },
-    { label: 'Zone 2', value: 'zone2' },
-    { label: 'Zone 3', value: 'zone3' },
-    { label: 'Zone 4', value: 'zone4' },
-    { label: 'Zone 5', value: 'zone5' },
-  ];
+  // const zoneOptions = [
+  //   { label: 'Zone 1', value: 'zone1' },
+  //   { label: 'Zone 2', value: 'zone2' },
+  //   { label: 'Zone 3', value: 'zone3' },
+  //   { label: 'Zone 4', value: 'zone4' },
+  //   { label: 'Zone 5', value: 'zone5' },
+  // ];
 
   // date change here
   const handleDateChange = (date: any | null) => {
@@ -88,7 +88,7 @@ const ReturnOrderFilter = () => {
               </StyledDatePicker>
             </div>
 
-            <div className="datefilter">
+            {/* <div className="datefilter">
               <div className="dateiconcontainer">
                 <StatusIcon />
               </div>
@@ -112,7 +112,7 @@ const ReturnOrderFilter = () => {
                   )}
                 />
               </StyledAntSelect>
-            </div>
+            </div> */}
             <div className="datefilter">
               <div className="dateiconcontainer">
                 <ClientIcon />
@@ -123,7 +123,7 @@ const ReturnOrderFilter = () => {
                   className="custom-select"
                   placeholder="Client"
                   onChange={handleClientChange}
-                  style={{ width: '125px' }}
+                  style={{ width: '125px', border: 'none' }}
                   maxTagCount={0}
                   maxTagPlaceholder={(omittedValues: any) => (
                     <Tooltip
@@ -138,7 +138,7 @@ const ReturnOrderFilter = () => {
                 />
               </StyledAntSelect>
             </div>
-            <div className="datefilter">
+            {/* <div className="datefilter">
               <div className="dateiconcontainer">
                 <AssigneIcon />
               </div>
@@ -162,7 +162,7 @@ const ReturnOrderFilter = () => {
                   )}
                 />
               </StyledAntSelect>
-            </div>
+            </div> */}
           </LeftSideConatiner>
         </StyledFIlterELements>
         <TableFilters />
@@ -184,6 +184,9 @@ export const StyledAntSelect = styled.div`
     border: none;
     width: 80px;
   }
+  .ant-select-selector {
+    border: 1px solid #ffffff !important;
+  }
   :where(.css-dev-only-do-not-override-m4timi).ant-select-single:not(.ant-select-customize-input)
     .ant-select-selector {
     padding: 0 5px;

package/src/components/order-daily-overview/return-order-table/return-orders-filters/ReturnOrderTable.tsx

@@ -1,8 +1,4 @@
-import {
-  Checkbox,
-  displayValueOrNA,
-  useApiHook,
-} from '@bjsdistribution/dms-component-library';
+import { Checkbox, useApiHook } from '@bjsdistribution/dms-component-library';
 import { Empty } from 'antd';
 import { useAtom } from 'jotai';
 import React, { useEffect, useRef, useState } from 'react';
@@ -22,6 +18,7 @@ import { useLoading, usePrintOptionTOggle } from '../../store/store';
 import { ApiResponse } from '../../../types';
 import { filtersReducerAtom } from '../../header-filters/filterStore';
 import PrintDropDown from '../../../order-view/details-filters/left-side-filters/dropdowns/PrintDropDown';
+import { displayValueOrNA } from '../../shared/utlis';
 const ReturnOrderTable = ({ loadingskeleton }: any) => {
   const [state] = useAtom(filtersReducerAtom);
 
@@ -209,10 +206,10 @@ const ReturnOrderTable = ({ loadingskeleton }: any) => {
               <th>Return Location</th>
               <th>Recipient</th>
               <th>Code</th>
-              <th> Description</th>
+              <th>Description</th>
               <th>Part</th>
               <th>Weight</th>
-              <th> CBM</th>
+              <th>CBM</th>
               <th>Return Reason</th>
               <th>Collected</th>
               <th>Collection Reason</th>
@@ -256,7 +253,9 @@ const ReturnOrderTable = ({ loadingskeleton }: any) => {
                   </td>
 
                   <td>
-                    {displayValueOrNA(item?.orders_products_stock?.location)}
+                    {item?.orders_products_stock?.location ? null : (
+                      <div className="awaiting">Awating</div>
+                    )}
                   </td>
 
                   <td> {displayValueOrNA(item?.return_location)}</td>
@@ -283,7 +282,7 @@ const ReturnOrderTable = ({ loadingskeleton }: any) => {
                   </td>
                   <td>{displayValueOrNA(item?.code)}</td>
                   <td>{displayValueOrNA(item?.description)}</td>
-                  <td>N/A</td>
+                  <td>{displayValueOrNA(item?.parts_count)}</td>
                   <td>{displayValueOrNA(item?.weight)}KG</td>
                   <td>{displayValueOrNA(item?.cube)}</td>
                   <td>{displayValueOrNA(item?.return_reasons?.reason)}</td>

package/src/components/order-daily-overview/return-order-table/return-orders-filters/returnstyles.ts

@@ -386,6 +386,20 @@ export const StyledTable = styled.table`
           border-radius: 22px;
           background: rgba(41, 204, 106, 0.15);
         }
+        .awaiting {
+          display: flex;
+          min-width: 85px;
+          padding: 6px 10px;
+          justify-content: center;
+          align-items: center;
+          gap: 5px;
+          border-radius: 22px;
+          background: rgba(233, 82, 82, 0.15);
+          color: #e95252;
+          font-family: 'Open Sans';
+          font-size: 12px;
+          font-weight: 600;
+        }
         ul > li > a {
           text-decoration: none !important;
           color: #0099ff;

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

@@ -74,5 +74,11 @@ export const formatDate = (date: any) => {
 
 export const displayValueOrNA = (value: any) => {
   const isBlankArray = Array.isArray(value) && value.length === 0;
-  return value && !isBlankArray ? value : '--';
+  if (value === 0) {
+    return 0;
+  }
+  if (value === 'NA' || value === undefined || value === null || isBlankArray) {
+    return 'NA';
+  }
+  return value;
 };