@mseva/digit-ui-module-ptr 1.3.4-UAT.13 → 1.3.4-UAT.14

package/dist/index.modern.js

@@ -7684,18 +7684,9 @@ 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 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 id = pathParts[pathParts.length - 1];
+  const checkNumber = pathParts[pathParts.length - 2];
+  const checkForRenew = id == "renew-application";
   const today = new Date();
   const todayStr = today.toISOString().split("T")[0];
   const minVaccineDate = new Date();
@@ -7721,7 +7712,7 @@ const PTRCitizenPet = ({
     return new Date(dateStr).getTime();
   }
   const onSubmit = async data => {
-    var _currentStepData$Crea, _currentStepData$appl, _data$petType, _data$breedType, _data$petGender, _currentStepData$owne, _currentStepData$resp;
+    var _currentStepData$Crea, _currentStepData$appl, _data$petType, _data$breedType, _data$petGender, _currentStepData$resp;
     if (validateStep) {
       const validationErrors = validateStep(data);
       if (Object.keys(validationErrors).length > 0) return;
@@ -7759,9 +7750,9 @@ const PTRCitizenPet = ({
       },
       address: {
         pincode,
-        addressLine1: currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$owne = currentStepData.ownerDetails) === null || _currentStepData$owne === void 0 ? void 0 : _currentStepData$owne.address
+        addressId: currentStepData.ownerDetails.address
       },
-      previousApplicationNumber: id ? id : null,
+      previousApplicationNumber: checkNumber ? checkNumber : null,
       applicationType: checkForRenew ? "RENEWAPPLICATION" : "NEWAPPLICATION",
       ownerName: name,
       fatherName: filteredOwnerDetails === null || filteredOwnerDetails === void 0 ? void 0 : filteredOwnerDetails.fatherOrHusbandName,
@@ -7788,7 +7779,7 @@ const PTRCitizenPet = ({
         address: {
           ...existing.address,
           pincode: pick(pincode, (_existing$address = existing.address) === null || _existing$address === void 0 ? void 0 : _existing$address.pincode),
-          addressLine1: pick(currentStepData.ownerDetails.address, (_existing$address2 = existing.address) === null || _existing$address2 === void 0 ? void 0 : _existing$address2.addressLine1),
+          addressId: pick(currentStepData.ownerDetails.address, (_existing$address2 = existing.address) === null || _existing$address2 === void 0 ? void 0 : _existing$address2.addressId),
           tenantId
         },
         petDetails: {
@@ -7919,7 +7910,7 @@ const PTRCitizenPet = ({
       totalYears: years + months / 12
     };
   };
-  const AGE_REGEX = /^(?:(?:[1-9]|[1-3][0-9])(?:\.(?:0|[1-9]|1[01]))?|40(?:\.0?)?|0?\.(?:[1-9]|1[01]))$/;
+  const AGE_REGEX = /^(?:(?:[1-9]|[1-3][0-9])(?:\.(?:[1-9]|1[01]))?|40(?:\.0?)?|0?\.(?:[1-9]|1[01]))$/;
   const petAgeVal = watch("petAge");
   useEffect(() => {
     if (!petAgeVal) return;
@@ -15378,12 +15369,12 @@ const PTRCitizenDetails = ({
     var _apiDataCheck$;
     const formattedData = (apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$ = apiDataCheck[0]) === null || _apiDataCheck$ === void 0 ? void 0 : _apiDataCheck$.owner) || (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.ownerDetails);
     if (formattedData) {
-      var _apiDataCheck$2, _apiDataCheck$2$addre, _apiDataCheck$3, _apiDataCheck$3$addre, _apiDataCheck$4, _apiDataCheck$4$addre, _currentStepData$owne, _apiDataCheck$5, _apiDataCheck$5$addre, _currentStepData$owne2;
+      var _apiDataCheck$2, _apiDataCheck$2$addre, _currentStepData$owne, _apiDataCheck$3, _apiDataCheck$3$addre, _currentStepData$owne2;
       Object.entries(formattedData).forEach(([key, value]) => {
         setValue(key, value);
       });
-      setValue("address", (apiDataCheck !== null && apiDataCheck !== void 0 && (_apiDataCheck$2 = apiDataCheck[0]) !== null && _apiDataCheck$2 !== void 0 && (_apiDataCheck$2$addre = _apiDataCheck$2.address) !== null && _apiDataCheck$2$addre !== void 0 && _apiDataCheck$2$addre.addressLine1 ? apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$3 = apiDataCheck[0]) === null || _apiDataCheck$3 === void 0 ? void 0 : (_apiDataCheck$3$addre = _apiDataCheck$3.address) === null || _apiDataCheck$3$addre === void 0 ? void 0 : _apiDataCheck$3$addre.addressLine1 : apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$4 = apiDataCheck[0]) === null || _apiDataCheck$4 === void 0 ? void 0 : (_apiDataCheck$4$addre = _apiDataCheck$4.address) === null || _apiDataCheck$4$addre === void 0 ? void 0 : _apiDataCheck$4$addre.addressId) || (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$owne = currentStepData.ownerDetails) === null || _currentStepData$owne === void 0 ? void 0 : _currentStepData$owne.address) || "");
-      setValue("pincode", (apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$5 = apiDataCheck[0]) === null || _apiDataCheck$5 === void 0 ? void 0 : (_apiDataCheck$5$addre = _apiDataCheck$5.address) === null || _apiDataCheck$5$addre === void 0 ? void 0 : _apiDataCheck$5$addre.pincode) || (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$owne2 = currentStepData.ownerDetails) === null || _currentStepData$owne2 === void 0 ? void 0 : _currentStepData$owne2.pincode) || "");
+      setValue("address", (apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$2 = apiDataCheck[0]) === null || _apiDataCheck$2 === void 0 ? void 0 : (_apiDataCheck$2$addre = _apiDataCheck$2.address) === null || _apiDataCheck$2$addre === void 0 ? void 0 : _apiDataCheck$2$addre.addressId) || (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$owne = currentStepData.ownerDetails) === null || _currentStepData$owne === void 0 ? void 0 : _currentStepData$owne.address) || "");
+      setValue("pincode", (apiDataCheck === null || apiDataCheck === void 0 ? void 0 : (_apiDataCheck$3 = apiDataCheck[0]) === null || _apiDataCheck$3 === void 0 ? void 0 : (_apiDataCheck$3$addre = _apiDataCheck$3.address) === null || _apiDataCheck$3$addre === void 0 ? void 0 : _apiDataCheck$3$addre.pincode) || (currentStepData === null || currentStepData === void 0 ? void 0 : (_currentStepData$owne2 = currentStepData.ownerDetails) === null || _currentStepData$owne2 === void 0 ? void 0 : _currentStepData$owne2.pincode) || "");
     }
   }, [apiDataCheck, currentStepData, setValue]);
   const getErrorMessage = fieldName => {
@@ -17138,7 +17129,7 @@ function NewApplicationTimeline({
 }
 
 const PTRWFApplicationTimeline = props => {
-  var _props$application2, _props$application3, _props$application4, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _user$info, _user$info$roles, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _data$PetService, _data$PetService$Appl, _checkRenewTime$, _props$application0, _props$application1, _props$application10, _props$application11, _props$application12, _actions$, _props$application13, _props$application14, _props$application16, _props$application18, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11;
+  var _props$application2, _props$application3, _props$application4, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _user$info, _user$info$roles, _workflowDetails$data6, _workflowDetails$data7, _workflowDetails$data8, _workflowDetails$data9, _workflowDetails$data0, _props$application0, _props$application1, _actions$, _props$application10, _props$application11, _props$application13, _workflowDetails$data1, _workflowDetails$data10, _workflowDetails$data11;
   const {
     t
   } = useTranslation();
@@ -17328,23 +17319,10 @@ const PTRWFApplicationTimeline = props => {
       fetchWorkflowService();
     }
   }, [tenantId]);
-  const {
-    data
-  } = Digit.Hooks.useCustomMDMS(tenantId, "PetService", [{
-    name: "ApplicationType"
-  }]);
-  const checkRenewTime = data === null || data === void 0 ? void 0 : (_data$PetService = data.PetService) === null || _data$PetService === void 0 ? void 0 : (_data$PetService$Appl = _data$PetService.ApplicationType) === null || _data$PetService$Appl === void 0 ? void 0 : _data$PetService$Appl.filter(item => item.code == "RENEWAPPLICATION");
-  const checkTimeRenew = (checkRenewTime === null || checkRenewTime === void 0 ? void 0 : (_checkRenewTime$ = checkRenewTime[0]) === null || _checkRenewTime$ === void 0 ? void 0 : _checkRenewTime$.renewalPeriod) * 1000;
-  const validToObj = (_props$application0 = props.application) === null || _props$application0 === void 0 ? void 0 : _props$application0.validityDate;
-  const validToMillis = validToObj ? validToObj * 1000 : null;
-  const currentDateObj = Date.now();
-  const duration = validToObj && currentDateObj ? validToMillis - currentDateObj : null;
-  const checkDuration = duration !== null && duration <= checkTimeRenew;
-  const checkRenewal = ((_props$application1 = props.application) === null || _props$application1 === void 0 ? void 0 : _props$application1.status) == "APPROVED" || ((_props$application10 = props.application) === null || _props$application10 === void 0 ? void 0 : _props$application10.status) == "EXPIRED";
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Fragment$1, null, /*#__PURE__*/React.createElement(NewApplicationTimeline, {
     workflowDetails: workflowDetails,
     t: t
-  }), (((_props$application11 = props.application) === null || _props$application11 === void 0 ? void 0 : _props$application11.status) != "CITIZENACTIONREQUIRED" || ((_props$application12 = props.application) === null || _props$application12 === void 0 ? void 0 : _props$application12.status) != "INITIATED") && actions && actions.length > 0 && ((_actions$ = actions[0]) === null || _actions$ === void 0 ? void 0 : _actions$.action) != "PAY" && !isCitizen && /*#__PURE__*/React.createElement(ActionBar, null, displayMenu ? /*#__PURE__*/React.createElement(Menu, {
+  }), (((_props$application0 = props.application) === null || _props$application0 === void 0 ? void 0 : _props$application0.status) != "CITIZENACTIONREQUIRED" || ((_props$application1 = props.application) === null || _props$application1 === void 0 ? void 0 : _props$application1.status) != "INITIATED") && actions && ((_actions$ = actions[0]) === null || _actions$ === void 0 ? void 0 : _actions$.action) != "PAY" && !isCitizen && /*#__PURE__*/React.createElement(ActionBar, null, displayMenu ? /*#__PURE__*/React.createElement(Menu, {
     localeKeyPrefix: `WF_EMPLOYEE_${"PTR"}`,
     options: actions,
     optionKey: "action",
@@ -17354,24 +17332,18 @@ const PTRWFApplicationTimeline = props => {
     ref: menuRef,
     label: t("WF_TAKE_ACTION"),
     onSubmit: () => setDisplayMenu(!displayMenu)
-  })), (((_props$application13 = props.application) === null || _props$application13 === void 0 ? void 0 : _props$application13.status) == "CITIZENACTIONREQUIRED" || ((_props$application14 = props.application) === null || _props$application14 === void 0 ? void 0 : _props$application14.status) == "INITIATED") && !isCitizen && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar, {
+  })), (((_props$application10 = props.application) === null || _props$application10 === void 0 ? void 0 : _props$application10.status) == "CITIZENACTIONREQUIRED" || ((_props$application11 = props.application) === null || _props$application11 === void 0 ? void 0 : _props$application11.status) == "INITIATED") && !isCitizen && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("COMMON_EDIT"),
     onSubmit: () => {
-      var _props$application15;
-      history.push(`/digit-ui/employee/ptr/petservice/new-application/${(_props$application15 = props.application) === null || _props$application15 === void 0 ? void 0 : _props$application15.applicationNumber}`);
-    }
-  })), checkRenewal && checkDuration && ((_props$application16 = props.application) === null || _props$application16 === void 0 ? void 0 : _props$application16.status) == "APPROVED" && !isCitizen && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement(SubmitBar, {
-    label: t("PT_RENEW_HEADER"),
-    onSubmit: () => {
-      var _props$application17;
-      history.push(`/digit-ui/employee/ptr/petservice/new-application/${props === null || props === void 0 ? void 0 : (_props$application17 = props.application) === null || _props$application17 === void 0 ? void 0 : _props$application17.applicationNumber}/renew-application`);
+      var _props$application12;
+      history.push(`/digit-ui/employee/ptr/petservice/new-application/${(_props$application12 = props.application) === null || _props$application12 === void 0 ? void 0 : _props$application12.applicationNumber}`);
     }
   })), showModal ? /*#__PURE__*/React.createElement(PTRModal, {
     t: t,
     action: selectedAction,
     tenantId: tenantId,
     state: state,
-    id: (_props$application18 = props.application) === null || _props$application18 === void 0 ? void 0 : _props$application18.applicationNumber,
+    id: (_props$application13 = props.application) === null || _props$application13 === void 0 ? void 0 : _props$application13.applicationNumber,
     applicationDetails: props.application,
     closeModal: closeModal,
     submitAction: submitAction,
@@ -20768,13 +20740,20 @@ const PTRApplicationDetails = () => {
     payments,
     ...params
   }) {
-    var _response;
+    var _application$document, _application$petDetai, _response;
+    const petImage = application === null || application === void 0 ? void 0 : (_application$document = application.documents) === null || _application$document === void 0 ? void 0 : _application$document.find(doc => (doc === null || doc === void 0 ? void 0 : doc.documentType) === "PET.PETPHOTO");
+    const petImageUrl = petImage !== null && petImage !== void 0 && petImage.filestoreId ? `${window.location.origin}/filestore/v1/files/id?tenantId=pb&fileStoreId=${petImage.filestoreId}` : `${window.location.origin}/adorable-golden-retriever.png`;
+    const petAge = formatPetAge(application === null || application === void 0 ? void 0 : (_application$petDetai = application.petDetails) === null || _application$petDetai === void 0 ? void 0 : _application$petDetai.petAge, t);
     let response = {
       filestoreIds: [payments === null || payments === void 0 ? void 0 : payments.fileStoreId]
     };
     response = await Digit.PaymentService.generatePdf(tenantId, {
       Payments: [{
-        ...payments
+        ...payments,
+        application,
+        approver,
+        petAge,
+        petImageUrl
       }]
     }, "petservice-receipt");
     const fileStore = await Digit.PaymentService.printReciept(tenantId, {
@@ -20892,7 +20871,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.addressLine1) || 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.addressId) || t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("PTR_PINCODE"),
@@ -23515,7 +23494,7 @@ const ApplicationDetails = () => {
   }, 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.addressLine1) || 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.addressId) || t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
     className: "border-none",
     label: t("PTR_PINCODE"),
@@ -24476,19 +24455,9 @@ const NewPTRStepperForm = () => {
   const step = formState.step;
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const pathParts = window.location.pathname.split("/");
-  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;
-  console.log("id:", id);
-  const shouldEnableSearch = Boolean(id);
+  const id = pathParts.find(part => part.startsWith("PB-PTR-"));
+  console.log("id", id);
+  const shouldEnableSearch = Boolean(id && id.startsWith("PB-PTR-"));
   console.log("shouldEnableSearch", shouldEnableSearch);
   const {
     isLoading,
@@ -24503,7 +24472,6 @@ const NewPTRStepperForm = () => {
   useEffect(() => {
     var _applicationData$PetR;
     console.log("applicationData for hereee:>> ", applicationData);
-    console.log("id", id);
     if (id && applicationData !== null && applicationData !== void 0 && (_applicationData$PetR = applicationData.PetRegistrationApplications) !== null && _applicationData$PetR !== void 0 && _applicationData$PetR.length) {
       dispatch(UPDATE_PTRNewApplication_FORM("responseData", applicationData.PetRegistrationApplications));
     }