@djb25/digit-ui-module-common 1.0.3 → 1.0.5

package/dist/index.modern.js

@@ -1378,7 +1378,7 @@ const SelectPaymentType$1 = props => {
             emailId: (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info4 = userInfo.info) === null || _userInfo$info4 === void 0 ? void 0 : _userInfo$info4.emailId) || (billDetails === null || billDetails === void 0 ? void 0 : billDetails.emailId),
             username: (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$info5 = userInfo.info) === null || _userInfo$info5 === void 0 ? void 0 : _userInfo$info5.userName) || (billDetails === null || billDetails === void 0 ? void 0 : billDetails.userName)
           },
-          callbackUrl: window.location.href.includes("mcollect") || wrkflow === "WNS" ? window.location.protocol + "//" + window.location.host + "/digit-ui/citizen/payment/success/" + businessService + "/" + (wrkflow === "WNS" ? consumerCode : consumerCode) + "/" + tenantId + "?workflow=" + (wrkflow === "WNS" ? wrkflow : "mcollect") : window.location.protocol + "//" + window.location.host + "/digit-ui/citizen/payment/success/" + businessService + "/" + (wrkflow === "WNS" ? encodeURIComponent(consumerCode) : consumerCode) + "/" + tenantId + "?propertyId=" + consumerCode,
+          callbackUrl: window.location.href.includes("mcollect") || wrkflow === "WNS" ? window.location.protocol + "//" + window.location.host + "/digit-ui/citizen/payment/success/" + businessService + "/" + encodeURIComponent(consumerCode) + "/" + tenantId + "?workflow=" + (wrkflow === "WNS" ? wrkflow : "mcollect") : window.location.protocol + "//" + window.location.host + "/digit-ui/citizen/payment/success/" + businessService + "/" + encodeURIComponent(consumerCode) + "/" + tenantId + "?propertyId=" + encodeURIComponent(consumerCode),
           additionalDetails: {
             isWhatsapp: false
           }
