@djb25/digit-ui-module-vendor 1.0.19 → 1.0.21

package/dist/index.modern.js

@@ -1,6 +1,6 @@
 import React, { useEffect, useMemo, useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useParams, useLocation, Switch, Link, useHistory, useRouteMatch, Route, Redirect } from 'react-router-dom';
+import { useParams, useLocation, Switch, useHistory, Link, useRouteMatch, Route, Redirect } from 'react-router-dom';
 import { Header, SearchForm, SearchField, Dropdown as Dropdown$2, MobileNumber, CardLabelError, DatePicker as DatePicker$3, SubmitBar, Card, Table, Loader, Toast, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, LayoutWrapper, HomeIcon, PropertyHouse, EmployeeModuleCard, VerticalTimeline, FormComposer, FormStep, LabelFieldPair, CardLabel, Tooltip, TextInput, UploadFile, CardSubHeader, CardText, RadioOrSelect, ShippingTruck, CheckBox, RadioButtons, CloseSvg, Localities, RemoveableTag, ActionBar, ApplyFilterBar, AddIcon, Menu, LinkLabel, ToggleSwitch, CardSectionHeader, Row, EditIcon, DeleteIcon, Modal, InfoIcon, CardHeader, StatusTable, LinkButton, Banner } from '@djb25/digit-ui-react-components';
 import { useForm, Controller } from 'react-hook-form';
 import { useQueryClient } from 'react-query';
