Merge pull request #1001 from sriranjan-s/Dev-2.0

Added BPA calculation FIX
upyog · Mar 15, 2024 · 66469d5 · 66469d5
2 parents ff6d0a7 + 8ba2566
commit 66469d5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
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"))
+let plotArea = parseInt(sessionStorage.getItem("plotArea")) *9
 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)
@@ -355,7 +355,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")) * 2.5}`} />
+       <Row className="border-none" label={t(`BPA_COMMON_P1_AMT`)} text={`₹ ${data?.boundaryWallLength*2.5 + parseInt(sessionStorage.getItem("plotArea"))* 9 * 2.5}`} />
        <CardSubHeader>{t("BPA_P2_SUMMARY_FEE_EST")}</CardSubHeader> 
 
        <Row className="border-none" label={t(`BPA_COMMON_MALBA_AMT`)} text={`₹ ${malbafees}`} />

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
@@ -407,16 +407,16 @@ export const convertToBPAObject = (data, isOCBPA = false, isSendBackTOCitizen =
       auditDetails: data?.auditDetails,
       additionalDetails: {
         ...data?.additionalDetails,
-        selfCertificationCharges:[
-          {"BPA_MALBA_CHARGES" : sessionStorage.getItem("Malbafees")},
-          {"BPA_LABOUR_CESS": sessionStorage.getItem("LabourCess")},
-          {"BPA_WATER_CHARGES":sessionStorage.getItem("WaterCharges")},
-          {"BPA_GAUSHALA_CHARGES_CESS":sessionStorage.getItem("GaushalaFees")},
-          {"BPA_LESS_ADJUSMENT_PLOT":sessionStorage.getItem("development")},
-          {"BPA_DEVELOPMENT_CHARGES":sessionStorage.getItem("lessAdjusment")},
-          {"BPA_OTHER_CHARGES":sessionStorage.getItem("otherCharges")}
-          ],
-          P1charges:data?.data?.boundaryWallLength*2.5 + parseInt(sessionStorage.getItem("plotArea")) * 2.5,
+        selfCertificationCharges:{
+          "BPA_MALBA_CHARGES" : sessionStorage.getItem("Malbafees"),
+          "BPA_LABOUR_CESS": sessionStorage.getItem("LabourCess"),
+          "BPA_WATER_CHARGES":sessionStorage.getItem("WaterCharges"),
+          "BPA_GAUSHALA_CHARGES_CESS":sessionStorage.getItem("GaushalaFees"),
+          "BPA_LESS_ADJUSMENT_PLOT":sessionStorage.getItem("lessAdjusment",),
+          "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 ,