@mseva/digit-ui-module-rentandlease 1.0.19 → 1.0.21

package/dist/index.modern.js

@@ -6164,6 +6164,9 @@ const getAcknowledgementData = async (application, tenantInfo, t) => {
   details.push({
     title: t("PT_PROPERTY_DETAILS"),
     values: [{
+      title: t("STATUS"),
+      value: t(application === null || application === void 0 ? void 0 : application.status) || "NA"
+    }, {
       title: t("PROPERTY_ID"),
       value: t(application === null || application === void 0 ? void 0 : (_application$addition = application.additionalDetails) === null || _application$addition === void 0 ? void 0 : _application$addition.propertyId) || "NA"
     }, {
@@ -7544,6 +7547,9 @@ const RALApplicationDetails = () => {
     moduleCode: "RENT_N_LEASE_NEW",
     role: "EMPLOYEE"
   });
+  const getDate = epoch => {
+    return Digit.DateUtils.ConvertEpochToDate(epoch);
+  };
   const propertyDetails = applicationData !== null && applicationData !== void 0 && applicationData.additionalDetails ? applicationData.additionalDetails : {};
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "cardHeaderWithOptions ral-app-details-header"
@@ -7557,7 +7563,7 @@ const RALApplicationDetails = () => {
   })), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, {
     className: "ral-card-subheader-24"
   }, t("RENT_LEASE_OWNER_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, null, applicationData !== null && applicationData !== void 0 && (_applicationData$Owne = applicationData.OwnerInfo) !== null && _applicationData$Owne !== void 0 && _applicationData$Owne.length ? applicationData.OwnerInfo.map((owner, index) => {
-    var _applicationData$Owne2, _owner$correspondence, _owner$permanentAddre;
+    var _applicationData$Owne2, _owner$correspondence, _owner$permanentAddre, _owner$correspondence2, _owner$permanentAddre2;
     const multipleOwners = (applicationData === null || applicationData === void 0 ? void 0 : (_applicationData$Owne2 = applicationData.OwnerInfo) === null || _applicationData$Owne2 === void 0 ? void 0 : _applicationData$Owne2.length) > 1;
     return /*#__PURE__*/React.createElement(React.Fragment, {
       key: owner.ownerId || index
@@ -7572,9 +7578,12 @@ const RALApplicationDetails = () => {
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("CORE_MOBILE_NUMBER"),
       text: (owner === null || owner === void 0 ? void 0 : owner.mobileNo) || t("CS_NA")
+    }), /*#__PURE__*/React.createElement(Row, {
+      label: t("PT_COMMON_COL_ADDRESS"),
+      text: (owner === null || owner === void 0 ? void 0 : (_owner$correspondence = owner.correspondenceAddress) === null || _owner$correspondence === void 0 ? void 0 : _owner$correspondence.addressId) || (owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre = owner.permanentAddress) === null || _owner$permanentAddre === void 0 ? void 0 : _owner$permanentAddre.addressId) || t("CS_NA")
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("CORE_COMMON_PINCODE"),
-      text: (owner === null || owner === void 0 ? void 0 : (_owner$correspondence = owner.correspondenceAddress) === null || _owner$correspondence === void 0 ? void 0 : _owner$correspondence.pincode) || (owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre = owner.permanentAddress) === null || _owner$permanentAddre === void 0 ? void 0 : _owner$permanentAddre.pincode) || t("CS_NA")
+      text: (owner === null || owner === void 0 ? void 0 : (_owner$correspondence2 = owner.correspondenceAddress) === null || _owner$correspondence2 === void 0 ? void 0 : _owner$correspondence2.pincode) || (owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre2 = owner.permanentAddress) === null || _owner$permanentAddre2 === void 0 ? void 0 : _owner$permanentAddre2.pincode) || t("CS_NA")
     }));
   }) : /*#__PURE__*/React.createElement(Row, {
     label: t("OWNER"),
@@ -7603,8 +7612,8 @@ const RALApplicationDetails = () => {
     label: t("RAL_PROPERTY_AMOUNT"),
     text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.baseRent) || t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
-    label: t("SECURITY_DEPOSIT"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit) || t("CS_NA")
+    label: t("PENALTY_TYPE"),
+    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.penaltyType) || t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_FEE_CYCLE"),
     text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$fees = propertyDetails.feesPeriodCycle) === null || _propertyDetails$fees === void 0 ? void 0 : (_propertyDetails$fees2 = _propertyDetails$fees[0]) === null || _propertyDetails$fees2 === void 0 ? void 0 : _propertyDetails$fees2.toUpperCase()) + (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$fees3 = propertyDetails.feesPeriodCycle) === null || _propertyDetails$fees3 === void 0 ? void 0 : (_propertyDetails$fees4 = _propertyDetails$fees3.slice(1)) === null || _propertyDetails$fees4 === void 0 ? void 0 : _propertyDetails$fees4.toLowerCase()) || t("CS_NA")
