@djb25/digit-ui-module-wt 1.0.16 → 1.0.17

package/dist/index.modern.js

@@ -1,4 +1,4 @@
-import { TickMark, ArrowDown, MobileNumber, CardLabelError, TextInput, Dropdown, DatePicker, SubmitBar, Card, Table, Loader, Toast, AppContainer, BackButton, PrivateRoute, KeyNote, Modal, CardHeader, CardText, FormStep, CardLabel, RadioButtons, UploadFile, TextArea, CheckBox, CardSubHeader, StatusTable, Row, GenericFileIcon, LinkButton, EditIcon, Banner, CHBIcon, EmployeeModuleCard, HomeIcon, CloseSvg, Label, LinkLabel, ActionBar, DetailsCard, SearchAction, FilterAction, PopUp, ShippingTruck, LabelFieldPair, AddIcon, Menu, ModuleHeader, ArrowLeft, Header, TelePhone, DisplayPhotos, CardSectionHeader, CheckPoint, ConnectingCheckPoints, MultiLink, Localities, RemoveableTag, FormComposer, PDFSvg, MultiUploadWrapper, Close as Close$g, BreakLine, InfoBannerIcon, ViewsIcon, ButtonSelector, LocationIcon, CitizenHomeCard, PTIcon, ApplicantDetails, AddressDetails } from '@djb25/digit-ui-react-components';
+import { TickMark, ArrowDown, MobileNumber, CardLabelError, TextInput, Dropdown, DatePicker, SubmitBar, Card, Table, Loader, Toast, AppContainer, ModuleHeader, ArrowLeft, PrivateRoute, HomeIcon, KeyNote, Modal, CardHeader, CardText, FormStep, CardLabel, RadioButtons, UploadFile, TextArea, CheckBox, CardSubHeader, StatusTable, Row, GenericFileIcon, LinkButton, EditIcon, Banner, CHBIcon, EmployeeModuleCard, CloseSvg, Label, LinkLabel, ActionBar, DetailsCard, SearchAction, FilterAction, PopUp, ShippingTruck, CustomNameDropdown, MultiSelectDropdown, LabelFieldPair, AddIcon, Menu, Header, TelePhone, DisplayPhotos, CardSectionHeader, CheckPoint, ConnectingCheckPoints, MultiLink, Localities, RemoveableTag, FormComposer, PDFSvg, MultiUploadWrapper, Close as Close$g, BreakLine, InfoBannerIcon, ViewsIcon, ButtonSelector, LocationIcon, CitizenHomeCard, PTIcon, ApplicantDetails, AddressDetails } from '@djb25/digit-ui-react-components';
 import React, { useState, useMemo, useCallback, useEffect, Fragment, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useHistory, useRouteMatch, Switch, Route, Redirect, Link, useParams } from 'react-router-dom';
