Merge pull request #971 from sriranjan-s/master-upyog-npm

published changes on npm
upyog · Mar 6, 2024 · 20f3ce2 · 20f3ce2
2 parents e0f3fd3 + 737f4c0
commit 20f3ce2
Show file tree

Hide file tree

Showing 51 changed files with 861 additions and 163 deletions.
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json b/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json
@@ -10,20 +10,20 @@
   },
   "devDependencies": {
     "microbundle-crl": "^0.13.11",
-    "@upyog/digit-ui-libraries":"1.7.0-beta.4",
-    "@upyog/digit-ui-module-common":"1.7.0-beta.3",
-    "@upyog/digit-ui-module-engagement":"^1.4.0",
-    "@upyog/digit-ui-module-fsm":"1.7.0-beta.13",
-    "@upyog/digit-ui-module-mcollect":"1.7.0-beta.3",
-    "@upyog/digit-ui-module-noc":"^1.4.0",
-    "@upyog/digit-ui-module-obps":"1.7.0-beta.6",
-    "@upyog/digit-ui-module-pgr":"1.7.0-beta.4",
-    "@upyog/digit-ui-module-pt":"1.7.0-beta.3",
-    "@upyog/digit-ui-module-receipts":"^1.4.0",
-    "@upyog/digit-ui-module-tl":"1.7.0-beta.6",
-    "@upyog/digit-ui-module-ws":"^1.7.0-beta.9",
-    "@upyog-niua/upyog-ui-module-ptr":"1.0.5",
-    "@upyog/digit-ui-module-commonpt":"^1.4.0",
+    "@upyog/digit-ui-libraries":"1.7.0-beta.5",
+    "@upyog/digit-ui-module-common":"1.7.0-beta.5",
+    "@upyog/digit-ui-module-engagement":"1.7.0-beta.4",
+    "@upyog/digit-ui-module-fsm":"1.7.0-beta.17",
+    "@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.7",
+    "@upyog/digit-ui-module-pgr":"1.7.0-beta.5",
+    "@upyog/digit-ui-module-pt":"1.7.0-beta.4",
+    "@upyog/digit-ui-module-receipts":"1.7.0-beta.3",
+    "@upyog/digit-ui-module-tl":"1.7.0-beta.7",
+    "@upyog/digit-ui-module-ws":"^1.7.0-beta.10",
+    "@upyog-niua/upyog-ui-module-ptr":"1.0.6",
+    "@upyog/digit-ui-module-commonpt":"1.7.0-beta.4",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -10,21 +10,21 @@
   },
   "devDependencies": {
     "microbundle-crl": "^0.13.11",
-    "@upyog/digit-ui-libraries": "^1.7.0-beta.4",
-    "@upyog/digit-ui-module-common": "1.7.0-beta.3",
-    "@upyog/digit-ui-module-engagement": "^1.7.0-beta.2",
-    "@upyog/digit-ui-module-fsm": "^1.7.0-beta.13",
-    "@upyog/digit-ui-module-mcollect": "^1.7.0-beta.2",
-    "@upyog/digit-ui-module-noc": "^1.7.0-beta.2",
-    "@upyog/digit-ui-module-obps": "^1.7.0-beta.6",
-    "@upyog/digit-ui-module-pgr": "^1.7.0-beta.2",
-    "@upyog/digit-ui-module-pt": "^1.7.0-beta.3",
-    "@upyog/digit-ui-module-receipts": "^1.7.0-beta.2",
-    "@upyog/digit-ui-module-tl": "^1.7.0-beta.6",
-    "@upyog/digit-ui-module-ws": "^1.7.0-beta.9",
-    "@upyog/digit-ui-module-bills": "^1.7.0-beta.2",
-    "@upyog/digit-ui-module-commonpt": "^1.7.0-beta.3",
-    "@upyog-niua/upyog-ui-module-ptr":"1.0.5",
+    "@upyog/digit-ui-libraries": "1.7.0-beta.5",
+    "@upyog/digit-ui-module-common": "1.7.0-beta.5",
+    "@upyog/digit-ui-module-engagement": "1.7.0-beta.4",
+    "@upyog/digit-ui-module-fsm": "1.7.0-beta.17",
+    "@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.7",
+    "@upyog/digit-ui-module-pgr": "1.7.0-beta.5",
+    "@upyog/digit-ui-module-pt": "1.7.0-beta.4",
+    "@upyog/digit-ui-module-receipts": "1.7.0-beta.3",
+    "@upyog/digit-ui-module-tl": "1.7.0-beta.7",
+    "@upyog/digit-ui-module-ws": "^1.7.0-beta.10",
+    "@upyog/digit-ui-module-bills": "^1.7.0-beta.3",
+    "@upyog/digit-ui-module-commonpt": "1.7.0-beta.4",
+    "@upyog-niua/upyog-ui-module-ptr":"1.0.6",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json
@@ -11,7 +11,10 @@
     "packages/modules/core",
     "packages/modules/commonPt",
     "packages/modules/dss",
-    "packages/modules/pt"
+    "packages/modules/pt",
+    "packages/modules/obps"
+
+
   ],
   "author": "Abhinav Kushwaha <[email protected]>",
   "license": "MIT",
