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

water charges bug fix
upyog · Sep 25, 2024 · 64788da · 64788da
2 parents d1e703c + 4d001b9
commit 64788da
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 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/[email protected]
 RUN yarn add @upyog/[email protected]
 RUN yarn add @upyog/[email protected]
 RUN yarn add @upyog/[email protected]
-RUN yarn add @upyog/[email protected].22
+RUN yarn add @upyog/[email protected].23
 RUN yarn add @upyog/[email protected]
 RUN yarn add @upyog/[email protected]
 RUN yarn add @upyog/[email protected]

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.22",
+    "@upyog/digit-ui-module-obps":"1.7.0-beta.23",
     "@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.22",
+    "@upyog/digit-ui-module-obps": "1.7.0-beta.23",
     "@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.22",
+  "version": "1.7.0-beta.23",
   "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
@@ -756,7 +756,7 @@ function selectfile(e) {
           </a>
           }            
           <Row className="border-none"></Row>
-     <Row  className="border-none" label={t(`BPA_P2_TOTAL_FEE`)} text={`₹ ${((parseInt(development)?parseInt(development):0)+(parseInt(otherCharges)?parseInt(otherCharges):0)+parseInt(malbafees)+parseInt(labourCess)+parseInt(waterCharges)+parseInt(gaushalaFees))-(parseInt(lessAdjusment)?parseInt(lessAdjusment):0)}`} />
+     <Row  className="border-none" label={t(`BPA_P2_TOTAL_FEE`)} text={`₹ ${((parseInt(development)?parseInt(development):0)+(parseInt(otherCharges)?parseInt(otherCharges):0)+parseInt(malbafees)+parseInt(labourCess)+(parseInt(waterCharges)?parseInt(waterCharges):0)+parseInt(gaushalaFees))-(parseInt(lessAdjusment)?parseInt(lessAdjusment):0)}`} />
 
      </StatusTable>
      <br></br>

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.22",
+    "@upyog/digit-ui-module-obps": "1.7.0-beta.23",
     "@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",