@mseva/digit-ui-module-ptr 1.1.75 → 1.1.77

package/dist/index.modern.js

@@ -18543,7 +18543,7 @@ const TimelineCaption = React.memo(({
     className: "timeline-label"
   }, t(label), ":"), /*#__PURE__*/React.createElement("span", {
     className: "timeline-value"
-  }, (checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint[key]) || "N/A")))), /*#__PURE__*/React.createElement("div", {
+  }, t(checkpoint === null || checkpoint === void 0 ? void 0 : checkpoint[key]) || "N/A")))), /*#__PURE__*/React.createElement("div", {
     className: "timeline-note"
   }, /*#__PURE__*/React.createElement("span", {
     className: "timeline-label"
@@ -21504,8 +21504,7 @@ const PTRApplicationDetails = () => {
   } = useTranslation();
   const history = useHistory();
   const {
-    acknowledgementIds,
-    tenantId
+    acknowledgementIds
   } = useParams();
   const [acknowldgementData, setAcknowldgementData] = useState([]);
   const [showOptions, setShowOptions] = useState(false);
@@ -21513,6 +21512,14 @@ const PTRApplicationDetails = () => {
   const [popup, setpopup] = useState(false);
   const [showToast, setShowToast] = useState(null);
   const [approver, setApprover] = useState(null);
+  const tenantId = window.location.href.includes("employee") ? Digit.ULBService.getCurrentPermanentCity() : localStorage.getItem("CITIZEN.CITY");
+  const pathname = window.location.pathname;
+  const afterApplication = pathname.split("/application/")[1];
+  const parts = afterApplication.split("/");
+  const tenantIdPop = parts.pop();
+  let applicationNumber = parts.join("/");
+  applicationNumber = decodeURIComponent(applicationNumber);
+  console.log("applicationNumber", applicationNumber);
   const {
     data: storeData
   } = Digit.Hooks.useStore.getInitData();
@@ -21529,7 +21536,7 @@ const PTRApplicationDetails = () => {
   } = Digit.Hooks.ptr.usePTRSearch({
     tenantId,
     filters: {
-      applicationNumber: acknowledgementIds
+      applicationNumber
     }
   });
   const [billData, setBillData] = useState(null);
@@ -21544,7 +21551,7 @@ const PTRApplicationDetails = () => {
     isLoading: approverDataLoading
   } = Digit.Hooks.useWorkflowDetails({
     tenantId,
-    id: petId,
+    id: applicationNumber,
     moduleCode: "ptr"
   });
   useEffect(() => {
@@ -21559,14 +21566,14 @@ const PTRApplicationDetails = () => {
     setLoading(true);
     const result = await Digit.PaymentService.fetchBill(tenantId, {
       businessService: "pet-services",
-      consumerCode: acknowledgementIds
+      consumerCode: applicationNumber
     });
     setBillData(result);
     setLoading(false);
   };
   useEffect(() => {
     fetchBillData();
-  }, [tenantId, acknowledgementIds]);
+  }, [tenantId, applicationNumber]);
   const {
     isLoading: auditDataLoading,
     isError: isAuditError,
@@ -21574,7 +21581,7 @@ const PTRApplicationDetails = () => {
   } = Digit.Hooks.ptr.usePTRSearch({
     tenantId,
     filters: {
-      applicationNumber: petId,
+      applicationNumber: applicationNumber,
       audit: true
     }
   }, {
@@ -21586,10 +21593,10 @@ const PTRApplicationDetails = () => {
   } = Digit.Hooks.useRecieptSearch({
     tenantId: tenantId,
     businessService: "pet-services",
-    consumerCodes: acknowledgementIds,
+    consumerCodes: applicationNumber,
     isEmployee: false
   }, {
-    enabled: acknowledgementIds ? true : false
+    enabled: applicationNumber ? true : false
   });
   if (!pet_details.workflow) {
     const workflow = {
@@ -22242,21 +22249,32 @@ const PTRApplicationDetails = () => {
     });
   }
   const formatPetAge = (ageValue, t) => {
-    if (ageValue === null || ageValue === undefined || ageValue === "") return t("CS_NA");
-    const ageStr = String(ageValue).trim();
-    if (!/^\d+(\.\d+)?$/.test(ageStr)) return t("CS_NA");
-    const [yearsPart, decPart] = ageStr.split(".");
-    let years = Number(yearsPart) || 0;
+    if (!ageValue) return t("CS_NA");
+    let ageStr = String(ageValue).trim();
+    if (/^\d+(\.\d+)?$/.test(ageStr)) {
+      const [yearsPart, decPart] = ageStr.split(".");
+      let _years = Number(yearsPart) || 0;
+      let _months = 0;
+      if (decPart) {
+        _months = parseInt(decPart.slice(0, 2), 10);
+        if (isNaN(_months)) _months = 0;
+        if (_months > 11) _months = 11;
+      }
+      if (_years === 0 && _months === 0) return t("CS_NA");
+      if (_years === 0) return `${_months} month${_months > 1 ? "s" : ""}`;
+      if (_months === 0) return `${_years} year${_years > 1 ? "s" : ""}`;
+      return `${_years} year${_years > 1 ? "s" : ""} and ${_months} month${_months > 1 ? "s" : ""}`;
+    }
+    const regex = /(\d+)\s*(year|years|yr|yrs|month|months|mo|mos)/gi;
+    const matches = ageStr.matchAll(regex);
+    let years = 0;
     let months = 0;
-    if (decPart) {
-      if (decPart.length === 1) {
-        months = parseInt(decPart, 10);
-      } else {
-        months = parseInt(decPart.slice(0, 2), 10);
-      }
-      if (isNaN(months)) months = 0;
+    for (const match of matches) {
+      const num = parseInt(match[1], 10);
+      const unit = match[2].toLowerCase();
+      if (unit.includes("year") || unit.includes("yr")) years = num;
+      if (unit.includes("month") || unit.includes("mo")) months = num;
     }
-    if (months > 11) months = 11;
     if (years === 0 && months === 0) return t("CS_NA");
     if (years === 0) return `${months} month${months > 1 ? "s" : ""}`;
     if (months === 0) return `${years} year${years > 1 ? "s" : ""}`;
@@ -22392,7 +22410,7 @@ const PTRApplicationDetails = () => {
   }))), ((pet_details === null || pet_details === void 0 ? void 0 : pet_details.status) == "CITIZENACTIONREQUIRED" || (pet_details === null || pet_details === void 0 ? void 0 : pet_details.status) == "INITIATED") && isCitizen && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("COMMON_EDIT"),
     onSubmit: () => {
-      history.push(`/digit-ui/citizen/ptr/petservice/new-application/${acknowledgementIds}`);
+      history.push(`/digit-ui/citizen/ptr/petservice/new-application/${applicationNumber}`);
     }
   })), /*#__PURE__*/React.createElement(PTRWFApplicationTimeline, {
     application: application,