@djb25/digit-ui-module-vendor 1.0.26 → 1.0.27

package/dist/index.modern.js

@@ -8084,6 +8084,21 @@ const SearchApplication = ({
           control: control,
           defaultValue: null
         });
+      case "dropdown":
+        return /*#__PURE__*/React.createElement(Controller, {
+          render: props => /*#__PURE__*/React.createElement(Dropdown$2, {
+            option: input.options,
+            optionKey: input.optionsKey,
+            value: props.value,
+            selected: props.value,
+            select: props.onChange,
+            t: t,
+            placeholder: input.label
+          }),
+          name: input.name,
+          control: control,
+          defaultValue: null
+        });
       default:
         return /*#__PURE__*/React.createElement(TextInput, Object.assign({}, input, {
           inputRef: register
@@ -8230,7 +8245,13 @@ const getDriverFillingPointIdentifiers = (driver = {}) => {
   return Array.from(new Set([driver === null || driver === void 0 ? void 0 : driver.fillingPointId, driver === null || driver === void 0 ? void 0 : driver.fillingStationId, driver === null || driver === void 0 ? void 0 : (_driver$additionalDet = driver.additionalDetails) === null || _driver$additionalDet === void 0 ? void 0 : _driver$additionalDet.fillingPointId, driver === null || driver === void 0 ? void 0 : (_driver$additionalDet2 = driver.additionalDetails) === null || _driver$additionalDet2 === void 0 ? void 0 : _driver$additionalDet2.fillingStationId, driver === null || driver === void 0 ? void 0 : (_driver$fillingpointm = driver.fillingpointmetadata) === null || _driver$fillingpointm === void 0 ? void 0 : _driver$fillingpointm.fillingPointId].filter(value => value !== undefined && value !== null && value !== "").map(String).concat(getFillingPointIdentifiers(driver === null || driver === void 0 ? void 0 : driver.fillingPoint), getFillingPointIdentifiers(driver === null || driver === void 0 ? void 0 : driver.fillingPointDetail), getFillingPointIdentifiers(driver === null || driver === void 0 ? void 0 : driver.fillingPointDetails))));
 };
 const getVendorDriversForFillingPoint = (vendor, fillingPoint) => {
-  const vendorDrivers = Array.isArray(vendor === null || vendor === void 0 ? void 0 : vendor.drivers) ? vendor.drivers.filter(Boolean) : [];
+  const vendorDrivers = Array.isArray(vendor === null || vendor === void 0 ? void 0 : vendor.drivers) ? vendor.drivers.filter(Boolean).map(d => {
+    var _d$owner;
+    return {
+      ...d,
+      displayName: `${d.name} (${((_d$owner = d.owner) === null || _d$owner === void 0 ? void 0 : _d$owner.mobileNumber) || "N/A"})`
+    };
+  }) : [];
   if (!fillingPoint) return [];
   const selectedFillingPointIdentifiers = getFillingPointIdentifiers(fillingPoint);
   if (!selectedFillingPointIdentifiers.length) return vendorDrivers;
@@ -8328,13 +8349,25 @@ const VendorInbox = props => {
   }, [props.selectedTab]);
   useEffect(() => {
     if (vendorData) {
-      let vendors = vendorData.map(data => data.dsoDetails);
+      let vendors = vendorData.map(data => {
+        var _data$dsoDetails$owne;
+        return {
+          ...data.dsoDetails,
+          displayName: `${data.dsoDetails.name} (${data.dsoDetails.mobileNumber || ((_data$dsoDetails$owne = data.dsoDetails.owner) === null || _data$dsoDetails$owne === void 0 ? void 0 : _data$dsoDetails$owne.mobileNumber) || "N/A"})`
+        };
+      });
       setVendors(vendors);
     }
   }, [vendorData]);
   useEffect(() => {
     if (driverData) {
-      setDrivers(driverData.driver || []);
+      setDrivers((driverData.driver || []).map(d => {
+        var _d$owner2;
+        return {
+          ...d,
+          displayName: `${d.name} (${((_d$owner2 = d.owner) === null || _d$owner2 === void 0 ? void 0 : _d$owner2.mobileNumber) || "N/A"})`
+        };
+      }));
     }
   }, [driverData]);
   const closeToast = () => {
@@ -8709,6 +8742,14 @@ const VendorInbox = props => {
               to: "/digit-ui/employee/vendor/registry/vendor-details/" + row.original["id"]
             }, /*#__PURE__*/React.createElement("div", null, row.original.name))));
           }