@@ -606,7 +606,7 @@ const VendorConfig = (t, disabled = false) => {
   }, {
     head: "ES_FSM_REGISTRY_NEW_ADDRESS_DETAILS",
     body: [{
-      label: "ES_FSM_REGISTRY_NEW_DOOR",
+      label: "HOUSE_NO",
       isMandatory: false,
       type: "text",
       key: "doorNo",
@@ -696,10 +696,10 @@ const AddVendor = ({
   const {
     t
   } = useTranslation();
+  const history = useHistory();
   const [currentStep, setCurrentStep] = useState(1);
   const [showToast, setShowToast] = useState(null);
   const [canSubmit, setCanSubmit] = useState(false);
-  const [step1Data, setStep1Data] = useState({});
   const [mutationHappened, setMutationHappened, clear] = Digit.Hooks.useSessionStorage("FSM_MUTATION_HAPPENED", false);
   const [errorInfo, setErrorInfo, clearError] = Digit.Hooks.useSessionStorage("FSM_ERROR_DATA", false);
   const [successData, setsuccessData, clearSuccessData] = Digit.Hooks.useSessionStorage("FSM_MUTATION_SUCCESS_DATA", false);
@@ -728,30 +728,51 @@ const AddVendor = ({
       amount: null
     }
   };
-  const vendorStepConfig = Config.filter(config => config.head === "ES_VRNDOR_NEW_VENDOR_DETAILS");
-  const addressStepConfig = Config.filter(config => config.head === "ES_FSM_REGISTRY_NEW_ADDRESS_DETAILS");
   const onFormValueChange = (setValue, formData) => {
-    var _formData$serviceType;
-    if (formData !== null && formData !== void 0 && formData.vendorName && formData !== null && formData !== void 0 && formData.phone && formData !== null && formData !== void 0 && (_formData$serviceType = formData.serviceType) !== null && _formData$serviceType !== void 0 && _formData$serviceType.code) {
+    var _formData$serviceType, _formData$address, _formData$address2;
+    const isVendorDetailsFilled = (formData === null || formData === void 0 ? void 0 : formData.vendorName) && (formData === null || formData === void 0 ? void 0 : formData.phone) && (formData === null || formData === void 0 ? void 0 : (_formData$serviceType = formData.serviceType) === null || _formData$serviceType === void 0 ? void 0 : _formData$serviceType.code);
+    const isAddressFilled = (formData === null || formData === void 0 ? void 0 : (_formData$address = formData.address) === null || _formData$address === void 0 ? void 0 : _formData$address.city) && (formData === null || formData === void 0 ? void 0 : (_formData$address2 = formData.address) === null || _formData$address2 === void 0 ? void 0 : _formData$address2.locality);
+    if (isVendorDetailsFilled && isAddressFilled) {
       setCanSubmit(true);
     } else {
       setCanSubmit(false);
     }
+    if (isVendorDetailsFilled) {
+      if (currentStep === 1) {
+        setCurrentStep(2);
+        setTimeout(() => {
+          const headers = Array.from(document.querySelectorAll(".collapsible-card-title"));
+          const addressHeader = headers.find(h => h.textContent.includes(t("ES_FSM_REGISTRY_NEW_ADDRESS_DETAILS")));
+          if (addressHeader) {
+            addressHeader.scrollIntoView({
+              behavior: "smooth",
+              block: "start"
+            });
+          }
+        }, 100);
+      }
+    } else {
+      if (currentStep === 2) {
+        setCurrentStep(1);
+        setTimeout(() => {
+          const headers = Array.from(document.querySelectorAll(".collapsible-card-title"));
+          const vendorHeader = headers.find(h => h.textContent.includes(t("ES_VRNDOR_NEW_VENDOR_DETAILS")));
+          if (vendorHeader) {
+            vendorHeader.scrollIntoView({
+              behavior: "smooth",
+              block: "start"
+            });
+          }
+        }, 100);
+      }
+    }
   };
   const closeToast = () => {
     setShowToast(null);
   };
   const onSubmit = data => {
     var _mergedData$street, _mergedData$doorNo, _mergedData$plotNo, _mergedData$landmark, _mergedData$address, _mergedData$address$c, _mergedData$address2, _mergedData$address2$, _mergedData$address3, _mergedData$address3$, _mergedData$address4, _mergedData$address4$, _mergedData$buildingN, _mergedData$address5, _mergedData$address5$, _mergedData$address6, _mergedData$address6$, _mergedData$address7, _mergedData$address7$, _mergedData$serviceTy, _mergedData$address8, _mergedData$address9;
-    if (currentStep === 1) {
-      setStep1Data(data);
-      setCurrentStep(2);
-      return;
-    }
-    const mergedData = {
-      ...step1Data,
-      ...data
-    };
+    const mergedData = data;
     const name = mergedData === null || mergedData === void 0 ? void 0 : mergedData.vendorName;
     const pincode = mergedData === null || mergedData === void 0 ? void 0 : mergedData.pincode;
     const street = mergedData === null || mergedData === void 0 ? void 0 : (_mergedData$street = mergedData.street) === null || _mergedData$street === void 0 ? void 0 : _mergedData$street.trim();
@@ -832,7 +853,10 @@ const AddVendor = ({
           key: "success",
           action: "ADD_VENDOR"
         });
-        setTimeout(closeToast, 5000);
+        setTimeout(() => {
+          closeToast();
+          history.push("/digit-ui/employee/vendor/search-vendor");
+        }, 2000);
       }
     });
   };
@@ -857,34 +881,20 @@ const AddVendor = ({
       flex: "1",
       overflowY: "auto"
     }
-  }, currentStep === 1 && /*#__PURE__*/React.createElement(FormComposer, {
-    key: "step1",
-    isDisabled: !canSubmit,
-    label: t("CS_COMMON_NEXT"),
-    config: vendorStepConfig.filter(i => !i.hideInEmployee).map(config => ({
-      ...config,
-      body: config.body.filter(a => !a.hideInEmployee)
-    })),
-    onSubmit: onSubmit,
-    defaultValues: {
-      ...defaultValues,
-      ...step1Data
-    },
-    onFormValueChange: onFormValueChange,
-    noBreakLine: true
-  }), currentStep === 2 && /*#__PURE__*/React.createElement(FormComposer, {
-    key: "step2",
+  }, /*#__PURE__*/React.createElement(FormComposer, {
     label: t("ES_COMMON_APPLICATION_SUBMIT"),
-    config: addressStepConfig.filter(i => !i.hideInEmployee).map(config => ({
+    config: Config.filter(i => !i.hideInEmployee).map(config => ({
       ...config,
+      isCollapsible: true,
+      isDefaultOpen: true,
       body: config.body.filter(a => !a.hideInEmployee)
     })),
     onSubmit: onSubmit,
-    defaultValues: {
-      ...defaultValues
-    },
-    onFormValueChange: (setValue, formData) => {},
-    noBreakLine: true
+    defaultValues: defaultValues,
+    onFormValueChange: onFormValueChange,
+    noBreakLine: true,
+    noCard: true,
+    isDisabled: !canSubmit
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key === "error",
     label: t(showToast.key === "success" ? `ES_FSM_REGISTRY_${showToast.action}_SUCCESS` : showToast.action),
@@ -8134,7 +8144,7 @@ const SearchApplication = ({
     }
   }, searchFields === null || searchFields === void 0 ? void 0 : searchFields.map((input, index) => /*#__PURE__*/React.createElement("span", {
     key: index,
-    className: index === 0 ? "finance-mainlayout-col2 complaint-input" : "finance-mainlayout-col2 mobile-input"
+    className: index === 0 ? "finance-mainlayout-col1 complaint-input" : "finance-mainlayout-col1 mobile-input"
   }, getFields(input))), /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
@@ -8163,6 +8173,36 @@ const parseAdditionalDetails = additionalDetails => {
     return {};
   }
 };
+const getFillingPointIdentifiers = fillingPoint => {
+  var _fillingPoint$filling;
+  if (!fillingPoint) return [];
+  if (typeof fillingPoint === "string" || typeof fillingPoint === "number") return [String(fillingPoint)];
+  return [fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.id, fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.fillingStationId, fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.bookingId, fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.fillingPointId, fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.uuid, fillingPoint === null || fillingPoint === void 0 ? void 0 : (_fillingPoint$filling = fillingPoint.fillingpointmetadata) === null || _fillingPoint$filling === void 0 ? void 0 : _fillingPoint$filling.fillingPointId].filter(value => value !== undefined && value !== null && value !== "").map(String);
+};
+const getRowFillingPointIdentifiers = (row = {}) => {
+  var _row$dsoDetails, _row$fillingpointmeta, _row$dsoDetails2;
+  return Array.from(new Set([...[row === null || row === void 0 ? void 0 : row.fillingPointId, row === null || row === void 0 ? void 0 : (_row$dsoDetails = row.dsoDetails) === null || _row$dsoDetails === void 0 ? void 0 : _row$dsoDetails.fillingPointId, row === null || row === void 0 ? void 0 : (_row$fillingpointmeta = row.fillingpointmetadata) === null || _row$fillingpointmeta === void 0 ? void 0 : _row$fillingpointmeta.fillingPointId, row === null || row === void 0 ? void 0 : row.fillingPtName, row === null || row === void 0 ? void 0 : row.filling_pt_name].filter(value => value !== undefined && value !== null && value !== "").map(String), ...getFillingPointIdentifiers(row === null || row === void 0 ? void 0 : row.fillingPoint), ...getFillingPointIdentifiers(row === null || row === void 0 ? void 0 : (_row$dsoDetails2 = row.dsoDetails) === null || _row$dsoDetails2 === void 0 ? void 0 : _row$dsoDetails2.fillingPoint), ...getFillingPointIdentifiers(row === null || row === void 0 ? void 0 : row.fillingPointDetail)]));
+};
+const getSelectedFillingPointOption = (row, fillingPoints = []) => {
+  const rowFillingPointIdentifiers = getRowFillingPointIdentifiers(row);
+  if (!rowFillingPointIdentifiers.length) return null;
+  return fillingPoints.find(fillingPoint => getFillingPointIdentifiers(fillingPoint).some(identifier => rowFillingPointIdentifiers.includes(identifier))) || null;
+};
+const getFillingPointDisplayValue = (row = {}) => {
+  var _row$fillingPoint, _row$dsoDetails3, _row$dsoDetails3$fill, _row$dsoDetails4, _row$dsoDetails5, _row$dsoDetails6, _row$dsoDetails7, _row$fillingpointmeta2;
+  return (row === null || row === void 0 ? void 0 : (_row$fillingPoint = row.fillingPoint) === null || _row$fillingPoint === void 0 ? void 0 : _row$fillingPoint.fillingPointName) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails3 = row.dsoDetails) === null || _row$dsoDetails3 === void 0 ? void 0 : (_row$dsoDetails3$fill = _row$dsoDetails3.fillingPoint) === null || _row$dsoDetails3$fill === void 0 ? void 0 : _row$dsoDetails3$fill.fillingPointName) || (row === null || row === void 0 ? void 0 : row.fillingPointName) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails4 = row.dsoDetails) === null || _row$dsoDetails4 === void 0 ? void 0 : _row$dsoDetails4.fillingPointName) || (row === null || row === void 0 ? void 0 : row.fillingPointId) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails5 = row.dsoDetails) === null || _row$dsoDetails5 === void 0 ? void 0 : _row$dsoDetails5.fillingPointId) || (typeof (row === null || row === void 0 ? void 0 : row.fillingPoint) === "string" ? row === null || row === void 0 ? void 0 : row.fillingPoint : null) || (typeof (row === null || row === void 0 ? void 0 : (_row$dsoDetails6 = row.dsoDetails) === null || _row$dsoDetails6 === void 0 ? void 0 : _row$dsoDetails6.fillingPoint) === "string" ? row === null || row === void 0 ? void 0 : (_row$dsoDetails7 = row.dsoDetails) === null || _row$dsoDetails7 === void 0 ? void 0 : _row$dsoDetails7.fillingPoint : null) || (row === null || row === void 0 ? void 0 : (_row$fillingpointmeta2 = row.fillingpointmetadata) === null || _row$fillingpointmeta2 === void 0 ? void 0 : _row$fillingpointmeta2.fillingPointId) || (row === null || row === void 0 ? void 0 : row.filling_pt_name) || (row === null || row === void 0 ? void 0 : row.fillingPtName) || "NA";
+};
+const normalizeFillingPointForVehicleUpdate = fillingPoint => {
+  if (!fillingPoint || typeof fillingPoint !== "object") return fillingPoint;
+  const {
+    id,
+    ...rest
+  } = fillingPoint;
+  return {
+    ...rest,
+    fillingStationId: (fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.fillingStationId) || id || (fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.bookingId) || (fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.uuid) || (fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.fillingPointId)
+  };
+};
 const VendorInbox = props => {
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const {
@@ -8179,7 +8219,6 @@ const VendorInbox = props => {
   const [vendors, setVendors] = useState([]);
   const [drivers, setDrivers] = useState([]);
   const queryClient = useQueryClient();
-  const [toast, setToast] = useState(null);
   const {
     data: vendorData,
     isLoading: isVendorLoading,
@@ -8249,6 +8288,20 @@ const VendorInbox = props => {
   const closeToast = () => {
     setShowToast(null);
   };
+  const getVehicleUpdatePayload = (vehicle, overrides = {}) => {
+    const normalizedVehicle = {
+      ...vehicle,
+      ...overrides,
+      driverData: (overrides === null || overrides === void 0 ? void 0 : overrides.driverData) || (vehicle === null || vehicle === void 0 ? void 0 : vehicle.driverData) || (vehicle === null || vehicle === void 0 ? void 0 : vehicle.driver),
+      fillingPoint: normalizeFillingPointForVehicleUpdate(Object.prototype.hasOwnProperty.call(overrides, "fillingPoint") ? overrides.fillingPoint : vehicle === null || vehicle === void 0 ? void 0 : vehicle.fillingPoint)
+    };
+    delete normalizedVehicle.vendor;
+    delete normalizedVehicle.popup;
+    delete normalizedVehicle.driver;
+    return {
+      vehicle: normalizedVehicle
+    };
+  };
   const onVendorUpdate = row => {
     var _formDetails$owner, _formDetails$owner2, _formDetails$owner3, _formDetails$owner4;
     let formDetails = row.original.dsoDetails;
@@ -8285,14 +8338,10 @@ const VendorInbox = props => {
     });
   };
   const onVehicleUpdate = row => {
-    let formDetails = row.original;
-    delete formDetails.vendor;
-    const formData = {
-      vehicle: {
-        ...formDetails,
-        status: (formDetails === null || formDetails === void 0 ? void 0 : formDetails.status) === "ACTIVE" ? "DISABLED" : "ACTIVE"
-      }
-    };
+    var _row$original;
+    const formData = getVehicleUpdatePayload(row.original, {
+      status: ((_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.status) === "ACTIVE" ? "DISABLED" : "ACTIVE"
+    });
     mutateVehicle(formData, {
       onError: (error, variables) => {
         setShowToast({
@@ -8386,14 +8435,9 @@ const VendorInbox = props => {
     });
   };
   const onDriverSelect = (row, selectedOption) => {
-    let vehicleData = row.original;
-    let selectedDriver = selectedOption;
-    const formData = {
-      vehicle: {
-        ...vehicleData,
-        driverData: selectedDriver
-      }
-    };
+    const formData = getVehicleUpdatePayload(row.original, {
+      driverData: selectedOption
+    });
     mutateVehicle(formData, {
       onError: (error, variables) => {
         setShowToast({
@@ -8415,6 +8459,42 @@ const VendorInbox = props => {
       }
     });
   };
+  const onVehicleFillingPointSelect = (row, selectedOption) => {
+    const formData = getVehicleUpdatePayload(row.original, {
+      fillingPoint: selectedOption
+    });
+    mutateVehicle(formData, {
+      onError: error => {
+        var _error$response, _error$response$data, _error$response$data$, _error$response$data$2;
+        setShowToast({
+          key: "error",
+          label: (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : (_error$response$data$ = _error$response$data.Errors) === null || _error$response$data$ === void 0 ? void 0 : (_error$response$data$2 = _error$response$data$[0]) === null || _error$response$data$2 === void 0 ? void 0 : _error$response$data$2.message) || "Failed to map filling point"
+        });
+        setTimeout(closeToast, 5000);
+      },
+      onSuccess: () => {
+        setTableData(currentTableData => currentTableData.map(vehicle => {
+          var _row$original2;
+          return (vehicle === null || vehicle === void 0 ? void 0 : vehicle.id) === ((_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : _row$original2.id) ? {
+            ...vehicle,
+            fillingPoint: {
+              ...selectedOption,
+              fillingStationId: (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.fillingStationId) || (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.id) || (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.bookingId) || (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.uuid) || (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.fillingPointId)
+            }
+          } : vehicle;
+        }));
+        setShowToast({
+          key: "success",
+          label: "Filling point mapped successfully"
+        });
+        queryClient.invalidateQueries("FSM_VEICLES_SEARCH");
+        queryClient.invalidateQueries("DSO_SEARCH");
+        props.refetchData();
+        props.refetchVendor && props.refetchVendor();
+        setTimeout(closeToast, 3000);
+      }
+    });
+  };
   const onSelectAdd = () => {
     switch (props.selectedTab) {
       case "VENDOR":
@@ -8470,8 +8550,9 @@ const VendorInbox = props => {
     };
     mapFixedFilling(payload, {
       onSuccess: () => {
-        setToast({
-          label: t("WT_FIXED_FILLING_MAPPING_SUCCESS")
+        setShowToast({
+          key: "success",
+          label: "WT_FIXED_FILLING_MAPPING_SUCCESS"
         });
         props.refetchData();
         props.refetchVendor && props.refetchVendor();
@@ -8479,9 +8560,9 @@ const VendorInbox = props => {
       },
       onError: err => {
         var _err$response, _err$response$data, _err$response$data$Er, _err$response$data$Er2;
-        setToast({
-          label: (err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : (_err$response$data$Er = _err$response$data.Errors) === null || _err$response$data$Er === void 0 ? void 0 : (_err$response$data$Er2 = _err$response$data$Er[0]) === null || _err$response$data$Er2 === void 0 ? void 0 : _err$response$data$Er2.message) || t("WT_FIXED_FILLING_MAPPING_FAIL"),
-          error: true
+        setShowToast({
+          key: "error",
+          label: (err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : (_err$response$data$Er = _err$response$data.Errors) === null || _err$response$data$Er === void 0 ? void 0 : (_err$response$data$Er2 = _err$response$data$Er[0]) === null || _err$response$data$Er2 === void 0 ? void 0 : _err$response$data$Er2.message) || "WT_FIXED_FILLING_MAPPING_FAIL"
         });
         setTimeout(closeToast, 5000);
       }
@@ -8508,27 +8589,19 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original, _row$original$auditDe, _row$original2, _row$original2$auditD;
-            return GetCell((_row$original = row.original) !== null && _row$original !== void 0 && (_row$original$auditDe = _row$original.auditDetails) !== null && _row$original$auditDe !== void 0 && _row$original$auditDe.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original2 = row.original) === null || _row$original2 === void 0 ? void 0 : (_row$original2$auditD = _row$original2.auditDetails) === null || _row$original2$auditD === void 0 ? void 0 : _row$original2$auditD.createdTime) : "");
+            var _row$original3, _row$original3$auditD, _row$original4, _row$original4$auditD;
+            return GetCell((_row$original3 = row.original) !== null && _row$original3 !== void 0 && (_row$original3$auditD = _row$original3.auditDetails) !== null && _row$original3$auditD !== void 0 && _row$original3$auditD.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : (_row$original4$auditD = _row$original4.auditDetails) === null || _row$original4$auditD === void 0 ? void 0 : _row$original4$auditD.createdTime) : "");
           }
         }, {
           Header: t("WT_FILLING_POINT"),
-          accessor: row => {
-            var _row$dsoDetails, _row$dsoDetails2, _row$dsoDetails$filli, _row$dsoDetails3, _row$fillingpointmeta;
-            return (row === null || row === void 0 ? void 0 : row.fillingPointId) || ((_row$dsoDetails = row.dsoDetails) === null || _row$dsoDetails === void 0 ? void 0 : _row$dsoDetails.fillingPointId) || ((_row$dsoDetails2 = row.dsoDetails) !== null && _row$dsoDetails2 !== void 0 && _row$dsoDetails2.fillingPoint && typeof row.dsoDetails.fillingPoint === "object" ? (_row$dsoDetails$filli = row.dsoDetails.fillingPoint) === null || _row$dsoDetails$filli === void 0 ? void 0 : _row$dsoDetails$filli.fillingPointName : (_row$dsoDetails3 = row.dsoDetails) === null || _row$dsoDetails3 === void 0 ? void 0 : _row$dsoDetails3.fillingPoint) || (row === null || row === void 0 ? void 0 : (_row$fillingpointmeta = row.fillingpointmetadata) === null || _row$fillingpointmeta === void 0 ? void 0 : _row$fillingpointmeta.fillingPointId) || (row === null || row === void 0 ? void 0 : row.filling_pt_name) || (row === null || row === void 0 ? void 0 : row.fillingPoint) || "NA";
-          },
+          accessor: row => getFillingPointDisplayValue(row),
           id: "fillingPoint",
           Cell: ({
             row
           }) => {
             return /*#__PURE__*/React.createElement(Dropdown$2, {
               className: "fsm-registry-dropdown",
-              selected: allFillingPoints === null || allFillingPoints === void 0 ? void 0 : allFillingPoints.find(fp => {
-                var _fp$fillingpointmetad, _row$original$dsoDeta, _row$original$dsoDeta2, _row$original$dsoDeta3, _row$original$filling, _row$original$filling2, _row$original$filling3, _row$original$filling4;
-                const fpId = String(fp.id || fp.bookingId || fp.fillingPointId || fp.uuid || ((_fp$fillingpointmetad = fp.fillingpointmetadata) === null || _fp$fillingpointmetad === void 0 ? void 0 : _fp$fillingpointmetad.fillingPointId));
-                const rowFpId = String(row.original.fillingPointId || ((_row$original$dsoDeta = row.original.dsoDetails) === null || _row$original$dsoDeta === void 0 ? void 0 : _row$original$dsoDeta.fillingPointId) || ((_row$original$dsoDeta2 = row.original.dsoDetails) === null || _row$original$dsoDeta2 === void 0 ? void 0 : (_row$original$dsoDeta3 = _row$original$dsoDeta2.fillingPoint) === null || _row$original$dsoDeta3 === void 0 ? void 0 : _row$original$dsoDeta3.id) || ((_row$original$filling = row.original.fillingpointmetadata) === null || _row$original$filling === void 0 ? void 0 : _row$original$filling.fillingPointId) || row.original.filling_pt_name || (row.original.fillingPoint && typeof row.original.fillingPoint === "object" ? (_row$original$filling2 = row.original.fillingPoint) === null || _row$original$filling2 === void 0 ? void 0 : _row$original$filling2.id : row.original.fillingPoint) || ((_row$original$filling3 = row.original.fillingPointDetail) === null || _row$original$filling3 === void 0 ? void 0 : _row$original$filling3.id) || ((_row$original$filling4 = row.original.fillingPointDetail) === null || _row$original$filling4 === void 0 ? void 0 : _row$original$filling4.bookingId) || "");
-                return fpId === rowFpId && rowFpId !== "undefined" && rowFpId !== "null" && rowFpId !== "";
-              }),
+              selected: getSelectedFillingPointOption(row.original, allFillingPoints),
               option: allFillingPoints,
               select: value => onFillingPointSelect(row, value),
               style: {
@@ -8542,8 +8615,8 @@ const VendorInbox = props => {
           Header: t("ES_VENDOR_INBOX_SERVICE_TYPE"),
           id: "serviceType",
           accessor: row => {
-            var _row$dsoDetails4, _additionalDetails;
-            let additionalDetails = (_row$dsoDetails4 = row.dsoDetails) === null || _row$dsoDetails4 === void 0 ? void 0 : _row$dsoDetails4.additionalDetails;
+            var _row$dsoDetails8, _additionalDetails;
+            let additionalDetails = (_row$dsoDetails8 = row.dsoDetails) === null || _row$dsoDetails8 === void 0 ? void 0 : _row$dsoDetails8.additionalDetails;
             if (typeof additionalDetails === "string") {
               try {
                 additionalDetails = JSON.parse(additionalDetails);
@@ -8556,8 +8629,8 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original$dsoDeta4, _additionalDetails2;
-            let additionalDetails = (_row$original$dsoDeta4 = row.original.dsoDetails) === null || _row$original$dsoDeta4 === void 0 ? void 0 : _row$original$dsoDeta4.additionalDetails;
+            var _row$original$dsoDeta, _additionalDetails2;
+            let additionalDetails = (_row$original$dsoDeta = row.original.dsoDetails) === null || _row$original$dsoDeta === void 0 ? void 0 : _row$original$dsoDeta.additionalDetails;
             if (typeof additionalDetails === "string") {
               try {
                 additionalDetails = JSON.parse(additionalDetails);
@@ -8573,19 +8646,19 @@ const VendorInbox = props => {
           Header: t("ES_VENDOR_REGISTRY_INBOX_ENABLED"),
           id: "status",
           accessor: row => {
-            var _row$dsoDetails5;
-            return ((_row$dsoDetails5 = row.dsoDetails) === null || _row$dsoDetails5 === void 0 ? void 0 : _row$dsoDetails5.status) || "";
+            var _row$dsoDetails9;
+            return ((_row$dsoDetails9 = row.dsoDetails) === null || _row$dsoDetails9 === void 0 ? void 0 : _row$dsoDetails9.status) || "";
           },
           Cell: ({
             row
           }) => {
-            var _row$original3, _row$original3$dsoDet;
+            var _row$original5, _row$original5$dsoDet;
             return /*#__PURE__*/React.createElement(ToggleSwitch, {
               style: {
                 display: "flex",
                 justifyContent: "left"
               },
-              value: ((_row$original3 = row.original) === null || _row$original3 === void 0 ? void 0 : (_row$original3$dsoDet = _row$original3.dsoDetails) === null || _row$original3$dsoDet === void 0 ? void 0 : _row$original3$dsoDet.status) === "DISABLED" ? false : true,
+              value: ((_row$original5 = row.original) === null || _row$original5 === void 0 ? void 0 : (_row$original5$dsoDet = _row$original5.dsoDetails) === null || _row$original5$dsoDet === void 0 ? void 0 : _row$original5$dsoDet.status) === "DISABLED" ? false : true,
               onChange: () => onVendorUpdate(row),
               name: `switch-${row.id}`
             });
@@ -8596,8 +8669,8 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original4, _additionalVendorData;
-            const vendorId = (_row$original4 = row.original) === null || _row$original4 === void 0 ? void 0 : _row$original4.id;
+            var _row$original6, _additionalVendorData;
+            const vendorId = (_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : _row$original6.id;
             if (!additionalVendorData) {
               return /*#__PURE__*/React.createElement("span", null, "Loading...");
             }
@@ -8610,7 +8683,7 @@ const VendorInbox = props => {
             }, /*#__PURE__*/React.createElement("button", {
               className: "submit-bar",
               style: {
-                backgroundColor: hasDetails ? "#417505" : "#F47738",
+                backgroundColor: hasDetails ? "#417505" : "#3A8DCC",
                 color: "white"
               }
             }, hasDetails ? "View Details" : "Add Details"));
@@ -8635,8 +8708,8 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original5, _row$original5$auditD, _row$original6, _row$original6$auditD;
-            return GetCell((_row$original5 = row.original) !== null && _row$original5 !== void 0 && (_row$original5$auditD = _row$original5.auditDetails) !== null && _row$original5$auditD !== void 0 && _row$original5$auditD.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original6 = row.original) === null || _row$original6 === void 0 ? void 0 : (_row$original6$auditD = _row$original6.auditDetails) === null || _row$original6$auditD === void 0 ? void 0 : _row$original6$auditD.createdTime) : "");
+            var _row$original7, _row$original7$auditD, _row$original8, _row$original8$auditD;
+            return GetCell((_row$original7 = row.original) !== null && _row$original7 !== void 0 && (_row$original7$auditD = _row$original7.auditDetails) !== null && _row$original7$auditD !== void 0 && _row$original7$auditD.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original8 = row.original) === null || _row$original8 === void 0 ? void 0 : (_row$original8$auditD = _row$original8.auditDetails) === null || _row$original8$auditD === void 0 ? void 0 : _row$original8$auditD.createdTime) : "");
           }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_VENDOR_NAME"),
@@ -8648,8 +8721,8 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original7, _row$original7$vendor;
-            return GetCell(((_row$original7 = row.original) === null || _row$original7 === void 0 ? void 0 : (_row$original7$vendor = _row$original7.vendor) === null || _row$original7$vendor === void 0 ? void 0 : _row$original7$vendor.name) || "NA");
+            var _row$original9, _row$original9$vendor;
+            return GetCell(((_row$original9 = row.original) === null || _row$original9 === void 0 ? void 0 : (_row$original9$vendor = _row$original9.vendor) === null || _row$original9$vendor === void 0 ? void 0 : _row$original9$vendor.name) || "NA");
           }
         }, {
           Header: t("ES_VENDOR_INBOX_SERVICE_TYPE"),
@@ -8682,6 +8755,25 @@ const VendorInbox = props => {
             const serviceType = ((_additionalDetail2 = additionalDetail) === null || _additionalDetail2 === void 0 ? void 0 : _additionalDetail2.serviceType) || "N/A";
             return /*#__PURE__*/React.createElement("div", null, serviceType);
           }
+        }, {
+          Header: t("WT_FILLING_POINT"),
+          accessor: row => getFillingPointDisplayValue(row),
+          id: "fillingPoint",
+          Cell: ({
+            row
+          }) => {
+            return /*#__PURE__*/React.createElement(Dropdown$2, {
+              className: "fsm-registry-dropdown",
+              selected: getSelectedFillingPointOption(row.original, allFillingPoints),
+              option: allFillingPoints,
+              select: value => onVehicleFillingPointSelect(row, value),
+              style: {
+                textAlign: "left"
+              },
+              optionKey: "fillingPointName",
+              t: t
+            });
+          }
         }, {
           Header: t("ES_FSM_REGISTRY_SELECT_DRIVER"),
           id: "driver",
@@ -8714,13 +8806,13 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original8;
+            var _row$original0;
             return /*#__PURE__*/React.createElement(ToggleSwitch, {
               style: {
                 display: "flex",
                 justifyContent: "left"
               },
-              value: ((_row$original8 = row.original) === null || _row$original8 === void 0 ? void 0 : _row$original8.status) === "DISABLED" ? false : true,
+              value: ((_row$original0 = row.original) === null || _row$original0 === void 0 ? void 0 : _row$original0.status) === "DISABLED" ? false : true,
               onChange: () => onVehicleUpdate(row),
               name: `switch-${row.id}`
             });
@@ -8762,8 +8854,8 @@ const VendorInbox = props => {
           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$original1, _row$original1$auditD, _row$original10, _row$original10$audit;
+            return GetCell((_row$original1 = row.original) !== null && _row$original1 !== void 0 && (_row$original1$auditD = _row$original1.auditDetails) !== null && _row$original1$auditD !== void 0 && _row$original1$auditD.createdTime ? Digit.DateUtils.ConvertEpochToDate((_row$original10 = row.original) === null || _row$original10 === void 0 ? void 0 : (_row$original10$audit = _row$original10.auditDetails) === null || _row$original10$audit === void 0 ? void 0 : _row$original10$audit.createdTime) : "");
           }
         }, {
           Header: t("ES_FSM_REGISTRY_INBOX_VENDOR_NAME"),
@@ -8797,13 +8889,13 @@ const VendorInbox = props => {
           Cell: ({
             row
           }) => {
-            var _row$original1;
+            var _row$original11;
             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$original11 = row.original) === null || _row$original11 === void 0 ? void 0 : _row$original11.status) === "DISABLED" ? false : true,
               onChange: () => onDriverUpdate(row),
               name: `switch-${row.id}`
             });
@@ -8819,8 +8911,8 @@ const VendorInbox = props => {
         return [{
           Header: t("ES_VENDOR_INBOX_VENDOR_NAME"),
           exportAccessor: row => {
-            var _row$dsoDetails6;
-            return (row === null || row === void 0 ? void 0 : row.name) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails6 = row.dsoDetails) === null || _row$dsoDetails6 === void 0 ? void 0 : _row$dsoDetails6.name) || "NA";
+            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";
           }
         }, {
           Header: t("ES_VENDOR_INBOX_DATE_VENDOR_CREATION"),
@@ -8830,21 +8922,18 @@ const VendorInbox = props => {
           }
         }, {
           Header: t("WT_FILLING_POINT"),
-          exportAccessor: row => {
-            var _row$dsoDetails7, _row$dsoDetails7$fill, _row$dsoDetails8, _row$dsoDetails9;
-            return (row === null || row === void 0 ? void 0 : (_row$dsoDetails7 = row.dsoDetails) === null || _row$dsoDetails7 === void 0 ? void 0 : (_row$dsoDetails7$fill = _row$dsoDetails7.fillingPoint) === null || _row$dsoDetails7$fill === void 0 ? void 0 : _row$dsoDetails7$fill.fillingPointName) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails8 = row.dsoDetails) === null || _row$dsoDetails8 === void 0 ? void 0 : _row$dsoDetails8.fillingPoint) || (row === null || row === void 0 ? void 0 : row.fillingPoint) || (row === null || row === void 0 ? void 0 : (_row$dsoDetails9 = row.dsoDetails) === null || _row$dsoDetails9 === void 0 ? void 0 : _row$dsoDetails9.fillingPointId) || (row === null || row === void 0 ? void 0 : row.fillingPointId) || "NA";
-          }
+          exportAccessor: row => getFillingPointDisplayValue(row)
         }, {
           Header: t("ES_VENDOR_INBOX_SERVICE_TYPE"),
           exportAccessor: row => {
-            var _parseAdditionalDetai, _row$dsoDetails0;
-            return ((_parseAdditionalDetai = parseAdditionalDetails(row === null || row === void 0 ? void 0 : (_row$dsoDetails0 = row.dsoDetails) === null || _row$dsoDetails0 === void 0 ? void 0 : _row$dsoDetails0.additionalDetails)) === null || _parseAdditionalDetai === void 0 ? void 0 : _parseAdditionalDetai.serviceType) || "N/A";
+            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";
           }
         }, {
           Header: t("ES_VENDOR_REGISTRY_INBOX_ENABLED"),
           exportAccessor: row => {
-            var _row$dsoDetails1;
-            return (row === null || row === void 0 ? void 0 : (_row$dsoDetails1 = row.dsoDetails) === null || _row$dsoDetails1 === void 0 ? void 0 : _row$dsoDetails1.status) || "NA";
+            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";
           }
         }];
       case "VEHICLE":
@@ -8869,6 +8958,9 @@ const VendorInbox = props => {
             var _parseAdditionalDetai2;
             return ((_parseAdditionalDetai2 = parseAdditionalDetails(row === null || row === void 0 ? void 0 : row.additionalDetails)) === null || _parseAdditionalDetai2 === void 0 ? void 0 : _parseAdditionalDetai2.serviceType) || "N/A";
           }
+        }, {
+          Header: t("WT_FILLING_POINT"),
+          exportAccessor: row => getFillingPointDisplayValue(row)
         }, {
           Header: t("ES_FSM_REGISTRY_SELECT_DRIVER"),
           exportAccessor: row => {
@@ -9015,7 +9107,7 @@ const VendorInbox = props => {
     }
   }, result)), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key === "error" ? true : false,
-    label: t(showToast.key === "success" ? `ES_FSM_REGISTRY_${showToast.action}_DISABLE_SUCCESS` : showToast.action),
+    label: showToast.label ? t(showToast.label) : t(showToast.key === "success" ? `ES_FSM_REGISTRY_${showToast.action}_DISABLE_SUCCESS` : showToast.action),
     onClose: closeToast
   }));
 };
@@ -9598,6 +9690,8 @@ const AddDriver = ({
     config: Config.filter(i => !i.hideInEmployee).map(config => {
       return {
         ...config,
+        isCollapsible: true,
+        isDefaultOpen: true,
         body: config.body.filter(a => !a.hideInEmployee)
       };
     }),
@@ -9608,7 +9702,8 @@ const AddDriver = ({
     defaultValues: defaultValues,
     onFormValueChange: onFormValueChange,
     noBreakLine: true,
-    mode: "onChange"
+    mode: "onChange",
+    noCard: true
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key === "error" ? true : false,
     label: t(showToast.key === "success" ? `ES_FSM_${showToast.action}_SUCCESS` : showToast.action),
@@ -10424,6 +10519,8 @@ const AddVehicle = ({
     config: Config.filter(i => !i.hideInEmployee).map(config => {
       return {
         ...config,
+        isCollapsible: true,
+        isDefaultOpen: true,
         body: config.body.filter(a => !a.hideInEmployee)
       };
     }),
@@ -10434,7 +10531,8 @@ const AddVehicle = ({
     defaultValues: defaultValues,
     onFormValueChange: onFormValueChange,
     noBreakLine: true,
-    mode: "onChange"
+    mode: "onChange",
+    noCard: true
   }), showToast && /*#__PURE__*/React.createElement(Toast, {
     error: showToast.key === "error" ? true : false,
     label: t(showToast.key === "success" ? `ES_FSM_REGISTRY_${showToast.action}_SUCCESS` : showToast.action),