@@ -7614,6 +7623,27 @@ const RALApplicationDetails = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RENT_LEASE_LOCATION_TYPE"),
     text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.locationType) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_START_DATE"),
+    text: getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.startDate) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_END_DATE"),
+    text: getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.endDate) || t("CS_NA")
+  }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) > 0 && /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_PROPERTY_PENALTY"),
+    text: applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("SECURITY_DEPOSIT"),
+    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit) || t("CS_NA")
+  }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) - (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit) > 0 && /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_AMOUNT_TO_TAKE_FROM_CITIZEN"),
+    text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) - (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit)
+  }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeRefund) > 0 && /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_AMOUNT_TO_REFUND"),
+    text: applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeRefund
+  }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.tradeLicenseNumber) && /*#__PURE__*/React.createElement(Row, {
+    label: t("RENT_LEASE_TRADE_LICENSE_NUMBER"),
+    text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.tradeLicenseNumber) || t("CS_NA")
   })), /*#__PURE__*/React.createElement(CardSubHeader, {
     className: "ral-card-subheader-24-margin"
   }, t("CS_COMMON_DOCUMENTS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Card, {
@@ -8648,7 +8678,7 @@ const ModalConfig = ({
   assigneeLabel,
   businessService
 }) => {
-  let checkAssigneeVisible = (action === null || action === void 0 ? void 0 : action.action) === "SENDBACKTOOVERIFIER" || (action === null || action === void 0 ? void 0 : action.action) === "VERIFY" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARDFORFIELDINSPECTION" || (action === null || action === void 0 ? void 0 : action.action) === "PENDING_FOR_FIELDINSPECTION" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD_FOR_APPROVAL" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARDFORAPPROVAL" || (action === null || action === void 0 ? void 0 : action.action) === "PENDING_FOR_DOCUMENT_VERIFY" || (action === null || action === void 0 ? void 0 : action.action) === "REQUEST_FOR_DISCONNECTION" || (action === null || action === void 0 ? void 0 : action.action) === "DISCONNECTION_FIELD_INSPECTION" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD_FOR_FIELDINSPECTION" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD_FOT_SETLEMENT";
+  let checkAssigneeVisible = (action === null || action === void 0 ? void 0 : action.action) === "PENDING_FOR_FIELDINSPECTION" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD_FOR_APPROVAL" || (action === null || action === void 0 ? void 0 : action.action) === "PENDING_FOR_DOCUMENT_VERIFY" || (action === null || action === void 0 ? void 0 : action.action) === "REQUEST_FOR_DISCONNECTION" || (action === null || action === void 0 ? void 0 : action.action) === "DISCONNECTION_FIELD_INSPECTION" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD_FOR_FIELDINSPECTION" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD_FOT_SETLEMENT";
   if (action !== null && action !== void 0 && action.isTerminateState) checkAssigneeMandatory = false;
   if (action.isTerminateState) {
     checkAssigneeVisible = false;
@@ -8716,9 +8746,15 @@ const ModalConfig = ({
           onDelete: () => {
             setUploadedFile(null);
           },
-          message: uploadedFile ? `1 ${t(`ES_PT_ACTION_FILEUPLOADED`)}` : t(`CS_ACTION_NO_FILEUPLOADED`)
+          message: uploadedFile ? `1 ${t("ES_PT_ACTION_FILEUPLOADED")}` : t("CS_ACTION_NO_FILEUPLOADED")
         })
-      }]
+      }, ...((action === null || action === void 0 ? void 0 : action.action) === "FORWARD_FOT_SETLEMENT" ? [{
+        label: `${t("RAL_PROPERTY_DAMAGE_PENALTY")}`,
+        type: "number",
+        populators: {
+          name: "amountToBeDeducted"
+        }
+      }] : [])]
     }]
   };
 };
