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

published OBPAS changes
upyog · Sep 19, 2024 · 80fd1a0 · 80fd1a0
2 parents d35aefc + a92b7a9
commit 80fd1a0
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile
@@ -12,7 +12,7 @@ RUN yarn add @upyog/digit-ui-module-noc@1.7.0-beta.3
 RUN yarn add @upyog/digit-ui-module-engagement@1.7.0-beta.4
 RUN yarn add @upyog/digit-ui-module-hrms@1.7.0-beta.3
 RUN yarn add @upyog/digit-ui-module-core@1.7.0-beta.3
-RUN yarn add @upyog/digit-ui-module-obps@1.7.0-beta.16
+RUN yarn add @upyog/digit-ui-module-obps@1.7.0-beta.17
 RUN yarn add @upyog/digit-ui-module-common@1.7.0-beta.5
 RUN yarn add @upyog/digit-ui-module-ws@1.7.0-beta.12
 RUN yarn add @upyog/digit-ui-module-commonpt@1.7.0-beta.4

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json b/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json
@@ -16,7 +16,7 @@
     "@upyog/digit-ui-module-fsm":"1.7.0-beta.18",
     "@upyog/digit-ui-module-mcollect":"1.7.0-beta.4",
     "@upyog/digit-ui-module-noc":"1.7.0-beta.3",
-    "@upyog/digit-ui-module-obps":"1.7.0-beta.16",
+    "@upyog/digit-ui-module-obps":"1.7.0-beta.17",
     "@upyog/digit-ui-module-pgr":"1.7.0-beta.6",
     "@upyog/digit-ui-module-pt":"1.7.0-beta.4",
     "@upyog/digit-ui-module-receipts":"1.7.0-beta.3",

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -16,7 +16,7 @@
     "@upyog/digit-ui-module-fsm": "1.7.0-beta.18",
     "@upyog/digit-ui-module-mcollect": "1.7.0-beta.4",
     "@upyog/digit-ui-module-noc": "1.7.0-beta.3",
-    "@upyog/digit-ui-module-obps": "1.7.0-beta.16",
+    "@upyog/digit-ui-module-obps": "1.7.0-beta.17",
     "@upyog/digit-ui-module-pgr": "1.7.0-beta.6",
     "@upyog/digit-ui-module-pt": "1.7.0-beta.4",
     "@upyog/digit-ui-module-receipts": "1.7.0-beta.3",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-obps",
-  "version": "1.7.0-beta.16",
+  "version": "1.7.0-beta.17",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

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
@@ -649,10 +649,10 @@ function selectfile(e) {
     ))} */}
      {/* <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_APPL_FEES`)} text={`₹ ${value?.additionalDetails?.P1charges || paymentDetails?.Bill[0]?.billDetails[0]?.amount}`} />
+
      <Row className="border-none" label={t(`BUILDING_APPLICATION_FEES`)} text={`₹ ${Math.round((datafromAPI?.planDetail?.blocks?.[0]?.building?.totalBuitUpArea)*10.7639*2.5)}`}></Row>
      <Row className="border-none" label={t(`BOUNDARY_WALL_FEES`)} text={`₹ ${Math.round(data?.boundaryWallLength*2.5)}`}></Row>
-
+     <Row className="border-none" label={t(`BPA_APPL_FEES`)} text={`₹ ${value?.additionalDetails?.P1charges || 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}`} />
      <Row className="border-none" label={t(`BPA_COMMON_LABOUR_AMT`)} text={`₹ ${labourCess}`} />

diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
@@ -29,7 +29,7 @@
     "@upyog/digit-ui-module-hrms": "1.7.0-beta.3",
     "@upyog/digit-ui-module-mcollect": "1.7.0-beta.4",
     "@upyog/digit-ui-module-commonpt":"1.7.0-beta.4",
-    "@upyog/digit-ui-module-obps": "1.7.0-beta.16",
+    "@upyog/digit-ui-module-obps": "1.7.0-beta.17",
     "@upyog/digit-ui-module-noc": "1.7.0-beta.3",
     "@upyog/digit-ui-module-pgr": "1.7.0-beta.6",
     "@upyog/digit-ui-module-pt": "1.7.0-beta.4",