+        }, {
+          Header: t("WT_MOBILE_NUMBER"),
+          accessor: "mobileNumber",
+          Cell: ({
+            row
+          }) => {
+            return /*#__PURE__*/React.createElement("div", null, row.original.mobileNumber);
+          }
         }, {
           Header: t("ES_VENDOR_INBOX_DATE_VENDOR_CREATION"),
           accessor: "createdTime",
@@ -8806,14 +8847,23 @@ const VendorInbox = props => {
               to: "/digit-ui/employee/vendor/registry/vehicle-details/" + row.original["registrationNumber"]
             }, /*#__PURE__*/React.createElement("div", null, row.original.registrationNumber))));
           }
+        }, {
+          Header: t("WT_MOBILE_NUMBER"),
+          accessor: "mobileNumber",
+          Cell: ({
+            row
+          }) => {
+            var _row$original9, _row$original9$owner;
+            return /*#__PURE__*/React.createElement("div", null, ((_row$original9 = row.original) === null || _row$original9 === void 0 ? void 0 : (_row$original9$owner = _row$original9.owner) === null || _row$original9$owner === void 0 ? void 0 : _row$original9$owner.mobileNumber) || "N/A");
+          }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_DATE_VEHICLE_CREATION"),
           accessor: "createdTime",
           Cell: ({
             row
           }) => {
-            var _row$original9, _row$original9$auditD, _row$original0, _row$original0$auditD;
-            return GetCell((_row$original9 = row.original) !== null && _row$original9 !== void 0 && (_row$original9$auditD = _row$original9.auditDetails) !== null && _row$original9$auditD !== void 0 && _row$original9$auditD.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original0 = row.original) === null || _row$original0 === void 0 ? void 0 : (_row$original0$auditD = _row$original0.auditDetails) === null || _row$original0$auditD === void 0 ? void 0 : _row$original0$auditD.createdTime) : "");
+            var _row$original0, _row$original0$auditD, _row$original1, _row$original1$auditD;
+            return GetCell((_row$original0 = row.original) !== null && _row$original0 !== void 0 && (_row$original0$auditD = _row$original0.auditDetails) !== null && _row$original0$auditD !== void 0 && _row$original0$auditD.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original1 = row.original) === null || _row$original1 === void 0 ? void 0 : (_row$original1$auditD = _row$original1.auditDetails) === null || _row$original1$auditD === void 0 ? void 0 : _row$original1$auditD.createdTime) : "");
           }
         }, {
           Header: "Map Vendor",
@@ -8835,7 +8885,7 @@ const VendorInbox = props => {
                 width: "100%",
                 minWidth: "250px"
               },
-              optionKey: "name",
+              optionKey: "displayName",
               t: t
             });
           }