@@ -795,25 +795,25 @@ const WTSearchApplication = ({
     code: "TREE_PRUNING_SERVICE_COMPLETED",
     value: t("TP_TREE_PRUNING_SERVICE_COMPLETED")
   }] : [{
-    i18nKey: "Booking Created",
+    i18nKey: "WT_BOOKING_CREATED",
     code: "BOOKING_CREATED",
     value: t("WT_BOOKING_CREATED")
   }, {
-    i18nKey: "Booking Approved",
-    code: "APPROVED",
-    value: t("WT_BOOKING_APPROVED")
+    i18nKey: "WT_VENDOR_ASSIGNED",
+    code: "VENDOR_ASSIGNED",
+    value: t("WT_VENDOR_ASSIGNED")
   }, {
-    i18nKey: "Tanker Delivered",
-    code: "TANKER_DELIVERED",
-    value: t("WT_TANKER_DELIVERED")
+    i18nKey: "WT_DELIVERY_PENDING",
+    code: "DELIVERY_PENDING",
+    value: t("WT_DELIVERY_PENDING")
   }, {
-    i18nKey: "Vendor Assigned",
-    code: "ASSIGN_VENDOR",
-    value: t("WT_ASSIGN_VENDOR")
+    i18nKey: "WT_DELIVERED",
+    code: "DELIVERED",
+    value: t("WT_DELIVERED")
   }, {
-    i18nKey: "Rejected",
-    code: "REJECT",
-    value: t("WT_BOOKING_REJECTED")
+    i18nKey: "WT_REQUEST_REJECTED",
+    code: "REQUEST_REJECTED",
+    value: t("WT_REQUEST_REJECTED")
   }];
   const onSort = useCallback(args => {
     if (args.length === 0) return;
@@ -1128,6 +1128,10 @@ const SearchApp = ({
 
 const App = () => {
   var _Digit, _Digit$ComponentRegis, _Digit2, _Digit2$ComponentRegi, _Digit3, _Digit3$ComponentRegi, _Digit4, _Digit4$ComponentRegi, _Digit5, _Digit5$ComponentRegi, _Digit6, _Digit6$ComponentRegi;
+  const {
+    t
+  } = useTranslation();
+  const location = useLocation();
   const {
     path,
     url,
@@ -1142,6 +1146,52 @@ const App = () => {
   const WTCard = Digit.ComponentRegistryService.getComponent("WTCitizenCard");
   const MTCard = Digit.ComponentRegistryService.getComponent("MTCitizenCard");
   const ApplicationDetails = (_Digit6 = Digit) === null || _Digit6 === void 0 ? void 0 : (_Digit6$ComponentRegi = _Digit6.ComponentRegistryService) === null || _Digit6$ComponentRegi === void 0 ? void 0 : _Digit6$ComponentRegi.getComponent("ApplicationDetails");
+  const getDynamicBreadcrumbs = () => {
+    const pathname = location.pathname;
+    if (pathname.includes("/mt/")) ;
+    if (pathname.includes("/tp/")) ;
+    let crumbs = [{
+      icon: HomeIcon,
+      path: "/digit-ui/citizen"
+    }, {
+      label: t("WT_MODULE_NAME"),
+      path: `${path}/wt-Vendor`
+    }];
+    if (pathname.includes("/inbox")) {
+      let label = "ES_COMMON_INBOX";
+      if (pathname.includes("/mt/inbox")) {
+        crumbs = [{
+          icon: HomeIcon,
+          path: "/digit-ui/citizen"
+        }, {
+          label: t("ACTION_TEST_MT"),
+          path: `${path}/mt-Vendor`
+        }];
+      }
+      crumbs.push({
+        label: t(label)
+      });
+    } else if (pathname.includes("/my-bookings")) {
+      let label = "WT_SEARCH_BOOKINGS";
+      if (pathname.includes("/mt/my-bookings")) label = "MT_SEARCH_BOOKINGS";
+      crumbs.push({
+        label: t(label)
+      });
+    } else if (pathname.includes("/status")) {
+      crumbs.push({
+        label: t("WT_MY_APPLICATIONS")
+      });
+    } else if (pathname.includes("/booking/") || pathname.includes("/booking-details") || pathname.includes("/bookingsearch/booking-details")) {
+      crumbs.push({
+        label: t("ES_COMMON_INBOX"),
+        path: pathname.includes("/mt/") ? `${path}/mt/inbox` : `${path}/inbox`
+      });
+      crumbs.push({
+        label: t("WT_BOOKING_DETAILS")
+      });
+    }
+    return crumbs;
+  };
   const getInboxInitialState = service => ({
     searchParams: {
       uuid: {
@@ -1159,7 +1209,17 @@ const App = () => {
     style: {
       width: "100%"
     }
-  }, /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(AppContainer, null, /*#__PURE__*/React.createElement(BackButton, null, "Back"), /*#__PURE__*/React.createElement(PrivateRoute, {
+  }, /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(AppContainer, null, /*#__PURE__*/React.createElement("div", {
+    className: "ground-container employee-app-container form-container"
+  }, /*#__PURE__*/React.createElement(ModuleHeader, {
+    leftContent: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ArrowLeft, {
+      className: "icon"
+    }), t("CS_COMMON_BACK")),
+    onLeftClick: () => window.history.back(),
+    breadcrumbs: getDynamicBreadcrumbs()
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "employee-form-content"
+  }, /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/inbox`,
     component: () => /*#__PURE__*/React.createElement(Inbox, {
       useNewInboxAPI: true,
@@ -1244,7 +1304,7 @@ const App = () => {
       parentRoute: path,
       moduleCode: "MT"
     }))
-  }))));
+  }))))));
 };
 
 const ExistingBookingDetails = ({
@@ -2291,6 +2351,9 @@ const WTCard = () => {
   }, {
     label: t("WT_SEARCH_FIX_POINT"),
     link: `${APPLICATION_PATH}/employee/wt/search-filling-fix-point`
+  }, {
+    label: t("Vendor_Assign"),
+    link: `${APPLICATION_PATH}/employee/wt/vendor-assignment`
   }];
   const WT_CEMP = Digit.UserService.hasAccess(["WT_CEMP"]) || false;
   const propsForModuleCard = {
@@ -2373,7 +2436,7 @@ const InboxLinks = ({
       className: "filter inboxLinks"
     }, /*#__PURE__*/React.createElement("div", {
       className: "complaint-links-container"
-    }, GetLogo(), /*#__PURE__*/React.createElement("div", {
+    }, Digit.UserService.getUser().info.type !== "CITIZEN" && GetLogo(), /*#__PURE__*/React.createElement("div", {
       className: "body"
     }, links.map(({
       link,
@@ -3137,10 +3200,36 @@ const AddTripModal = ({
     control,
     formState: {
       errors
-    }
+    },
+    watch,
+    setValue
   } = useForm({
     defaultValues: initialValues || {}
   });
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const {
+    isLoading: isFixedPointLoading,
+    data: fixedPointsData
+  } = Digit.Hooks.wt.useFixedPointSearchAPI({
+    tenantId,
+    filters: {
+      limit: 1000
+    }
+  });
+  const fixedPoints = (fixedPointsData === null || fixedPointsData === void 0 ? void 0 : fixedPointsData.waterTankerBookingDetail) || [];
+  const fixedPointOptions = fixedPoints.map(fp => {
+    var _fp$applicantDetail, _fp$applicantDetail2, _fp$address, _fp$applicantDetail3, _fp$applicantDetail4, _fp$address2, _fp$address3, _fp$address4, _fp$address5, _fp$address6;
+    return {
+      name: (fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail = fp.applicantDetail) === null || _fp$applicantDetail === void 0 ? void 0 : _fp$applicantDetail.name) || "NA",
+      mobileNumber: (fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail2 = fp.applicantDetail) === null || _fp$applicantDetail2 === void 0 ? void 0 : _fp$applicantDetail2.mobileNumber) || "NA",
+      locality: (fp === null || fp === void 0 ? void 0 : (_fp$address = fp.address) === null || _fp$address === void 0 ? void 0 : _fp$address.locality) || "NA",
+      displayLabel: `${(fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail3 = fp.applicantDetail) === null || _fp$applicantDetail3 === void 0 ? void 0 : _fp$applicantDetail3.name) || "NA"} | ${(fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail4 = fp.applicantDetail) === null || _fp$applicantDetail4 === void 0 ? void 0 : _fp$applicantDetail4.mobileNumber) || "NA"} | ${(fp === null || fp === void 0 ? void 0 : (_fp$address2 = fp.address) === null || _fp$address2 === void 0 ? void 0 : _fp$address2.locality) || "NA"}`,
+      value: fp.bookingId,
+      fullAddress: [(fp === null || fp === void 0 ? void 0 : (_fp$address3 = fp.address) === null || _fp$address3 === void 0 ? void 0 : _fp$address3.houseNo) && `${t("WT_HOUSE_NO")} = ${fp.address.houseNo}`, (fp === null || fp === void 0 ? void 0 : (_fp$address4 = fp.address) === null || _fp$address4 === void 0 ? void 0 : _fp$address4.streetName) && `${t("WT_STREET_NAME")} = ${fp.address.streetName}`, (fp === null || fp === void 0 ? void 0 : (_fp$address5 = fp.address) === null || _fp$address5 === void 0 ? void 0 : _fp$address5.landmark) && `${t("WT_LANDMARK")} = ${fp.address.landmark}`, (fp === null || fp === void 0 ? void 0 : (_fp$address6 = fp.address) === null || _fp$address6 === void 0 ? void 0 : _fp$address6.locality) && `${t("WT_LOCALITY")} = ${fp.address.locality}`].filter(Boolean).join(", ")
+    };
+  });
+  const selectedFixedPointCode = watch("fixedPointCode");
+  const selectedFixedPoint = fixedPointOptions.find(opt => opt.value === selectedFixedPointCode);
   const dayOptions = [{
     label: t("MONDAY"),
     value: "MONDAY"
@@ -3185,21 +3274,66 @@ const AddTripModal = ({
       display: "flex",
       justifyContent: "center",
       alignItems: "center",
-      zIndex: 9999
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "custom-modal-content",
-    style: {
-      backgroundColor: "#fff",
-      borderRadius: "8px",
-      width: "70%",
-      maxWidth: "800px",
-      maxHeight: "90vh",
-      display: "flex",
-      flexDirection: "column",
-      boxShadow: "0 4px 12px rgba(0,0,0,0.15)",
-      position: "relative"
-    }
+      zIndex: 200000
+    }
+  }, /*#__PURE__*/React.createElement("style", null, `
+          .custom-modal-content {
+            background-color: #fff;
+            border-radius: 8px;
+            width: 70%;
+            max-width: 800px;
+            max-height: 90vh;
+            display: flex;
+            flex-direction: column;
+            box-shadow: 0 4px 12px rgba(0,0,0,0.15);
+            position: relative;
+          }
+          .add-trip-form {
+            display: grid;
+            grid-template-columns: repeat(2, 1fr);
+            gap: 20px;
+          }
+          @media (max-width: 768px) {
+            .custom-modal-content {
+              width: 90%;
+              max-height: 85vh;
+            }
+            .add-trip-form {
+              grid-template-columns: 1fr;
+              gap: 15px;
+            }
+          }
+          @media (max-width: 480px) {
+            .custom-modal-content {
+              width: 95%;
+              max-height: 95vh;
+            }
+            .custom-modal-body {
+              padding: 15px !important;
+            }
+            .custom-modal-footer {
+              padding: 12px 15px !important;
+              flex-direction: row;
+              justify-content: flex-end;
+            }
+            .custom-modal-header {
+                padding: 12px 15px !important;
+            }
+            .custom-modal-header h1 {
+                font-size: 18px !important;
+            }
+          }
+           @media (max-width: 320px) {
+             .custom-modal-footer {
+              flex-direction: column-reverse;
+              align-items: stretch;
+            }
+            .custom-modal-footer button {
+              width: 100%;
+            }
+          }
+        `), /*#__PURE__*/React.createElement("div", {
+    className: "custom-modal-content"
   }, /*#__PURE__*/React.createElement("div", {
     className: "custom-modal-header",
     style: {
@@ -3232,12 +3366,7 @@ const AddTripModal = ({
       overflowY: "auto"
     }
   }, /*#__PURE__*/React.createElement("div", {
-    className: "add-trip-form",
-    style: {
-      display: "grid",
-      gridTemplateColumns: "repeat(3, 1fr)",
-      gap: "20px"
-    }
+    className: "add-trip-form"
   }, /*#__PURE__*/React.createElement("div", {
     className: "field-group"
   }, /*#__PURE__*/React.createElement(CardLabel, {
@@ -3245,10 +3374,32 @@ const AddTripModal = ({
       marginBottom: "8px",
       fontWeight: "500"
     }
-  }, t("WT_FIXED_POINT_CODE")), /*#__PURE__*/React.createElement(TextInput, {
+  }, t("WT_FIXED_POINT_CODE")), isFixedPointLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement(Controller, {
+    control: control,
     name: "fixedPointCode",
-    inputRef: register()
-  })), /*#__PURE__*/React.createElement("div", {
+    render: props => /*#__PURE__*/React.createElement(CustomNameDropdown, {
+      option: fixedPointOptions,
+      optionKey: "displayLabel",
+      selected: fixedPointOptions.find(opt => opt.value === props.value),
+      select: val => props.onChange(val.value),
+      t: t,
+      optionsHeader: {
+        name: "WT_NAME",
+        mobileNumber: "WT_MOBILE_NUMBER",
+        locality: "WT_LOCALITY"
+      }
+    })
+  }), selectedFixedPoint && /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: "8px",
+      padding: "10px",
+      backgroundColor: "#f9f9f9",
+      border: "1px solid #ddd",
+      borderRadius: "4px",
+      fontSize: "14px",
+      color: "#555"
+    }
+  }, /*#__PURE__*/React.createElement("strong", null, t("WT_ADDRESS"), ":"), " ", selectedFixedPoint.fullAddress)), /*#__PURE__*/React.createElement("div", {
     className: "field-group"
   }, /*#__PURE__*/React.createElement(CardLabel, {
     style: {
@@ -3258,12 +3409,14 @@ const AddTripModal = ({
   }, t("WT_DAY")), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "day",
-    render: props => /*#__PURE__*/React.createElement(Dropdown, {
-      option: dayOptions,
-      optionKey: "label",
-      selected: props.value,
-      select: props.onChange,
-      t: t
+    render: props => /*#__PURE__*/React.createElement(MultiSelectDropdown, {
+      options: dayOptions,
+      optionsKey: "label",
+      selected: dayOptions.filter(opt => (props.value || []).some(v => v === opt.value || (v === null || v === void 0 ? void 0 : v.value) === opt.value)),
+      onSelect: val => props.onChange(val.map(v => Array.isArray(v) ? v[1] : (v === null || v === void 0 ? void 0 : v.value) || v)),
+      t: t,
+      defaultLabel: t("WT_SELECT_DAYS"),
+      defaultUnit: t("WT_DAYS")
     })
   })), /*#__PURE__*/React.createElement("div", {
     className: "field-group"
@@ -3282,16 +3435,6 @@ const AddTripModal = ({
       marginBottom: "8px",
       fontWeight: "500"
     }
-  }, t("WT_VEHICLE_ID")), /*#__PURE__*/React.createElement(TextInput, {
-    name: "vehicleId",
-    inputRef: register()
-  })), /*#__PURE__*/React.createElement("div", {
-    className: "field-group"
-  }, /*#__PURE__*/React.createElement(CardLabel, {
-    style: {
-      marginBottom: "8px",
-      fontWeight: "500"
-    }
   }, t("WT_ARRIVAL_TIME_TO_FPL")), /*#__PURE__*/React.createElement(TextInput, {
     name: "arrivalTimeFpl",
     inputRef: register(),
@@ -3368,7 +3511,7 @@ const AddTripModal = ({
       t: t
     })
   })), /*#__PURE__*/React.createElement("div", {
-    className: "field-group",
+    className: "field-group remarks-field-group",
     style: {
       gridColumn: "span 2"
     }
@@ -3413,33 +3556,35 @@ const AddTripModal = ({
   }, initialValues ? t("WT_UPDATE") : t("CS_COMMON_SAVE")))));
 };
 
-const FixedPointScheduleManagement = () => {
+const FixedPointScheduleManagement = ({
+  ...props
+}) => {
   const {
     t
   } = useTranslation();
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const [showModal, setShowModal] = useState(false);
   const [toast, setToast] = useState(null);
-  const [selectedDay, setSelectedDay] = useState("Mon");
+  const [selectedDay, setSelectedDay] = useState("all");
   const [year, setYear] = useState({
     label: "Year 2026",
     value: "2026"
   });
   const [fixedPoint, setFixedPoint] = useState({
-    label: "FP01",
-    value: "FP01"
+    label: "All Fixed Points",
+    value: "all"
   });
   const [day, setDay] = useState({
-    label: "Mon",
-    value: "Mon"
+    label: "All Days",
+    value: "all"
   });
   const [status, setStatus] = useState({
     label: "All Status",
     value: "all"
   });
   const [vehicle, setVehicle] = useState({
-    label: "DL1LAG7729",
-    value: "DL1LAG7729"
+    label: "All Vehicles",
+    value: "all"
   });
   const [editingRowIndex, setEditingRowIndex] = useState(null);
   const [filters, setFilters] = useState({});
@@ -3508,9 +3653,9 @@ const FixedPointScheduleManagement = () => {
       setData(mappedData);
     }
   }, [scheduleData]);
-  const handleSearch = () => {
+  const handleSearch = (customFilters = null) => {
     var _day$value;
-    setFilters({
+    setFilters(customFilters || {
       fixedPointCode: (fixedPoint === null || fixedPoint === void 0 ? void 0 : fixedPoint.value) === "all" ? "" : fixedPoint === null || fixedPoint === void 0 ? void 0 : fixedPoint.value,
       day: (day === null || day === void 0 ? void 0 : day.value) === "all" ? "" : day === null || day === void 0 ? void 0 : (_day$value = day.value) === null || _day$value === void 0 ? void 0 : _day$value.toUpperCase(),
       status: (status === null || status === void 0 ? void 0 : status.value) === "all" ? "" : status === null || status === void 0 ? void 0 : status.value,
@@ -3595,7 +3740,7 @@ const FixedPointScheduleManagement = () => {
       }
     }, t("WT_DELETE")))
   }], [t]);
-  const days = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+  const days = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY", "SUNDAY"];
   return /*#__PURE__*/React.createElement("div", {
     className: "fixed-point-schedule-management"
   }, /*#__PURE__*/React.createElement(Card, {
@@ -3609,24 +3754,24 @@ const FixedPointScheduleManagement = () => {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "finance-mainlayout-col1"
-  }, /*#__PURE__*/React.createElement(Dropdown, {
+  }, /*#__PURE__*/React.createElement(CardLabel, null, t("WT_FIXED_POINT")), /*#__PURE__*/React.createElement(Dropdown, {
     option: [{
-      label: "Year 2024",
-      value: "2024"
+      label: t("WT_EXCEL_WEEKWISE"),
+      value: "Weekwise"
     }, {
-      label: "Year 2025",
-      value: "2025"
+      label: t("WT_EXCEL_MONTHWISE"),
+      value: "Monthwise"
     }, {
-      label: "Year 2026",
-      value: "2026"
+      label: t("WT_EXCEL_YEARWISE"),
+      value: "Yearwise"
     }],
     optionKey: "label",
-    selected: year,
+    placeholder: t("WT_EXPORT"),
     t: t,
-    select: setYear
+    select: handleDownload
   })), /*#__PURE__*/React.createElement("div", {
     className: "finance-mainlayout-col1"
-  }, /*#__PURE__*/React.createElement(Dropdown, {
+  }, /*#__PURE__*/React.createElement(CardLabel, null, t("WT_FIXED_POINT")), /*#__PURE__*/React.createElement(Dropdown, {
     option: [{
       label: "All Fixed Points",
       value: "all"
@@ -3643,44 +3788,63 @@ const FixedPointScheduleManagement = () => {
     optionKey: "label",
     selected: fixedPoint,
     t: t,
-    select: setFixedPoint,
+    select: val => {
+      var _day$value2;
+      setFixedPoint(val);
+      handleSearch({
+        fixedPointCode: (val === null || val === void 0 ? void 0 : val.value) === "all" ? "" : val === null || val === void 0 ? void 0 : val.value,
+        day: (day === null || day === void 0 ? void 0 : day.value) === "all" ? "" : day === null || day === void 0 ? void 0 : (_day$value2 = day.value) === null || _day$value2 === void 0 ? void 0 : _day$value2.toUpperCase(),
+        status: (status === null || status === void 0 ? void 0 : status.value) === "all" ? "" : status === null || status === void 0 ? void 0 : status.value,
+        vehicleId: (vehicle === null || vehicle === void 0 ? void 0 : vehicle.value) === "all" ? "" : vehicle === null || vehicle === void 0 ? void 0 : vehicle.value
+      });
+    },
     placeholder: "All Fixed Points"
   })), /*#__PURE__*/React.createElement("div", {
     className: "finance-mainlayout-col1"
-  }, /*#__PURE__*/React.createElement(Dropdown, {
+  }, /*#__PURE__*/React.createElement(CardLabel, null, t("WT_DAY")), /*#__PURE__*/React.createElement(Dropdown, {
     option: [{
       label: "All Days",
       value: "all"
     }, {
-      label: "Mon",
-      value: "Mon"
+      label: t("MONDAY"),
+      value: "MONDAY"
     }, {
-      label: "Tue",
-      value: "Tue"
+      label: t("TUESDAY"),
+      value: "TUESDAY"
     }, {
-      label: "Wed",
-      value: "Wed"
+      label: t("WEDNESDAY"),
+      value: "WEDNESDAY"
     }, {
-      label: "Thu",
-      value: "Thu"
+      label: t("THURSDAY"),
+      value: "THURSDAY"
     }, {
-      label: "Fri",
-      value: "Fri"
+      label: t("FRIDAY"),
+      value: "FRIDAY"
     }, {
-      label: "Sat",
-      value: "Sat"
+      label: t("SATURDAY"),
+      value: "SATURDAY"
     }, {
-      label: "Sun",
-      value: "Sun"
+      label: t("SUNDAY"),
+      value: "SUNDAY"
     }],
     optionKey: "label",
     selected: day,
     t: t,
-    select: setDay,
+    select: val => {
+      var _val$value;
+      setDay(val);
+      setSelectedDay(val.value);
+      handleSearch({
+        fixedPointCode: (fixedPoint === null || fixedPoint === void 0 ? void 0 : fixedPoint.value) === "all" ? "" : fixedPoint === null || fixedPoint === void 0 ? void 0 : fixedPoint.value,
+        day: (val === null || val === void 0 ? void 0 : val.value) === "all" ? "" : val === null || val === void 0 ? void 0 : (_val$value = val.value) === null || _val$value === void 0 ? void 0 : _val$value.toUpperCase(),
+        status: (status === null || status === void 0 ? void 0 : status.value) === "all" ? "" : status === null || status === void 0 ? void 0 : status.value,
+        vehicleId: (vehicle === null || vehicle === void 0 ? void 0 : vehicle.value) === "all" ? "" : vehicle === null || vehicle === void 0 ? void 0 : vehicle.value
+      });
+    },
     placeholder: "All Days"
   })), /*#__PURE__*/React.createElement("div", {
     className: "finance-mainlayout-col1"
-  }, /*#__PURE__*/React.createElement(Dropdown, {
+  }, /*#__PURE__*/React.createElement(CardLabel, null, t("WT_STATUS")), /*#__PURE__*/React.createElement(Dropdown, {
     option: [{
       label: "All Status",
       value: "all"
@@ -3694,7 +3858,16 @@ const FixedPointScheduleManagement = () => {
     optionKey: "label",
     selected: status,
     t: t,
-    select: setStatus,
+    select: val => {
+      var _day$value3;
+      setStatus(val);
+      handleSearch({
+        fixedPointCode: (fixedPoint === null || fixedPoint === void 0 ? void 0 : fixedPoint.value) === "all" ? "" : fixedPoint === null || fixedPoint === void 0 ? void 0 : fixedPoint.value,
+        day: (day === null || day === void 0 ? void 0 : day.value) === "all" ? "" : day === null || day === void 0 ? void 0 : (_day$value3 = day.value) === null || _day$value3 === void 0 ? void 0 : _day$value3.toUpperCase(),
+        status: (val === null || val === void 0 ? void 0 : val.value) === "all" ? "" : val === null || val === void 0 ? void 0 : val.value,
+        vehicleId: (vehicle === null || vehicle === void 0 ? void 0 : vehicle.value) === "all" ? "" : vehicle === null || vehicle === void 0 ? void 0 : vehicle.value
+      });
+    },
     placeholder: "All Status"
   }))), /*#__PURE__*/React.createElement("div", {
     className: "finance-mainlayout",
@@ -3703,26 +3876,7 @@ const FixedPointScheduleManagement = () => {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "finance-mainlayout-col1"
-  }, /*#__PURE__*/React.createElement(Dropdown, {
-    option: [{
-      label: "All Vehicles",
-      value: "all"
-    }, {
-      label: "DL1LAG7729",
-      value: "DL1LAG7729"
-    }, {
-      label: "DL1LAG7730",
-      value: "DL1LAG7730"
-    }, {
-      label: "DL1LAG7731",
-      value: "DL1LAG7731"
-    }],
-    optionKey: "label",
-    selected: vehicle,
-    t: t,
-    select: setVehicle,
-    placeholder: "All Vehicles"
-  })), /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("div", {
     className: "finance-mainlayout-col1"
   }), /*#__PURE__*/React.createElement("div", {
     className: "finance-mainlayout-col1"
@@ -3745,25 +3899,43 @@ const FixedPointScheduleManagement = () => {
     className: "finance-mainlayout-col1"
   }, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("ES_COMMON_SEARCH"),
-    onSubmit: handleSearch
+    onSubmit: () => handleSearch()
   }))), /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
       gap: "5px",
       marginBottom: "20px"
     }
-  }, days.map(day => /*#__PURE__*/React.createElement("button", {
-    key: day,
-    onClick: () => setSelectedDay(day),
+  }, days.map(dayItem => /*#__PURE__*/React.createElement("button", {
+    key: dayItem,
+    onClick: () => {
+      setSelectedDay(dayItem);
+      const dayOption = {
+        label: dayItem,
+        value: dayItem
+      };
+      setDay(dayOption);
+      handleSearch({
+        fixedPointCode: (fixedPoint === null || fixedPoint === void 0 ? void 0 : fixedPoint.value) === "all" ? "" : fixedPoint === null || fixedPoint === void 0 ? void 0 : fixedPoint.value,
+        day: dayItem.toUpperCase(),
+        status: (status === null || status === void 0 ? void 0 : status.value) === "all" ? "" : status === null || status === void 0 ? void 0 : status.value,
+        vehicleId: (vehicle === null || vehicle === void 0 ? void 0 : vehicle.value) === "all" ? "" : vehicle === null || vehicle === void 0 ? void 0 : vehicle.value
+      });
+    },
     style: {
       padding: "8px 16px",
       border: "1px solid #ccc",
       borderRadius: "4px",
-      background: selectedDay === day ? "#1D4E7F" : "#fff",
-      color: selectedDay === day ? "#fff" : "#333",
+      background: selectedDay === dayItem ? "#1D4E7F" : "#fff",
+      color: selectedDay === dayItem ? "#fff" : "#333",
       cursor: "pointer"
     }
-  }, t(day.toUpperCase())))), /*#__PURE__*/React.createElement(Table, {
+  }, t(dayItem.toUpperCase())))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: "100%",
+      overflowX: "auto"
+    }
+  }, /*#__PURE__*/React.createElement(ApplicationTable, {
     t: t,
     data: data,
     columns: columns,
@@ -3774,8 +3946,17 @@ const FixedPointScheduleManagement = () => {
     inboxStyles: {
       overflowX: "auto"
     },
-    isLoading: isLoading
-  }), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("button", {
+    isLoading: isLoading,
+    onPageSizeChange: props.onPageSizeChange,
+    currentPage: props.currentPage,
+    onNextPage: props.onNextPage,
+    onPrevPage: props.onPrevPage,
+    pageSizeLimit: props.pageSizeLimit,
+    onSort: props.onSort,
+    disableSort: props.disableSort,
+    sortParams: props.sortParams,
+    totalRecords: props.totalRecords
+  })), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("button", {
     onClick: () => {
       setEditingRowIndex(null);
       setShowModal(true);
@@ -3801,10 +3982,10 @@ const FixedPointScheduleManagement = () => {
     initialValues: editingRowIndex !== null ? {
       scheduleId: data[editingRowIndex].scheduleId,
       fixedPointCode: data[editingRowIndex].fixedPoint,
-      day: {
+      day: [{
         label: t(data[editingRowIndex].day),
         value: data[editingRowIndex].day
-      },
+      }],
       frequencyNo: data[editingRowIndex].freq,
       arrivalTimeFpl: data[editingRowIndex].arrToFpl,
       departureTimeFpl: data[editingRowIndex].depFromFpl,
@@ -3819,24 +4000,37 @@ const FixedPointScheduleManagement = () => {
       }
     } : null,
     onSubmit: formData => {
-      var _formData$day, _formData$day$value, _formData$active, _formData$active2;
+      var _formData$active, _formData$active2;
+      const formDataDay = formData === null || formData === void 0 ? void 0 : formData.day;
+      let daysArr = [];
+      if (Array.isArray(formDataDay)) {
+        daysArr = formDataDay.map(d => typeof d === "string" ? d : (d === null || d === void 0 ? void 0 : d.value) || (Array.isArray(d) ? d[1] : d)).filter(d => typeof d === "string" && d !== "WT_SELECT_ALL");
+        if (daysArr.length === 0 && formDataDay.some(d => (typeof d === "string" ? d : (d === null || d === void 0 ? void 0 : d.value) || (Array.isArray(d) ? d[1] : d)) === "WT_SELECT_ALL")) {
+          daysArr = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY", "SUNDAY"];
+        }
+      } else if (formDataDay) {
+        const dayVal = typeof formDataDay === "string" ? formDataDay : formDataDay === null || formDataDay === void 0 ? void 0 : formDataDay.value;
+        if (dayVal && dayVal !== "WT_SELECT_ALL") daysArr = [dayVal];
+      }
+      const fixedPointTimeTableDetails = {
+        tenantId,
+        system_assigned_schedule_id: formData.scheduleId,
+        fixed_point_code: formData.fixedPointCode,
+        days: daysArr.map(d => d.toUpperCase()),
+        trip_no: formData.frequencyNo,
+        arrival_time_to_fpl: formData.arrivalTimeFpl,
+        departure_time_from_fpl: formData.departureTimeFpl,
+        arrival_time_delivery_point: formData.arrivalFixedPoint,
+        departure_time_delivery_point: formData.departureFixedPoint,
+        time_of_arriving_back_fpl_after_delivery: formData.returnFpl,
+        volume_water_tobe_delivery: formData.volume,
+        active: ((_formData$active = formData.active) === null || _formData$active === void 0 ? void 0 : _formData$active.value) === "Yes" || formData.active === "Yes",
+        is_enable: ((_formData$active2 = formData.active) === null || _formData$active2 === void 0 ? void 0 : _formData$active2.value) === "Yes" || formData.active === "Yes",
+        remarks: formData.remarks,
+        vehicle_id: formData.vehicleId
+      };
       const payload = {
-        fixedPointDetails: {
-          system_assigned_schedule_id: formData.scheduleId,
-          fixed_point_code: formData.fixedPointCode,
-          day: (_formData$day = formData.day) === null || _formData$day === void 0 ? void 0 : (_formData$day$value = _formData$day.value) === null || _formData$day$value === void 0 ? void 0 : _formData$day$value.toUpperCase(),
-          trip_no: formData.frequencyNo,
-          arrival_time_to_fpl: formData.arrivalTimeFpl,
-          departure_time_from_fpl: formData.departureTimeFpl,
-          arrival_time_delivery_point: formData.arrivalFixedPoint,
-          departure_time_delivery_point: formData.departureFixedPoint,
-          time_of_arriving_back_fpl_after_delivery: formData.returnFpl,
-          volume_water_tobe_delivery: formData.volume,
-          active: ((_formData$active = formData.active) === null || _formData$active === void 0 ? void 0 : _formData$active.value) === "Yes",
-          is_enable: ((_formData$active2 = formData.active) === null || _formData$active2 === void 0 ? void 0 : _formData$active2.value) === "Yes",
-          remarks: formData.remarks,
-          vehicle_id: formData.vehicleId
-        }
+        fixedPointTimeTableDetails
       };
       createSchedule(payload, {
         onError: (error, variables) => {
@@ -4077,7 +4271,7 @@ const RouteLayer = ({
   }, /*#__PURE__*/React.createElement("h4", {
     style: {
       margin: 0,
-      color: "#1a237e"
+      color: "#667eea"
     }
   }, "Route Information"), /*#__PURE__*/React.createElement("button", {
     onClick: () => setShowSteps(false),
@@ -4132,7 +4326,7 @@ const RouteLayer = ({
       width: "20px",
       height: "20px",
       borderRadius: "50%",
-      background: "#1a237e",
+      background: "#667eea",
       color: "white",
       display: "flex",
       alignItems: "center",
@@ -4170,12 +4364,12 @@ const RouteMarkers = ({
           className: "distance-marker",
           html: `<div style="
               background: white;
-              border: 2px solid #2196f3;
+              border: 2px solid #667eea;
               border-radius: 12px;
               padding: 2px 6px;
               font-size: 10px;
               font-weight: bold;
-              color: #1a237e;
+              color: #667eea;
               white-space: nowrap;
             ">${(i / 1000).toFixed(0)} km</div>`,
           iconSize: [40, 20],
@@ -4274,7 +4468,7 @@ const DriverCard = ({
     style: {
       fontWeight: "600",
       fontSize: "16px",
-      color: "#1a237e",
+      color: "#667eea",
       marginBottom: "4px",
       overflow: "hidden",
       textOverflow: "ellipsis",
@@ -4377,7 +4571,7 @@ const DriverCard = ({
     style: {
       fontSize: "14px",
       fontWeight: "600",
-      color: "#1a237e"
+      color: "#667eea"
     }
   }, eta, " min")), driver.speed && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     style: {
@@ -4531,7 +4725,7 @@ function LiveTrackingSystem() {
       top: "10px",
       left: "10px",
       zIndex: 2000,
-      background: "#1a237e",
+      background: "#667eea",
       color: "white",
       border: "none",
       borderRadius: "8px",
@@ -4572,7 +4766,7 @@ function LiveTrackingSystem() {
   }, showSidebar && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: {
       padding: isMobile ? "16px" : "24px",
-      background: "linear-gradient(135deg, #1a237e, #0d47a1)",
+      background: "linear-gradient(135deg, #667eea, #0d47a1)",
       color: "white"
     }
   }, isMobile && /*#__PURE__*/React.createElement("button", {
@@ -4639,7 +4833,7 @@ function LiveTrackingSystem() {
     style: {
       fontSize: isMobile ? "16px" : "20px",
       fontWeight: "bold",
-      color: "#1a237e"
+      color: "#667eea"
     }
   }, Object.keys(drivers).length)), /*#__PURE__*/React.createElement("div", {
     style: {
@@ -4708,7 +4902,7 @@ function LiveTrackingSystem() {
       transition: "border-color 0.2s",
       boxSizing: "border-box"
     },
-    onFocus: e => e.target.style.borderColor = "#1a237e",
+    onFocus: e => e.target.style.borderColor = "#667eea",
     onBlur: e => e.target.style.borderColor = "#e0e0e0"
   }), /*#__PURE__*/React.createElement("div", {
     style: {
@@ -4724,7 +4918,7 @@ function LiveTrackingSystem() {
       padding: isMobile ? "6px" : "8px",
       border: "1px solid #e0e0e0",
       borderRadius: "6px",
-      background: filterOnline === filter ? "#1a237e" : "white",
+      background: filterOnline === filter ? "#667eea" : "white",
       color: filterOnline === filter ? "white" : "#333",
       cursor: "pointer",
       fontSize: isMobile ? "11px" : "12px",
@@ -4824,7 +5018,7 @@ function LiveTrackingSystem() {
     style: {
       fontWeight: "bold",
       fontSize: isMobile ? "14px" : "16px",
-      color: "#1a237e",
+      color: "#667eea",
       marginBottom: "8px",
       borderBottom: "1px solid #eee",
       paddingBottom: "4px"
@@ -4901,7 +5095,7 @@ function LiveTrackingSystem() {
     },
     style: {
       padding: isMobile ? "10px 12px" : "8px 16px",
-      background: "#1a237e",
+      background: "#667eea",
       color: "white",
       border: "none",
       borderRadius: "4px",
@@ -4955,7 +5149,7 @@ function LiveTrackingSystem() {
   }, /*#__PURE__*/React.createElement("h4", {
     style: {
       margin: 0,
-      color: "#1a237e",
+      color: "#667eea",
       fontSize: isMobile ? "14px" : "16px"
     }
   }, "Selected Driver"), /*#__PURE__*/React.createElement("span", {
@@ -5186,9 +5380,11 @@ const AddFixFillAddress = ({
     label: local.label
   }))) || [];
   useEffect(() => {
-    if (formData !== null && formData !== void 0 && formData.bookingId && lastBookingId.current !== formData.bookingId) {
+    var _formData$address10;
+    const currentId = (formData === null || formData === void 0 ? void 0 : formData.id) || (formData === null || formData === void 0 ? void 0 : formData.bookingId) || (formData === null || formData === void 0 ? void 0 : (_formData$address10 = formData.address) === null || _formData$address10 === void 0 ? void 0 : _formData$address10.id);
+    if (currentId && lastBookingId.current !== currentId) {
       isInitialized.current = false;
-      lastBookingId.current = formData.bookingId;
+      lastBookingId.current = currentId;
     }
     if (formData !== null && formData !== void 0 && formData.address && !isInitialized.current && allCities) {
       const addressData = formData.address;
@@ -5349,6 +5545,7 @@ const AddFillingPointAddress = () => {
     t
   } = useTranslation();
   const location = useLocation();
+  const history = useHistory();
   const queryParams = new URLSearchParams(location.search);
   const editId = queryParams.get("id");
   const [formData, setFormData] = useState({});
@@ -5360,10 +5557,10 @@ const AddFillingPointAddress = () => {
   const {
     isLoading: isEditLoading,
     data: editData
-  } = Digit.Hooks.wt.useTankerSearchAPI({
+  } = Digit.Hooks.wt.useFillPointSearch({
     tenantId,
     filters: {
-      bookingId: editId
+      id: editId
     }
   }, {
     enabled: !!editId
@@ -5378,29 +5575,28 @@ const AddFillingPointAddress = () => {
     }));
   };
   useEffect(() => {
-    if (editId && editData !== null && editData !== void 0 && editData.waterTankerBookingDetail) {
-      const data = editData.waterTankerBookingDetail.find(item => item.bookingId === editId);
+    if (editId && editData !== null && editData !== void 0 && editData.fillingPoints) {
+      const data = editData.fillingPoints.find(item => item.id === editId);
       if (data) {
-        var _data$fillingpointmet, _data$fillingpointmet2, _data$fillingpointmet3, _data$fillingpointmet4, _data$fillingpointmet5, _data$fillingpointmet6, _data$fillingpointmet7, _data$fillingpointmet8, _data$fillingpointmet9, _data$fillingpointmet0, _data$fillingpointmet1, _data$fillingpointmet10, _data$fillingpointmet11, _data$fillingpointmet12, _data$fillingpointmet13, _data$fillingpointmet14, _data$fillingpointmet15, _data$fillingpointmet16;
         setFormData({
+          id: data.id,
+          tenantId: data.tenantId,
           owner: {
-            fillingPointName: ((_data$fillingpointmet = data.fillingpointmetadata) === null || _data$fillingpointmet === void 0 ? void 0 : _data$fillingpointmet.fillingPointName) || ((_data$fillingpointmet2 = data.fillingpointmetadata) === null || _data$fillingpointmet2 === void 0 ? void 0 : _data$fillingpointmet2.name),
-            emergencyName: (_data$fillingpointmet3 = data.fillingpointmetadata) === null || _data$fillingpointmet3 === void 0 ? void 0 : _data$fillingpointmet3.emergencyName,
-            aeName: (_data$fillingpointmet4 = data.fillingpointmetadata) === null || _data$fillingpointmet4 === void 0 ? void 0 : _data$fillingpointmet4.aeName,
-            aeMobile: ((_data$fillingpointmet5 = data.fillingpointmetadata) === null || _data$fillingpointmet5 === void 0 ? void 0 : _data$fillingpointmet5.aeMobile) || ((_data$fillingpointmet6 = data.fillingpointmetadata) === null || _data$fillingpointmet6 === void 0 ? void 0 : _data$fillingpointmet6.mobileNumber),
-            aeEmail: ((_data$fillingpointmet7 = data.fillingpointmetadata) === null || _data$fillingpointmet7 === void 0 ? void 0 : _data$fillingpointmet7.aeEmail) || ((_data$fillingpointmet8 = data.fillingpointmetadata) === null || _data$fillingpointmet8 === void 0 ? void 0 : _data$fillingpointmet8.emailId),
-            jeName: (_data$fillingpointmet9 = data.fillingpointmetadata) === null || _data$fillingpointmet9 === void 0 ? void 0 : _data$fillingpointmet9.jeName,
-            jeMobile: ((_data$fillingpointmet0 = data.fillingpointmetadata) === null || _data$fillingpointmet0 === void 0 ? void 0 : _data$fillingpointmet0.jeMobile) || ((_data$fillingpointmet1 = data.fillingpointmetadata) === null || _data$fillingpointmet1 === void 0 ? void 0 : _data$fillingpointmet1.jeMobileNumber),
-            jeEmail: ((_data$fillingpointmet10 = data.fillingpointmetadata) === null || _data$fillingpointmet10 === void 0 ? void 0 : _data$fillingpointmet10.jeEmail) || ((_data$fillingpointmet11 = data.fillingpointmetadata) === null || _data$fillingpointmet11 === void 0 ? void 0 : _data$fillingpointmet11.jeEmailId),
-            eeName: (_data$fillingpointmet12 = data.fillingpointmetadata) === null || _data$fillingpointmet12 === void 0 ? void 0 : _data$fillingpointmet12.eeName,
-            eeMobile: ((_data$fillingpointmet13 = data.fillingpointmetadata) === null || _data$fillingpointmet13 === void 0 ? void 0 : _data$fillingpointmet13.eeMobile) || ((_data$fillingpointmet14 = data.fillingpointmetadata) === null || _data$fillingpointmet14 === void 0 ? void 0 : _data$fillingpointmet14.eeMobileNumber),
-            eeEmail: ((_data$fillingpointmet15 = data.fillingpointmetadata) === null || _data$fillingpointmet15 === void 0 ? void 0 : _data$fillingpointmet15.eeEmail) || ((_data$fillingpointmet16 = data.fillingpointmetadata) === null || _data$fillingpointmet16 === void 0 ? void 0 : _data$fillingpointmet16.eeEmailId)
+            fillingPointName: data.fillingPointName,
+            emergencyName: data.emergencyName,
+            aeName: data.aeName,
+            aeMobile: data.aeMobile,
+            aeEmail: data.aeEmail,
+            jeName: data.jeName,
+            jeMobile: data.jeMobile,
+            jeEmail: data.jeEmail,
+            eeName: data.eeName,
+            eeMobile: data.eeMobile,
+            eeEmail: data.eeEmail
           },
           address: {
             ...data.address
-          },
-          bookingId: data.bookingId,
-          auditDetails: data.auditDetails
+          }
         });
       }
     }
@@ -5415,19 +5611,25 @@ const AddFillingPointAddress = () => {
   const {
     mutate: createFillingPoint
   } = Digit.Hooks.wt.useCreateFillPoint(tenantId);
+  const {
+    mutate: updateFillingPoint
+  } = Digit.Hooks.wt.useUpdateFillPoint(tenantId);
   const handleSubmit = e => {
     if (e && e.preventDefault) e.preventDefault();
     const payload = fillingPointPayload({
       ...formData,
       tenantId
     });
-    const mutation = createFillingPoint;
+    const mutation = editId ? updateFillingPoint : createFillingPoint;
     mutation(payload, {
       onSuccess: () => {
         setShowToast({
           label: editId ? t("WT_FILLING_POINT_UPDATED_SUCCESS") : t("WT_FILLING_POINT_CREATED_SUCCESS")
         });
-        setTimeout(() => setShowToast(null), 5000);
+        setTimeout(() => {
+          setShowToast(null);
+          history.push(`/digit-ui/employee/wt/search-filling-fix-point`);
+        }, 3000);
       },
       onError: error => {
         var _error$response, _error$response$data, _error$response$data$, _error$response$data$2;
@@ -5466,7 +5668,8 @@ const AddFillingPointAddress = () => {
     t: t,
     config: addressConfig,
     onSelect: handleSelect,
-    formData: formData
+    formData: formData,
+    isEdit: !!editId
   }), /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
@@ -5707,7 +5910,11 @@ const SearchFillingPointAddress = () => {
   const [mobileNumber, setMobileNumber] = useState("");
   const [status, setStatus] = useState(null);
   const [searchParams, setSearchParams] = useState({});
+  const [toast, setToast] = useState(null);
   const tenantId = Digit.ULBService.getCurrentTenantId();
+  const closeToast = () => {
+    setToast(null);
+  };
   const {
     isLoading: isFixedLoading,
     data: fixedPointData,
@@ -5728,6 +5935,21 @@ const SearchFillingPointAddress = () => {
   }, {
     enabled: selectedTab === "FILLING_POINT"
   });
+  const {
+    isLoading: isAllFillingPointsLoading,
+    data: allFillingPointsData
+  } = Digit.Hooks.wt.useFillPointSearch({
+    tenantId,
+    filters: {
+      limit: 1000
+    }
+  }, {
+    enabled: true
+  });
+  const allFillingPoints = (allFillingPointsData === null || allFillingPointsData === void 0 ? void 0 : allFillingPointsData.fillingPoints) || [];
+  const {
+    mutate: mapFixedFilling
+  } = Digit.Hooks.wt.useFixedFillingMapping(tenantId);
   const isLoading = selectedTab === "FIXED_POINT" ? isFixedLoading : isFillingLoading;
   const tableData = (selectedTab === "FIXED_POINT" ? fixedPointData === null || fixedPointData === void 0 ? void 0 : fixedPointData.waterTankerBookingDetail : fillingPointData === null || fillingPointData === void 0 ? void 0 : fillingPointData.fillingPoints) || [];
   const searchConfig = {
@@ -5794,6 +6016,32 @@ const SearchFillingPointAddress = () => {
     };
     setSearchParams(filters);
   };
+  const onFillingPointSelect = (row, value) => {
+    var _row$original$applica, _value$fillingpointme;
+    const payload = {
+      fixedFillingPointMapping: {
+        fixed_pt_name: (_row$original$applica = row.original.applicantDetail) === null || _row$original$applica === void 0 ? void 0 : _row$original$applica.applicantId,
+        filling_pt_name: value.id || value.bookingId || value.fillingPointId || value.uuid || ((_value$fillingpointme = value.fillingpointmetadata) === null || _value$fillingpointme === void 0 ? void 0 : _value$fillingpointme.fillingPointId)
+      }
+    };
+    mapFixedFilling(payload, {
+      onSuccess: () => {
+        setToast({
+          label: t("WT_FIXED_FILLING_MAPPING_SUCCESS")
+        });
+        setTimeout(closeToast, 5000);
+        refetchFixed();
+      },
+      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
+        });
+        setTimeout(closeToast, 5000);
+      }
+    });
+  };
   const columns = React.useMemo(() => {
     if (selectedTab === "FIXED_POINT") {
       return [{
@@ -5806,12 +6054,12 @@ const SearchFillingPointAddress = () => {
         Cell: ({
           row
         }) => {
-          var _row$original$applica;
+          var _row$original$applica2;
           return /*#__PURE__*/React.createElement("span", {
             className: "link"
           }, /*#__PURE__*/React.createElement(Link, {
             to: `/digit-ui/employee/wt/add-fix-point-address?id=${row.original.bookingId}`
-          }, ((_row$original$applica = row.original.applicantDetail) === null || _row$original$applica === void 0 ? void 0 : _row$original$applica.name) || "NA"));
+          }, ((_row$original$applica2 = row.original.applicantDetail) === null || _row$original$applica2 === void 0 ? void 0 : _row$original$applica2.name) || "NA"));
         }
       }, {
         Header: t("WT_MOBILE_NUMBER"),
@@ -5827,6 +6075,35 @@ const SearchFillingPointAddress = () => {
           return (row === null || row === void 0 ? void 0 : (_row$address = row.address) === null || _row$address === void 0 ? void 0 : _row$address.locality) || "NA";
         },
         id: "locality"
+      }, {
+        Header: t("WT_FILLING_POINT"),
+        accessor: row => {
+          var _row$fillingpointmeta;
+          return (row === null || row === void 0 ? void 0 : row.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) || (row === null || row === void 0 ? void 0 : row.fillingPoint) || "NA";
+        },
+        id: "fillingPoint",
+        Cell: ({
+          row
+        }) => {
+          var _row$original$filling, _row$original$filling2, _row$original$filling3, _row$original$filling4;
+          const rowFpId = String(row.original.fillingPointId || ((_row$original$filling = row.original.fillingpointmetadata) === null || _row$original$filling === void 0 ? void 0 : _row$original$filling.fillingPointId) || row.original.fillingPtName || row.original.filling_pt_name || (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) || "");
+          const selectedOption = allFillingPoints === null || allFillingPoints === void 0 ? void 0 : allFillingPoints.find(fp => {
+            var _fp$fillingpointmetad;
+            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));
+            return fpId === rowFpId && rowFpId !== "undefined" && rowFpId !== "null" && rowFpId !== "";
+          });
+          return /*#__PURE__*/React.createElement(Dropdown, {
+            className: "fsm-registry-dropdown",
+            selected: selectedOption,
+            option: allFillingPoints,
+            select: value => onFillingPointSelect(row, value),
+            style: {
+              textAlign: "left"
+            },
+            optionKey: "fillingPointName",
+            t: t
+          });
+        }
       }];
     } else {
       return [{
@@ -5840,10 +6117,18 @@ const SearchFillingPointAddress = () => {
         }, /*#__PURE__*/React.createElement(Link, {
           to: `/digit-ui/employee/wt/add-filling-point-address?id=${row.original.id}`
         }, row.original.fillingPointName || "NA"))
+      }, {
+        Header: t("WT_AE_NAME"),
+        accessor: row => (row === null || row === void 0 ? void 0 : row.aeName) || "NA",
+        id: "aeName"
       }, {
         Header: t("WT_JE_NAME"),
         accessor: row => (row === null || row === void 0 ? void 0 : row.jeName) || "NA",
         id: "jeName"
+      }, {
+        Header: t("WT_EE_NAME"),
+        accessor: row => (row === null || row === void 0 ? void 0 : row.eeName) || "NA",
+        id: "eeName"
       }, {
         Header: t("WT_LOCALITY"),
         accessor: row => {
@@ -5853,7 +6138,7 @@ const SearchFillingPointAddress = () => {
         id: "locality"
       }];
     }
-  }, [selectedTab, t]);
+  }, [allFillingPoints, selectedTab, t]);
   const isMobile = window.Digit.Utils.browser.isMobile();
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement("div", {
     className: "search-tabs-container",
@@ -5928,6 +6213,7 @@ const SearchFillingPointAddress = () => {
     label: t("ES_COMMON_SEARCH"),
     onSubmit: onSearch
   })))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(Table, {
+    key: (allFillingPoints === null || allFillingPoints === void 0 ? void 0 : allFillingPoints.length) > 0 ? "loaded" : "loading",
     data: tableData,
     columns: columns,
     pageSize: 10,
@@ -5941,12 +6227,16 @@ const SearchFillingPointAddress = () => {
       }
     }),
     t: t,
-    isLoading: isLoading,
+    isLoading: isLoading || isAllFillingPointsLoading,
     isSearchRequired: false,
     isDownloadRequired: true,
     isFilterRequired: true,
     isSortRequired: true
-  })));
+  })), toast && /*#__PURE__*/React.createElement(Toast, {
+    error: toast.error,
+    label: toast.label,
+    onClose: closeToast
+  }));
 };
 
 const VendorAssign = ({
@@ -5958,83 +6248,60 @@ const VendorAssign = ({
     t
   } = useTranslation();
   const [showToast, setShowToast] = useState(null);
-  const [formData, setFormData] = useState({});
+  const [workOrderId, setWorkOrderId] = useState("");
+  const [vendor, setVendor] = useState(null);
   const [applicantName, setApplicantName] = useState("");
   const [mobileNumber, setMobileNumber] = useState("");
   const [alternateNumber, setAlternateNumber] = useState("");
   const [emailId, setEmailId] = useState("");
   const [validFrom, setValidFrom] = useState("");
   const [validTo, setValidTo] = useState("");
-  const [fillingPoint, setFillingPoint] = useState(null);
   const {
-    data: fetchedOptions,
-    isLoading: isFillingLoading
-  } = Digit.Hooks.wt.useTankerSearchAPI({
+    data: vendorOptions,
+    isLoading: isVendorLoading
+  } = Digit.Hooks.fsm.useVendorSearch({
     tenantId,
-    filters: {}
-  }, {
-    select: data => {
-      var _data$waterTankerBook, _data$waterTankerBook2;
-      return data === null || data === void 0 ? void 0 : (_data$waterTankerBook = data.waterTankerBookingDetail) === null || _data$waterTankerBook === void 0 ? void 0 : (_data$waterTankerBook2 = _data$waterTankerBook.filter(fp => fp.fillingpointmetadata)) === null || _data$waterTankerBook2 === void 0 ? void 0 : _data$waterTankerBook2.map(fp => {
-        var _fp$fillingpointmetad, _fp$fillingpointmetad2, _fp$fillingpointmetad3, _fp$fillingpointmetad4, _fp$fillingpointmetad5;
-        return {
-          name: ((_fp$fillingpointmetad = fp.fillingpointmetadata) === null || _fp$fillingpointmetad === void 0 ? void 0 : _fp$fillingpointmetad.fillingPointName) || ((_fp$fillingpointmetad2 = fp.fillingpointmetadata) === null || _fp$fillingpointmetad2 === void 0 ? void 0 : _fp$fillingpointmetad2.name),
-          code: ((_fp$fillingpointmetad3 = fp.fillingpointmetadata) === null || _fp$fillingpointmetad3 === void 0 ? void 0 : _fp$fillingpointmetad3.fillingPointId) || fp.bookingId,
-          i18nKey: ((_fp$fillingpointmetad4 = fp.fillingpointmetadata) === null || _fp$fillingpointmetad4 === void 0 ? void 0 : _fp$fillingpointmetad4.fillingPointName) || ((_fp$fillingpointmetad5 = fp.fillingpointmetadata) === null || _fp$fillingpointmetad5 === void 0 ? void 0 : _fp$fillingpointmetad5.name)
-        };
-      });
+    filters: {
+      status: "ACTIVE"
+    },
+    config: {
+      select: data => (data === null || data === void 0 ? void 0 : data.vendor) || []
     }
   });
-  const fillingPointOptions = (fetchedOptions === null || fetchedOptions === void 0 ? void 0 : fetchedOptions.length) > 0 ? fetchedOptions : [{
-    name: "Filling Point 1",
-    code: "FILLING_POINT_1",
-    i18nKey: "WT_FILLING_POINT_1"
-  }, {
-    name: "Filling Point 2",
-    code: "FILLING_POINT_2",
-    i18nKey: "WT_FILLING_POINT_2"
-  }, {
-    name: "Filling Point 3",
-    code: "FILLING_POINT_3",
-    i18nKey: "WT_FILLING_POINT_3"
-  }, {
-    name: "Filling Point 4",
-    code: "FILLING_POINT_4",
-    i18nKey: "WT_FILLING_POINT_4"
-  }];
+  const {
+    mutate: createWorkOrder
+  } = Digit.Hooks.wt.useVendorWorkOrderCreate(tenantId);
   const handleSubmit = () => {
-    if (!applicantName || !mobileNumber || !emailId || !validFrom || !validTo || !formData.address) {
-      setShowToast({
-        isError: true,
-        label: t("ES_COMMON_FILL_ALL_MANDATORY_FIELDS")
-      });
-      return;
-    }
     const payload = {
-      vendor: {
+      vendorWorkOrder: {
+        id: workOrderId,
         tenantId,
         name: applicantName,
+        vendorId: (vendor === null || vendor === void 0 ? void 0 : vendor.code) || (vendor === null || vendor === void 0 ? void 0 : vendor.id),
+        validFrom: new Date(validFrom).getTime(),
+        validTo: new Date(validTo).getTime(),
         mobileNumber,
         alternateNumber,
         emailId,
-        validFrom,
-        validTo,
-        fillingPoint: fillingPoint === null || fillingPoint === void 0 ? void 0 : fillingPoint.code,
-        address: formData.address
+        serviceType: "WT"
       }
     };
-    Digit.VendorService.createVendor(payload, tenantId).then(result => {
-      setShowToast({
-        isError: false,
-        label: t("ES_COMMON_SAVE_SUCCESS")
-      });
-    }).catch(err => {
-      var _err$response, _err$response$data, _err$response$data$Er, _err$response$data$Er2;
-      setShowToast({
-        isError: true,
-        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("ES_COMMON_ERROR_SAVING")
-      });
+    createWorkOrder(payload, {
+      onSuccess: result => {
+        setShowToast({
+          isError: false,
+          label: t("ES_COMMON_SAVE_SUCCESS")
+        });
+      },
+      onError: err => {
+        var _err$response, _err$response$data, _err$response$data$Er, _err$response$data$Er2;
+        setShowToast({
+          isError: true,
+          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("ES_COMMON_ERROR_SAVING")
+        });
+      }
     });
+    console.log(payload, "iuyui");
   };
   const isMobile = window.Digit.Utils.browser.isMobile();
   return /*#__PURE__*/React.createElement("div", {
@@ -6062,61 +6329,15 @@ const VendorAssign = ({
       display: "flex",
       flexDirection: "column"
     }
-  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("COMMON_APPLICANT_NAME")}`, " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(TextInput, {
-    t: t,
-    type: "text",
-    isMandatory: true,
-    name: "applicantName",
-    value: applicantName,
-    style: {
-      width: "100%"
-    },
-    onChange: e => setApplicantName(e.target.value)
-  })), /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "flex",
-      flexDirection: "column"
-    }
-  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("CORE_COMMON_APPLICANT_MOBILE_NUMBER")}`, " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(MobileNumber, {
-    value: mobileNumber,
-    name: "mobileNumber",
-    onChange: value => setMobileNumber(value),
-    style: {
-      width: "100%"
-    }
-  })), /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "flex",
-      flexDirection: "column"
-    }
-  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WT_VENDOR_ALT_MOBILE_NUMBER")}`), /*#__PURE__*/React.createElement(MobileNumber, {
-    value: alternateNumber,
-    name: "alternateNumber",
-    onChange: value => setAlternateNumber(value),
-    style: {
-      width: "100%"
-    }
-  })), /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "flex",
-      flexDirection: "column"
-    }
-  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("CORE_COMMON_APPLICANT_EMAIL_ID")}`, " ", /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("WT_VENDOR_NAME")}`, " ", /*#__PURE__*/React.createElement("span", {
     className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(TextInput, {
+  }, "*")), /*#__PURE__*/React.createElement(Dropdown, {
     t: t,
-    type: "email",
-    isMandatory: true,
-    name: "emailId",
-    value: emailId,
-    style: {
-      width: "100%"
-    },
-    onChange: e => setEmailId(e.target.value)
+    option: vendorOptions,
+    optionKey: "name",
+    select: setVendor,
+    selected: vendor,
+    placeholder: t("WT_SELECT_VENDOR")
   })), /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
@@ -6143,30 +6364,6 @@ const VendorAssign = ({
     style: {
       width: "100%"
     }
-  })), /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "flex",
-      flexDirection: "column"
-    }
-  }, /*#__PURE__*/React.createElement(CardLabel, null, `${t("COMMON_FILLING_POINT")}`, " ", /*#__PURE__*/React.createElement("span", {
-    className: "astericColor"
-  }, "*")), /*#__PURE__*/React.createElement(Dropdown, {
-    className: "form-field",
-    selected: fillingPoint,
-    disable: isFillingLoading,
-    select: setFillingPoint,
-    option: fillingPointOptions,
-    optionKey: "i18nKey",
-    optionCardStyles: {
-      overflowY: "auto",
-      maxHeight: "300px"
-    },
-    t: t,
-    name: "fillingPoint",
-    placeholder: t("WT_SELECT_FILLING_POINT") || "Select Filling Point",
-    style: {
-      width: "100%"
-    }
   })))), /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
@@ -21581,8 +21778,9 @@ const WTCitizenCard = () => {
   const {
     t
   } = useTranslation();
+  const history = useHistory();
   const [total, setTotal] = useState("-");
-  const tenantId = Digit.ULBService.getCitizenCurrentTenant(true) || Digit.ULBService.getCurrentTenantId();
+  const tenantId = Digit.ULBService.getCurrentTenantId() || Digit.ULBService.getCitizenCurrentTenant(true);
   const {
     data,
     isLoading,
@@ -21609,6 +21807,9 @@ const WTCitizenCard = () => {
   useEffect(() => {
     if (!isFetching && isSuccess) setTotal(data);
   }, [isFetching]);
+  const handleDetailsClick = () => {
+    history.push(`${APPLICATION_PATH}/citizen/wt/inbox`);
+  };
   const links = [{
     label: t("ES_COMMON_INBOX"),
     link: `${APPLICATION_PATH}/citizen/wt/inbox`
@@ -21622,9 +21823,10 @@ const WTCitizenCard = () => {
     kpis: [{
       count: total === null || total === void 0 ? void 0 : total.totalCount,
       label: t("ES_TITLE_INBOX"),
-      link: `${APPLICATION_PATH}/employee/wt/inbox`
+      link: `${APPLICATION_PATH}/citizen/wt/inbox`
     }],
-    links
+    links,
+    onDetailsClick: handleDetailsClick
   };
   return /*#__PURE__*/React.createElement(EmployeeModuleCard, propsForModuleCard);
 };
@@ -23062,10 +23264,13 @@ const WTLinks = ({
   }, []);
   const links = [{
     link: `${matchPath}/wt`,
-    i18nKey: t("WT_REAQUEST_TANKER")
+    i18nKey: t("WT_REQUEST_TANKER")
   }, {
     link: `${matchPath}/wt/status`,
     i18nKey: t("WT_VIEW_APPLICATIONS")
+  }, {
+    link: `${matchPath}/wt/wt-Vendor`,
+    i18nKey: t("WT_VENDOR_LOGIN")
   }];
   return /*#__PURE__*/React.createElement(CitizenHomeCard, {
     header: t("WATER_TANKER_SERVICE"),
@@ -23101,6 +23306,7 @@ const componentsToRegister = {
   WFCaption,
   WTEmpInbox: Inbox,
   WTCitizenCard: WTCitizenCard,
+  WTCard: WTCard,
   ServiceTypes,
   ToiletRequestDetails,
   TreePruningRequestDetails,