@@ -1388,7 +1388,7 @@ const SelectPaymentType$1 = props => {
         return Promise.resolve(Digit.PaymentService.createCitizenReciept(billDetails === null || billDetails === void 0 ? void 0 : billDetails.tenantId, filterData)).then(function (data) {
           var _data$Transaction;
           const redirectUrl = data === null || data === void 0 ? void 0 : (_data$Transaction = data.Transaction) === null || _data$Transaction === void 0 ? void 0 : _data$Transaction.redirectUrl;
-          if ((d === null || d === void 0 ? void 0 : d.paymentType) == "AXIS") {
+          if ((d === null || d === void 0 ? void 0 : d.paymentType) == "AXIS" || (d === null || d === void 0 ? void 0 : d.paymentType) == "NPCI") {
             window.location = redirectUrl;
           } else if ((d === null || d === void 0 ? void 0 : d.paymentType) == "NTTDATA") {
             let redirect = redirectUrl.split("returnURL=");
@@ -1553,7 +1553,8 @@ const WrapPaymentComponent = props => {
     bpaData = _Digit$Hooks$obps$use2 === void 0 ? {} : _Digit$Hooks$obps$use2,
     isBpaSearchLoading = _Digit$Hooks$obps$use.isLoading;
   const _Digit$Hooks$usePayme = Digit.Hooks.usePaymentUpdate({
-      egId
+      egId,
+      tenantId
     }, business_service, {
       retry: false,
       staleTime: Infinity,
@@ -1676,15 +1677,26 @@ const WrapPaymentComponent = props => {
   const printReciept = function () {
     try {
       var _payments$Payments$;
-      function _temp6() {
-        return Promise.resolve(Digit.PaymentService.printReciept(state, {
-          fileStoreIds: response.filestoreIds[0]
-        })).then(function (fileStore) {
-          if (fileStore && fileStore[response.filestoreIds[0]]) {
-            window.open(fileStore[response.filestoreIds[0]], "_blank");
-          }
+      function _temp9() {
+        var _response, _response$filestoreId, _response2, _response2$fileStoreI;
+        function _temp7() {
           setPrinting(false);
-        });
+        }
+        const fileStoreId = ((_response = response) === null || _response === void 0 ? void 0 : (_response$filestoreId = _response.filestoreIds) === null || _response$filestoreId === void 0 ? void 0 : _response$filestoreId[0]) || ((_response2 = response) === null || _response2 === void 0 ? void 0 : (_response2$fileStoreI = _response2.fileStoreIds) === null || _response2$fileStoreI === void 0 ? void 0 : _response2$fileStoreI[0]);
+        const _temp6 = function () {
+          if (fileStoreId) {
+            return Promise.resolve(Digit.PaymentService.printReciept(state, {
+              fileStoreIds: fileStoreId
+            })).then(function (fileStore) {
+              if (fileStore && fileStore[fileStoreId]) {
+                window.open(fileStore[fileStoreId], "_blank");
+              }
+            });
+          } else {
+            console.error("PDF generation failed to return a filestoreId", response);
+          }
+        }();
+        return _temp6 && _temp6.then ? _temp6.then(_temp7) : _temp7(_temp6);
       }
       let generatePdfKeyForWs = "ws-onetime-receipt";
       if (printing) return Promise.resolve();
@@ -1695,13 +1707,13 @@ const WrapPaymentComponent = props => {
       let response = {
         filestoreIds: [(_payments$Payments$ = payments.Payments[0]) === null || _payments$Payments$ === void 0 ? void 0 : _payments$Payments$.fileStoreId]
       };
-      const _temp5 = function () {
+      const _temp8 = function () {
         if (!(paymentData !== null && paymentData !== void 0 && paymentData.fileStoreId)) {
           let assessmentYear = "",
             assessmentYearForReceipt = "";
           let count = 0;
           let toDate, fromDate;
-          const _temp4 = function (_payments$Payments, _payments$Payments$2, _payments$Payments$2$, _payments$Payments2) {
+          const _temp5 = function (_payments$Payments, _payments$Payments$2, _payments$Payments$2$, _payments$Payments2) {
             if ((payments === null || payments === void 0 ? void 0 : (_payments$Payments = payments.Payments) === null || _payments$Payments === void 0 ? void 0 : (_payments$Payments$2 = _payments$Payments[0]) === null || _payments$Payments$2 === void 0 ? void 0 : (_payments$Payments$2$ = _payments$Payments$2.paymentDetails) === null || _payments$Payments$2$ === void 0 ? void 0 : _payments$Payments$2$[0].businessService) == "PT" || (payments === null || payments === void 0 ? void 0 : (_payments$Payments2 = payments.Payments) === null || _payments$Payments2 === void 0 ? void 0 : _payments$Payments2[0].paymentDetails[0].businessService) == "PT.MUTATION") {
               payments.Payments[0].paymentDetails[0].bill.billDetails.map(element => {
                 if (element.amount > 0 || element.amountPaid > 0) {
@@ -1735,15 +1747,25 @@ const WrapPaymentComponent = props => {
               payments.Payments[0].additionalDetails = details;
               paymentArray[0] = payments.Payments[0];
               console.log("generatedpdfkey", generatePdfKey);
-              const _temp3 = function () {
-                if (business_service == "WS" || business_service == "SW") {
+              const _temp4 = function () {
+                if (business_service !== null && business_service !== void 0 && business_service.includes("WS") || business_service !== null && business_service !== void 0 && business_service.includes("SW")) {
                   return Promise.resolve(Digit.PaymentService.generatePdf(state, {
                     Payments: [_extends({}, paymentData)]
                   }, generatePdfKeyForWs)).then(function (_Digit$PaymentService) {
                     response = _Digit$PaymentService;
+                    const _temp2 = function (_response3, _response3$filestoreI, _response4, _response4$fileStoreI) {
+                      if (!((_response3 = response) !== null && _response3 !== void 0 && (_response3$filestoreI = _response3.filestoreIds) !== null && _response3$filestoreI !== void 0 && _response3$filestoreI[0]) && !((_response4 = response) !== null && _response4 !== void 0 && (_response4$fileStoreI = _response4.fileStoreIds) !== null && _response4$fileStoreI !== void 0 && _response4$fileStoreI[0])) {
+                        return Promise.resolve(Digit.PaymentService.generatePdf(state, {
+                          Payments: [_extends({}, paymentData)]
+                        }, generatePdfKey)).then(function (_Digit$PaymentService2) {
+                          response = _Digit$PaymentService2;
+                        });
+                      }
+                    }();
+                    if (_temp2 && _temp2.then) return _temp2.then(function () {});
                   });
                 } else {
-                  const _temp2 = function () {
+                  const _temp3 = function () {
                     if (businessServ.includes("BPA")) {
                       var _payments$Payments$0$, _payments$Payments$0$2;
                       let queryObj = {
@@ -1762,28 +1784,28 @@ const WrapPaymentComponent = props => {
                         });
                         return Promise.resolve(Digit.PaymentService.generatePdf(state, {
                           Payments: [_extends({}, updatedpayments)]
-                        }, generatePdfKey)).then(function (_Digit$PaymentService2) {
-                          response = _Digit$PaymentService2;
+                        }, generatePdfKey)).then(function (_Digit$PaymentService3) {
+                          response = _Digit$PaymentService3;
                         });
                       });
                     } else {
                       return Promise.resolve(Digit.PaymentService.generatePdf(state, {
                         Payments: [_extends({}, paymentData)]
-                      }, generatePdfKey)).then(function (_Digit$PaymentService3) {
-                        response = _Digit$PaymentService3;
+                      }, generatePdfKey)).then(function (_Digit$PaymentService4) {
+                        response = _Digit$PaymentService4;
                       });
                     }
                   }();
-                  if (_temp2 && _temp2.then) return _temp2.then(function () {});
+                  if (_temp3 && _temp3.then) return _temp3.then(function () {});
                 }
               }();
-              if (_temp3 && _temp3.then) return _temp3.then(function () {});
+              if (_temp4 && _temp4.then) return _temp4.then(function () {});
             }
           }();
-          if (_temp4 && _temp4.then) return _temp4.then(function () {});
+          if (_temp5 && _temp5.then) return _temp5.then(function () {});
         }
       }();
-      return Promise.resolve(_temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5));
+      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp9) : _temp9(_temp8));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -1940,7 +1962,7 @@ const WrapPaymentComponent = props => {
         }
       })).then(function (applicationDetails) {
         var _applicationDetails$h, _applicationDetails$h2;
-        function _temp8() {
+        function _temp1() {
           return Promise.resolve(Digit.PaymentService.printReciept(tenantId, {
             fileStoreIds: fileStoreId
           })).then(function (fileStore) {
@@ -1949,7 +1971,7 @@ const WrapPaymentComponent = props => {
         }
         let fileStoreId = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$h = applicationDetails.hallsBookingApplication) === null || _applicationDetails$h === void 0 ? void 0 : (_applicationDetails$h2 = _applicationDetails$h[0]) === null || _applicationDetails$h2 === void 0 ? void 0 : _applicationDetails$h2.permissionLetterFilestoreId;
         const generatePdfKeyForTL = "chbpermissionletter";
-        const _temp7 = function () {
+        const _temp0 = function () {
           if (!fileStoreId) {
             return Promise.resolve(Digit.PaymentService.generatePdf(tenantId, {
               hallsBookingApplication: [applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.hallsBookingApplication[0]]
@@ -1965,7 +1987,7 @@ const WrapPaymentComponent = props => {
             });
           }
         }();
-        return _temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7);
+        return _temp0 && _temp0.then ? _temp0.then(_temp1) : _temp1(_temp0);
       });
     } catch (e) {
       return Promise.reject(e);
@@ -1980,7 +2002,7 @@ const WrapPaymentComponent = props => {
         }
       })).then(function (applicationDetails) {
         var _applicationDetails$b, _applicationDetails$b2;
-        function _temp0() {
+        function _temp11() {
           return Promise.resolve(Digit.PaymentService.printReciept(tenantId, {
             fileStoreIds: fileStoreId
           })).then(function (fileStore) {
@@ -1989,7 +2011,7 @@ const WrapPaymentComponent = props => {
         }
         let fileStoreId = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$b = applicationDetails.bookingApplication) === null || _applicationDetails$b === void 0 ? void 0 : (_applicationDetails$b2 = _applicationDetails$b[0]) === null || _applicationDetails$b2 === void 0 ? void 0 : _applicationDetails$b2.permissionLetterFilestoreId;
         const generatePdfKeyForTL = "advpermissionletter";
-        const _temp9 = function () {
+        const _temp10 = function () {
           if (!fileStoreId) {
             return Promise.resolve(Digit.PaymentService.generatePdf(tenantId, {
               bookingApplication: [applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.bookingApplication[0]]
@@ -2005,7 +2027,7 @@ const WrapPaymentComponent = props => {
             });
           }
         }();
-        return _temp9 && _temp9.then ? _temp9.then(_temp0) : _temp0(_temp9);
+        return _temp10 && _temp10.then ? _temp10.then(_temp11) : _temp11(_temp10);
       });
     } catch (e) {
       return Promise.reject(e);
@@ -2022,7 +2044,7 @@ const WrapPaymentComponent = props => {
         }
       })).then(function (applicationDetails) {
         const generatePdfKeyForTL = "svcertificate";
-        const _temp1 = function () {
+        const _temp12 = function () {
           if (applicationDetails) {
             var _applicationDetails$S;
             return Promise.resolve(Digit.PaymentService.generatePdf(state, {
@@ -2036,7 +2058,7 @@ const WrapPaymentComponent = props => {
             });
           }
         }();
-        if (_temp1 && _temp1.then) return _temp1.then(function () {});
+        if (_temp12 && _temp12.then) return _temp12.then(function () {});
       });
     } catch (e) {
       return Promise.reject(e);
@@ -2052,7 +2074,7 @@ const WrapPaymentComponent = props => {
         }
       })).then(function (applicationDetails) {
         const generatePdfKeyForTL = "petservicecertificate";
-        const _temp10 = function () {
+        const _temp13 = function () {
           if (applicationDetails) {
             var _applicationDetails$P;
             return Promise.resolve(Digit.PaymentService.generatePdf(state, {
@@ -2066,7 +2088,7 @@ const WrapPaymentComponent = props => {
             });
           }
         }();
-        if (_temp10 && _temp10.then) return _temp10.then(function () {});
+        if (_temp13 && _temp13.then) return _temp13.then(function () {});
       });
     } catch (e) {
       return Promise.reject(e);
@@ -2083,7 +2105,7 @@ const WrapPaymentComponent = props => {
         }
       })).then(function (applicationDetails) {
         const generatePdfKeyForTL = "svidentitycard";
-        const _temp11 = function () {
+        const _temp14 = function () {
           if (applicationDetails) {
             var _applicationDetails$S2;
             return Promise.resolve(Digit.PaymentService.generatePdf(state, {
@@ -2097,7 +2119,7 @@ const WrapPaymentComponent = props => {
             });
           }
         }();
-        if (_temp11 && _temp11.then) return _temp11.then(function () {});
+        if (_temp14 && _temp14.then) return _temp14.then(function () {});
       });
     } catch (e) {
       return Promise.reject(e);
@@ -2112,7 +2134,7 @@ const WrapPaymentComponent = props => {
         }
       })).then(function (applicationDetails) {
         var _applicationDetails$b3, _applicationDetails$b4;
-        function _temp13() {
+        function _temp16() {
           return Promise.resolve(Digit.PaymentService.printReciept(tenantId, {
             fileStoreIds: fileStoreId
           })).then(function (fileStore) {
@@ -2120,29 +2142,29 @@ const WrapPaymentComponent = props => {
           });
         }
         let fileStoreId = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$b3 = applicationDetails.bookingApplication) === null || _applicationDetails$b3 === void 0 ? void 0 : (_applicationDetails$b4 = _applicationDetails$b3[0]) === null || _applicationDetails$b4 === void 0 ? void 0 : _applicationDetails$b4.paymentReceiptFilestoreId;
-        const _temp12 = function () {
+        const _temp15 = function () {
           if (!fileStoreId) {
             let response = {
               filestoreIds: [payments === null || payments === void 0 ? void 0 : payments.fileStoreId]
             };
             return Promise.resolve(Digit.PaymentService.generatePdf(tenantId, {
               Payments: [_extends({}, paymentData)]
-            }, "advservice-receipt")).then(function (_Digit$PaymentService4) {
-              var _response;
-              response = _Digit$PaymentService4;
+            }, "advservice-receipt")).then(function (_Digit$PaymentService5) {
+              var _response5;
+              response = _Digit$PaymentService5;
               const updatedApplication = _extends({}, applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.bookingApplication[0], {
-                paymentReceiptFilestoreId: (_response = response) === null || _response === void 0 ? void 0 : _response.filestoreIds[0]
+                paymentReceiptFilestoreId: (_response5 = response) === null || _response5 === void 0 ? void 0 : _response5.filestoreIds[0]
               });
               return Promise.resolve(AdvertisementCreateApi.mutateAsync({
                 bookingApplication: updatedApplication
               })).then(function () {
-                var _response2;
-                fileStoreId = (_response2 = response) === null || _response2 === void 0 ? void 0 : _response2.filestoreIds[0];
+                var _response6;
+                fileStoreId = (_response6 = response) === null || _response6 === void 0 ? void 0 : _response6.filestoreIds[0];
               });
             });
           }
         }();
-        return _temp12 && _temp12.then ? _temp12.then(_temp13) : _temp13(_temp12);
+        return _temp15 && _temp15.then ? _temp15.then(_temp16) : _temp16(_temp15);
       });
     } catch (e) {
       return Promise.reject(e);
@@ -2157,7 +2179,7 @@ const WrapPaymentComponent = props => {
         }
       })).then(function (applicationDetails) {
         var _applicationDetails$h3, _applicationDetails$h4;
-        function _temp15() {
+        function _temp18() {
           return Promise.resolve(Digit.PaymentService.printReciept(tenantId, {
             fileStoreIds: fileStoreId
           })).then(function (fileStore) {
@@ -2165,29 +2187,29 @@ const WrapPaymentComponent = props => {
           });
         }
         let fileStoreId = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$h3 = applicationDetails.hallsBookingApplication) === null || _applicationDetails$h3 === void 0 ? void 0 : (_applicationDetails$h4 = _applicationDetails$h3[0]) === null || _applicationDetails$h4 === void 0 ? void 0 : _applicationDetails$h4.paymentReceiptFilestoreId;
-        const _temp14 = function () {
+        const _temp17 = function () {
           if (!fileStoreId) {
             let response = {
               filestoreIds: [payments === null || payments === void 0 ? void 0 : payments.fileStoreId]
             };
             return Promise.resolve(Digit.PaymentService.generatePdf(tenantId, {
               Payments: [_extends({}, paymentData)]
-            }, "chbservice-receipt")).then(function (_Digit$PaymentService5) {
-              var _response3;
-              response = _Digit$PaymentService5;
+            }, "chbservice-receipt")).then(function (_Digit$PaymentService6) {
+              var _response7;
+              response = _Digit$PaymentService6;
               const updatedApplication = _extends({}, applicationDetails === null || applicationDetails === void 0 ? void 0 : applicationDetails.hallsBookingApplication[0], {
-                paymentReceiptFilestoreId: (_response3 = response) === null || _response3 === void 0 ? void 0 : _response3.filestoreIds[0]
+                paymentReceiptFilestoreId: (_response7 = response) === null || _response7 === void 0 ? void 0 : _response7.filestoreIds[0]
               });
               return Promise.resolve(mutation.mutateAsync({
                 hallsBookingApplication: updatedApplication
               })).then(function () {
-                var _response4;
-                fileStoreId = (_response4 = response) === null || _response4 === void 0 ? void 0 : _response4.filestoreIds[0];
+                var _response8;
+                fileStoreId = (_response8 = response) === null || _response8 === void 0 ? void 0 : _response8.filestoreIds[0];
               });
             });
           }
         }();
-        return _temp14 && _temp14.then ? _temp14.then(_temp15) : _temp15(_temp14);
+        return _temp17 && _temp17.then ? _temp17.then(_temp18) : _temp18(_temp17);
       });
     } catch (e) {
       return Promise.reject(e);
@@ -2195,9 +2217,9 @@ const WrapPaymentComponent = props => {
   };
   const printRecieptNew = function (payment) {
     try {
-      function _temp20() {
+      function _temp23() {
         var _payments$Payments$3;
-        function _temp18() {
+        function _temp21() {
           return Promise.resolve(Digit.PaymentService.printReciept(state, {
             fileStoreIds: response.filestoreIds[0]
           })).then(function (fileStore) {
@@ -2207,7 +2229,7 @@ const WrapPaymentComponent = props => {
         let response = {
           filestoreIds: [(_payments$Payments$3 = payments.Payments[0]) === null || _payments$Payments$3 === void 0 ? void 0 : _payments$Payments$3.fileStoreId]
         };
-        const _temp17 = function () {
+        const _temp20 = function () {
           if (true) {
             let assessmentYear = "",
               assessmentYearForReceipt = "";
@@ -2403,47 +2425,47 @@ const WrapPaymentComponent = props => {
               payments.Payments[0].paymentDetails[0].additionalDetails = details;
             }
             paymentArray[0] = payments.Payments[0];
-            const _temp16 = function () {
+            const _temp19 = function () {
               if (payment.Payments[0].paymentDetails[0].businessService == "PT.MUTATION") {
                 return Promise.resolve(Digit.PaymentService.generatePdf(state, {
                   Payments: paymentArray
-                }, "pt-receipt")).then(function (_Digit$PaymentService8) {
-                  response = _Digit$PaymentService8;
+                }, "pt-receipt")).then(function (_Digit$PaymentService9) {
+                  response = _Digit$PaymentService9;
                 });
               } else {
                 return Promise.resolve(Digit.PaymentService.generatePdf(state, {
                   Payments: paymentArray
-                }, generatePdfKey)).then(function (_Digit$PaymentService9) {
-                  response = _Digit$PaymentService9;
+                }, generatePdfKey)).then(function (_Digit$PaymentService0) {
+                  response = _Digit$PaymentService0;
                 });
               }
             }();
-            if (_temp16 && _temp16.then) return _temp16.then(function () {});
+            if (_temp19 && _temp19.then) return _temp19.then(function () {});
           }
         }();
-        return _temp17 && _temp17.then ? _temp17.then(_temp18) : _temp18(_temp17);
+        return _temp20 && _temp20.then ? _temp20.then(_temp21) : _temp21(_temp20);
       }
       console.log("paymentpayment", payment, payment.Payments[0].paymentDetails[0].receiptNumber, payment.Payments[0]);
       const tenantId = Digit.ULBService.getCurrentTenantId();
       const state = Digit.ULBService.getStateId();
       let paymentArray = [];
       let payments;
-      const _temp19 = function () {
+      const _temp22 = function () {
         if (payment.Payments[0].paymentDetails[0].businessService == "PT.MUTATION") {
           return Promise.resolve(Digit.PaymentService.getReciept(tenantId, "PT.MUTATION", {
             receiptNumbers: payment.Payments[0].paymentDetails[0].receiptNumber
-          })).then(function (_Digit$PaymentService6) {
-            payments = _Digit$PaymentService6;
+          })).then(function (_Digit$PaymentService7) {
+            payments = _Digit$PaymentService7;
           });
         } else {
           return Promise.resolve(Digit.PaymentService.getReciept(tenantId, "PT", {
             receiptNumbers: payment.Payments[0].paymentDetails[0].receiptNumber
-          })).then(function (_Digit$PaymentService7) {
-            payments = _Digit$PaymentService7;
+          })).then(function (_Digit$PaymentService8) {
+            payments = _Digit$PaymentService8;
           });
         }
       }();
-      return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(_temp20) : _temp20(_temp19));
+      return Promise.resolve(_temp22 && _temp22.then ? _temp22.then(_temp23) : _temp23(_temp22));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -5139,7 +5161,7 @@ const BillDetails$1 = _ref => {
 const _excluded$2 = ["ManualRecieptDetails", "paymentModeDetails"],
   _excluded2 = ["errorObj"];
 const CollectPayment = props => {
-  var _businessService$toUp;
+  var _paymentdetails$Bill, _businessService$toUp;
   const _Digit$Hooks$useQuery = Digit.Hooks.useQueryParams(),
     ModuleWorkflow = _Digit$Hooks$useQuery.workflow,
     IsDisconnectionFlow = _Digit$Hooks$useQuery.IsDisconnectionFlow;
@@ -5163,11 +5185,11 @@ const CollectPayment = props => {
   const _Digit$Hooks$useFetch = Digit.Hooks.useFetchPayment({
       tenantId: tenantId,
       consumerCode,
-      businessService: "request-service.water_tanker"
+      businessService
     }),
     paymentdetails = _Digit$Hooks$useFetch.data,
     isLoading = _Digit$Hooks$useFetch.isLoading;
-  const bill = paymentdetails !== null && paymentdetails !== void 0 && paymentdetails.Bill ? paymentdetails === null || paymentdetails === void 0 ? void 0 : paymentdetails.Bill[0] : {};
+  const bill = (paymentdetails === null || paymentdetails === void 0 ? void 0 : (_paymentdetails$Bill = paymentdetails.Bill) === null || _paymentdetails$Bill === void 0 ? void 0 : _paymentdetails$Bill.length) > 0 ? paymentdetails === null || paymentdetails === void 0 ? void 0 : paymentdetails.Bill[0] : {};
   const _Digit$Hooks$fsm$useS = Digit.Hooks.fsm.useSearch(tenantId, {
       applicationNos: consumerCode
     }, {
@@ -5502,7 +5524,7 @@ const CollectPayment = props => {
     onSubmit: onSubmit,
     formState: formState,
     defaultValues: getDefaultValues(),
-    isDisabled: (IsDisconnectionFlow ? false : businessService === "SW" || "WS" ? false : bill !== null && bill !== void 0 && bill.totalAmount ? !bill.totalAmount > 0 : true) || timerEnabledForBusinessService(businessService) && Time === 0,
+    isDisabled: (IsDisconnectionFlow ? false : businessService === "SW" || businessService === "WS" ? false : bill !== null && bill !== void 0 && bill.totalAmount ? !bill.totalAmount > 0 : true) || timerEnabledForBusinessService(businessService) && Time === 0,
     onFormValueChange: (setValue, formValue) => {
       if (!isEqual_1(formValue.paymentMode, selectedPaymentMode)) {
         setFormState(formValue);