@@ -8914,7 +8964,7 @@ const VendorInbox = props => {
               selected: getSelectedDriverOption(row.original, availableDrivers),
               option: availableDrivers,
               select: value => onDriverSelect(row, value),
-              optionKey: "name",
+              optionKey: "displayName",
               t: t,
               style: {
                 textAlign: "left",
@@ -8931,13 +8981,13 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original1;
+            var _row$original10;
             return /*#__PURE__*/React.createElement(ToggleSwitch, {
               style: {
                 display: "flex",
                 justifyContent: "left"
               },
-              value: ((_row$original1 = row.original) === null || _row$original1 === void 0 ? void 0 : _row$original1.status) === "DISABLED" ? false : true,
+              value: ((_row$original10 = row.original) === null || _row$original10 === void 0 ? void 0 : _row$original10.status) === "DISABLED" ? false : true,
               onChange: () => onVehicleUpdate(row),
               name: `switch-${row.id}`
             });
@@ -8945,7 +8995,7 @@ const VendorInbox = props => {
         }];
       case "DRIVER":
         return [{
-          Header: t("ES_FSM_REGISTRY_INBOX_USERNAME"),
+          Header: t("Driver's Mobile No."),
           id: "userName",
           accessor: row => {
             var _row$owner;
@@ -8971,7 +9021,16 @@ const VendorInbox = props => {
               className: "link"
             }, /*#__PURE__*/React.createElement(Link, {
               to: "/digit-ui/employee/vendor/registry/driver-details/" + row.original["id"]
-            }, /*#__PURE__*/React.createElement("div", null, row.original.name))));
+            }, /*#__PURE__*/React.createElement("div", null, `${row.original.name || "N/A"}`))));
+          }
+        }, {
+          Header: t("WT_MOBILE_NUMBER"),
+          accessor: "mobileNumber",
+          Cell: ({
+            row
+          }) => {
+            var _row$original11, _row$original11$owner;
+            return /*#__PURE__*/React.createElement("div", null, ((_row$original11 = row.original) === null || _row$original11 === void 0 ? void 0 : (_row$original11$owner = _row$original11.owner) === null || _row$original11$owner === void 0 ? void 0 : _row$original11$owner.mobileNumber) || "N/A");
           }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_DATE_DRIVER_CREATION"),
@@ -8979,8 +9038,8 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original10, _row$original10$audit, _row$original11, _row$original11$audit;
-            return GetCell((_row$original10 = row.original) !== null && _row$original10 !== void 0 && (_row$original10$audit = _row$original10.auditDetails) !== null && _row$original10$audit !== void 0 && _row$original10$audit.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original11 = row.original) === null || _row$original11 === void 0 ? void 0 : (_row$original11$audit = _row$original11.auditDetails) === null || _row$original11$audit === void 0 ? void 0 : _row$original11$audit.createdTime) : "");
+            var _row$original12, _row$original12$audit, _row$original13, _row$original13$audit;
+            return GetCell((_row$original12 = row.original) !== null && _row$original12 !== void 0 && (_row$original12$audit = _row$original12.auditDetails) !== null && _row$original12$audit !== void 0 && _row$original12$audit.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original13 = row.original) === null || _row$original13 === void 0 ? void 0 : (_row$original13$audit = _row$original13.auditDetails) === null || _row$original13$audit === void 0 ? void 0 : _row$original13$audit.createdTime) : "");
           }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_VENDOR_NAME"),
@@ -9006,7 +9065,7 @@ const VendorInbox = props => {
                 width: "100%",
                 minWidth: "250px"
               },
-              optionKey: "name",
+              optionKey: "displayName",
               t: t
             });
           }
@@ -9017,13 +9076,13 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original12;
+            var _row$original14;
             return /*#__PURE__*/React.createElement(ToggleSwitch, {
               style: {
                 display: "flex",
                 justifyContent: "left"
               },
-              value: ((_row$original12 = row.original) === null || _row$original12 === void 0 ? void 0 : _row$original12.status) === "DISABLED" ? false : true,
+              value: ((_row$original14 = row.original) === null || _row$original14 === void 0 ? void 0 : _row$original14.status) === "DISABLED" ? false : true,
               onChange: () => onDriverUpdate(row),
               name: `switch-${row.id}`
             });
