@bjsdistribution/dms-client-return 0.0.95-prod → 0.0.96-prod

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.95-prod",
+  "version": "0.0.96-prod",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -59,7 +59,7 @@
     "testEnvironment": "jest-environment-jsdom-sixteen"
   },
   "devDependencies": {
-    "@bjsdistribution/dms-component-library": "0.3.14-prod",
+    "@bjsdistribution/dms-component-library": "0.3.19-dev",
     "@size-limit/preset-small-lib": "^11.0.1",
     "@tippyjs/react": "^4.2.6",
     "@types/react": "^18.2.47",

package/src/components/order-daily-overview/common/interface.ts

@@ -34,3 +34,14 @@ export interface ApiResponse {
   error_traceback: string | null;
   data: any[];
 }
+
+export interface ClientType {
+  id: number;
+  name: string;
+  client_id: number;
+  parent_client_id: number;
+  domain: string;
+  url: string;
+  master_key: string;
+  phoneline: string;
+}

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

@@ -11,7 +11,6 @@ import {
   StyledTableWrapper,
   CustomDrop,
 } from '../../return-order-table/return-orders-filters/returnstyles';
-import LoadIcon from '../../../../assets/icons/LoadIcon';
 import { useLoading, usePrintOptionTOggle } from '../../store/store';
 import { NavLink } from 'react-router-dom';
 import { displayValueOrNA, formatDate } from '../../shared/utlis';
@@ -380,9 +379,6 @@ const OrderTable = () => {
                             )}
                           </li>
                         </CustomDrop>
-                        <li className="downloadcontainer">
-                          <LoadIcon />
-                        </li>
                       </ul>
                     </td>
                   </tr>

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

@@ -26,6 +26,7 @@ import {
   useLiveRecalling,
   useGlobalStateHitOrder,
   useAtom,
+  usegetClientData,
 } from './store';
 import { OrdersType } from './types';
 import { useLocation } from 'react-router-dom';
@@ -35,6 +36,7 @@ import { useSubContracterData } from '../store';
 import Notification from './notification';
 import Order from './order-resources/expanded-content';
 import { setResourcesCall, useAllOrderStatus } from './order-actions/store';
+import { ClientType } from '../order-daily-overview/common/interface';
 
 interface ApiResponse {
   message: string;
@@ -69,6 +71,8 @@ function OrderView() {
   const [recallOrders] = useGlobalStateHitOrder();
   const [, setStatusVal] = useAllOrderStatus();
   const order_id = orderDetails?.id;
+  const [getResources] = useAtom(setResourcesCall);
+  const [, setClientData] = usegetClientData();
 
   useEffect(() => {
     setStatusVal(orderDetails?.status_value);
@@ -222,7 +226,29 @@ function OrderView() {
     }
   }, [statusDataLoading, fetchedStatusData]);
 
-  const [getResources] = useAtom(setResourcesCall);
+  const {
+    fetchData: callCLientApi,
+    loading: clientLoading,
+    data: clientData,
+  } = useAxios<{
+    data: ClientType[];
+  }>({
+    endpoint: `/v1/client/list`,
+    method: 'GET',
+  });
+
+  useEffect(() => {
+    if (orderId) {
+      callCLientApi();
+    }
+  }, [orderId]);
+
+  useEffect(() => {
+    if (clientData && clientData?.data) {
+      const res = clientData?.data;
+      setClientData(res);
+    }
+  }, [clientLoading]);
 
   useEffect(() => {
     setLoading(depotDataLoading);

package/src/components/order-view/notes/order-dropdown/NewReturnDropdown.tsx

@@ -97,7 +97,10 @@ const NewReturnDropdown = () => {
         showSearch
         dropdownStyle={{ width: 'max-content' }}
         popupClassName={defaultPopupClassName}
-        status={selectedOrderId ? '' : 'error'}
+        status={
+          dropdownOptions.length === 0 ? '' : selectedOrderId ? '' : 'error'
+        }
+        notFoundContent="No orders found with a similar postcode"
       />
     </Container>
   );

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

@@ -1,23 +1,51 @@
 import { Label, SelectDropdown } from '@bjsdistribution/dms-component-library';
 import React from 'react';
 import styled from 'styled-components';
-import { useOrderDetails, useStatusDetails } from '../../../store';
-import { useSubContracterData } from '../../../../store';
+import {
+  usegetClientData,
+  useOrderDetails,
+  useStatusDetails,
+} from '../../../store';
+import { useClientPortal, useSubContracterData } from '../../../../store';
 
 function Carrier() {
   const [orderDetails, setOrderDetails] = useOrderDetails();
   const [subContracterData] = useSubContracterData();
   const [orderStatus] = useStatusDetails();
+  const [isClientPortal] = useClientPortal();
+  const [clientData] = usegetClientData();
 
-  const carrierOptions = subContracterData?.map((carrier: any) => ({
-    label: carrier.name,
-    value: carrier.id,
-  }));
+  const localClientData = JSON.parse(
+    localStorage?.getItem('Client_iD') || '{}'
+  );
+  const clientId = Number(localClientData?.client_id);
+
+  // Build options from subContracterData
+  const carrierOptions =
+    subContracterData?.map((carrier: any) => ({
+      label: carrier?.name,
+      value: carrier?.id,
+    })) || [];
+
+  // find the value which is selected
+  const selectedCarrierOption = carrierOptions?.find(
+    (option: any) => option?.value === orderDetails?.carrier_id
+  );
+
+  // get client name when no carrierid found
+  const fallbackClientName = clientData?.find(
+    (client: any) => Number(client?.client_id) === clientId
+  )?.name;
+
+  // fall if no carrierid
+  const fallbackOption = fallbackClientName
+    ? { label: fallbackClientName, value: '' }
+    : null;
 
   const onChange = (selectedOption: any) => {
     setOrderDetails(prev => ({
       ...prev,
-      carrier_id: selectedOption.value,
+      carrier_id: selectedOption?.value,
     }));
   };
 
@@ -28,15 +56,13 @@ function Carrier() {
         placeholder="Select Carrier"
         inputId="CarrierDropdown"
         openMenuOnFocus={false}
-        value={
-          carrierOptions.find(
-            (option: any) => option.value === orderDetails?.carrier_id
-          ) || null
-        }
+        value={selectedCarrierOption || fallbackOption || null}
         options={carrierOptions}
         onChange={onChange}
         isDisabled={
-          orderStatus?.length > 0 && orderStatus[0]?.confirmed === true
+          isClientPortal
+            ? true
+            : orderStatus?.length > 0 && orderStatus[0]?.confirmed === true
         }
       />
     </FormContainer>

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

@@ -8,7 +8,10 @@ import {
   UnRecieveOrderProduct,
   UpdateOrderProduct,
 } from './types';
-import { ClientData } from '../order-daily-overview/common/interface';
+import {
+  ClientData,
+  ClientType,
+} from '../order-daily-overview/common/interface';
 // OrderActionsType
 const activeTabAtom = atom<string>('active');
 const infoAtom = atom<boolean | undefined>(false);
@@ -403,11 +406,18 @@ const returnAfterOrderAtom = atom<any[]>([]);
 export function useReturnAfterOrderData() {
   return useAtom(returnAfterOrderAtom);
 }
+
 const clientDataAtom = atom<ClientData[]>([]);
 function useClientData() {
   return useAtom(clientDataAtom);
 }
 
+const clientData = atom<ClientType[]>([]);
+
+export function usegetClientData() {
+  return useAtom(clientData);
+}
+
 export {
   useAtom,
   useOrderDetails,