@@ -62,7 +65,7 @@
     "buildD:tl": "cd packages/modules/tl && yarn build",
     "buildD:ptr": "cd packages/modules/ptr && yarn build",
     "buildD:hrms": "cd packages/modules/hrms && yarn build",
-    "buildD:obps": "cd packages/modules/obps && yarn build",
+    "build:obps": "cd packages/modules/obps && yarn build",
     "buildD:engagement": "cd packages/modules/engagement && yarn build",
     "buildD:noc": "cd packages/modules/noc && yarn build",
     "buildD:ws": "cd packages/modules/ws && yarn build",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/config/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/config/index.js
@@ -1,3 +1,3 @@
 module.exports = {
-  PORT: "3000",
+  PORT: "3001",
 };
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-libraries",
-  "version": "1.7.0-beta.4",
+  "version": "1.7.0-beta.5",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
   "source": "src/index.js",

diff --git a/...end/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/tl/userPaymentHistory.js b/...end/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/tl/userPaymentHistory.js
@@ -2,7 +2,7 @@ import { useQuery } from "react-query";
 import { PaymentService } from "../../services/elements/Payment";
 
 const useTLPaymentHistory = (tenantId, id, config = {}) => {
-  return useQuery(["PAYMENT_HISTORY", id], () => PaymentService.getReciept(tenantId, "", { consumerCodes: id }), { ...config });
+  return useQuery(["PAYMENT_HISTORY", id], () => PaymentService.getReciept(tenantId, "TL", { consumerCodes: id }), { ...config });
 };
 
 export default useTLPaymentHistory;
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Payment.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Payment.js
@@ -52,7 +52,7 @@ export const PaymentService = {
   getReciept: (tenantId, businessservice, filters = {}) =>
     Request({
       url:
-        businessservice && businessservice !== "BPAREG"
+        businessservice && businessservice !== "BPAREG" || businessservice && businessservice !== "TL"
           ? `${Urls.payment.print_reciept}/${businessservice}/_search`
           : `${Urls.payment.print_reciept}/_search`,
       useCache: false,

diff --git a/...tend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Receipts.js b/...tend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Receipts.js
@@ -19,7 +19,7 @@ const ReceiptsService = {
             newParam['consumerCode']=consumerCode;
         }
             return Request({
-            url: Urls.mcollect.receipt_download,
+            url: Urls.receipts.receipt_download,
             data: {},
             useCache: true,
             method: "POST",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-bills",
-  "version": "1.7.0-beta.2",
+  "version": "1.7.0-beta.3",
   "description": "BILLS",
   "license": "MIT",
   "main": "dist/index.js",
@@ -15,7 +15,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@upyog/digit-ui-react-components": "^1.7.0-beta.2",
+    "@upyog/digit-ui-react-components": "1.7.0-beta.4",
     "microbundle-crl": "^0.13.11",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-common",
-  "version": "1.7.0-beta.3",
+  "version": "1.7.0-beta.5",
   "license": "MIT",
   "description": "Digit Common Payment Module",
   "main": "dist/index.js",
@@ -15,8 +15,8 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@upyog/digit-ui-libraries": "1.7.0-beta.4",
-    "@upyog/digit-ui-react-components": "^1.7.0-beta.2",
+    "@upyog/digit-ui-libraries": "1.7.0-beta.5",
+    "@upyog/digit-ui-react-components": "1.7.0-beta.4",
     "microbundle-crl": "^0.13.11",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/...-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/response/index.js b/...-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/response/index.js
@@ -167,6 +167,7 @@ export const convertEpochToDate = (dateEpoch) => {
   // };
 
   const printReciept = async () => {
+    let generatePdfKeyForWs="ws-onetime-receipt";
     if (printing) return;
     setPrinting(true);
     let paymentArray=[];
@@ -221,10 +222,16 @@ export const convertEpochToDate = (dateEpoch) => {
           }
           payments.Payments[0].additionalDetails=details;
           paymentArray[0]=payments.Payments[0]
-          console.log("paymentArray",paymentArray)
-           response = await Digit.PaymentService.generatePdf(state, { Payments: paymentArray }, generatePdfKey);
+          console.log("generatedpdfkey",generatePdfKey)
+          if(business_service=="WS" || business_service=="SW"){
+            response = await Digit.PaymentService.generatePdf(state, { Payments: [{...paymentData}] }, generatePdfKeyForWs);
+          }
+          else{
+            response = await Digit.PaymentService.generatePdf(state, { Payments: [{...paymentData}] }, generatePdfKey);
+          }
+
         }       
-    }  
+    }
     const fileStore = await Digit.PaymentService.printReciept(state, { fileStoreIds: response.filestoreIds[0] });
     if (fileStore && fileStore[response.filestoreIds[0]]) {
       window.open(fileStore[response.filestoreIds[0]], "_blank");
@@ -486,7 +493,7 @@ export const convertEpochToDate = (dateEpoch) => {
             assessmentYearForReceipt=fromDate+"-"+toDate;
 
 
-      payloadReceiptDetails.Payments[0].paymentDetails[0].bill.billDetails[0].billAccountDetails.map(ele => {
+            payments.Payments[0].paymentDetails[0].bill.billDetails[0].billAccountDetails.map(ele => {
 
         if(ele.taxHeadCode == "PT_TAX")
         {tax=ele.adjustedAmount;
@@ -538,7 +545,7 @@ export const convertEpochToDate = (dateEpoch) => {
       "adhoc_penalty":adhoc_penalty,
       "adhoc_rebate":adhoc_rebate,
       "roundoff":roundoff,
-      "total": payloadReceiptDetails.Payments[0].paymentDetails[0].bill.billDetails[0].amountPaid
+      "total": payments.Payments[0].paymentDetails[0].bill.billDetails[0].amountPaid
 
       };
       taxRow={
@@ -554,7 +561,7 @@ export const convertEpochToDate = (dateEpoch) => {
         "adhoc_penalty":adhoc_penaltyT,
         "adhoc_rebate":adhoc_rebateT,
         "roundoff":roundoffT,
-        "total": payloadReceiptDetails.Payments[0].paymentDetails[0].bill.billDetails[0].amount
+        "total": payments.Payments[0].paymentDetails[0].bill.billDetails[0].amount
       };
       arrearArray.push(arrearRow);
       taxArray.push(taxRow);
@@ -607,7 +614,7 @@ export const convertEpochToDate = (dateEpoch) => {
             rowContainerStyle={rowContainerStyle}
             last
             label={t("CS_PAYMENT_BILLING_PERIOD")}
-            text={getBillingPeriod(reciept_data?.paymentDetails[0]?.bill?.billDetails[0])}
+            text={getBillingPeriod(paymentData?.paymentDetails[0]?.bill?.billDetails[0])}
           />
         )}
 
@@ -616,7 +623,7 @@ export const convertEpochToDate = (dateEpoch) => {
             rowContainerStyle={rowContainerStyle}
             last
             label={t("CS_PAYMENT_AMOUNT_PENDING")}
-            text={(reciept_data?.paymentDetails?.[0]?.totalDue && reciept_data?.paymentDetails?.[0]?.totalAmountPaid ) ? `₹ ${reciept_data?.paymentDetails?.[0]?.totalDue - reciept_data?.paymentDetails?.[0]?.totalAmountPaid}` : `₹ ${0}`}
+            text={paymentData?.totalDue-paymentData?.totalAmountPaid || (reciept_data?.paymentDetails?.[0]?.totalDue && reciept_data?.paymentDetails?.[0]?.totalAmountPaid ) ? `₹ ${reciept_data?.paymentDetails?.[0]?.totalDue - reciept_data?.paymentDetails?.[0]?.totalAmountPaid}` : `₹ ${0}`}
           />
         )}
 
@@ -625,7 +632,7 @@ export const convertEpochToDate = (dateEpoch) => {
           rowContainerStyle={rowContainerStyle}
           last
           label={t(ommitRupeeSymbol ? "CS_PAYMENT_AMOUNT_PAID_WITHOUT_SYMBOL" : "CS_PAYMENT_AMOUNT_PAID")}
-          text={reciept_data?.paymentDetails?.[0]?.totalAmountPaid ? ("₹ " +  reciept_data?.paymentDetails?.[0]?.totalAmountPaid) : `₹ 0` }
+          text={paymentData?.totalAmountPaid ||( reciept_data?.paymentDetails?.[0]?.totalAmountPaid ? ("₹ " +  reciept_data?.paymentDetails?.[0]?.totalAmountPaid) : `₹ 0`) }
         />
         {(business_service !== "PT" || workflw) && (
           <Row

diff --git a/...ui/web/micro-ui-internals/packages/modules/common/src/payments/employee/response/index.js b/...ui/web/micro-ui-internals/packages/modules/common/src/payments/employee/response/index.js
@@ -363,7 +363,7 @@ export const SuccessfulPayment = (props) => {
             assessmentYearForReceipt=fromDate+"-"+toDate;
 
 
-      payloadReceiptDetails.Payments[0].paymentDetails[0].bill.billDetails[0].billAccountDetails.map(ele => {
+            payments.Payments[0].paymentDetails[0].bill.billDetails[0].billAccountDetails.map(ele => {
 
         if(ele.taxHeadCode == "PT_TAX")
         {tax=ele.adjustedAmount;
@@ -415,7 +415,7 @@ export const SuccessfulPayment = (props) => {
       "adhoc_penalty":adhoc_penalty,
       "adhoc_rebate":adhoc_rebate,
       "roundoff":roundoff,
-      "total": payloadReceiptDetails.Payments[0].paymentDetails[0].bill.billDetails[0].amountPaid
+      "total": payments.Payments[0].paymentDetails[0].bill.billDetails[0].amountPaid
 
       };
       taxRow={
@@ -431,7 +431,7 @@ export const SuccessfulPayment = (props) => {
         "adhoc_penalty":adhoc_penaltyT,
         "adhoc_rebate":adhoc_rebateT,
         "roundoff":roundoffT,
-        "total": payloadReceiptDetails.Payments[0].paymentDetails[0].bill.billDetails[0].amount
+        "total": payments.Payments[0].paymentDetails[0].bill.billDetails[0].amount
       };
       arrearArray.push(arrearRow);
       taxArray.push(taxRow);

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/commonPt/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/commonPt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-commonpt",
-  "version": "1.7.0-beta.3",
+  "version": "1.7.0-beta.4",
   "license": "MIT",
   "description": "Digit PT Light weight Module",
   "main": "dist/index.js",
@@ -19,7 +19,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@upyog/digit-ui-react-components": "^1.7.0-beta.2",
+    "@upyog/digit-ui-react-components": "1.7.0-beta.4",
     "microbundle-crl": "^0.13.11",
     "lodash.merge": "^4.6.2",
     "react": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-core",
-  "version": "1.7.0-beta.2",
+  "version": "1.7.0-beta.3",
   "license": "MIT",
   "description": "Digit App Core Module contains all core components",
   "main": "dist/index.js",
@@ -15,7 +15,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@upyog/digit-ui-react-components": "^1.7.0-beta.2",
+    "@upyog/digit-ui-react-components": "1.7.0-beta.4",
     "microbundle-crl": "^0.13.11",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/...eb/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/SelectMobileNumber.js b/...eb/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/SelectMobileNumber.js
@@ -103,9 +103,9 @@ const SelectMobileNumber = ({ t, onSelect, showRegisterLink, mobileNumber, onMob
           setMdmsConfig={setMdmsConfig}
         />
       </div>)}
-      <div className="col col-md-4  text-md-center p-0" style={{width:"40%", marginTop:"5px"}}>
+      {/* <div className="col col-md-4  text-md-center p-0" style={{width:"40%", marginTop:"5px"}}>
              <button className="digilocker-btn"type="submit" onClick={(e)=> register(e)}><img src="https://meripehchaan.gov.in/assets/img/icon/digi.png" class="mr-2" style={{"width":"12%"}}></img>Register with DigiLocker</button>
-                </div>
+                </div> */}
     </FormStep>
   );
 };

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-dss",
-  "version": "1.7.0-beta.2",
+  "version": "1.7.0-beta.4",
   "license": "MIT",
   "description": "Digit Dashboard Module",
   "main": "dist/index.js",
@@ -19,7 +19,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@upyog/digit-ui-react-components": "^1.7.0-beta.2",
+    "@upyog/digit-ui-react-components": "1.7.0-beta.4",
     "microbundle-crl": "^0.13.11",
     "lodash": "4.17.21",
     "react": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@upyog/digit-ui-module-engagement",
-    "version": "1.7.0-beta.3",
+    "version": "1.7.0-beta.4",
     "license": "MIT",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",
@@ -18,7 +18,7 @@
         "react-router-dom": "5.3.0"
     },
     "dependencies": {
-        "@upyog/digit-ui-react-components": "^1.7.0-beta.2",
+        "@upyog/digit-ui-react-components": "1.7.0-beta.4",
         "microbundle-crl": "^0.13.11",
         "react": "17.0.2",
         "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-fsm",
-  "version": "1.7.0-beta.13",
+  "version": "1.7.0-beta.17",
   "license": "MIT",
   "main": "dist/index.js",
   "description": "Digit FSM Module",
@@ -19,7 +19,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@upyog/digit-ui-react-components": "^1.7.0-beta.2",
+    "@upyog/digit-ui-react-components": "1.7.0-beta.4",
     "microbundle-crl": "0.13.11",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/...ro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/citizen/ApplicationDetails.js b/...ro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/citizen/ApplicationDetails.js
@@ -45,7 +45,7 @@ const ApplicationDetails = () => {
   const downloadPaymentReceipt = async () => {
     const receiptFile = { filestoreIds: [paymentsHistory.Payments[0]?.fileStoreId] };
 
-    if (!receiptFile?.fileStoreIds?.[0]) {
+    if (!receiptFile?.filestoreIds?.[0]) {
       const newResponse = await Digit.PaymentService.generatePdf(state, { Payments: [paymentsHistory.Payments[0]] }, "fsm-receipt");
       const fileStore = await Digit.PaymentService.printReciept(state, { fileStoreIds: newResponse.filestoreIds[0] });
       window.open(fileStore[newResponse.filestoreIds[0]], "_blank");