@@ -9039,8 +9098,8 @@ const VendorInbox = props => {
         return [{
           Header: t("ES_VENDOR_INBOX_VENDOR_NAME"),
           exportAccessor: row => {
-            var _row$dsoDetails0;
-            return (row === null || row === void 0 ? void 0 : row.name) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails0 = row.dsoDetails) === null || _row$dsoDetails0 === void 0 ? void 0 : _row$dsoDetails0.name) || "NA";
+            var _row$dsoDetails0, _row$owner2, _row$dsoDetails1, _row$dsoDetails10, _row$dsoDetails10$own;
+            return `${(row === null || row === void 0 ? void 0 : row.name) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails0 = row.dsoDetails) === null || _row$dsoDetails0 === void 0 ? void 0 : _row$dsoDetails0.name) || "NA"} (${(row === null || row === void 0 ? void 0 : row.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$owner2 = row.owner) === null || _row$owner2 === void 0 ? void 0 : _row$owner2.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails1 = row.dsoDetails) === null || _row$dsoDetails1 === void 0 ? void 0 : _row$dsoDetails1.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails10 = row.dsoDetails) === null || _row$dsoDetails10 === void 0 ? void 0 : (_row$dsoDetails10$own = _row$dsoDetails10.owner) === null || _row$dsoDetails10$own === void 0 ? void 0 : _row$dsoDetails10$own.mobileNumber) || "NA"})`;
           }
         }, {
           Header: t("ES_VENDOR_INBOX_DATE_VENDOR_CREATION"),
@@ -9054,14 +9113,14 @@ const VendorInbox = props => {
         }, {
           Header: t("ES_VENDOR_INBOX_SERVICE_TYPE"),
           exportAccessor: row => {
-            var _parseAdditionalDetai, _row$dsoDetails1;
-            return ((_parseAdditionalDetai = parseAdditionalDetails(row === null || row === void 0 ? void 0 : (_row$dsoDetails1 = row.dsoDetails) === null || _row$dsoDetails1 === void 0 ? void 0 : _row$dsoDetails1.additionalDetails)) === null || _parseAdditionalDetai === void 0 ? void 0 : _parseAdditionalDetai.serviceType) || "N/A";
+            var _parseAdditionalDetai, _row$dsoDetails11;
+            return ((_parseAdditionalDetai = parseAdditionalDetails(row === null || row === void 0 ? void 0 : (_row$dsoDetails11 = row.dsoDetails) === null || _row$dsoDetails11 === void 0 ? void 0 : _row$dsoDetails11.additionalDetails)) === null || _parseAdditionalDetai === void 0 ? void 0 : _parseAdditionalDetai.serviceType) || "N/A";
           }
         }, {
           Header: t("ES_VENDOR_REGISTRY_INBOX_ENABLED"),
           exportAccessor: row => {
-            var _row$dsoDetails10;
-            return (row === null || row === void 0 ? void 0 : (_row$dsoDetails10 = row.dsoDetails) === null || _row$dsoDetails10 === void 0 ? void 0 : _row$dsoDetails10.status) || "NA";
+            var _row$dsoDetails12;
+            return (row === null || row === void 0 ? void 0 : (_row$dsoDetails12 = row.dsoDetails) === null || _row$dsoDetails12 === void 0 ? void 0 : _row$dsoDetails12.status) || "NA";
           }
         }];
       case "VEHICLE":
