@mseva/digit-ui-module-ndc 1.0.26 → 1.0.27

package/dist/index.modern.js

@@ -547,7 +547,7 @@ const Response = props => {
     label: t("CORE_COMMON_GO_TO_NDC"),
     onSubmit: onGoToNDC
   }), /*#__PURE__*/React.createElement(SubmitBar$1, {
-    label: t("COMMON_MAKE_PAYMENT"),
+    label: t("CS_APPLICATION_DETAILS_MAKE_PAYMENT"),
     onSubmit: handlePayment
   }))));
 };
@@ -1117,6 +1117,24 @@ const ApplicationOverview = () => {
   const [errorOne, setErrorOne] = useState(null);
   const [displayData, setDisplayData] = useState({});
   const [isDetailsLoading, setIsDetailsLoading] = useState(false);
+  const [markedPending, setMarkedPending] = useState({});
+  const handleMarkPending = consumerCode => {
+    setMarkedPending(prev => {
+      const updated = {
+        ...prev,
+        [consumerCode]: !prev[consumerCode]
+      };
+      if (updated[consumerCode]) {
+        console.log("✅ Marked dues pending for", consumerCode);
+      } else {
+        console.log("↩️ Undo marking dues pending for", consumerCode);
+      }
+      return updated;
+    });
+  };
+  useEffect(() => {
+    console.log("markedPending", markedPending);
+  }, [markedPending]);
   const {
     isLoading,
     data: applicationDetails
@@ -1263,8 +1281,13 @@ const ApplicationOverview = () => {
     const payloadData = applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.Applications[0];
     const updatedApplicant = {
       ...payloadData,
+      NdcDetails: payloadData.NdcDetails.map(detail => ({
+        ...detail,
+        isDuePending: markedPending[detail.consumerCode] || false
+      })),
       workflow: {}
     };
+    console.log("updatedApplicant", updatedApplicant);
     const filtData = data === null || data === void 0 ? void 0 : (_data$Licenses = data.Licenses) === null || _data$Licenses === void 0 ? void 0 : _data$Licenses[0];
     updatedApplicant.workflow = {
       action: filtData.action,
@@ -1272,42 +1295,17 @@ const ApplicationOverview = () => {
       comment: filtData === null || filtData === void 0 ? void 0 : filtData.comment,
       documents: filtData === null || filtData === void 0 ? void 0 : filtData.wfDocuments
     };
-    if (!(filtData !== null && filtData !== void 0 && filtData.assignee) && filtData.action == "FORWARD") {
+    console.log("filtData action", filtData.action);
+    if (!(filtData !== null && filtData !== void 0 && filtData.assignee) && filtData.action !== "SENDBACKTOCITIZEN" && filtData.action !== "APPROVE" && filtData.action !== "REJECT" && filtData.action !== "SENDBACK") {
       setErrorOne("Assignee is Mandatory");
       setShowErrorToastt(true);
       return;
-    } else if (!(filtData !== null && filtData !== void 0 && filtData.comment) && ((filtData === null || filtData === void 0 ? void 0 : filtData.action) == "FORWARD" || (filtData === null || filtData === void 0 ? void 0 : filtData.action) == "REJECT")) {
+    } else if (!(filtData !== null && filtData !== void 0 && filtData.comment)) {
       setErrorOne("Comment is Mandatory");
       setShowErrorToastt(true);
       return;
     }
-    const finalPayload = {
-      Applications: [updatedApplicant]
-    };
-    try {
-      const response = await Digit.NDCService.NDCUpdate({
-        tenantId,
-        details: finalPayload
-      });
-      setShowToast({
-        key: "success",
-        message: "Successfully updated the status"
-      });
-      setError("Successfully updated the status");
-      workflowDetails.revalidate();
-      setTimeout(() => {
-        history.push("/digit-ui/employee/ndc/inbox");
-        window.location.reload();
-      }, 2000);
-      setSelectedAction(null);
-      setShowModal(false);
-    } catch (err) {
-      setShowToast({
-        key: "error",
-        message: "Something went wrong"
-      });
-      setError("Something went wrong");
-    }
+    return;
   };
   const closeModal = () => {
     setSelectedAction(null);
@@ -1317,9 +1315,7 @@ const ApplicationOverview = () => {
   useEffect(() => {
     if (displayData) {
       var _displayData$NdcDetai, _checkProperty$;
-      console.log("here");
       const checkProperty = displayData === null || displayData === void 0 ? void 0 : (_displayData$NdcDetai = displayData.NdcDetails) === null || _displayData$NdcDetai === void 0 ? void 0 : _displayData$NdcDetai.filter(item => (item === null || item === void 0 ? void 0 : item.businessService) == "NDC_PROPERTY_TAX");
-      console.log("checkProperty", checkProperty);
       setPropertyId(checkProperty === null || checkProperty === void 0 ? void 0 : (_checkProperty$ = checkProperty[0]) === null || _checkProperty$ === void 0 ? void 0 : _checkProperty$.consumerCode);
     }
   }, [displayData]);
@@ -1352,6 +1348,11 @@ const ApplicationOverview = () => {
     text: Array.isArray(value) ? value.map(item => typeof item === "object" ? t((item === null || item === void 0 ? void 0 : item.code) || "N/A") : t(item || "N/A")).join(", ") : typeof value === "object" ? t((value === null || value === void 0 ? void 0 : value.code) || "N/A") : t(value || "N/A")
   }))))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("NDC_APPLICATION_NDC_DETAILS_OVERVIEW")), displayData === null || displayData === void 0 ? void 0 : (_displayData$NdcDetai2 = displayData.NdcDetails) === null || _displayData$NdcDetai2 === void 0 ? void 0 : _displayData$NdcDetai2.map((detail, index) => {
     var _detail$dueAmount, _propertyDetailsFetch, _propertyDetailsFetch2, _propertyDetailsFetch3, _propertyDetailsFetch4, _propertyDetailsFetch5, _propertyDetailsFetch6, _propertyDetailsFetch7, _propertyDetailsFetch8, _propertyDetailsFetch9, _propertyDetailsFetch0, _propertyDetailsFetch1, _propertyDetailsFetch10, _propertyDetailsFetch11, _propertyDetailsFetch12, _propertyDetailsFetch13, _propertyDetailsFetch14, _propertyDetailsFetch15, _propertyDetailsFetch16, _propertyDetailsFetch17, _propertyDetailsFetch18;
+    const isPT = (detail === null || detail === void 0 ? void 0 : detail.businessService) === "NDC_PROPERTY_TAX";
+    const isSW = (detail === null || detail === void 0 ? void 0 : detail.businessService) === "NDC_SEWERAGE_SERVICE_CONNECTION";
+    const isWS = (detail === null || detail === void 0 ? void 0 : detail.businessService) === "NDC_WATER_SERVICE_CONNECTION";
+    const canRaiseFlag = isPT && (userRoles === null || userRoles === void 0 ? void 0 : userRoles.includes("NDC_PT_VERIFIER")) || (isSW || isWS) && (userRoles === null || userRoles === void 0 ? void 0 : userRoles.includes("NDC_WS_SW_VERIFIER"));
+    const isMarked = markedPending[detail.consumerCode];
     return /*#__PURE__*/React.createElement("div", {
       key: index,
       style: {
@@ -1372,7 +1373,7 @@ const ApplicationOverview = () => {
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("NDC_PROPERTY_TYPE"),
       text: t(detail.propertyType) || detail.propertyType
-    }), (detail === null || detail === void 0 ? void 0 : detail.businessService) == "NDC_PROPERTY_TAX" && (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : propertyDetailsFetch.Properties) && /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement(Row, {
+    }), isPT && (propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : propertyDetailsFetch.Properties) && /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement(Row, {
       label: t("City"),
       text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch2 = _propertyDetailsFetch[0]) === null || _propertyDetailsFetch2 === void 0 ? void 0 : (_propertyDetailsFetch3 = _propertyDetailsFetch2.address) === null || _propertyDetailsFetch3 === void 0 ? void 0 : _propertyDetailsFetch3.city
     }), /*#__PURE__*/React.createElement(Row, {
@@ -1393,7 +1394,16 @@ const ApplicationOverview = () => {
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("Year of creation of Property"),
       text: propertyDetailsFetch === null || propertyDetailsFetch === void 0 ? void 0 : (_propertyDetailsFetch16 = propertyDetailsFetch.Properties) === null || _propertyDetailsFetch16 === void 0 ? void 0 : (_propertyDetailsFetch17 = _propertyDetailsFetch16[0]) === null || _propertyDetailsFetch17 === void 0 ? void 0 : (_propertyDetailsFetch18 = _propertyDetailsFetch17.additionalDetails) === null || _propertyDetailsFetch18 === void 0 ? void 0 : _propertyDetailsFetch18.yearConstruction
-    }))));
+    }))), canRaiseFlag && /*#__PURE__*/React.createElement("div", {
+      style: {
+        marginTop: "16px",
+        display: "flex",
+        justifyContent: "right"
+      }
+    }, /*#__PURE__*/React.createElement(SubmitBar$1, {
+      label: isMarked ? "Undo Mark Pending" : "Mark Dues Pending",
+      onSubmit: () => handleMarkPending(detail === null || detail === void 0 ? void 0 : detail.consumerCode)
+    })));
   })), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, null, t("NDC_APPLICATION_DOCUMENTS_OVERVIEW")), /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
