@bjsdistribution/dms-client-return 0.0.70 → 0.0.71

package/package.json

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

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

@@ -146,6 +146,8 @@ const OrderTable = () => {
         return { color: '#F4A503', background: '#FFF1D6' };
       case 'Awaiting route':
         return { color: '#845ADF', background: 'rgba(132, 90, 223, 0.15)' };
+      case 'Awaiting':
+        return { color: '#845ADF', background: 'rgba(132, 90, 223, 0.15)' };
       case 'Completed':
         return { color: '#1F9254', background: 'rgba(41, 204, 106, 0.15)' };
       case 'Outstanding':
@@ -276,7 +278,8 @@ const OrderTable = () => {
                   cancelled: 'Cancelled',
                   OO: 'On Hold',
                   SC: 'Sub-Contracted',
-                  'awaiting route': 'Awaiting route',
+                  'awaiting route': 'Awaiting',
+                  'awaiting confirmation': 'Awaiting',
                   completed: 'completed',
                   outstanding: 'Outstanding',
                   routed: 'Routed',

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

@@ -194,7 +194,7 @@ const ReturnOrderFilter = () => {
                   className="custom-select"
                   placeholder="Status of Order"
                   onChange={handleStatusOfOrder}
-                  style={{ width: '145px' }}
+                  style={{ minWidth: '150px', width: 'auto' }}
                   value={statusOrder}
                   onClear={handleClear}
                   allowClear
@@ -209,10 +209,10 @@ const ReturnOrderFilter = () => {
                 <Select
                   options={clientOptions}
                   className="custom-select"
-                  placeholder="Client"
+                  placeholder="Clients"
                   onChange={handleClientChange}
                   value={selectedClient}
-                  style={{ width: '125px', border: 'none' }}
+                  style={{ minWidth: '150px', width: 'auto' }}
                   allowClear
                   onClear={handleClearClient}
                 />

package/src/components/order-view/order-actions/actions/confirm-order/customer-info/DeliveryDate.tsx

@@ -33,7 +33,7 @@ function DeliveryDate() {
   const today = new Date();
   const tomorrow = new Date(today);
   tomorrow.setDate(today.getDate() + 1);
-
+  //confirm popouop
   return (
     <Container>
       <Label>Delivery Date</Label>
@@ -43,6 +43,7 @@ function DeliveryDate() {
         value={deliveryDate ? dayjs(deliveryDate) : null}
         style={{ borderRadius: '15px' }}
         minDate={dayjs(tomorrow)}
+        allowClear={false}
       />
     </Container>
   );

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

@@ -5,7 +5,7 @@ import CustomerInformation from './customer-info';
 import ProductTable from './tables/ProductTable';
 import NotesTable from './tables/NotesTable';
 import SlotAndInstructions from './slot-and-instructions';
-import { Alert, useApiHook } from '@bjsdistribution/dms-component-library';
+import { useApiHook } from '@bjsdistribution/dms-component-library';
 import {
   useCurrentAction,
   useCustomerInfo,
@@ -217,14 +217,14 @@ function ConfirmOrder() {
       isSubmitDisabled={errorFound()}
     >
       <ContentContainer>
-        <Alert
+        {/* <Alert
           description=""
           onClose={() => {}}
           type="info"
           title="There is Orders with identical postcodes that are yet to be delivered.View Orders"
           showOkButton={false}
           showCloseIcon={false}
-        />
+        /> */}
         <Wrapper>
           <CustomerInformation />
           <SlotAndInstructions />

package/src/components/order-view/order-details/expanded-content/orders-section/DeliveryDate.tsx

@@ -46,14 +46,16 @@ function DeliveryDate() {
       });
     }
   };
+
   return (
     <MainContainer>
-      <Label label="Delivery Date" />
+      <Label label="Delivery Date next" />
       <DatePicker
         onChange={onChange}
         value={actionDate === null ? actionDate : dayjs(actionDate)}
         format="DD/MM/YY"
         style={{ borderRadius: '25px' }}
+        allowClear={false}
       />
     </MainContainer>
   );

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

@@ -52,7 +52,8 @@ const Container = styled.div`
   display: flex;
   flex-direction: column;
   gap: 6px;
-  flex: 1;
+  // flex: 1;
+  min-width: 250px;
 `;
 const StyledSelectDropdown = styled(SelectDropdown)`
   &.disabled {

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

@@ -44,7 +44,8 @@ const Container = styled.div`
   display: flex;
   flex-direction: column;
   gap: 6px;
-  flex: 1;
+  // flex: 1;
+  min-width: 250px;
 `;
 
 const StyledSelectDropdown = styled(SelectDropdown)`

package/src/index.tsx

@@ -43,8 +43,9 @@ function ReturnClient() {
     return parts;
   };
   const paths = splitPath(location.pathname);
+
   useEffect(() => {
-    if (paths[paths.length - 1] === 'orders/view/return') {
+    if (paths.join('/') === 'orders/view/return') {
       setActionTypeOptions([]);
       setLocationOptions([]);
       setSelectedClient(null);
@@ -52,11 +53,7 @@ function ReturnClient() {
       setSelectedLocationValue(null);
     }
   }, [location.pathname, searchParams]);
-  // useEffect(() => {
-  //   if (selectedClientId) {
-  //     navigate(`filter/${selectedClientId}`);
-  //   }
-  // }, [selectedClientId]);
+
   //API for client data
   const { data: fetchedCustomerData, loading: loading } = useApiHook<
     ApiResponse
@@ -113,22 +110,18 @@ function ReturnClient() {
       <Suspense fallback={<LoadingMessage />}>
         <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 />} />
-          {/* <Route
-          path=""
-          element={
-            selectedClientString ? (
-              <Navigate to={`return/${selectedClientString}`} />
-            ) : (
-              <ReturnMainTable />
-            )
-          }
-        /> */}
         </Routes>
       </Suspense>
     </>