@djb25/digit-ui-module-wt 1.0.73 → 1.0.75

package/dist/index.js

@@ -43,11 +43,13 @@ const commonConfig = [{
     key: "serviceType",
     type: "component",
     nextStep: "info",
+    isCollapsible: false,
     hideInEmployee: true,
     isMandatory: true,
     texts: {
       submitBarLabel: "COMMON_SAVE_NEXT"
-    }
+    },
+    noGrid: true
   }, {
     route: "info",
     component: "InfoPage",
@@ -432,12 +434,12 @@ const WTCreate = () => {
         path: match.path + "/" + routeObj.route,
         key: index
       }, /*#__PURE__*/React__default.createElement(Component, {
-        config: {
+        config: _extends({}, routeObj, {
           texts,
           inputs,
           key,
           additionaFields
-        },
+        }),
         onSelect: handleSelect,
         t: t,
         formData: params,
@@ -1799,7 +1801,7 @@ const App = () => {
       parentRoute: path
     })
   }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.PrivateRoute, {
-    path: path + "/vendor",
+    path: path + "/wt-Vendor",
     component: () => Digit.UserService.hasAccess(["WT_VENDOR"]) ? /*#__PURE__*/React__default.createElement("div", {
       style: {
         display: "flex",
@@ -3523,6 +3525,9 @@ const WTDesktopInbox = _ref => {
   const _useState3 = React.useState(false),
     clearSearchCalled = _useState3[0],
     setClearSearchCalled = _useState3[1];
+  const _useState4 = React.useState(false),
+    isSidebarCollapsed = _useState4[0],
+    setIsSidebarCollapsed = _useState4[1];
   const columns = React__default.useMemo(() => props.isSearch ? tableConfig.searchColumns(props) : tableConfig.inboxColumns(props) || [], []);
   const inboxCsvColumns = React__default.useMemo(() => {
     var _columns$, _columns$2, _columns$3, _columns$4, _columns$find3;
@@ -3688,14 +3693,88 @@ const WTDesktopInbox = _ref => {
     });
   }
   return /*#__PURE__*/React__default.createElement("div", {
-    className: "inbox-container"
+    className: "inbox-container",
+    style: {
+      display: "flex",
+      flexDirection: "row",
+      gap: "12px",
+      alignItems: "flex-start",
+      width: "100%",
+      minHeight: 0,
+      overflow: "visible"
+    }
   }, !props.isSearch && /*#__PURE__*/React__default.createElement("div", {
-    className: "side-panel-item"
+    className: "wt-sidebar-panel",
+    style: {
+      width: isSidebarCollapsed ? "40px" : "240px",
+      minWidth: isSidebarCollapsed ? "40px" : "240px",
+      flexShrink: 0,
+      transition: "width 0.25s ease, min-width 0.25s ease",
+      overflow: "hidden",
+      display: "flex",
+      flexDirection: "column",
+      gap: "8px"
+    }
+  }, /*#__PURE__*/React__default.createElement("button", {
+    onClick: () => setIsSidebarCollapsed(prev => !prev),
+    title: isSidebarCollapsed ? "Expand Filters" : "Collapse Filters",
+    style: {
+      alignSelf: "flex-end",
+      background: "#0B2559",
+      border: "none",
+      borderRadius: "6px",
+      width: "32px",
+      height: "32px",
+      cursor: "pointer",
+      display: "flex",
+      alignItems: "center",
+      justifyContent: "center",
+      flexShrink: 0,
+      boxShadow: "0 2px 6px rgba(0,0,0,0.15)",
+      transition: "background 0.2s ease",
+      marginBottom: "4px"
+    },
+    onMouseEnter: e => e.currentTarget.style.background = "#1a3a7a",
+    onMouseLeave: e => e.currentTarget.style.background = "#0B2559"
+  }, isSidebarCollapsed ? /*#__PURE__*/React__default.createElement("svg", {
+    width: "16",
+    height: "16",
+    viewBox: "0 0 24 24",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, /*#__PURE__*/React__default.createElement("path", {
+    d: "M9 18l6-6-6-6",
+    stroke: "#fff",
+    strokeWidth: "2.5",
+    strokeLinecap: "round",
+    strokeLinejoin: "round"
+  })) : /*#__PURE__*/React__default.createElement("svg", {
+    width: "16",
+    height: "16",
+    viewBox: "0 0 24 24",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, /*#__PURE__*/React__default.createElement("path", {
+    d: "M15 18l-6-6 6-6",
+    stroke: "#fff",
+    strokeWidth: "2.5",
+    strokeLinecap: "round",
+    strokeLinejoin: "round"
+  }))), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      opacity: isSidebarCollapsed ? 0 : 1,
+      visibility: isSidebarCollapsed ? "hidden" : "visible",
+      transition: "opacity 0.2s ease, visibility 0.2s ease",
+      display: "flex",
+      flexDirection: "column",
+      gap: "8px",
+      overflow: "hidden"
+    }
   }, /*#__PURE__*/React__default.createElement(InboxLinks, {
     parentRoute: props.parentRoute,
     businessService: props.moduleCode
   }), /*#__PURE__*/React__default.createElement("div", {
-    className: "filter-form "
+    className: "filter-form"
   }, /*#__PURE__*/React__default.createElement(FilterComponent, {
     defaultSearchParams: props.defaultSearchParams,
     onFilterChange: props.onFilterChange,
@@ -3704,14 +3783,24 @@ const WTDesktopInbox = _ref => {
     useNewInboxAPI: useNewInboxAPI,
     statusMap: useNewInboxAPI ? data === null || data === void 0 ? void 0 : data[0].statusMap : null,
     moduleCode: props.moduleCode
-  }))), /*#__PURE__*/React__default.createElement("div", {
-    className: "employee-form-content",
+  })))), /*#__PURE__*/React__default.createElement("div", {
     style: {
-      flex: 1
+      flex: 1,
+      display: "flex",
+      flexDirection: "column",
+      gap: "12px",
+      minWidth: 0,
+      overflow: "hidden"
     }
   }, !props.isSearch && /*#__PURE__*/React__default.createElement("div", {
-    className: "summary-cards-container"
-  }, ((_props$searchParams, _props$searchParams$s, _data$4, _props$searchParams2) => {
+    className: "summary-cards-container",
+    style: {
+      display: "flex",
+      gap: "10px",
+      flexWrap: "wrap",
+      width: "100%"
+    }
+  }, ((_data$4, _props$searchParams) => {
     const getCount = statusList => {
       var _data$3;
       return ((data === null || data === void 0 ? void 0 : (_data$3 = data[0]) === null || _data$3 === void 0 ? void 0 : _data$3.statusMap) || []).filter(s => {
@@ -3719,13 +3808,12 @@ const WTDesktopInbox = _ref => {
         return statusList.includes(st);
       }).reduce((acc, curr) => acc + curr.count, 0);
     };
-    const isFixedPoint = props.businessService === "watertanker-fixedpoint" || ((_props$searchParams = props.searchParams) === null || _props$searchParams === void 0 ? void 0 : (_props$searchParams$s = _props$searchParams.services) === null || _props$searchParams$s === void 0 ? void 0 : _props$searchParams$s.includes("watertanker-fixedpoint"));
     const cards = [{
       label: "WT_TOTAL_BOOKINGS",
       count: (data === null || data === void 0 ? void 0 : (_data$4 = data[0]) === null || _data$4 === void 0 ? void 0 : _data$4.totalCount) || 0,
       color: "#0B2559",
       filter: null,
-      active: !((_props$searchParams2 = props.searchParams) !== null && _props$searchParams2 !== void 0 && _props$searchParams2.status)
+      active: !((_props$searchParams = props.searchParams) !== null && _props$searchParams !== void 0 && _props$searchParams.status)
     }, {
       label: "WT_SCHEDULED",
       count: getCount(["SCHEDULED", "VENDOR_ASSIGNED"]),
@@ -3736,8 +3824,7 @@ const WTDesktopInbox = _ref => {
       count: getCount(["TANKER_DELIVERED", "DELIVERED"]),
       color: "#10B981",
       filter: ["TANKER_DELIVERED"]
-    }];
-    cards.push({
+    }, {
       label: "IN_TRANSIT",
       count: getCount(["IN_TRANSIT", "DELIVERY_PENDING"]),
       color: "#A855F7",
@@ -3752,21 +3839,21 @@ const WTDesktopInbox = _ref => {
       count: getCount(["CANCELLED", "REJECTED", "REQUEST_REJECTED"]),
       color: "#64748B",
       filter: ["CANCELLED"]
-    });
+    }];
     return cards;
   })().map((card, idx) => {
-    var _props$searchParams3, _props$searchParams3$, _card$filter, _props$searchParams4, _props$searchParams4$;
-    const isActive = (_props$searchParams3 = props.searchParams) !== null && _props$searchParams3 !== void 0 && (_props$searchParams3$ = _props$searchParams3.status) !== null && _props$searchParams3$ !== void 0 && _props$searchParams3$.code ? (_card$filter = card.filter) === null || _card$filter === void 0 ? void 0 : _card$filter.includes((_props$searchParams4 = props.searchParams) === null || _props$searchParams4 === void 0 ? void 0 : (_props$searchParams4$ = _props$searchParams4.status) === null || _props$searchParams4$ === void 0 ? void 0 : _props$searchParams4$.code) : card.active;
+    var _props$searchParams2, _props$searchParams2$, _card$filter, _props$searchParams3, _props$searchParams3$;
+    const isActive = (_props$searchParams2 = props.searchParams) !== null && _props$searchParams2 !== void 0 && (_props$searchParams2$ = _props$searchParams2.status) !== null && _props$searchParams2$ !== void 0 && _props$searchParams2$.code ? (_card$filter = card.filter) === null || _card$filter === void 0 ? void 0 : _card$filter.includes((_props$searchParams3 = props.searchParams) === null || _props$searchParams3 === void 0 ? void 0 : (_props$searchParams3$ = _props$searchParams3.status) === null || _props$searchParams3$ === void 0 ? void 0 : _props$searchParams3$.code) : card.active;
     return /*#__PURE__*/React__default.createElement("div", {
       key: idx,
       className: "summary-card",
       style: {
         backgroundColor: "#fff",
         borderRadius: "6px",
-        padding: "16px 14px",
+        padding: "12px 14px",
         boxShadow: "0 2px 8px rgba(0,0,0,0.05)",
-        flex: "1 1 0%",
-        minWidth: "110px",
+        flex: "1 1 110px",
+        minWidth: "100px",
         border: isActive ? "2px solid " + card.color : "1px solid #E2E8F0",
         cursor: "pointer",
         display: "flex",
@@ -3776,7 +3863,7 @@ const WTDesktopInbox = _ref => {
       }
     }, /*#__PURE__*/React__default.createElement("div", {
       style: {
-        fontSize: "11px",
+        fontSize: "10px",
         color: "#64748B",
         fontWeight: "600",
         textTransform: "uppercase",
@@ -3787,10 +3874,10 @@ const WTDesktopInbox = _ref => {
       }
     }, t(card.label)), /*#__PURE__*/React__default.createElement("div", {
       style: {
-        fontSize: "28px",
+        fontSize: "24px",
         fontWeight: "700",
         color: card.color,
-        marginTop: "12px"
+        marginTop: "8px"
       }
     }, String(card.count).padStart(2, "0")));
   })), /*#__PURE__*/React__default.createElement(SearchApplication, {
@@ -3807,7 +3894,9 @@ const WTDesktopInbox = _ref => {
   }), /*#__PURE__*/React__default.createElement("div", {
     className: "result",
     style: {
-      flex: 1
+      flex: 1,
+      minWidth: 0,
+      overflowX: "auto"
     }
   }, result)));
 };
@@ -17830,7 +17919,7 @@ const TableConfig = t => ({
     }] : [])],
     serviceRequestIdKey: original => {
       var _original$t, _original$t$props;
-      return original === null || original === void 0 ? void 0 : (_original$t = original[t("WT_INBOX_UNIQUE_BOOKING_NO")]) === null || _original$t === void 0 ? void 0 : (_original$t$props = _original$t.props) === null || _original$t$props === void 0 ? void 0 : _original$t$props.children;
+      return original === null || original === void 0 ? void 0 : (_original$t = original[t("WT_BOOKING_NO")]) === null || _original$t === void 0 ? void 0 : (_original$t$props = _original$t.props) === null || _original$t$props === void 0 ? void 0 : _original$t$props.children;
     }
   },
   MT: {
@@ -17919,7 +18008,7 @@ const TableConfig = t => ({
     }],
     serviceRequestIdKey: original => {
       var _original$t2, _original$t2$props;
-      return original === null || original === void 0 ? void 0 : (_original$t2 = original[t("WT_INBOX_UNIQUE_BOOKING_NO")]) === null || _original$t2 === void 0 ? void 0 : (_original$t2$props = _original$t2.props) === null || _original$t2$props === void 0 ? void 0 : _original$t2$props.children;
+      return original === null || original === void 0 ? void 0 : (_original$t2 = original[t("MT_BOOKING_NO")]) === null || _original$t2 === void 0 ? void 0 : (_original$t2$props = _original$t2.props) === null || _original$t2$props === void 0 ? void 0 : _original$t2$props.children;
     }
   },
   TP: {
@@ -18008,7 +18097,7 @@ const TableConfig = t => ({
     }],
     serviceRequestIdKey: original => {
       var _original$t3, _original$t3$props;
-      return original === null || original === void 0 ? void 0 : (_original$t3 = original[t("WT_INBOX_UNIQUE_BOOKING_NO")]) === null || _original$t3 === void 0 ? void 0 : (_original$t3$props = _original$t3.props) === null || _original$t3$props === void 0 ? void 0 : _original$t3$props.children;
+      return original === null || original === void 0 ? void 0 : (_original$t3 = original[t("MT_BOOKING_NO")]) === null || _original$t3 === void 0 ? void 0 : (_original$t3$props = _original$t3.props) === null || _original$t3$props === void 0 ? void 0 : _original$t3$props.children;
     }
   }
 });
@@ -22026,12 +22115,12 @@ const ActionModal$5 = _ref => {
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat7 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat7 !== void 0 && _parsedAdhocRebateDat7.adhocRebate) applicationData.additionalDetails.adhocRebate = parseInt(parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat8 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat8 === void 0 ? void 0 : _parsedAdhocRebateDat8.adhocRebate) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat9 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat9 !== void 0 && _parsedAdhocRebateDat9.adhocRebateComment) applicationData.additionalDetails.adhocRebateComment = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat0 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat0 === void 0 ? void 0 : _parsedAdhocRebateDat0.adhocRebateComment) || "";
       if (parsedAdhocRebateData !== null && parsedAdhocRebateData !== void 0 && (_parsedAdhocRebateDat1 = parsedAdhocRebateData.value) !== null && _parsedAdhocRebateDat1 !== void 0 && _parsedAdhocRebateDat1.adhocRebateReason) applicationData.additionalDetails.adhocRebateReason = (parsedAdhocRebateData === null || parsedAdhocRebateData === void 0 ? void 0 : (_parsedAdhocRebateDat10 = parsedAdhocRebateData.value) === null || _parsedAdhocRebateDat10 === void 0 ? void 0 : _parsedAdhocRebateDat10.adhocRebateReason) || "";
-      const dueVerificationData = sessionStorage.getItem("Digit.DUE_VERIFICATION_DATA");
-      if (dueVerificationData) {
+      const inspectionInformationData = sessionStorage.getItem("Digit.INSPECTION_INFORMATION_DATA");
+      if (inspectionInformationData) {
         try {
-          applicationData.dueVerification = JSON.parse(dueVerificationData);
+          applicationData.inspectionInformation = JSON.parse(inspectionInformationData);
         } catch (e) {
-          console.error("Error parsing due verification data", e);
+          console.error("Error parsing inspection information data", e);
         }
       }
       ((_applicationData12 = applicationData) === null || _applicationData12 === void 0 ? void 0 : _applicationData12.serviceType) == "WATER" ? submitAction({
@@ -25260,19 +25349,23 @@ const WSFeeEstimation = _ref => {
     var _wsAdditionalDetails$2, _wsAdditionalDetails$3, _sessionFormData$bill;
     const data = _extends({}, wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$2 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$2 === void 0 ? void 0 : (_wsAdditionalDetails$3 = _wsAdditionalDetails$2.appDetails) === null || _wsAdditionalDetails$3 === void 0 ? void 0 : _wsAdditionalDetails$3.additionalDetails);
     if ((sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill = sessionFormData.billDetails) === null || _sessionFormData$bill === void 0 ? void 0 : _sessionFormData$bill.length) > 0) {
-      var _sessionFormData$bill2, _sessionFormData$bill3, _sessionFormData$bill4, _sessionFormData$bill5, _sessionFormData$bill6, _sessionFormData$bill7, _sessionFormData$bill8;
-      const values = [{
+      var _sessionFormData$bill2, _sessionFormData$bill3, _sessionFormData$bill4, _sessionFormData$bill5, _sessionFormData$bill6, _sessionFormData$bill7, _sessionFormData$bill8, _sessionFormData$bill9, _sessionFormData$bill0;
+      const billAccountDetails = (sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill2 = sessionFormData.billDetails) === null || _sessionFormData$bill2 === void 0 ? void 0 : (_sessionFormData$bill3 = _sessionFormData$bill2[0]) === null || _sessionFormData$bill3 === void 0 ? void 0 : _sessionFormData$bill3.billAccountDetails) || [];
+      const values = billAccountDetails.length > 0 ? billAccountDetails.map(bill => ({
+        title: bill === null || bill === void 0 ? void 0 : bill.taxHeadCode,
+        value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", Number(bill === null || bill === void 0 ? void 0 : bill.amount).toFixed(2))
+      })) : [{
         title: "WS_APPLICATION_FEE_HEADER",
-        value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill2 = sessionFormData.billDetails) === null || _sessionFormData$bill2 === void 0 ? void 0 : (_sessionFormData$bill3 = _sessionFormData$bill2[0]) === null || _sessionFormData$bill3 === void 0 ? void 0 : _sessionFormData$bill3.fee)
+        value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill4 = sessionFormData.billDetails) === null || _sessionFormData$bill4 === void 0 ? void 0 : (_sessionFormData$bill5 = _sessionFormData$bill4[0]) === null || _sessionFormData$bill5 === void 0 ? void 0 : _sessionFormData$bill5.fee)
       }, {
         title: "WS_SERVICE_FEE_HEADER",
-        value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill4 = sessionFormData.billDetails) === null || _sessionFormData$bill4 === void 0 ? void 0 : (_sessionFormData$bill5 = _sessionFormData$bill4[0]) === null || _sessionFormData$bill5 === void 0 ? void 0 : _sessionFormData$bill5.charge)
+        value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill6 = sessionFormData.billDetails) === null || _sessionFormData$bill6 === void 0 ? void 0 : (_sessionFormData$bill7 = _sessionFormData$bill6[0]) === null || _sessionFormData$bill7 === void 0 ? void 0 : _sessionFormData$bill7.charge)
       }, {
         title: "WS_TAX_HEADER",
-        value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill6 = sessionFormData.billDetails) === null || _sessionFormData$bill6 === void 0 ? void 0 : (_sessionFormData$bill7 = _sessionFormData$bill6[0]) === null || _sessionFormData$bill7 === void 0 ? void 0 : _sessionFormData$bill7.taxAmount)
+        value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill8 = sessionFormData.billDetails) === null || _sessionFormData$bill8 === void 0 ? void 0 : (_sessionFormData$bill9 = _sessionFormData$bill8[0]) === null || _sessionFormData$bill9 === void 0 ? void 0 : _sessionFormData$bill9.taxAmount)
       }];
       setValues(values);