@@ -11771,17 +11781,17 @@ const NewNDCStepFormOne = ({
     }
   };
   function validateStepData(data) {
-    var _data$cpt6, _data$cpt6$dues, _data$cpt7, _data$cpt7$dues, _data$dues, _propertyDetails$wate, _propertyDetails$sewe;
+    var _data$cpt6, _data$cpt7, _data$cpt7$dues, _propertyDetails$wate, _propertyDetails$sewe;
     const missingFields = [];
     const invalidFields = [];
     const cpt = (data === null || data === void 0 ? void 0 : data.cpt) || {};
     const cptDetails = (cpt === null || cpt === void 0 ? void 0 : cpt.details) || {};
     const propertyDetails = (data === null || data === void 0 ? void 0 : data.PropertyDetails) || {};
     const NDCReason = (data === null || data === void 0 ? void 0 : data.NDCReason) || {};
-    if ((data === null || data === void 0 ? void 0 : (_data$cpt6 = data.cpt) === null || _data$cpt6 === void 0 ? void 0 : (_data$cpt6$dues = _data$cpt6.dues) === null || _data$cpt6$dues === void 0 ? void 0 : _data$cpt6$dues.totalAmount) != 0) {
+    if (!(data !== null && data !== void 0 && (_data$cpt6 = data.cpt) !== null && _data$cpt6 !== void 0 && _data$cpt6.dues)) {
       missingFields.push(`${t("NDC_MESSAGE_PLEASE_CHECK_STATUS_OF_PROPERTY_TAX")} ${cpt === null || cpt === void 0 ? void 0 : cpt.id}`);
     }
-    if (data !== null && data !== void 0 && (_data$cpt7 = data.cpt) !== null && _data$cpt7 !== void 0 && (_data$cpt7$dues = _data$cpt7.dues) !== null && _data$cpt7$dues !== void 0 && _data$cpt7$dues.id && (data === null || data === void 0 ? void 0 : (_data$dues = data.dues) === null || _data$dues === void 0 ? void 0 : _data$dues.totalAmount) > 0) {
+    if ((data === null || data === void 0 ? void 0 : (_data$cpt7 = data.cpt) === null || _data$cpt7 === void 0 ? void 0 : (_data$cpt7$dues = _data$cpt7.dues) === null || _data$cpt7$dues === void 0 ? void 0 : _data$cpt7$dues.totalAmount) > 0) {
       missingFields.push(`${t("NDC_MESSAGE_PLEASE_PAY_DUES_OF_PROPERTY_TAX")} ${cpt === null || cpt === void 0 ? void 0 : cpt.id}`);
     }
     if ((propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$wate = propertyDetails.waterConnection) === null || _propertyDetails$wate === void 0 ? void 0 : _propertyDetails$wate.length) > 0) {
@@ -11814,7 +11824,7 @@ const NewNDCStepFormOne = ({
     if (!(propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.email)) missingFields.push(t("NDC_MESSAGE_EMAIL"));
     if (!(NDCReason !== null && NDCReason !== void 0 && NDCReason.code)) missingFields.push(t("NDC_MESSAGE_NDC_REASON"));
     const nameRegex = /^[A-Za-z\s]+$/;
-    const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9-]+\.[a-zA-Z]{2,}$/;
+    const emailRegex = /^(?!\.)(?!.*\.\.)[a-zA-Z0-9._%+-]+@[a-zA-Z0-9-]+(\.[a-zA-Z]{2,})+$/;
     const mobileRegex = /^[6-9]\d{9}$/;
     if (propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.firstName && !nameRegex.test(propertyDetails.firstName)) {
       invalidFields.push(t("NDC_MESSAGE_FIRST_NAME_ONLY_ALPHABETS_ALLOWED"));
@@ -11966,7 +11976,7 @@ const PropertyDetailsForm$1 = ({
   formState,
   clearErrors
 }) => {
-  var _formData$cpt, _formData$cpt$details, _formData$cpt3, _Digit, _Digit$ComponentRegis, _formData$cpt6, _formData$cpt6$detail, _formData$cpt7, _apiDataCheck$6, _propertyDetails$wate, _propertyDetails$sewe;
+  var _formData$cpt, _formData$cpt$details, _formData$cpt3, _Digit, _Digit$ComponentRegis, _formData$cpt4, _apiDataCheck$5, _propertyDetails$wate, _propertyDetails$sewe;
   const {
     control,
     formState: localFormState,
@@ -12022,21 +12032,23 @@ const PropertyDetailsForm$1 = ({
     t
   });
   useEffect(() => {
-    var _formData$cpt2, _formData$cpt2$detail, _formData$cpt2$detail2, _owner$name, _formData$PropertyDet, _formData$PropertyDet2;
+    var _formData$cpt2, _formData$cpt2$detail, _formData$cpt2$detail2, _owner$name, _formData$PropertyDet, _formData$PropertyDet2, _formData$PropertyDet3;
+    console.log("coming here everytime", formData);
     const owner = formData === null || formData === void 0 ? void 0 : (_formData$cpt2 = formData.cpt) === null || _formData$cpt2 === void 0 ? void 0 : (_formData$cpt2$detail = _formData$cpt2.details) === null || _formData$cpt2$detail === void 0 ? void 0 : (_formData$cpt2$detail2 = _formData$cpt2$detail.owners) === null || _formData$cpt2$detail2 === void 0 ? void 0 : _formData$cpt2$detail2[0];
     const fullName = owner === null || owner === void 0 ? void 0 : (_owner$name = owner.name) === null || _owner$name === void 0 ? void 0 : _owner$name.split(" ");
     const firstName = owner === null || owner === void 0 ? void 0 : owner.name;
-    const email = owner === null || owner === void 0 ? void 0 : owner.email;
+    console.log("ikiki email", owner === null || owner === void 0 ? void 0 : owner.emailId);
+    const email = (owner === null || owner === void 0 ? void 0 : owner.emailId) || (formData === null || formData === void 0 ? void 0 : (_formData$PropertyDet = formData.PropertyDetails) === null || _formData$PropertyDet === void 0 ? void 0 : _formData$PropertyDet.email) || "";
     const mobileNumber = owner === null || owner === void 0 ? void 0 : owner.mobileNumber;
     const address = owner === null || owner === void 0 ? void 0 : owner.permanentAddress;
     const combinedObject = {};
     if (firstName) combinedObject.firstName = firstName;
-    if (email) combinedObject.email = email;
+    combinedObject.email = email;
     if (mobileNumber) combinedObject.mobileNumber = mobileNumber;
     if (address) combinedObject.address = address;
     combinedObject.propertyBillData = {
       isLoading: false,
-      billData: (formData === null || formData === void 0 ? void 0 : (_formData$PropertyDet = formData.PropertyDetails) === null || _formData$PropertyDet === void 0 ? void 0 : (_formData$PropertyDet2 = _formData$PropertyDet.propertyBillData) === null || _formData$PropertyDet2 === void 0 ? void 0 : _formData$PropertyDet2.billData) || {}
+      billData: (formData === null || formData === void 0 ? void 0 : (_formData$PropertyDet2 = formData.PropertyDetails) === null || _formData$PropertyDet2 === void 0 ? void 0 : (_formData$PropertyDet3 = _formData$PropertyDet2.propertyBillData) === null || _formData$PropertyDet3 === void 0 ? void 0 : _formData$PropertyDet3.billData) || {}
     };
     setPropertyDetails(prev => {
       return {
@@ -12045,6 +12057,9 @@ const PropertyDetailsForm$1 = ({
       };
     });
   }, [formData === null || formData === void 0 ? void 0 : (_formData$cpt3 = formData.cpt) === null || _formData$cpt3 === void 0 ? void 0 : _formData$cpt3.details]);
+  useEffect(() => {
+    console.log("updated propertyDetails", propertyDetails);
+  }, [propertyDetails]);
   useEffect(() => {
     var _apiDataCheck$;
     let waterConnection;
@@ -12361,35 +12376,11 @@ const PropertyDetailsForm$1 = ({
       return () => clearTimeout(timer);
     }
   }, [showToast]);
-  useEffect(() => {
-    if (apiDataCheck) {
-      var _apiDataCheck$5, _apiDataCheck$5$owner, _apiDataCheck$5$owner2;
-      const apiEmail = (apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$5 = apiDataCheck[0]) === null || _apiDataCheck$5 === void 0 ? void 0 : (_apiDataCheck$5$owner = _apiDataCheck$5.owners) === null || _apiDataCheck$5$owner === void 0 ? void 0 : (_apiDataCheck$5$owner2 = _apiDataCheck$5$owner[0]) === null || _apiDataCheck$5$owner2 === void 0 ? void 0 : _apiDataCheck$5$owner2.emailId) || "";
-      setValue("email", apiEmail);
-      setPropertyDetails(prev => ({
-        ...prev,
-        email: apiEmail
-      }));
-    }
-  }, [apiDataCheck]);
-  useEffect(() => {
-    var _formData$cpt4, _formData$cpt4$detail;
-    if (formData !== null && formData !== void 0 && (_formData$cpt4 = formData.cpt) !== null && _formData$cpt4 !== void 0 && (_formData$cpt4$detail = _formData$cpt4.details) !== null && _formData$cpt4$detail !== void 0 && _formData$cpt4$detail.owners) {
-      var _formData$cpt5, _formData$cpt5$detail, _formData$cpt5$detail2, _formData$cpt5$detail3;
-      const formDataEmail = formData === null || formData === void 0 ? void 0 : (_formData$cpt5 = formData.cpt) === null || _formData$cpt5 === void 0 ? void 0 : (_formData$cpt5$detail = _formData$cpt5.details) === null || _formData$cpt5$detail === void 0 ? void 0 : (_formData$cpt5$detail2 = _formData$cpt5$detail.owners) === null || _formData$cpt5$detail2 === void 0 ? void 0 : (_formData$cpt5$detail3 = _formData$cpt5$detail2[0]) === null || _formData$cpt5$detail3 === void 0 ? void 0 : _formData$cpt5$detail3.emailId;
-      setValue("email", formDataEmail);
-      setPropertyDetails(prev => ({
-        ...prev,
-        email: formDataEmail
-      }));
-    }
-  }, [formData === null || formData === void 0 ? void 0 : (_formData$cpt6 = formData.cpt) === null || _formData$cpt6 === void 0 ? void 0 : (_formData$cpt6$detail = _formData$cpt6.details) === null || _formData$cpt6$detail === void 0 ? void 0 : _formData$cpt6$detail.owners]);
-  console.log("propertyDetails====", propertyDetails, formData);
   return /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: "16px"
     }
-  }, ((formData === null || formData === void 0 ? void 0 : (_formData$cpt7 = formData.cpt) === null || _formData$cpt7 === void 0 ? void 0 : _formData$cpt7.details) || (apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$6 = apiDataCheck[0]) === null || _apiDataCheck$6 === void 0 ? void 0 : _apiDataCheck$6.NdcDetails)) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, {
+  }, ((formData === null || formData === void 0 ? void 0 : (_formData$cpt4 = formData.cpt) === null || _formData$cpt4 === void 0 ? void 0 : _formData$cpt4.details) || (apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$5 = apiDataCheck[0]) === null || _apiDataCheck$5 === void 0 ? void 0 : _apiDataCheck$5.NdcDetails)) && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(LabelFieldPair, {
     style: {
       marginTop: "40px"
     }
@@ -12404,7 +12395,7 @@ const PropertyDetailsForm$1 = ({
       width: "100%"
     }
   }, propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$wate = propertyDetails.waterConnection) === null || _propertyDetails$wate === void 0 ? void 0 : _propertyDetails$wate.map((item, index) => {
-    var _apiDataCheck$7, _item$billData, _item$billData2, _item$billData3, _item$billData4;
+    var _apiDataCheck$6, _item$billData, _item$billData2, _item$billData3, _item$billData4;
     return /*#__PURE__*/React.createElement("div", {
       className: "ndc_property_search",
       key: index,
@@ -12445,7 +12436,7 @@ const PropertyDetailsForm$1 = ({
         alignItems: "center",
         gap: "12px"
       }
-    }, !(apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$7 = apiDataCheck[0]) !== null && _apiDataCheck$7 !== void 0 && _apiDataCheck$7.NdcDetails) && (item === null || item === void 0 ? void 0 : item.connectionNo) && !(item !== null && item !== void 0 && (_item$billData = item.billData) !== null && _item$billData !== void 0 && _item$billData.id) && (item === null || item === void 0 ? void 0 : (_item$billData2 = item.billData) === null || _item$billData2 === void 0 ? void 0 : _item$billData2.totalAmount) != 0 && /*#__PURE__*/React.createElement("button", {
+    }, !(apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$6 = apiDataCheck[0]) !== null && _apiDataCheck$6 !== void 0 && _apiDataCheck$6.NdcDetails) && (item === null || item === void 0 ? void 0 : item.connectionNo) && !(item !== null && item !== void 0 && (_item$billData = item.billData) !== null && _item$billData !== void 0 && _item$billData.id) && (item === null || item === void 0 ? void 0 : (_item$billData2 = item.billData) === null || _item$billData2 === void 0 ? void 0 : _item$billData2.totalAmount) != 0 && /*#__PURE__*/React.createElement("button", {
       className: "submit-bar",
       type: "button",
       style: {
@@ -12512,7 +12503,7 @@ const PropertyDetailsForm$1 = ({
       width: "100%"
     }
   }, propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$sewe = propertyDetails.sewerageConnection) === null || _propertyDetails$sewe === void 0 ? void 0 : _propertyDetails$sewe.map((item, index) => {
-    var _apiDataCheck$8, _item$billData5, _item$billData6, _item$billData7, _item$billData8;
+    var _apiDataCheck$7, _item$billData5, _item$billData6, _item$billData7, _item$billData8;
     return /*#__PURE__*/React.createElement("div", {
       className: "ndc_property_search",
       key: index,
@@ -12553,7 +12544,7 @@ const PropertyDetailsForm$1 = ({
         alignItems: "center",
         gap: "12px"
       }
-    }, !(apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$8 = apiDataCheck[0]) !== null && _apiDataCheck$8 !== void 0 && _apiDataCheck$8.NdcDetails) && (item === null || item === void 0 ? void 0 : item.connectionNo) && !(item !== null && item !== void 0 && (_item$billData5 = item.billData) !== null && _item$billData5 !== void 0 && _item$billData5.id) && (item === null || item === void 0 ? void 0 : (_item$billData6 = item.billData) === null || _item$billData6 === void 0 ? void 0 : _item$billData6.totalAmount) != 0 && /*#__PURE__*/React.createElement("button", {
+    }, !(apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$7 = apiDataCheck[0]) !== null && _apiDataCheck$7 !== void 0 && _apiDataCheck$7.NdcDetails) && (item === null || item === void 0 ? void 0 : item.connectionNo) && !(item !== null && item !== void 0 && (_item$billData5 = item.billData) !== null && _item$billData5 !== void 0 && _item$billData5.id) && (item === null || item === void 0 ? void 0 : (_item$billData6 = item.billData) === null || _item$billData6 === void 0 ? void 0 : _item$billData6.totalAmount) != 0 && /*#__PURE__*/React.createElement("button", {
       className: "submit-bar",
       type: "button",
       style: {
@@ -12624,7 +12615,7 @@ const PropertyDetailsForm$1 = ({
       }
     },
     render: props => {
-      var _formData$cpt8, _formData$cpt8$detail, _formData$cpt8$detail2, _formData$cpt8$detail3, _formData$cpt8$detail4, _formData$cpt8$detail5, _formData$cpt8$detail6;
+      var _formData$cpt5, _formData$cpt5$detail, _formData$cpt5$detail2, _formData$cpt5$detail3, _formData$cpt5$detail4, _formData$cpt5$detail5, _formData$cpt5$detail6;
       return /*#__PURE__*/React.createElement(TextInput, {
         value: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.firstName) || "",
         onChange: e => {
@@ -12637,7 +12628,7 @@ const PropertyDetailsForm$1 = ({
         onBlur: e => {
           props.onBlur(e);
         },
-        disabled: (formData === null || formData === void 0 ? void 0 : (_formData$cpt8 = formData.cpt) === null || _formData$cpt8 === void 0 ? void 0 : (_formData$cpt8$detail = _formData$cpt8.details) === null || _formData$cpt8$detail === void 0 ? void 0 : (_formData$cpt8$detail2 = _formData$cpt8$detail.owners) === null || _formData$cpt8$detail2 === void 0 ? void 0 : (_formData$cpt8$detail3 = _formData$cpt8$detail2[0]) === null || _formData$cpt8$detail3 === void 0 ? void 0 : (_formData$cpt8$detail4 = _formData$cpt8$detail3.name) === null || _formData$cpt8$detail4 === void 0 ? void 0 : (_formData$cpt8$detail5 = _formData$cpt8$detail4.split(" ")) === null || _formData$cpt8$detail5 === void 0 ? void 0 : (_formData$cpt8$detail6 = _formData$cpt8$detail5[0]) === null || _formData$cpt8$detail6 === void 0 ? void 0 : _formData$cpt8$detail6.length) > 0
+        disabled: (formData === null || formData === void 0 ? void 0 : (_formData$cpt5 = formData.cpt) === null || _formData$cpt5 === void 0 ? void 0 : (_formData$cpt5$detail = _formData$cpt5.details) === null || _formData$cpt5$detail === void 0 ? void 0 : (_formData$cpt5$detail2 = _formData$cpt5$detail.owners) === null || _formData$cpt5$detail2 === void 0 ? void 0 : (_formData$cpt5$detail3 = _formData$cpt5$detail2[0]) === null || _formData$cpt5$detail3 === void 0 ? void 0 : (_formData$cpt5$detail4 = _formData$cpt5$detail3.name) === null || _formData$cpt5$detail4 === void 0 ? void 0 : (_formData$cpt5$detail5 = _formData$cpt5$detail4.split(" ")) === null || _formData$cpt5$detail5 === void 0 ? void 0 : (_formData$cpt5$detail6 = _formData$cpt5$detail5[0]) === null || _formData$cpt5$detail6 === void 0 ? void 0 : _formData$cpt5$detail6.length) > 0
       });
     }
   }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
@@ -12691,7 +12682,7 @@ const PropertyDetailsForm$1 = ({
     name: "address",
     defaultValue: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.address) || "",
     render: props => {
-      var _formData$cpt9, _formData$cpt9$detail, _formData$cpt9$detail2, _formData$cpt9$detail3, _formData$cpt9$detail4;
+      var _formData$cpt6, _formData$cpt6$detail, _formData$cpt6$detail2, _formData$cpt6$detail3, _formData$cpt6$detail4;
       return /*#__PURE__*/React.createElement(TextInput, {
         value: propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.address,
         onChange: e => {
@@ -12704,7 +12695,7 @@ const PropertyDetailsForm$1 = ({
         onBlur: e => {
           props.onBlur(e);
         },
-        disabled: (formData === null || formData === void 0 ? void 0 : (_formData$cpt9 = formData.cpt) === null || _formData$cpt9 === void 0 ? void 0 : (_formData$cpt9$detail = _formData$cpt9.details) === null || _formData$cpt9$detail === void 0 ? void 0 : (_formData$cpt9$detail2 = _formData$cpt9$detail.owners) === null || _formData$cpt9$detail2 === void 0 ? void 0 : (_formData$cpt9$detail3 = _formData$cpt9$detail2[0]) === null || _formData$cpt9$detail3 === void 0 ? void 0 : (_formData$cpt9$detail4 = _formData$cpt9$detail3.permanentAddress) === null || _formData$cpt9$detail4 === void 0 ? void 0 : _formData$cpt9$detail4.length) > 0
+        disabled: (formData === null || formData === void 0 ? void 0 : (_formData$cpt6 = formData.cpt) === null || _formData$cpt6 === void 0 ? void 0 : (_formData$cpt6$detail = _formData$cpt6.details) === null || _formData$cpt6$detail === void 0 ? void 0 : (_formData$cpt6$detail2 = _formData$cpt6$detail.owners) === null || _formData$cpt6$detail2 === void 0 ? void 0 : (_formData$cpt6$detail3 = _formData$cpt6$detail2[0]) === null || _formData$cpt6$detail3 === void 0 ? void 0 : (_formData$cpt6$detail4 = _formData$cpt6$detail3.permanentAddress) === null || _formData$cpt6$detail4 === void 0 ? void 0 : _formData$cpt6$detail4.length) > 0
       });
     }
   })))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
@@ -12750,7 +12741,7 @@ const PropertySearchNSummary = ({
   onSelect,
   formData
 }) => {
-  var _apiDataCheck$, _apiDataCheck$$NdcDet, _formData$cpt, _formData$cpt2, _propertyDetails$Prop3, _apiDataCheck$2, _formData$cpt13, _formData$cpt13$dues;
+  var _apiDataCheck$, _apiDataCheck$$NdcDet, _formData$cpt, _formData$cpt2, _propertyDetails$Prop3, _apiDataCheck$2, _formData$cpt12, _formData$cpt12$dues;
   const {
     t
   } = useTranslation();
@@ -12771,7 +12762,6 @@ const PropertySearchNSummary = ({
   const urlPropertyId = new URLSearchParams(search).get("propertyId");
   const isfirstRender = useRef(true);
   const ptFromApi = apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$ = apiDataCheck[0]) === null || _apiDataCheck$ === void 0 ? void 0 : (_apiDataCheck$$NdcDet = _apiDataCheck$.NdcDetails) === null || _apiDataCheck$$NdcDet === void 0 ? void 0 : _apiDataCheck$$NdcDet.find(item => item.businessService == "PT");
-  console.log("ptFromApi", ptFromApi);
   const [propertyId, setPropertyId] = useState((formData === null || formData === void 0 ? void 0 : (_formData$cpt = formData.cpt) === null || _formData$cpt === void 0 ? void 0 : _formData$cpt.id) || (urlPropertyId !== "null" ? urlPropertyId : "") || (ptFromApi === null || ptFromApi === void 0 ? void 0 : ptFromApi.consumerCode) || "");
   const [searchPropertyId, setSearchPropertyId] = useState((formData === null || formData === void 0 ? void 0 : (_formData$cpt2 = formData.cpt) === null || _formData$cpt2 === void 0 ? void 0 : _formData$cpt2.id) || (urlPropertyId !== "null" ? urlPropertyId : "") || (ptFromApi === null || ptFromApi === void 0 ? void 0 : ptFromApi.consumerCode) || "");
   const [showToast, setShowToast] = useState(null);
@@ -12827,7 +12817,6 @@ const PropertySearchNSummary = ({
     enabled: searchPropertyId ? true : false,
     privacy: Digit.Utils.getPrivacyObject()
   });
-  console.log("apiDataCheck", apiDataCheck);
   useEffect(() => {
     if (ptFromApi !== null && ptFromApi !== void 0 && ptFromApi.consumerCode) {
       setIsSearchClicked(true);
@@ -12900,6 +12889,21 @@ const PropertySearchNSummary = ({
       });
       setSearchPropertyId(propertyId);
       setIsSearchClicked(true);
+      setPropertyDues({
+        dues: null
+      });
+      onSelect("PropertyDetails", {
+        email: "",
+        propertyBillData: {
+          isLoading: false,
+          billData: {}
+        },
+        waterConnection: [],
+        sewerageConnection: [],
+        firstName: "",
+        mobileNumber: "",
+        address: ""
+      });
       dispatch(resetNDCForm());
     }
   };
@@ -13056,19 +13060,25 @@ const PropertySearchNSummary = ({
     onClick: () => {
       fetchBill();
     }
-  }, `${t("CHECK_STATUS_PROPERTY")}`), getPayDuesButton && /*#__PURE__*/React.createElement("button", {
+  }, `${t("CHECK_STATUS_PROPERTY")}`), getPayDuesButton && /*#__PURE__*/React.createElement("div", {
+    style: {
+      color: "red",
+      width: "100%",
+      maxWidth: "70px"
+    }
+  }, "Rs. ", formData === null || formData === void 0 ? void 0 : (_formData$cpt12 = formData.cpt) === null || _formData$cpt12 === void 0 ? void 0 : (_formData$cpt12$dues = _formData$cpt12.dues) === null || _formData$cpt12$dues === void 0 ? void 0 : _formData$cpt12$dues.totalAmount, " "), getPayDuesButton && /*#__PURE__*/React.createElement("button", {
     className: "submit-bar",
     type: "button",
     style: {
       color: "white",
       width: "100%",
-      maxWidth: "190px"
+      maxWidth: "115px"
     },
     onClick: () => {
       redirectToPayBill();
       setPayDuesButton(false);
     }
-  }, `${t("PAY_DUES")} (Rs.${formData === null || formData === void 0 ? void 0 : (_formData$cpt13 = formData.cpt) === null || _formData$cpt13 === void 0 ? void 0 : (_formData$cpt13$dues = _formData$cpt13.dues) === null || _formData$cpt13$dues === void 0 ? void 0 : _formData$cpt13$dues.totalAmount})`), getNoDue && /*#__PURE__*/React.createElement("div", {
+  }, `${t("PAY_DUES")} `), getNoDue && /*#__PURE__*/React.createElement("div", {
     style: {
       color: "green",
       width: "100%",
@@ -14008,7 +14018,7 @@ const NewNDCStepFormOne$1 = ({
     }
   };
   function validateStepData(data) {
-    var _data$cpt6, _data$cpt6$dues, _data$cpt7, _data$cpt7$dues, _data$dues, _propertyDetails$wate, _propertyDetails$sewe;
+    var _data$cpt6, _data$cpt7, _data$cpt7$dues, _propertyDetails$wate, _propertyDetails$sewe;
     console.log("data", data);
     const missingFields = [];
     const invalidFields = [];
@@ -14016,10 +14026,10 @@ const NewNDCStepFormOne$1 = ({
     const cptDetails = (cpt === null || cpt === void 0 ? void 0 : cpt.details) || {};
     const propertyDetails = (data === null || data === void 0 ? void 0 : data.PropertyDetails) || {};
     const NDCReason = (data === null || data === void 0 ? void 0 : data.NDCReason) || {};
-    if ((data === null || data === void 0 ? void 0 : (_data$cpt6 = data.cpt) === null || _data$cpt6 === void 0 ? void 0 : (_data$cpt6$dues = _data$cpt6.dues) === null || _data$cpt6$dues === void 0 ? void 0 : _data$cpt6$dues.totalAmount) != 0) {
+    if (!(data !== null && data !== void 0 && (_data$cpt6 = data.cpt) !== null && _data$cpt6 !== void 0 && _data$cpt6.dues)) {
       invalidFields.push(`${t("NDC_MESSAGE_PLEASE_CHECK_STATUS_OF_PROPERTY_TAX")} ${cpt === null || cpt === void 0 ? void 0 : cpt.id}`);
     }
-    if (data !== null && data !== void 0 && (_data$cpt7 = data.cpt) !== null && _data$cpt7 !== void 0 && (_data$cpt7$dues = _data$cpt7.dues) !== null && _data$cpt7$dues !== void 0 && _data$cpt7$dues.id && (data === null || data === void 0 ? void 0 : (_data$dues = data.dues) === null || _data$dues === void 0 ? void 0 : _data$dues.totalAmount) > 0) {
+    if ((data === null || data === void 0 ? void 0 : (_data$cpt7 = data.cpt) === null || _data$cpt7 === void 0 ? void 0 : (_data$cpt7$dues = _data$cpt7.dues) === null || _data$cpt7$dues === void 0 ? void 0 : _data$cpt7$dues.totalAmount) > 0) {
       invalidFields.push(`${t("NDC_MESSAGE_PLEASE_PAY_DUES_OF_PROPERTY_TAX")} ${cpt === null || cpt === void 0 ? void 0 : cpt.id}`);
     }
     if ((propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$wate = propertyDetails.waterConnection) === null || _propertyDetails$wate === void 0 ? void 0 : _propertyDetails$wate.length) > 0) {
@@ -14052,7 +14062,7 @@ const NewNDCStepFormOne$1 = ({
     if (!(propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.email)) missingFields.push(t("NDC_MESSAGE_EMAIL"));
     if (!(NDCReason !== null && NDCReason !== void 0 && NDCReason.code)) missingFields.push(t("NDC_MESSAGE_NDC_REASON"));
     const nameRegex = /^[A-Za-z\s]+$/;
-    const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9-]+\.[a-zA-Z]{2,}$/;
+    const emailRegex = /^(?!\.)(?!.*\.\.)[a-zA-Z0-9._%+-]+@[a-zA-Z0-9-]+(\.[a-zA-Z]{2,})+$/;
     const mobileRegex = /^[6-9]\d{9}$/;
     if (propertyDetails !== null && propertyDetails !== void 0 && propertyDetails.firstName && !nameRegex.test(propertyDetails.firstName)) {
       invalidFields.push(t("NDC_MESSAGE_FIRST_NAME_ONLY_ALPHABETS_ALLOWED"));