Merge pull request #1013 from deepa-s-13/Dev-2.0

OBPAS Changes: P1 and P2 fees
upyog · Mar 22, 2024 · fe97aad · fe97aad
2 parents 3db347e + 9faedc9
commit fe97aad
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.../micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js b/.../micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js
@@ -19,6 +19,7 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => {
     const [isPrimaryOwner, setisPrimaryOwner] = useState(false);
     const [gender, setGender] = useState(formData?.owners?.gender);
     const [mobileNumber, setMobileNumber] = useState(formData?.owners?.mobileNumber || "");
+    const [emailId, setEmail] = useState(formData?.owners?.emailId || "");
     const [showToast, setShowToast] = useState(null);
     const [isDisable, setIsDisable] = useState(false);
     let Webview = !Digit.Utils.browser.isMobile();
@@ -329,6 +330,7 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => {
                 payload.additionalDetails.area  = (formData?.data.edcrDetails.planDetail.planInformation.plotArea).toString()||  "NA";
                 payload.additionalDetails.height  = (formData?.data.edcrDetails.planDetail.blocks[0].building.buildingHeight).toString() || "NA";
                 payload.additionalDetails.usage  = formData?.data.occupancyType  || "NA";
+                payload.additionalDetails.builtUpArea =(formData?.data.edcrDetails.planDetail.blocks[0].building.totalBuitUpArea).toString();
 
                 if (formData?.data?.holdingNumber) payload.additionalDetails.holdingNo = formData?.data?.holdingNumber;
                 if (formData?.data?.registrationDetails) payload.additionalDetails.registrationDetails = formData?.data?.registrationDetails;
@@ -545,7 +547,7 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => {
                                             type: "emailId",
                                             title: t("TL_EMAIL_ID_ERROR_MESSAGE"),
                                         })}
-                                        disabled={true}
+                                        //disabled={true}
                                     />
                                     {ismultiple && (
                                         <CheckBox

diff --git a/...micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js b/...micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js
@@ -34,7 +34,7 @@ import {
     const isEditApplication = window.location.href.includes("editApplication");
     useEffect(()=>{
 console.log("mdmsData",mdmsData,sessionStorage.getItem("plotArea"),typeof(sessionStorage.getItem("plotArea")))
-let plotArea = parseInt(sessionStorage.getItem("plotArea")) *9
+let plotArea = parseInt(sessionStorage.getItem("plotArea")) 
 const LabourCess = plotArea > 909 ?mdmsData?.BPA?.LabourCess[1].rate * plotArea : 0
  const GaushalaFees =  mdmsData?.BPA?.GaushalaFees[0].rate  
  const Malbafees = (plotArea <=500 ?mdmsData?.BPA?.MalbaCharges[0].rate :plotArea >500 && plotArea <=1000 ?mdmsData?.BPA?.MalbaCharges?.[1].rate :mdmsData?.BPA?.MalbaCharges[2].rate || 500)
@@ -89,6 +89,7 @@ console.log("mdmsData",mdmsData,mdmsData?.MalbaCharges?.BPA[1].rate,plotArea)
         }
       );
 
+      value.additionalDetails.P1charges=paymentDetails?.Bill[0].billDetails[0].amount;
       const sendbacktocitizenApp = window.location.href.includes("sendbacktocitizen");
       let routeLink = `/digit-ui/citizen/obps/bpa/${additionalDetails?.applicationType.toLowerCase()}/${additionalDetails?.serviceType.toLowerCase()}`;
       if (isEditApplication) routeLink = `/digit-ui/citizen/obps/editApplication/bpa/${value?.tenantId}/${value?.applicationNo}`;
@@ -355,7 +356,7 @@ console.log("mdmsData",mdmsData,mdmsData?.MalbaCharges?.BPA[1].rate,plotArea)
       ))} */}
        {/* <Row className="border-none" label={t(`BPA_COMMON_TOTAL_AMT`)} text={`₹ ${paymentDetails?.Bill?.[0]?.billDetails[0]?.amount || "0"}`} /> */}
        <CardSubHeader>{t("BPA_P1_SUMMARY_FEE_EST")}</CardSubHeader> 
-       <Row className="border-none" label={t(`BPA_COMMON_P1_AMT`)} text={`₹ ${data?.boundaryWallLength*2.5 + parseInt(sessionStorage.getItem("plotArea"))* 9 * 2.5}`} />
+       <Row className="border-none" label={t(`BPA_COMMON_P1_AMT`)} text={`₹ ${paymentDetails?.Bill[0].billDetails[0].amount}`} />
        <CardSubHeader>{t("BPA_P2_SUMMARY_FEE_EST")}</CardSubHeader> 
 
        <Row className="border-none" label={t(`BPA_COMMON_MALBA_AMT`)} text={`₹ ${malbafees}`} />
@@ -407,7 +408,7 @@ console.log("mdmsData",mdmsData,mdmsData?.MalbaCharges?.BPA[1].rate,plotArea)
       <hr style={{color:"#cccccc",backgroundColor:"#cccccc",height:"2px",marginTop:"20px",marginBottom:"20px"}}/>
       {/* <CardHeader>{t("BPA_COMMON_TOTAL_AMT")}</CardHeader> 
       <CardHeader>₹ {paymentDetails?.Bill?.[0]?.billDetails[0]?.amount || "0"}</CardHeader>  */}
-      <SubmitBar label={t("BPA_SEND_TO_CITIZEN_LABEL")} onSubmit={onSubmit} />
+      <SubmitBar label={t("BPA_SEND_TO_CITIZEN_LABEL")} onSubmit={onSubmit} disabled={!development || !otherCharges || !lessAdjusment} id/>
       </Card>
     </React.Fragment>
     );

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/utils/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/utils/index.js
@@ -416,7 +416,7 @@ export const convertToBPAObject = (data, isOCBPA = false, isSendBackTOCitizen =
           "BPA_DEVELOPMENT_CHARGES":sessionStorage.getItem("development"),
           "BPA_OTHER_CHARGES":sessionStorage.getItem("otherCharges")
         },
-        P1charges:data?.data?.boundaryWallLength*2.5 + parseInt(sessionStorage.getItem("plotArea"))* 9 * 2.5,
+
         GISPlaceName : data?.address?.placeName,
         holdingNo: data?.data?.holdingNumber ? data?.data?.holdingNumber : data?.additionalDetails?.holdingNo,
         boundaryWallLength:data?.data?.boundaryWallLength ? data?.data?.boundaryWallLength : data?.additionalDetails?.boundaryWallLength ,