@mseva/digit-ui-module-ptr 1.3.4-UAT.10 → 1.3.4-UAT.12

package/dist/index.modern.js

@@ -7684,9 +7684,18 @@ const PTRCitizenPet = ({
     return gt.name === (apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$3 = apiDataCheck[0]) === null || _apiDataCheck$3 === void 0 ? void 0 : (_apiDataCheck$3$petDe = _apiDataCheck$3.petDetails) === null || _apiDataCheck$3$petDe === void 0 ? void 0 : _apiDataCheck$3$petDe.petGender);
   })) || null;
   const pathParts = window.location.pathname.split("/");
-  const id = pathParts[pathParts.length - 1];
-  const checkNumber = pathParts[pathParts.length - 2];
-  const checkForRenew = id == "renew-application";
+  const startIndex = pathParts.findIndex(part => part === "new-application");
+  let id = null;
+  if (startIndex !== -1) {
+    const nextPart = pathParts[startIndex + 1];
+    if (nextPart !== null && nextPart !== void 0 && nextPart.startsWith("PB-PTR-")) {
+      id = nextPart;
+    } else if (nextPart === "PL") {
+      id = pathParts.slice(startIndex + 1, startIndex + 5).join("/");
+    }
+  }
+  id = id ? decodeURIComponent(id) : null;
+  const checkForRenew = window.location.pathname.includes("renew-application");
   const today = new Date();
   const todayStr = today.toISOString().split("T")[0];
   const minVaccineDate = new Date();
@@ -7712,7 +7721,7 @@ const PTRCitizenPet = ({
     return new Date(dateStr).getTime();
   }
   const onSubmit = async data => {
-    var _currentStepData$Crea, _currentStepData$appl, _data$petType, _data$breedType, _data$petGender, _currentStepData$resp;
+    var _currentStepData$Crea, _currentStepData$appl, _data$petType, _data$breedType, _data$petGender, _currentStepData$owne, _currentStepData$resp;
     if (validateStep) {
       const validationErrors = validateStep(data);
       if (Object.keys(validationErrors).length > 0) return;
@@ -7750,9 +7759,9 @@ const PTRCitizenPet = ({
       },
       address: {
         pincode,
-        addressId: currentStepData.ownerDetails.address
+        addressLine1: currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$owne = currentStepData.ownerDetails) === null || _currentStepData$owne === void 0 ? void 0 : _currentStepData$owne.address
       },
-      previousApplicationNumber: checkNumber ? checkNumber : null,
+      previousApplicationNumber: id ? id : null,
       applicationType: checkForRenew ? "RENEWAPPLICATION" : "NEWAPPLICATION",
       ownerName: name,
       fatherName: filteredOwnerDetails === null || filteredOwnerDetails === void 0 ? void 0 : filteredOwnerDetails.fatherOrHusbandName,
@@ -7779,7 +7788,7 @@ const PTRCitizenPet = ({
         address: {
           ...existing.address,
           pincode: pick(pincode, (_existing$address = existing.address) === null || _existing$address === void 0 ? void 0 : _existing$address.pincode),
-          addressId: pick(currentStepData.ownerDetails.address, (_existing$address2 = existing.address) === null || _existing$address2 === void 0 ? void 0 : _existing$address2.addressId),
+          addressLine1: pick(currentStepData.ownerDetails.address, (_existing$address2 = existing.address) === null || _existing$address2 === void 0 ? void 0 : _existing$address2.addressLine1),
           tenantId
         },
         petDetails: {
@@ -7910,7 +7919,7 @@ const PTRCitizenPet = ({
       totalYears: years + months / 12
     };
   };
-  const AGE_REGEX = /^(?:(?:[1-9]|[1-3][0-9])(?:\.(?:[1-9]|1[01]))?|40(?:\.0?)?|0?\.(?:[1-9]|1[01]))$/;
+  const AGE_REGEX = /^(?:(?:[1-9]|[1-3][0-9])(?:\.(?:0|[1-9]|1[01]))?|40(?:\.0?)?|0?\.(?:[1-9]|1[01]))$/;
   const petAgeVal = watch("petAge");
   useEffect(() => {
     if (!petAgeVal) return;
@@ -20883,7 +20892,7 @@ const PTRApplicationDetails = () => {
   }, t("WS_COMMON_TABLE_COL_ADDRESS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("PTR_ADDRESS"),
-    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$address = pet_details.address) === null || _pet_details$address === void 0 ? void 0 : _pet_details$address.addressId) || t("CS_NA")
+    text: (pet_details === null || pet_details === void 0 ? void 0 : (_pet_details$address = pet_details.address) === null || _pet_details$address === void 0 ? void 0 : _pet_details$address.addressLine1) || t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("PTR_PINCODE"),