-      setBillDetails(sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill8 = sessionFormData.billDetails) === null || _sessionFormData$bill8 === void 0 ? void 0 : _sessionFormData$bill8[0]);
+      setBillDetails(sessionFormData === null || sessionFormData === void 0 ? void 0 : (_sessionFormData$bill0 = sessionFormData.billDetails) === null || _sessionFormData$bill0 === void 0 ? void 0 : _sessionFormData$bill0[0]);
     } else {
       setSessionFormData(data);
       setFields(data);
@@ -25336,24 +25429,28 @@ const WSFeeEstimation = _ref => {
         };
         let businessService = (wsAdditionalDetails === null || wsAdditionalDetails === void 0 ? void 0 : (_wsAdditionalDetails$16 = wsAdditionalDetails.additionalDetails) === null || _wsAdditionalDetails$16 === void 0 ? void 0 : (_wsAdditionalDetails$17 = _wsAdditionalDetails$16.appDetails) === null || _wsAdditionalDetails$17 === void 0 ? void 0 : _wsAdditionalDetails$17.service) == "WATER" ? "WS" : "SW";
         Digit.WSService.wsCalculationEstimate(data, businessService).then((result, err) => {
-          var _result$Calculation, _result$Calculation$, _result$Calculation$$, _result$Calculation3, _result$Calculation3$, _result$Calculation4, _result$Calculation4$, _result$Calculation5, _result$Calculation5$, _result$Calculation6, _result$Calculation6$, _result$Calculation7;
+          var _result$Calculation, _result$Calculation$, _result$Calculation$$, _result$Calculation3, _result$Calculation3$, _result$Calculation4, _result$Calculation4$, _result$Calculation5, _result$Calculation5$, _result$Calculation6, _result$Calculation6$, _result$Calculation7, _result$Calculation7$, _result$Calculation8;
           if ((result === null || result === void 0 ? void 0 : (_result$Calculation = result.Calculation) === null || _result$Calculation === void 0 ? void 0 : (_result$Calculation$ = _result$Calculation[0]) === null || _result$Calculation$ === void 0 ? void 0 : (_result$Calculation$$ = _result$Calculation$.taxHeadEstimates) === null || _result$Calculation$$ === void 0 ? void 0 : _result$Calculation$$.length) > 0) {
             var _result$Calculation2, _result$Calculation2$, _result$Calculation2$2;
             result === null || result === void 0 ? void 0 : (_result$Calculation2 = result.Calculation) === null || _result$Calculation2 === void 0 ? void 0 : (_result$Calculation2$ = _result$Calculation2[0]) === null || _result$Calculation2$ === void 0 ? void 0 : (_result$Calculation2$2 = _result$Calculation2$.taxHeadEstimates) === null || _result$Calculation2$2 === void 0 ? void 0 : _result$Calculation2$2.forEach(data => data.amount = data.estimateAmount);
           }
           result.Calculation[0].billSlabData = _.groupBy(result === null || result === void 0 ? void 0 : (_result$Calculation3 = result.Calculation) === null || _result$Calculation3 === void 0 ? void 0 : (_result$Calculation3$ = _result$Calculation3[0]) === null || _result$Calculation3$ === void 0 ? void 0 : _result$Calculation3$.taxHeadEstimates, "category");
-          const values = [{
+          const taxHeadEstimates = (result === null || result === void 0 ? void 0 : (_result$Calculation4 = result.Calculation) === null || _result$Calculation4 === void 0 ? void 0 : (_result$Calculation4$ = _result$Calculation4[0]) === null || _result$Calculation4$ === void 0 ? void 0 : _result$Calculation4$.taxHeadEstimates) || [];
+          const values = taxHeadEstimates.length > 0 ? taxHeadEstimates.map(data => ({
+            title: data === null || data === void 0 ? void 0 : data.taxHeadCode,
+            value: /*#__PURE__*/React__default.createElement("span", null, "\u20B9", Number(data === null || data === void 0 ? void 0 : data.estimateAmount).toFixed(2))
+          })) : [{
             title: "WS_APPLICATION_FEE_HEADER",
-            value: (_result$Calculation4 = result.Calculation) === null || _result$Calculation4 === void 0 ? void 0 : (_result$Calculation4$ = _result$Calculation4[0]) === null || _result$Calculation4$ === void 0 ? void 0 : _result$Calculation4$.fee
+            value: (_result$Calculation5 = result.Calculation) === null || _result$Calculation5 === void 0 ? void 0 : (_result$Calculation5$ = _result$Calculation5[0]) === null || _result$Calculation5$ === void 0 ? void 0 : _result$Calculation5$.fee
           }, {
             title: "WS_SERVICE_FEE_HEADER",
-            value: (_result$Calculation5 = result.Calculation) === null || _result$Calculation5 === void 0 ? void 0 : (_result$Calculation5$ = _result$Calculation5[0]) === null || _result$Calculation5$ === void 0 ? void 0 : _result$Calculation5$.charge
+            value: (_result$Calculation6 = result.Calculation) === null || _result$Calculation6 === void 0 ? void 0 : (_result$Calculation6$ = _result$Calculation6[0]) === null || _result$Calculation6$ === void 0 ? void 0 : _result$Calculation6$.charge
           }, {
             title: "WS_TAX_HEADER",
-            value: (_result$Calculation6 = result.Calculation) === null || _result$Calculation6 === void 0 ? void 0 : (_result$Calculation6$ = _result$Calculation6[0]) === null || _result$Calculation6$ === void 0 ? void 0 : _result$Calculation6$.taxAmount
+            value: (_result$Calculation7 = result.Calculation) === null || _result$Calculation7 === void 0 ? void 0 : (_result$Calculation7$ = _result$Calculation7[0]) === null || _result$Calculation7$ === void 0 ? void 0 : _result$Calculation7$.taxAmount
           }];
           setSessionBillFormData(cloneDeep_1(result.Calculation[0]));
-          setBillDetails(result === null || result === void 0 ? void 0 : (_result$Calculation7 = result.Calculation) === null || _result$Calculation7 === void 0 ? void 0 : _result$Calculation7[0]);
+          setBillDetails(result === null || result === void 0 ? void 0 : (_result$Calculation8 = result.Calculation) === null || _result$Calculation8 === void 0 ? void 0 : _result$Calculation8[0]);
           setValues(values);
           fields.billDetails = result === null || result === void 0 ? void 0 : result.Calculation;
           setSessionFormData(fields);
@@ -26113,36 +26210,65 @@ const DueVerification = _ref => {
   const _useState = React.useState(""),
     kno = _useState[0],
     setKno = _useState[1];
-  const _useState2 = React.useState([]),
-    tableData = _useState2[0],
-    setTableData = _useState2[1];
-  const columns = React.useMemo(() => [{
-    Header: t("K No."),
-    accessor: "kno"
-  }, {
-    Header: t("Full Name"),
-    accessor: "fullName"
-  }, {
-    Header: t("Full Address"),
-    accessor: "fullAddress"
-  }, {
-    Header: t("Due Amount"),
-    accessor: "dueAmount"
-  }, {
-    Header: t("Total Amount"),
-    accessor: "totalAmount"
-  }], [t]);
-  React.useEffect(() => {
-    const savedData = sessionStorage.getItem("Digit.DUE_VERIFICATION_DATA");
-    if (savedData) {
-      try {
-        setTableData(JSON.parse(savedData));
-      } catch (e) {
-        console.error("Error parsing due verification data", e);
+  const _useState2 = React.useState(""),
+    remarks = _useState2[0],
+    setRemarks = _useState2[1];
+  const _useState3 = React.useState([]),
+    tableData = _useState3[0],
+    setTableData = _useState3[1];
+  const handleRemarkChange = React__default.useCallback((index, value) => {
+    setTableData(prevData => {
+      const newData = [...prevData];
+      newData[index] = _extends({}, newData[index], {
+        remarks: value
+      });
+      if (applicationData) {
+        applicationData.dueVerification = newData;
       }
-    } else if (applicationData !== null && applicationData !== void 0 && applicationData.dueVerification && Array.isArray(applicationData.dueVerification)) {
+      return newData;
+    });
+  }, [applicationData]);
+  const isPendingApproval = (applicationData === null || applicationData === void 0 ? void 0 : applicationData.applicationStatus) === "PENDING_APPROVAL_FOR_CONNECTION";
+  const columns = React.useMemo(() => {
+    const baseColumns = [{
+      Header: t("K No."),
+      accessor: "kno"
+    }, {
+      Header: t("Full Name"),
+      accessor: "fullName"
+    }, {
+      Header: t("Full Address"),
+      accessor: "fullAddress"
+    }, {
+      Header: t("Due Amount"),
+      accessor: "dueAmount"
+    }, {
+      Header: t("Total Amount"),
+      accessor: "totalAmount"
+    }];
+    if (isPendingApproval) {
+      baseColumns.push({
+        Header: t("Remarks"),
+        accessor: "remarks",
+        Cell: _ref2 => {
+          let row = _ref2.row,
+            value = _ref2.value;
+          return /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+            style: {
+              marginBottom: "0px",
+              minWidth: "150px"
+            },
+            value: value || "",
+            onChange: e => handleRemarkChange(row.index, e.target.value)
+          });
+        }
+      });
+    }
+    return baseColumns;
+  }, [t, handleRemarkChange, isPendingApproval]);
+  React.useEffect(() => {
+    if (applicationData !== null && applicationData !== void 0 && applicationData.dueVerification && Array.isArray(applicationData.dueVerification)) {
       setTableData(applicationData.dueVerification);
-      sessionStorage.setItem("Digit.DUE_VERIFICATION_DATA", JSON.stringify(applicationData.dueVerification));
     }
   }, [applicationData]);
   const handleAdd = () => {
@@ -26152,12 +26278,16 @@ const DueVerification = _ref => {
         fullName: "John Doe",
         fullAddress: "123 Main St, New Delhi, Delhi 110001",
         dueAmount: "1500",
-        totalAmount: "1500"
+        totalAmount: "1500",
+        remarks: remarks
       };
       const newTableData = [...tableData, mockData];
       setTableData(newTableData);
-      sessionStorage.setItem("Digit.DUE_VERIFICATION_DATA", JSON.stringify(newTableData));
+      if (applicationData) {
+        applicationData.dueVerification = newTableData;
+      }
       setKno("");
+      setRemarks("");
     }
   };
   return /*#__PURE__*/React__default.createElement("div", {
@@ -26239,7 +26369,8 @@ const DueVerification = _ref => {
   })));
 };
 
-const InspectionInformation = () => {
+const InspectionInformation = _ref => {
+  let applicationData = _ref.applicationData;
   const _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   const _useState = React.useState(null),
@@ -26251,9 +26382,37 @@ const InspectionInformation = () => {
   const _useState3 = React.useState(""),
     inspectorName = _useState3[0],
     setInspectorName = _useState3[1];
+  React.useEffect(() => {
+    const savedData = sessionStorage.getItem("Digit.INSPECTION_INFORMATION_DATA");
+    if (savedData) {
+      try {
+        const parsed = JSON.parse(savedData);
+        setInspectionType(parsed.inspectionType || null);
+        setInspectionDate(parsed.inspectionDate || "");
+        setInspectorName(parsed.inspectorName || "");
+      } catch (e) {
+        console.error("Error parsing inspection information data", e);
+      }
+    } else if (applicationData !== null && applicationData !== void 0 && applicationData.inspectionInformation) {
+      setInspectionType(applicationData.inspectionInformation.inspectionType || null);
+      setInspectionDate(applicationData.inspectionInformation.inspectionDate || "");
+      setInspectorName(applicationData.inspectionInformation.inspectorName || "");
+      sessionStorage.setItem("Digit.INSPECTION_INFORMATION_DATA", JSON.stringify(applicationData.inspectionInformation));
+    }
+  }, [applicationData]);
+  React.useEffect(() => {
+    sessionStorage.setItem("Digit.INSPECTION_INFORMATION_DATA", JSON.stringify({
+      inspectionType,
+      inspectionDate,
+      inspectorName
+    }));
+  }, [inspectionType, inspectionDate, inspectorName]);
   const inspectionTypeOptions = [{
-    name: "Select",
+    i18nKey: "ES_COMMON_SELECT",
     code: ""
+  }, {
+    i18nKey: "New Connection Visit",
+    code: "new_connection_visit"
   }];
   return /*#__PURE__*/React__default.createElement("div", {
     style: {
@@ -26289,7 +26448,7 @@ const InspectionInformation = () => {
     }
   }, "*")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
     option: inspectionTypeOptions,
-    optionKey: "name",
+    optionKey: "i18nKey",
     id: "inspectionType",
     selected: inspectionType,
     select: setInspectionType,
@@ -27264,6 +27423,14 @@ const ApplicationDetails = props => {
   function onActionSelect(action) {
     sessionStorage.setItem("SELECTED_ACTION", action === null || action === void 0 ? void 0 : action.action);
     if (action) {
+      if ((action === null || action === void 0 ? void 0 : action.action) === "PAY" && !(action !== null && action !== void 0 && action.redirectionUrl) && !(action !== null && action !== void 0 && action.redirectionUrll)) {
+        if (window.location.href.includes("/employee")) {
+          history.push("/digit-ui/employee/payment/collect/" + businessService + "/" + applicationNumber + "?tenantId=" + tenantId);
+        } else {
+          history.push("/digit-ui/citizen/payment/my-bills/" + businessService + "/" + applicationNumber + "?tenantId=" + tenantId);
+        }
+        return;
+      }
       if (action !== null && action !== void 0 && action.isToast) {
         setShowToast({
           key: "error",
@@ -27956,35 +28123,18 @@ const TPCard = () => {
   return /*#__PURE__*/React__default.createElement(digitUiReactComponents.EmployeeModuleCard, propsForModuleCard);
 };
 
-const Close$g = () => /*#__PURE__*/React__default.createElement("svg", {
-  xmlns: "http://www.w3.org/2000/svg",
-  viewBox: "0 0 24 24",
-  fill: "#FFFFFF"
-}, /*#__PURE__*/React__default.createElement("path", {
-  d: "M0 0h24v24H0V0z",
-  fill: "none"
-}), /*#__PURE__*/React__default.createElement("path", {
-  d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
-}));
-const CloseBtn$g = _ref => {
-  let onClick = _ref.onClick;
-  return /*#__PURE__*/React__default.createElement("div", {
-    className: "icon-bg-secondary",
-    onClick: onClick
-  }, /*#__PURE__*/React__default.createElement(Close$g, null));
-};
 const Heading$d = props => {
   return /*#__PURE__*/React__default.createElement("h1", {
     className: "heading-m"
   }, props.t("SERVICE_TYPE"));
 };
-const ServiceTypes = _ref2 => {
+const ServiceTypes = _ref => {
   var _formData$serviceType;
-  let t = _ref2.t,
-    config = _ref2.config,
-    onSelect = _ref2.onSelect,
-    userType = _ref2.userType,
-    formData = _ref2.formData;
+  let t = _ref.t,
+    config = _ref.config,
+    onSelect = _ref.onSelect,
+    userType = _ref.userType,
+    formData = _ref.formData;
   const tenantId = Digit.ULBService.getStateId();
   const _Digit$Hooks$useCusto = Digit.Hooks.useCustomMDMS(tenantId, "request-service", [{
       name: "ServiceType"
@@ -27996,7 +28146,6 @@ const ServiceTypes = _ref2 => {
       }
     }),
     serviceTypeData = _Digit$Hooks$useCusto.data;
-  const user = Digit.UserService.getUser().info;
   const _useState = React.useState((formData === null || formData === void 0 ? void 0 : (_formData$serviceType = formData.serviceType) === null || _formData$serviceType === void 0 ? void 0 : _formData$serviceType.serviceType) || ""),
     serviceType = _useState[0],
     setServiceType = _useState[1];
@@ -28009,7 +28158,6 @@ const ServiceTypes = _ref2 => {
   }, [formData.serviceType, serviceType, onSelect, config.key]);
   React.useEffect(() => {
     if (userType === "citizen") {
-      console.log('calling meeeeeee');
       goNext();
     }
   }, [serviceType, userType, goNext]);
@@ -28017,32 +28165,20 @@ const ServiceTypes = _ref2 => {
     headerBarMain: /*#__PURE__*/React__default.createElement(Heading$d, {
       t: t
     }),
-    headerBarEnd: /*#__PURE__*/React__default.createElement(CloseBtn$g, {
+    headerBarEnd: /*#__PURE__*/React__default.createElement(digitUiReactComponents.CloseSvg, {
+      className: "icon-bg-secondary",
+      fill: "#fff",
       onClick: () => window.history.back()
     }),
-    popupStyles: {
-      backgroundColor: "#fff",
-      position: 'relative',
-      maxHeight: '50vh',
-      width: '50%',
-      overflowY: 'visible'
-    },
-    popupModuleMianStyles: {
-      padding: "10px"
-    },
     hideSubmit: true,
-    headerBarMainStyle: {
-      position: "sticky",
-      top: 0,
-      backgroundColor: "#f5f5f5"
-    },
     formId: "modal-action"
   }, /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormStep, {
     config: config,
     onSelect: goNext,
     t: t,
-    isDisabled: !serviceType
-  }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, "" + t("REQUEST_TYPE"), " ", /*#__PURE__*/React__default.createElement("span", {
+    isDisabled: !serviceType,
+    className: "grid-1 ws-search-form"
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.LabelFieldPair, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, null, "" + t("REQUEST_TYPE"), " ", /*#__PURE__*/React__default.createElement("span", {
     className: "astericColor"
   }, "*")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
     className: "form-field",