@@ -8869,7 +8905,8 @@ const RALModal = ({
       closeModal();
       return;
     }
-    let checkAssigneeMandatory = (action === null || action === void 0 ? void 0 : action.action) === "SENDBACKTOOVERIFIER" || (action === null || action === void 0 ? void 0 : action.action) === "VERIFY" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARDFORFIELDINSPECTION" || (action === null || action === void 0 ? void 0 : action.action) === "PENDING_FOR_FIELDINSPECTION" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD_FOR_APPROVAL" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARDFORAPPROVAL" || (action === null || action === void 0 ? void 0 : action.action) === "PENDING_FOR_DOCUMENT_VERIFY" || (action === null || action === void 0 ? void 0 : action.action) === "REQUEST_FOR_DISCONNECTION" || (action === null || action === void 0 ? void 0 : action.action) === "DISCONNECTION_FIELD_INSPECTION" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD_FOR_FIELDINSPECTION" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD_FOT_SETLEMENT";
+    if (action !== null && action !== void 0 && action.isTerminateState) checkCommentsMandatory = true;
+    let checkAssigneeMandatory = (action === null || action === void 0 ? void 0 : action.action) === "PENDING_FOR_FIELDINSPECTION" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD_FOR_APPROVAL" || (action === null || action === void 0 ? void 0 : action.action) === "PENDING_FOR_DOCUMENT_VERIFY" || (action === null || action === void 0 ? void 0 : action.action) === "REQUEST_FOR_DISCONNECTION" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD_FOT_SETLEMENT" || (action === null || action === void 0 ? void 0 : action.action) === "DISCONNECTION_FIELD_INSPECTION" || (action === null || action === void 0 ? void 0 : action.action) === "FORWARD_FOR_FIELDINSPECTION";
     if (action !== null && action !== void 0 && action.isTerminateState) checkAssigneeMandatory = false;
     if (checkAssigneeMandatory && !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid)) {
       setShowToast({
@@ -8888,6 +8925,7 @@ const RALModal = ({
     }
     applicationData = {
       ...applicationData,
+      ...data,
       action: action === null || action === void 0 ? void 0 : action.action,
       comment: data === null || data === void 0 ? void 0 : data.comments,
       assignee: !(selectedApprover !== null && selectedApprover !== void 0 && selectedApprover.uuid) ? null : [selectedApprover === null || selectedApprover === void 0 ? void 0 : selectedApprover.uuid],
@@ -8916,6 +8954,13 @@ const RALModal = ({
       }));
     }
   }, [action, approvers, financialYears, uploadedFile]);
+  useEffect(() => {
+    if ((action === null || action === void 0 ? void 0 : action.action) === "FORWARD_FOT_SETLEMENT") {
+      setDefaultValues({
+        amountToBeDeducted: 0
+      });
+    }
+  }, [action]);
   if (!action || !config.form) return null;
   return /*#__PURE__*/React.createElement(Modal, {
     headerBarMain: /*#__PURE__*/React.createElement(Heading, {
@@ -8950,7 +8995,7 @@ const RALModal = ({
 };
 
 const RALApplicationDetails$1 = () => {
-  var _user$info, _user$info$roles, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _actions, _applicationData$Owne, _propertyDetails$fees, _propertyDetails$fees2, _propertyDetails$fees3, _propertyDetails$fees4, _applicationData$Docu2, _actions2, _workflowDetails$data6;
+  var _user$info, _user$info$roles, _workflowDetails$data, _workflowDetails$data2, _workflowDetails$data3, _workflowDetails$data4, _workflowDetails$data5, _actions, _actions2, _applicationData$Owne, _propertyDetails$fees, _propertyDetails$fees2, _propertyDetails$fees3, _propertyDetails$fees4, _applicationData$Docu2, _actions3, _workflowDetails$data6;
   const {
     t
   } = useTranslation();
@@ -9022,11 +9067,21 @@ const RALApplicationDetails$1 = () => {
       return (_e$roles2 = e.roles) === null || _e$roles2 === void 0 ? void 0 : _e$roles2.includes(role);
     })) || !e.roles;
   }));
-  if ((_actions = actions) !== null && _actions !== void 0 && _actions.some(action => action.action === "REQUEST_FOR_DISCONNECTION") && (applicationData === null || applicationData === void 0 ? void 0 : applicationData.endDate) > Date.now()) {
+  if ((_actions = actions) !== null && _actions !== void 0 && _actions.some(action => (action === null || action === void 0 ? void 0 : action.action) === "REQUEST_FOR_DISCONNECTION") && !(applicationData !== null && applicationData !== void 0 && applicationData.expireFlag) && Date.now() >= (applicationData === null || applicationData === void 0 ? void 0 : applicationData.endDate) - 15 * 24 * 60 * 60 * 1000) {
     actions = [...(actions || []), {
       action: "RENEWAL"
     }];
   }
+  actions = (_actions2 = actions) === null || _actions2 === void 0 ? void 0 : _actions2.filter(action => {
+    if (action.action === "PAY_SETTLEMENT_AMOUNT") {
+      return (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) > 0 && (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) - (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit) > 0 && (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeRefund) == 0;
+    }
+    if (action.action === "CLOSE") {
+      return (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeRefund) > 0;
+    }
+    return true;
+  });
+  console.log("actions", actions);
   const closeToast = () => {
     setShowToast(null);
   };
@@ -9035,6 +9090,9 @@ const RALApplicationDetails$1 = () => {
     setShowModal(false);
     setShowToast(false);
   };
+  const getDate = epoch => {
+    return Digit.DateUtils.ConvertEpochToDate(epoch);
+  };
   function onActionSelect(action) {
     var _ref, _action$state, _filterRoles$;
     const payload = {
@@ -9046,9 +9104,9 @@ const RALApplicationDetails$1 = () => {
       return (item === null || item === void 0 ? void 0 : item.uuid) == (filterNexState === null || filterNexState === void 0 ? void 0 : (_filterNexState$ = filterNexState[0]) === null || _filterNexState$ === void 0 ? void 0 : _filterNexState$.nextState);
     });
     setEmployees((filterRoles === null || filterRoles === void 0 ? void 0 : (_filterRoles$ = filterRoles[0]) === null || _filterRoles$ === void 0 ? void 0 : _filterRoles$.actions) || []);
-    if ((action === null || action === void 0 ? void 0 : action.action) == "APPLY" || (action === null || action === void 0 ? void 0 : action.action) == "REJECT" || (action === null || action === void 0 ? void 0 : action.action) == "CASH_REFUND") {
+    if ((action === null || action === void 0 ? void 0 : action.action) == "APPLY" || (action === null || action === void 0 ? void 0 : action.action) == "REJECT" || (action === null || action === void 0 ? void 0 : action.action) == "CLOSED" || (action === null || action === void 0 ? void 0 : action.action) == "CLOSE") {
       submitAction(payload);
-    } else if ((action === null || action === void 0 ? void 0 : action.action) == "PAY") {
+    } else if ((action === null || action === void 0 ? void 0 : action.action) == "PAY" || (action === null || action === void 0 ? void 0 : action.action) == "PAY_SETTLEMENT_AMOUNT") {
       const appNo = acknowledgementIds;
       history.push(`/digit-ui/employee/payment/collect/rl-services/${appNo}/${tenantId}`);
     } else if ((action === null || action === void 0 ? void 0 : action.action) === "RAL_RENEWAL") {
@@ -9060,7 +9118,7 @@ const RALApplicationDetails$1 = () => {
     }
   }
   const submitAction = async data => {
-    var _applicationData$audi, _filtData, _filtData2, _filtData3, _filtData4;
+    var _applicationData$audi, _filtData, _filtData2, _filtData3, _filtData4, _filtData5;
     const payloadData = applicationData;
     const updatedApplicant = {
       ...payloadData,
@@ -9084,6 +9142,9 @@ const RALApplicationDetails$1 = () => {
       comments: (_filtData2 = filtData) === null || _filtData2 === void 0 ? void 0 : _filtData2.comment,
       documents: (_filtData3 = filtData) !== null && _filtData3 !== void 0 && _filtData3.wfDocuments ? (_filtData4 = filtData) === null || _filtData4 === void 0 ? void 0 : _filtData4.wfDocuments : null
     };
+    if (filtData.action === "FORWARD_FOT_SETLEMENT" && ((_filtData5 = filtData) === null || _filtData5 === void 0 ? void 0 : _filtData5.amountToBeDeducted) !== undefined) {
+      updatedApplicant.amountToBeDeducted = filtData.amountToBeDeducted;
+    }
     const finalPayload = {
       AllotmentDetails: updatedApplicant
     };
@@ -9150,6 +9211,7 @@ const RALApplicationDetails$1 = () => {
         previousApplicationNumber: data === null || data === void 0 ? void 0 : data.applicationNumber,
         OwnerInfo: sanitizedOwners,
         tradeLicenseNumber: data === null || data === void 0 ? void 0 : data.tradeLicenseNumber,
+        registrationNumber: data === null || data === void 0 ? void 0 : data.registrationNumber,
         additionalDetails: data === null || data === void 0 ? void 0 : data.additionalDetails,
         startDate: newStart.getTime(),
         endDate: newEnd.getTime(),
@@ -9215,7 +9277,7 @@ const RALApplicationDetails$1 = () => {
   }, t("RENT_LEASE_APPLICATION_DETAILS"))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(CardSubHeader, {
     className: "ral-card-subheader-24"
   }, t("RENT_LEASE_OWNER_DETAILS")), /*#__PURE__*/React.createElement(StatusTable, null, applicationData !== null && applicationData !== void 0 && (_applicationData$Owne = applicationData.OwnerInfo) !== null && _applicationData$Owne !== void 0 && _applicationData$Owne.length ? applicationData.OwnerInfo.map((owner, index) => {
-    var _owner$correspondence, _owner$permanentAddre;
+    var _owner$correspondence, _owner$permanentAddre, _owner$correspondence2, _owner$permanentAddre2;
     const multipleOwners = applicationData.OwnerInfo.length > 1;
     return /*#__PURE__*/React.createElement(React.Fragment, {
       key: owner.ownerId || index
@@ -9230,9 +9292,12 @@ const RALApplicationDetails$1 = () => {
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("CORE_MOBILE_NUMBER"),
       text: (owner === null || owner === void 0 ? void 0 : owner.mobileNo) || t("CS_NA")
+    }), /*#__PURE__*/React.createElement(Row, {
+      label: t("PT_COMMON_COL_ADDRESS"),
+      text: (owner === null || owner === void 0 ? void 0 : (_owner$correspondence = owner.correspondenceAddress) === null || _owner$correspondence === void 0 ? void 0 : _owner$correspondence.addressId) || (owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre = owner.permanentAddress) === null || _owner$permanentAddre === void 0 ? void 0 : _owner$permanentAddre.addressId) || t("CS_NA")
     }), /*#__PURE__*/React.createElement(Row, {
       label: t("CORE_COMMON_PINCODE"),
-      text: (owner === null || owner === void 0 ? void 0 : (_owner$correspondence = owner.correspondenceAddress) === null || _owner$correspondence === void 0 ? void 0 : _owner$correspondence.pincode) || (owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre = owner.permanentAddress) === null || _owner$permanentAddre === void 0 ? void 0 : _owner$permanentAddre.pincode) || t("CS_NA")
+      text: (owner === null || owner === void 0 ? void 0 : (_owner$correspondence2 = owner.correspondenceAddress) === null || _owner$correspondence2 === void 0 ? void 0 : _owner$correspondence2.pincode) || (owner === null || owner === void 0 ? void 0 : (_owner$permanentAddre2 = owner.permanentAddress) === null || _owner$permanentAddre2 === void 0 ? void 0 : _owner$permanentAddre2.pincode) || t("CS_NA")
     }));
   }) : /*#__PURE__*/React.createElement(Row, {
     label: t("OWNER"),
@@ -9264,8 +9329,8 @@ const RALApplicationDetails$1 = () => {
     label: t("RAL_PROPERTY_AMOUNT"),
     text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.baseRent) || t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
-    label: t("SECURITY_DEPOSIT"),
-    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit) || t("CS_NA")
+    label: t("PENALTY_TYPE"),
+    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.penaltyType) || t("CS_NA")
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RAL_FEE_CYCLE"),
     text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$fees = propertyDetails.feesPeriodCycle) === null || _propertyDetails$fees === void 0 ? void 0 : (_propertyDetails$fees2 = _propertyDetails$fees[0]) === null || _propertyDetails$fees2 === void 0 ? void 0 : _propertyDetails$fees2.toUpperCase()) + (propertyDetails === null || propertyDetails === void 0 ? void 0 : (_propertyDetails$fees3 = propertyDetails.feesPeriodCycle) === null || _propertyDetails$fees3 === void 0 ? void 0 : (_propertyDetails$fees4 = _propertyDetails$fees3.slice(1)) === null || _propertyDetails$fees4 === void 0 ? void 0 : _propertyDetails$fees4.toLowerCase()) || t("CS_NA")
@@ -9275,6 +9340,27 @@ const RALApplicationDetails$1 = () => {
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("RENT_LEASE_LOCATION_TYPE"),
     text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.locationType) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_START_DATE"),
+    text: getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.startDate) || t("CS_NA")
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_END_DATE"),
+    text: getDate(applicationData === null || applicationData === void 0 ? void 0 : applicationData.endDate) || t("CS_NA")
+  }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) > 0 && /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_PROPERTY_PENALTY"),
+    text: applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted
+  }), /*#__PURE__*/React.createElement(Row, {
+    label: t("SECURITY_DEPOSIT"),
+    text: (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit) || t("CS_NA")
+  }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) - (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit) > 0 && /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_AMOUNT_TO_TAKE_FROM_CITIZEN"),
+    text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeDeducted) - (propertyDetails === null || propertyDetails === void 0 ? void 0 : propertyDetails.securityDeposit)
+  }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeRefund) > 0 && /*#__PURE__*/React.createElement(Row, {
+    label: t("RAL_AMOUNT_TO_REFUND"),
+    text: applicationData === null || applicationData === void 0 ? void 0 : applicationData.amountToBeRefund
+  }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.tradeLicenseNumber) && /*#__PURE__*/React.createElement(Row, {
+    label: t("RENT_LEASE_TRADE_LICENSE_NUMBER"),
+    text: (applicationData === null || applicationData === void 0 ? void 0 : applicationData.tradeLicenseNumber) || t("CS_NA")
   })), /*#__PURE__*/React.createElement(CardSubHeader, {
     className: "ral-card-subheader-24-margin"
   }, t("CS_COMMON_DOCUMENTS")), /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Card, {
@@ -9288,7 +9374,7 @@ const RALApplicationDetails$1 = () => {
   }), t(doc === null || doc === void 0 ? void 0 : doc.documentType))) : /*#__PURE__*/React.createElement("h5", null, t("CS_NO_DOCUMENTS_UPLOADED"))))), /*#__PURE__*/React.createElement(NewApplicationTimeline, {
     workflowDetails: workflowDetails,
     t: t
-  }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.status) != "INITIATED" && ((_actions2 = actions) === null || _actions2 === void 0 ? void 0 : _actions2.length) > 0 && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement("div", {
+  }), (applicationData === null || applicationData === void 0 ? void 0 : applicationData.status) != "INITIATED" && ((_actions3 = actions) === null || _actions3 === void 0 ? void 0 : _actions3.length) > 0 && !(applicationData !== null && applicationData !== void 0 && applicationData.expireFlag) && /*#__PURE__*/React.createElement(ActionBar, null, /*#__PURE__*/React.createElement("div", {
     ref: menuRef
   }, displayMenu ? /*#__PURE__*/React.createElement(Menu, {
     localeKeyPrefix: `WF_EMPLOYEE_${"PTR"}`,
@@ -10106,6 +10192,7 @@ const RentAndLeasePropertyDetails = ({
       baseRent: "",
       securityDeposit: "",
       refundApplicableOnDiscontinuation: null,
+      penaltyType: "",
       startDate: "",
       endDate: "",
       incrementApplicable: "",
@@ -10136,7 +10223,7 @@ const RentAndLeasePropertyDetails = ({
   };
   const handlePropertySelect = property => {
     if (!property) return;
-    const fieldsToPrefill = ["propertyId", "propertyName", "baseRent", "securityDeposit", "refundApplicableOnDiscontinuation"];
+    const fieldsToPrefill = ["propertyId", "propertyName", "baseRent", "securityDeposit", "refundApplicableOnDiscontinuation", "penaltyType"];
     setValue("selectedProperty", property);
     fieldsToPrefill === null || fieldsToPrefill === void 0 ? void 0 : fieldsToPrefill.forEach(field => {
       setValue(field, (property === null || property === void 0 ? void 0 : property[field]) ?? null, {
@@ -10418,7 +10505,27 @@ const RentAndLeasePropertyDetails = ({
     })
   }))), errors.baseRent && /*#__PURE__*/React.createElement(CardLabelError, {
     className: "ral-error-label"
-  }, getErrorMessage("baseRent")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("RAL_SECURITY_AMOUNT"), " ", /*#__PURE__*/React.createElement("span", null, "*")), /*#__PURE__*/React.createElement("div", {
+  }, getErrorMessage("baseRent")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    className: "card-label-smaller"
+  }, t("PENALTY_TYPE"), " ", /*#__PURE__*/React.createElement("span", null, "*")), /*#__PURE__*/React.createElement("div", {
+    className: "form-field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "penaltyType",
+    rules: {
+      required: t("PTR_FIELD_REQUIRED")
+    },
+    render: ({
+      value,
+      onChange
+    }) => /*#__PURE__*/React.createElement(TextInput, {
+      type: "text",
+      value: value || "",
+      onChange: e => onChange(e.target.value),
+      t: t,
+      disabled: true
+    })
+  }))), errors.penaltyType && /*#__PURE__*/React.createElement(CardLabelError, null, getErrorMessage("penaltyType")), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, null, t("RAL_SECURITY_AMOUNT"), " ", /*#__PURE__*/React.createElement("span", null, "*")), /*#__PURE__*/React.createElement("div", {
     className: "form-field"
   }, /*#__PURE__*/React.createElement(Controller, {
     control: control,
@@ -11539,7 +11646,8 @@ function RentAndLeaseSummary({
     baseRent: t("RENT_AMOUNT "),
     securityDeposit: t("SECURITY_DEPOSIT"),
     tax_applicable: t("GST_APPLICABLE"),
-    refundApplicableOnDiscontinuation: t("REFUND_APPLICABLE")
+    refundApplicableOnDiscontinuation: t("REFUND_APPLICABLE"),
+    penaltyType: t("PENALTY_TYPE")
   };
   return /*#__PURE__*/React.createElement("div", {
     className: "application-summary"
@@ -13309,6 +13417,8 @@ const MyProperties = ({
     offset: 0,
     mobileNumber: userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info = userInfo.info) === null || _userInfo$info === void 0 ? void 0 : _userInfo$info.mobileNumber
   });
+  const [selectedProperty, setSelectedProperty] = useState(null);
+  const [showToast, setShowToast] = useState(null);
   const fetchProperties = async () => {
     setLoader(true);
     try {
@@ -13333,6 +13443,12 @@ const MyProperties = ({
   useEffect(() => {
     fetchProperties();
   }, [filters.offset]);
+  useEffect(() => {
+    if (showToast) {
+      const timer = setTimeout(() => setShowToast(null), 2000);
+      return () => clearTimeout(timer);
+    }
+  }, [showToast]);
   const handleLoadMore = () => {
     setFilters(prev => ({
       ...prev,
@@ -13342,12 +13458,51 @@ const MyProperties = ({
   const handleMakePayment = id => {
     history.push(`/digit-ui/citizen/payment/collect/rl-services/${id}/${tenantId}?tenantId=${tenantId}`);
   };
+  const submitAction = async (action, property) => {
+    const updatedApplicant = {
+      ...property,
+      workflow: {
+        action: action,
+        assignes: [],
+        comments: "",
+        documents: null
+      }
+    };
+    const finalPayload = {
+      AllotmentDetails: updatedApplicant
+    };
+    try {
+      var _response$ResponseInf;
+      setLoader(true);
+      const response = await Digit.RentAndLeaseService.update(finalPayload);
+      if ((response === null || response === void 0 ? void 0 : (_response$ResponseInf = response.ResponseInfo) === null || _response$ResponseInf === void 0 ? void 0 : _response$ResponseInf.status) == "successful") {
+        setShowToast({
+          key: false,
+          label: "Successfully updated the status"
+        });
+        setPropertiesData([]);
+        setFilters(prev => ({
+          ...prev,
+          offset: 0
+        }));
+        fetchProperties();
+      }
+    } catch (err) {
+      setShowToast({
+        key: true,
+        label: "Something went wrong"
+      });
+    } finally {
+      setLoader(false);
+    }
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "ral-my-properties-container"
   }, /*#__PURE__*/React.createElement("div", null, header && /*#__PURE__*/React.createElement(Header, {
     className: "ral-my-properties-header"
   }, t(header), " (", totalCount, ")"), getPropertiesData === null || getPropertiesData === void 0 ? void 0 : getPropertiesData.map((property, index) => {
     var _property$additionalD, _property$additionalD2;
+    console.log("property", property);
     return /*#__PURE__*/React.createElement(Card, {
       key: index
     }, (property === null || property === void 0 ? void 0 : property.registrationNumber) && /*#__PURE__*/React.createElement(KeyNote, {
@@ -13371,9 +13526,12 @@ const MyProperties = ({
       to: `/digit-ui/citizen/rentandlease/property/${property === null || property === void 0 ? void 0 : property.applicationNumber}/${property === null || property === void 0 ? void 0 : property.tenantId}`
     }, /*#__PURE__*/React.createElement(SubmitBar, {
       label: t("CS_VIEW_DETAILS")
-    })), ((property === null || property === void 0 ? void 0 : property.status) == "PENDINGPAYMENT" || (property === null || property === void 0 ? void 0 : property.status) == "PENDING_FOR_PAYMENT" || (property === null || property === void 0 ? void 0 : property.status) == "PENDING_FOT_SETLEMENT") && /*#__PURE__*/React.createElement(SubmitBar, {
+    })), ((property === null || property === void 0 ? void 0 : property.status) == "PENDINGPAYMENT" || (property === null || property === void 0 ? void 0 : property.status) == "PENDING_FOR_PAYMENT" || (property === null || property === void 0 ? void 0 : property.status) == "PENDING_FOT_SETLEMENT" && (property === null || property === void 0 ? void 0 : property.amountToBeDeducted) > 0) && /*#__PURE__*/React.createElement(SubmitBar, {
       label: t("CS_APPLICATION_DETAILS_MAKE_PAYMENT"),
       onSubmit: () => handleMakePayment(property === null || property === void 0 ? void 0 : property.applicationNumber)
+    }), (property === null || property === void 0 ? void 0 : property.status) == "APPROVED" && /*#__PURE__*/React.createElement(SubmitBar, {
+      label: t("REQUEST_FOR_DISCONNECTION"),
+      onSubmit: () => submitAction("REQUEST_FOR_DISCONNECTION", property)
     })));
   }), (getPropertiesData === null || getPropertiesData === void 0 ? void 0 : getPropertiesData.length) === 0 && !loader && /*#__PURE__*/React.createElement("p", {
     className: "ral-my-properties-no-result"
@@ -13384,6 +13542,11 @@ const MyProperties = ({
     onClick: handleLoadMore
   }, t("CHB_LOAD_MORE_MSG")))), loader && /*#__PURE__*/React.createElement(Loader, {
     page: true
+  }), showToast && /*#__PURE__*/React.createElement(Toast, {
+    error: showToast.key,
+    label: t(showToast.label),
+    isDleteBtn: true,
+    onClose: () => setShowToast(null)
   }));
 };
 MyProperties.propTypes = {