@@ -9077,8 +9136,8 @@ const VendorInbox = props => {
         }, {
           Header: "Map Vendor",
           exportAccessor: row => {
-            var _row$vendor4, _row$vendorData4;
-            return (row === null || row === void 0 ? void 0 : (_row$vendor4 = row.vendor) === null || _row$vendor4 === void 0 ? void 0 : _row$vendor4.name) || (row === null || row === void 0 ? void 0 : (_row$vendorData4 = row.vendorData) === null || _row$vendorData4 === void 0 ? void 0 : _row$vendorData4.name) || "NA";
+            var _row$vendor4, _row$vendorData4, _row$vendor5, _row$vendor6, _row$vendor6$owner, _row$vendorData5, _row$vendorData6, _row$vendorData6$owne;
+            return `${(row === null || row === void 0 ? void 0 : (_row$vendor4 = row.vendor) === null || _row$vendor4 === void 0 ? void 0 : _row$vendor4.name) || (row === null || row === void 0 ? void 0 : (_row$vendorData4 = row.vendorData) === null || _row$vendorData4 === void 0 ? void 0 : _row$vendorData4.name) || "NA"} (${(row === null || row === void 0 ? void 0 : (_row$vendor5 = row.vendor) === null || _row$vendor5 === void 0 ? void 0 : _row$vendor5.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendor6 = row.vendor) === null || _row$vendor6 === void 0 ? void 0 : (_row$vendor6$owner = _row$vendor6.owner) === null || _row$vendor6$owner === void 0 ? void 0 : _row$vendor6$owner.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendorData5 = row.vendorData) === null || _row$vendorData5 === void 0 ? void 0 : _row$vendorData5.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendorData6 = row.vendorData) === null || _row$vendorData6 === void 0 ? void 0 : (_row$vendorData6$owne = _row$vendorData6.owner) === null || _row$vendorData6$owne === void 0 ? void 0 : _row$vendorData6$owne.mobileNumber) || "NA"})`;
           }
         }, {
           Header: t("ES_VENDOR_INBOX_SERVICE_TYPE"),
@@ -9092,8 +9151,8 @@ const VendorInbox = props => {
         }, {
           Header: t("ES_FSM_REGISTRY_SELECT_DRIVER"),
           exportAccessor: row => {
-            var _row$driverData3, _row$driver3;
-            return (row === null || row === void 0 ? void 0 : (_row$driverData3 = row.driverData) === null || _row$driverData3 === void 0 ? void 0 : _row$driverData3.name) || (row === null || row === void 0 ? void 0 : (_row$driver3 = row.driver) === null || _row$driver3 === void 0 ? void 0 : _row$driver3.name) || "NA";
+            var _row$driverData3, _row$driver3, _row$driverData4, _row$driverData4$owne, _row$driver4, _row$driver4$owner;
+            return `${(row === null || row === void 0 ? void 0 : (_row$driverData3 = row.driverData) === null || _row$driverData3 === void 0 ? void 0 : _row$driverData3.name) || (row === null || row === void 0 ? void 0 : (_row$driver3 = row.driver) === null || _row$driver3 === void 0 ? void 0 : _row$driver3.name) || "NA"} (${(row === null || row === void 0 ? void 0 : (_row$driverData4 = row.driverData) === null || _row$driverData4 === void 0 ? void 0 : (_row$driverData4$owne = _row$driverData4.owner) === null || _row$driverData4$owne === void 0 ? void 0 : _row$driverData4$owne.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$driver4 = row.driver) === null || _row$driver4 === void 0 ? void 0 : (_row$driver4$owner = _row$driver4.owner) === null || _row$driver4$owner === void 0 ? void 0 : _row$driver4$owner.mobileNumber) || "NA"})`;
           }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"),
@@ -9103,12 +9162,15 @@ const VendorInbox = props => {
         return [{
           Header: t("ES_FSM_REGISTRY_INBOX_USERNAME"),
           exportAccessor: row => {
-            var _row$owner2;
-            return (row === null || row === void 0 ? void 0 : (_row$owner2 = row.owner) === null || _row$owner2 === void 0 ? void 0 : _row$owner2.userName) || "NA";
+            var _row$owner3;
+            return (row === null || row === void 0 ? void 0 : (_row$owner3 = row.owner) === null || _row$owner3 === void 0 ? void 0 : _row$owner3.userName) || "NA";
           }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_DRIVER_NAME"),
-          exportAccessor: row => (row === null || row === void 0 ? void 0 : row.name) || "NA"
+          exportAccessor: row => {
+            var _row$owner4;
+            return `${(row === null || row === void 0 ? void 0 : row.name) || "NA"} (${(row === null || row === void 0 ? void 0 : (_row$owner4 = row.owner) === null || _row$owner4 === void 0 ? void 0 : _row$owner4.mobileNumber) || "NA"})`;
+          }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_DATE_DRIVER_CREATION"),
           exportAccessor: row => {
@@ -9118,8 +9180,8 @@ const VendorInbox = props => {
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_VENDOR_NAME"),
           exportAccessor: row => {
-            var _row$vendorData5, _row$vendor5;
-            return (row === null || row === void 0 ? void 0 : (_row$vendorData5 = row.vendorData) === null || _row$vendorData5 === void 0 ? void 0 : _row$vendorData5.name) || (row === null || row === void 0 ? void 0 : (_row$vendor5 = row.vendor) === null || _row$vendor5 === void 0 ? void 0 : _row$vendor5.name) || "NA";
+            var _row$vendorData7, _row$vendor7, _row$vendorData8, _row$vendorData9, _row$vendorData9$owne, _row$vendor8, _row$vendor9, _row$vendor9$owner;
+            return `${(row === null || row === void 0 ? void 0 : (_row$vendorData7 = row.vendorData) === null || _row$vendorData7 === void 0 ? void 0 : _row$vendorData7.name) || (row === null || row === void 0 ? void 0 : (_row$vendor7 = row.vendor) === null || _row$vendor7 === void 0 ? void 0 : _row$vendor7.name) || "NA"} (${(row === null || row === void 0 ? void 0 : (_row$vendorData8 = row.vendorData) === null || _row$vendorData8 === void 0 ? void 0 : _row$vendorData8.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendorData9 = row.vendorData) === null || _row$vendorData9 === void 0 ? void 0 : (_row$vendorData9$owne = _row$vendorData9.owner) === null || _row$vendorData9$owne === void 0 ? void 0 : _row$vendorData9$owne.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendor8 = row.vendor) === null || _row$vendor8 === void 0 ? void 0 : _row$vendor8.mobileNumber) || (row === null || row === void 0 ? void 0 : (_row$vendor9 = row.vendor) === null || _row$vendor9 === void 0 ? void 0 : (_row$vendor9$owner = _row$vendor9.owner) === null || _row$vendor9$owner === void 0 ? void 0 : _row$vendor9$owner.mobileNumber) || "NA"})`;
           }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"),
@@ -9255,7 +9317,7 @@ const VendorInbox = props => {
 };
 
 const SearchVendor = () => {
-  var _sortParams$, _sortParams$2;
+  var _sortParams$, _sortParams$2, _searchParams$vendor, _searchParams$filling, _searchParams$vendor2, _allFillingPoints$fil;
   const {
     t
   } = useTranslation();
@@ -9274,6 +9336,23 @@ const SearchVendor = () => {
   const [vehicleIds, setVehicleIds] = useState("");
   const [driverIds, setDriverIds] = useState("");
   const [tableData, setTableData] = useState([]);
+  const {
+    data: allVendors
+  } = Digit.Hooks.fsm.useDsoSearch(tenantId, {
+    status: "ACTIVE"
+  }, {
+    staleTime: Infinity
+  });
+  const {
+    data: allFillingPoints
+  } = Digit.Hooks.wt.useFillPointSearch({
+    tenantId,
+    filters: {
+      limit: 1000
+    }
+  }, {
+    staleTime: Infinity
+  });
   let paginationParms = {
     limit: pageSize,
     offset: pageOffset,
@@ -9291,7 +9370,9 @@ const SearchVendor = () => {
     filters: {
       ...paginationParms,
       registrationNumber: searchParams === null || searchParams === void 0 ? void 0 : searchParams.registrationNumber,
-      status: "ACTIVE,DISABLED"
+      status: "ACTIVE,DISABLED",
+      vendorId: searchParams === null || searchParams === void 0 ? void 0 : (_searchParams$vendor = searchParams.vendor) === null || _searchParams$vendor === void 0 ? void 0 : _searchParams$vendor.id,
+      fillingPointId: searchParams === null || searchParams === void 0 ? void 0 : (_searchParams$filling = searchParams.fillingPoint) === null || _searchParams$filling === void 0 ? void 0 : _searchParams$filling.id
     },
     config: {
       enabled: false
@@ -9301,7 +9382,8 @@ const SearchVendor = () => {
     filters: {
       ...paginationParms,
       name: searchParams === null || searchParams === void 0 ? void 0 : searchParams.name,
-      status: "ACTIVE,DISABLED"
+      status: "ACTIVE,DISABLED",
+      vendorId: searchParams === null || searchParams === void 0 ? void 0 : (_searchParams$vendor2 = searchParams.vendor) === null || _searchParams$vendor2 === void 0 ? void 0 : _searchParams$vendor2.id
     },
     config: {
       enabled: false
@@ -9446,11 +9528,44 @@ const SearchVendor = () => {
   };
   const handleFilterChange = () => {};
   const searchFields = tab === "VEHICLE" ? [{
+    label: t("ES_VENDOR_SEARCH_VENDOR_NAME"),
+    name: "vendor",
+    type: "dropdown",
+    options: allVendors === null || allVendors === void 0 ? void 0 : allVendors.map(data => {
+      var _data$dsoDetails$owne;
+      return {
+        ...data.dsoDetails,
+        displayName: `${data.dsoDetails.name} (${data.dsoDetails.mobileNumber || ((_data$dsoDetails$owne = data.dsoDetails.owner) === null || _data$dsoDetails$owne === void 0 ? void 0 : _data$dsoDetails$owne.mobileNumber) || "N/A"})`
+      };
+    }),
+    optionsKey: "displayName"
+  }, {
+    label: t("ES_FSM_REGISTRY_SEARCH_FILLING_POINT"),
+    name: "fillingPoint",
+    type: "dropdown",
+    options: allFillingPoints === null || allFillingPoints === void 0 ? void 0 : (_allFillingPoints$fil = allFillingPoints.fillingPoints) === null || _allFillingPoints$fil === void 0 ? void 0 : _allFillingPoints$fil.map(fp => ({
+      ...fp,
+      name: (fp === null || fp === void 0 ? void 0 : fp.name) || (fp === null || fp === void 0 ? void 0 : fp.fillingPointName) || (fp === null || fp === void 0 ? void 0 : fp.fillingStationId)
+    })),
+    optionsKey: "name"
+  }, {
     label: t("ES_VEHICLE_SEARCH_VEHICLE_NUMBER"),
     name: "registrationNumber",
     pattern: "[A-Z]{2}[- ]?[0-9]{2}[- ]?[A-Z]{1,2}[- ]?[0-9]{4}",
     title: t("ES_FSM_VEHICLE_FORMAT_TIP")
   }] : tab === "DRIVER" ? [{
+    label: t("ES_VENDOR_SEARCH_VENDOR_NAME"),
+    name: "vendor",
+    type: "dropdown",
+    options: allVendors === null || allVendors === void 0 ? void 0 : allVendors.map(data => {
+      var _data$dsoDetails$owne2;
+      return {
+        ...data.dsoDetails,
+        displayName: `${data.dsoDetails.name} (${data.dsoDetails.mobileNumber || ((_data$dsoDetails$owne2 = data.dsoDetails.owner) === null || _data$dsoDetails$owne2 === void 0 ? void 0 : _data$dsoDetails$owne2.mobileNumber) || "N/A"})`
+      };
+    }),
+    optionsKey: "displayName"
+  }, {
     label: t("ES_DRIVER_SEARCH_DRIVER_NAME"),
     name: "name"
   }] : [{
@@ -11910,7 +12025,6 @@ const VehicleDetails = props => {
       }, t(value.title)), /*#__PURE__*/React.createElement("div", {
         className: "additional-value",
         style: {
-          color: "#a82227",
           display: "flex",
           alignItems: "center",
           gap: "8px"
@@ -11927,13 +12041,15 @@ const VehicleDetails = props => {
       }, /*#__PURE__*/React.createElement(AddIcon, {
         className: "",
         fill: "#a82227"
-      }), " ", t(value.value) || "N/A"), value.value !== "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement("div", {
+      }), " ", t(value.value) || "N/A"), value.value !== "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, value.value), /*#__PURE__*/React.createElement("div", {
         className: "add-details-link hover-button",
         onClick: () => onActionSelect("EDIT_VENDOR"),
         style: {
           cursor: "pointer"
         }
-      }, /*#__PURE__*/React.createElement(EditIcon, null)), value.value !== "ES_FSM_REGISTRY_DETAILS_ADD_VENDOR" && /*#__PURE__*/React.createElement("div", {
+      }, /*#__PURE__*/React.createElement(EditIcon, {
+        fill: "#a82227"
+      })), /*#__PURE__*/React.createElement("div", {
         className: "add-details-link hover-button",
         onClick: () => onActionSelect("DELETE_VENDOR"),
         style: {
@@ -11942,7 +12058,7 @@ const VehicleDetails = props => {
       }, /*#__PURE__*/React.createElement(DeleteIcon, {
         className: "delete",
         fill: "#a82227"
-      })))) : /*#__PURE__*/React.createElement(React.Fragment, {
+      }))))) : /*#__PURE__*/React.createElement(React.Fragment, {
         key: index
       }, /*#__PURE__*/React.createElement("div", {
         className: "additional-label"