@mseva/digit-ui-module-common 1.1.88-dev.1.13 → 1.1.88-dev.1.15

package/dist/index.modern.js

@@ -7410,11 +7410,16 @@ const WrapPaymentComponent = props => {
     if (sourceData) {
       var _sourceData$approvalN, _sourceData$additiona, _sourceData$additiona2, _sourceData$additiona3, _sourceData$additiona4;
       fileNo = `PB/${districtCode}/${ulbCode}/${+(sourceData === null || sourceData === void 0 ? void 0 : (_sourceData$approvalN = sourceData.approvalNo) === null || _sourceData$approvalN === void 0 ? void 0 : _sourceData$approvalN.slice(-6)) + 500000}`;
+      console.log("newCode", fileNo);
       usage = (sourceData === null || sourceData === void 0 ? void 0 : (_sourceData$additiona = sourceData.additionalDetails) === null || _sourceData$additiona === void 0 ? void 0 : _sourceData$additiona.usage) || (sourceData === null || sourceData === void 0 ? void 0 : (_sourceData$additiona2 = sourceData.additionalDetails) === null || _sourceData$additiona2 === void 0 ? void 0 : (_sourceData$additiona3 = _sourceData$additiona2.siteDetails) === null || _sourceData$additiona3 === void 0 ? void 0 : (_sourceData$additiona4 = _sourceData$additiona3.buildingCategory) === null || _sourceData$additiona4 === void 0 ? void 0 : _sourceData$additiona4.name);
+      console.log("usage", usage);
     }
+    console.log("licenseType:", licenseType);
     const state = Digit.ULBService.getStateId();
     const fee = paymentData === null || paymentData === void 0 ? void 0 : paymentData.totalAmountPaid;
+    console.log("fee here here", fee);
     const amountinwords = amountToWords(fee);
+    console.log('amountinwords', amountinwords);
     let response = {
       filestoreIds: [(_payments$Payments$ = payments.Payments[0]) === null || _payments$Payments$ === void 0 ? void 0 : _payments$Payments$.fileStoreId]
     };
@@ -7503,6 +7508,7 @@ const WrapPaymentComponent = props => {
             }]
           }, generatePdfKey);
         } else {
+          console.log('this else triggered');
           response = await Digit.PaymentService.generatePdf(tenantId, {
             Payments: [{
               ...paymentData,
@@ -7528,6 +7534,7 @@ const WrapPaymentComponent = props => {
           const blob = await res.blob();
           downloadPdf(blob, `receipt_${receiptNumber || "obpas_noc"}.pdf`);
         } catch (err) {
+          console.log(err, "error in receipt download");
           window.open(downloadUrl, "_blank");
         }
       } else {
@@ -8604,7 +8611,7 @@ const CitizenPayment = ({
   const isResponse = window.location.href.includes("/response");
   const isMobile = window.Digit.Utils.browser.isMobile();
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "bills-citizen-wrapper"
+    className: "card"
   }, /*#__PURE__*/React.createElement(Switch, null, /*#__PURE__*/React.createElement(AppContainer, null, !isResponse ? /*#__PURE__*/React.createElement("div", {
     style: window.location.href.includes("application-overview") || isMobile ? {
       marginLeft: "10px"
@@ -11290,16 +11297,22 @@ const BillDetails$1 = ({
       }, year_bill.amount));
     })));
   };
+  const isTL = businessService === "TL";
+  console.log("billDetails==????", billDetails);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(StatusTable, null, !checkFSM && bill && config.details.map((obj, index) => {
     const value = obj.keyPath.reduce((acc, key) => {
       if (typeof key === "function") acc = key(acc);else acc = acc[key];
       return acc;
     }, bill);
-    return /*#__PURE__*/React.createElement(Row, {
+    return /*#__PURE__*/React.createElement(Row, Object.assign({
       key: index + "bill",
       label: t(obj.keyValue),
       text: value
-    });
+    }, isTL ? {
+      textStyle: {
+        textAlign: "right"
+      }
+    } : {}));
   })), checkFSM ? /*#__PURE__*/React.createElement(StatusTable, null, /*#__PURE__*/React.createElement(Row, {
     label: t("ES_PAYMENT_DETAILS_AMOUNT_PER_TRIP"),
     textStyle: {
@@ -11340,11 +11353,18 @@ const BillDetails$1 = ({
   }, /*#__PURE__*/React.createElement(Row, {
     label: t("ES_PAYMENT_TAXHEADS"),
     textStyle: {
-      fontWeight: "bold"
+      fontWeight: "bold",
+      ...(isTL ? {
+        textAlign: "right",
+        maxWidth: "none",
+        width: "40%"
+      } : {})
     },
     text: t("ES_PAYMENT_AMOUNT")
   }), /*#__PURE__*/React.createElement("hr", {
-    style: {
+    style: isTL ? {
+      width: "100%"
+    } : {
       width: "40%"
     },
     className: "underline"
@@ -11355,7 +11375,11 @@ const BillDetails$1 = ({
       labelStyle: {
         fontWeight: "normal"
       },
-      textStyle: {
+      textStyle: isTL ? {
+        textAlign: "right",
+        maxWidth: "none",
+        width: "40%"
+      } : {
         textAlign: "right",
         maxWidth: "100px"
       },
@@ -11366,20 +11390,31 @@ const BillDetails$1 = ({
     labelStyle: {
       fontWeight: "normal"
     },
-    textStyle: {
+    textStyle: isTL ? {
+      textAlign: "right",
+      maxWidth: "none",
+      width: "40%"
+    } : {
       textAlign: "right",
       maxWidth: "100px"
     },
     label: t("COMMON_ARREARS"),
     text: "₹ " + (arrears === null || arrears === void 0 ? void 0 : (_arrears$toFixed2 = arrears.toFixed) === null || _arrears$toFixed2 === void 0 ? void 0 : _arrears$toFixed2.call(arrears, 2)) || Number(0).toFixed(2)
   }) : null, /*#__PURE__*/React.createElement("hr", {
-    style: {
+    style: isTL ? {
+      width: "100%"
+    } : {
       width: "40%"
     },
     className: "underline"
   }), /*#__PURE__*/React.createElement(Row, {
     label: t("CS_PAYMENT_TOTAL_AMOUNT"),
-    textStyle: {
+    textStyle: isTL ? {
+      fontWeight: "bold",
+      textAlign: "right",
+      maxWidth: "none",
+      width: "40%"
+    } : {
       fontWeight: "bold",
       textAlign: "right",
       maxWidth: "100px"
@@ -11534,6 +11569,7 @@ const CollectPayment = props => {
   } = useParams();
   console.log("businessService", businessService);
   const tenantId = Digit.ULBService.getCurrentTenantId();
+  const location = useLocation();
   const search = useLocation().search;
   if (window.location.href.includes("ISWSAPP")) consumerCode = new URLSearchParams(search).get("applicationNumber");
   if (window.location.href.includes("ISWSCON") || ModuleWorkflow === "WS") consumerCode = decodeURIComponent(consumerCode);
@@ -11556,6 +11592,7 @@ const CollectPayment = props => {
     enabled: businessService !== null && businessService !== void 0 && (_businessService$toUp = businessService.toUpperCase()) !== null && _businessService$toUp !== void 0 && _businessService$toUp.includes("FSM") ? true : false
   });
   const advanceBill = applicationData === null || applicationData === void 0 ? void 0 : applicationData.advanceAmount;
+  const [formState, setFormState] = useState({});
   const {
     cardConfig
   } = useCardPaymentDetails(props, t);
@@ -11580,8 +11617,8 @@ const CollectPayment = props => {
   const {
     qrConfig
   } = useQRDetails(props, t);
-  const [formState, setFormState] = useState({});
   const [toast, setToast] = useState(null);
+  const isChallanGeneration = location.pathname.includes("Challan_Generation");
   useEffect(() => {
     if (paymentdetails !== null && paymentdetails !== void 0 && paymentdetails.Bill && paymentdetails.Bill.length === 0) {
       setToast({
@@ -11596,25 +11633,28 @@ const CollectPayment = props => {
   }, {
     code: "CHEQUE",
     label: t("COMMON_MASTERS_PAYMENTMODE_CHEQUE")
-  }, {
+  }, ...(!isChallanGeneration ? [{
     code: "CARD",
     label: t("COMMON_MASTERS_PAYMENTMODE_CREDIT/DEBIT CARD")
-  }, {
+  }] : []), {
     code: "DD",
     label: "Demand Draft"
-  }, {
+  }, ...(isChallanGeneration ? [{
+    code: "ONLINE",
+    label: "Online"
+  }] : []), ...(!isChallanGeneration ? [{
     code: "OFFLINE_NEFT",
     label: "NEFT"
-  }, {
+  }] : []), ...(!isChallanGeneration ? [{
     code: "OFFLINE_RTGS",
     label: "RTGS"
-  }, {
+  }] : []), ...(!isChallanGeneration ? [{
     code: "POSTAL_ORDER",
     label: "Postal Order"
-  }, {
+  }] : []), ...(!isChallanGeneration ? [{
     code: "QR_CODE",
     label: "QR Code"
-  }];
+  }] : [])];
   const formConfigMap = {
     CHEQUE: chequeConfig,
     CARD: cardConfig,
@@ -11641,7 +11681,11 @@ const CollectPayment = props => {
     name: t("COMMON_OWNER")
   });
   const onSubmit = async data => {
-    var _data$amount, _data$amount6, _data$amount7, _data$paymentMode, _data$paymentModeDeta, _recieptRequest$Payme2, _recieptRequest$Payme3, _recieptRequest$Payme4, _recieptRequest$Payme5, _recieptRequest$Payme6;
+    var _data$paymentMode, _data$amount, _data$amount6, _data$amount7, _data$paymentMode2, _data$paymentModeDeta, _recieptRequest$Payme2, _recieptRequest$Payme3, _recieptRequest$Payme4, _recieptRequest$Payme5, _recieptRequest$Payme6;
+    if ((data === null || data === void 0 ? void 0 : (_data$paymentMode = data.paymentMode) === null || _data$paymentMode === void 0 ? void 0 : _data$paymentMode.code) == "ONLINE") {
+      history.push(`/digit-ui/employee/payment/challan/collect/${businessService}/${consumerCode}/${tenantId}?tenantId=${tenantId}`);
+      return;
+    }
     bill.totalAmount = Math.round(bill.totalAmount);
     data.paidBy = data.paidBy.code;
     if (BillDetailsFormConfig({
@@ -11691,7 +11735,7 @@ const CollectPayment = props => {
     if (data.ManualRecieptDetails.manualReceiptNumber) {
       recieptRequest.Payment.paymentDetails[0].manualReceiptNumber = ManualRecieptDetails.manualReceiptNumber;
     }
-    recieptRequest.Payment.paymentMode = data === null || data === void 0 ? void 0 : (_data$paymentMode = data.paymentMode) === null || _data$paymentMode === void 0 ? void 0 : _data$paymentMode.code;
+    recieptRequest.Payment.paymentMode = data === null || data === void 0 ? void 0 : (_data$paymentMode2 = data.paymentMode) === null || _data$paymentMode2 === void 0 ? void 0 : _data$paymentMode2.code;
     if (data.paymentModeDetails) {
       var _recieptRequest$Payme;
       recieptRequest.Payment = {
@@ -11863,7 +11907,7 @@ const CollectPayment = props => {
   });
   console.log("ModuleWorkflow", ModuleWorkflow);
   const getFormConfig = () => {
-    var _formState$paymentMod, _conf;
+    var _formState$paymentMod, _formState$paymentMod2;
     const isGCService = businessService === null || businessService === void 0 ? void 0 : businessService.startsWith("GC");
     if (BillDetailsFormConfig({
       consumerCode,
@@ -11872,7 +11916,9 @@ const CollectPayment = props => {
       config.splice(0, 1);
     }
     let conf = config.concat(formConfigMap[formState === null || formState === void 0 ? void 0 : (_formState$paymentMod = formState.paymentMode) === null || _formState$paymentMod === void 0 ? void 0 : _formState$paymentMod.code] || []);
-    conf = (_conf = conf) === null || _conf === void 0 ? void 0 : _conf.concat(cashConfig);
+    if ((formState === null || formState === void 0 ? void 0 : (_formState$paymentMod2 = formState.paymentMode) === null || _formState$paymentMod2 === void 0 ? void 0 : _formState$paymentMod2.code) !== "ONLINE") {
+      conf = conf.concat(cashConfig);
+    }
     return BillDetailsFormConfig({
       consumerCode,
       businessService
@@ -11917,6 +11963,348 @@ const CollectPayment = props => {
   }));
 };
 
+const SelectPaymentType$2 = props => {
+  var _menuList$PAYMENT, _menuList$PAYMENT$Pay, _menuList$PAYMENT2, _menuList$PAYMENT2$Pa, _menuList$PAYMENT2$Pa2;
+  const {
+    state = {}
+  } = useLocation();
+  const userInfo = Digit.UserService.getUser();
+  const [showToast, setShowToast] = useState(null);
+  const [showOwnerToast, setShowOwnerToast] = useState(null);
+  const {
+    tenantId: __tenantId,
+    authorization,
+    workflow: wrkflow,
+    consumerCode: connectionNo
+  } = Digit.Hooks.useQueryParams();
+  const paymentAmount = state === null || state === void 0 ? void 0 : state.paymentAmount;
+  const {
+    t
+  } = useTranslation();
+  const history = useHistory();
+  const {
+    pathname,
+    search
+  } = useLocation();
+  let {
+    consumerCode,
+    businessService
+  } = useParams();
+  const tenantId = (state === null || state === void 0 ? void 0 : state.tenantId) || __tenantId || Digit.ULBService.getCurrentTenantId();
+  const stateTenant = Digit.ULBService.getStateId();
+  const {
+    control,
+    handleSubmit,
+    setValue
+  } = useForm();
+  const {
+    data: menuList,
+    isLoading
+  } = Digit.Hooks.useCustomMDMS(tenantId, "PAYMENT", [{
+    name: "PaymentGateway"
+  }]);
+  console.log("menuList", menuList);
+  const [isPaymentLoading, setPaymentLoading] = useState(false);
+  const {
+    data: paymentdetails,
+    isLoading: paymentLoading
+  } = Digit.Hooks.useFetchPayment({
+    tenantId: tenantId,
+    consumerCode: wrkflow === "WNS" ? connectionNo : consumerCode,
+    businessService
+  }, {});
+  if (window.location.href.includes("ISWSCON") || wrkflow === "WNS") consumerCode = decodeURIComponent(consumerCode);
+  if (wrkflow === "WNS") consumerCode = stringReplaceAll(consumerCode, "+", "/");
+  useEffect(() => {
+    if (paymentdetails !== null && paymentdetails !== void 0 && paymentdetails.Bill && paymentdetails.Bill.length == 0) {
+      setShowToast({
+        key: true,
+        label: "CS_BILL_NOT_FOUND"
+      });
+    }
+  }, [paymentdetails]);
+  useEffect(() => {
+    localStorage.setItem("BillPaymentEnabled", "true");
+  }, []);
+  const {
+    name,
+    mobileNumber
+  } = state;
+  const billDetails = paymentdetails !== null && paymentdetails !== void 0 && paymentdetails.Bill ? paymentdetails === null || paymentdetails === void 0 ? void 0 : paymentdetails.Bill[0] : {};
+  console.log(billDetails, "BILL");
+  const userOptions = ["OWNER", "OTHER"];
+  const onSubmit = async d => {
+    if (!(d !== null && d !== void 0 && d.name) || (d === null || d === void 0 ? void 0 : d.name.trim()) === "") {
+      setShowOwnerToast({
+        key: true,
+        label: t("PAYMENT_NAME_MANDATORY_MESSAGE")
+      });
+      return;
+    }
+    const mobileRegex = /^[6-9]\d{9}$/;
+    if (!(d !== null && d !== void 0 && d.mobileNumber) || (d === null || d === void 0 ? void 0 : d.mobileNumber.trim()) === "") {
+      setShowOwnerToast({
+        key: true,
+        label: t("PAYMENT_MOBILE_NUMBER_MANDATORY_MESSAGE")
+      });
+      return;
+    } else if (!mobileRegex.test(d.mobileNumber)) {
+      setShowOwnerToast({
+        key: true,
+        label: t("ERR_INVALID_MOBILE")
+      });
+      return;
+    }
+    setPaymentLoading(true);
+    const baseURL = document.location.origin;
+    console.log("BASEURLINPAYMENT", baseURL);
+    const filterData = {
+      Transaction: {
+        tenantId: billDetails === null || billDetails === void 0 ? void 0 : billDetails.tenantId,
+        txnAmount: paymentAmount || billDetails.totalAmount,
+        module: businessService,
+        businessService: businessService,
+        billId: billDetails.id,
+        consumerCode: consumerCode,
+        productInfo: "Common Payment",
+        gateway: d === null || d === void 0 ? void 0 : d.paymentType,
+        taxAndPayments: [{
+          taxAmount: paymentAmount || billDetails.totalAmount,
+          billId: billDetails.id,
+          amountPaid: paymentAmount || billDetails.totalAmount,
+          businessService: businessService
+        }],
+        user: {
+          name: d === null || d === void 0 ? void 0 : d.name,
+          mobileNumber: d === null || d === void 0 ? void 0 : d.mobileNumber,
+          tenantId: billDetails === null || billDetails === void 0 ? void 0 : billDetails.tenantId
+        },
+        callbackUrl: `${baseURL}/digit-ui/employee/payment/challan/success/${businessService}/${consumerCode}`,
+        additionalDetails: {
+          isWhatsapp: false,
+          paidBy: d === null || d === void 0 ? void 0 : d.paidBy
+        }
+      }
+    };
+    console.log("coming here", filterData);
+    try {
+      const data = await Digit.PaymentService.createCitizenReciept(billDetails === null || billDetails === void 0 ? void 0 : billDetails.tenantId, filterData);
+      console.log("data=========", data);
+      if (paymentAmount === 0 || billDetails.totalAmount === 0) {
+        var _data$ResponseInfo;
+        setPaymentLoading(false);
+        if ((data === null || data === void 0 ? void 0 : (_data$ResponseInfo = data.ResponseInfo) === null || _data$ResponseInfo === void 0 ? void 0 : _data$ResponseInfo.status) === "SUCCESSFUL") {
+          var _data$Transaction;
+          window.location.href = data === null || data === void 0 ? void 0 : (_data$Transaction = data.Transaction) === null || _data$Transaction === void 0 ? void 0 : _data$Transaction.callbackUrl;
+        } else {
+          window.location.href = "/digit-ui/citizen/payment/failure";
+        }
+        return;
+      }
+      if ((d === null || d === void 0 ? void 0 : d.paymentType) === gatewayType.RAZORPAY) {
+        displayRazorpay(data);
+      } else {
+        setPaymentLoading(false);
+      }
+    } catch (error) {
+      var _error$response, _error$response$data, _error$response$data$;
+      console.log("error", error);
+      let messageToShow = "CS_PAYMENT_UNKNOWN_ERROR_ON_SERVER";
+      if ((_error$response = error.response) !== null && _error$response !== void 0 && (_error$response$data = _error$response.data) !== null && _error$response$data !== void 0 && (_error$response$data$ = _error$response$data.Errors) !== null && _error$response$data$ !== void 0 && _error$response$data$[0]) {
+        var _error$response2, _error$response2$data, _error$response2$data2;
+        const {
+          code,
+          message
+        } = (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : (_error$response2$data2 = _error$response2$data.Errors) === null || _error$response2$data2 === void 0 ? void 0 : _error$response2$data2[0];
+        messageToShow = code;
+      }
+      setPaymentLoading(false);
+      setShowToast({
+        key: true,
+        label: t(messageToShow)
+      });
+    }
+  };
+  async function displayRazorpay(getOrderData) {
+    const res = await loadScript(RAZORPAY_LOADSCRIPT_URL);
+    if (!res) {
+      alert("Razorpay SDK failed to load. Are you online?");
+      return;
+    }
+    function getQueryVariable(variable) {
+      const query = lodash.get(getOrderData, TRANSACTION_REDIRECTURL);
+      var vars = query.split("&");
+      for (var i = 0; i < vars.length; i++) {
+        var pair = vars[i].split("=");
+        if (pair[0] == variable) {
+          return pair[1];
+        }
+      }
+      return false;
+    }
+    const options = {
+      key: getQueryVariable(MERCHENT_KEY),
+      amount: lodash.get(getOrderData, TRANSACTION_AMMOUNT) * 100,
+      name: POPUP_DIPSPLAY_NAME,
+      description: lodash.get(getOrderData, TRANSACTION_BUSINESSSERVICE) + " Charge Collection",
+      image: POPUP_DIPSPLAY_IMAGE,
+      order_id: getQueryVariable(ORDER_ID),
+      handler: async function (response) {
+        const data = {
+          razorpayPaymentId: response.razorpay_payment_id,
+          razorpayOrderId: response.razorpay_order_id,
+          razorpaySignature: response.razorpay_signature
+        };
+        window.location = lodash.get(getOrderData, TRANSACTION_CALLBACKURL) + RAZORPAY_CALLBACK_URL_KEYS.PAYMENT_ID + data.razorpayPaymentId + RAZORPAY_CALLBACK_URL_KEYS.ORDER_ID + data.razorpayOrderId + RAZORPAY_CALLBACK_URL_KEYS.SIGNATURE + data.razorpaySignature;
+      },
+      prefill: {
+        name: lodash.get(getOrderData, TRANSACTION_USERNAME),
+        email: lodash.get(getOrderData, TRANSACTION_USER_EMAIL),
+        contact: lodash.get(getOrderData, TRANSACTION_USER_MOBILE)
+      },
+      theme: {
+        color: "#61dafb"
+      }
+    };
+    const paymentObject = new window.Razorpay(options);
+    setPaymentLoading(false);
+    paymentObject.open();
+  }
+  function loadScript(src) {
+    return new Promise(resolve => {
+      const script = document.createElement("script");
+      script.src = src;
+      script.onload = () => {
+        resolve(true);
+      };
+      script.onerror = () => {
+        resolve(false);
+      };
+      document.body.appendChild(script);
+    });
+  }
+  if (authorization === "true" && !userInfo.access_token) {
+    localStorage.clear();
+    sessionStorage.clear();
+    window.location.href = `/digit-ui/citizen/login?from=${encodeURIComponent(pathname + search)}`;
+  }
+  if (paymentLoading || isPaymentLoading || isLoading) {
+    window.scrollTo({
+      top: 0,
+      behavior: "smooth"
+    });
+    return /*#__PURE__*/React.createElement(Loader, null);
+  }
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("form", {
+    style: {
+      padding: "20px"
+    },
+    onSubmit: handleSubmit(onSubmit)
+  }, /*#__PURE__*/React.createElement(Header, null, t("PAYMENT_CS_HEADER")), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement("div", {
+    className: "payment-amount-info",
+    style: {
+      marginBottom: "26px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    className: "dark"
+  }, t("PAYMENT_CS_TOTAL_AMOUNT_DUE")), /*#__PURE__*/React.createElement(CardSectionHeader, null, " ", "\u20B9 ", paymentAmount !== undefined ? Number(paymentAmount).toFixed(2) : Number(billDetails === null || billDetails === void 0 ? void 0 : billDetails.totalAmount).toFixed(2))), /*#__PURE__*/React.createElement(CardLabel, null, t("PAYMENT_CS_SELECT_METHOD")), (menuList === null || menuList === void 0 ? void 0 : (_menuList$PAYMENT = menuList.PAYMENT) === null || _menuList$PAYMENT === void 0 ? void 0 : (_menuList$PAYMENT$Pay = _menuList$PAYMENT.PaymentGateway) === null || _menuList$PAYMENT$Pay === void 0 ? void 0 : _menuList$PAYMENT$Pay.length) && /*#__PURE__*/React.createElement(Controller, {
+    name: "paymentType",
+    defaultValue: menuList === null || menuList === void 0 ? void 0 : (_menuList$PAYMENT2 = menuList.PAYMENT) === null || _menuList$PAYMENT2 === void 0 ? void 0 : (_menuList$PAYMENT2$Pa = _menuList$PAYMENT2.PaymentGateway) === null || _menuList$PAYMENT2$Pa === void 0 ? void 0 : (_menuList$PAYMENT2$Pa2 = _menuList$PAYMENT2$Pa[0]) === null || _menuList$PAYMENT2$Pa2 === void 0 ? void 0 : _menuList$PAYMENT2$Pa2.gateway,
+    control: control,
+    render: props => {
+      var _menuList$PAYMENT3, _menuList$PAYMENT3$Pa;
+      return /*#__PURE__*/React.createElement(RadioButtons, {
+        selectedOption: props.value,
+        options: menuList === null || menuList === void 0 ? void 0 : (_menuList$PAYMENT3 = menuList.PAYMENT) === null || _menuList$PAYMENT3 === void 0 ? void 0 : (_menuList$PAYMENT3$Pa = _menuList$PAYMENT3.PaymentGateway) === null || _menuList$PAYMENT3$Pa === void 0 ? void 0 : _menuList$PAYMENT3$Pa.map(item => item === null || item === void 0 ? void 0 : item.gateway),
+        onSelect: props.onChange
+      });
+    }
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "card"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "payment-amount-info",
+    style: {
+      marginBottom: "26px"
+    }
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    className: "dark"
+  }, t("PAYMENT_CS_PAYER_DETAILS"))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    className: "card-label-smaller"
+  }, `${t("PAYMENT_CS_PAID_BY")} * `), /*#__PURE__*/React.createElement(Controller, {
+    name: "paidBy",
+    defaultValue: userOptions[0],
+    control: control,
+    render: props => /*#__PURE__*/React.createElement(Dropdown, {
+      className: "text-input-width",
+      selected: props.value,
+      option: userOptions,
+      select: val => {
+        if (val === "OWNER") {
+          props.onChange(val);
+          setValue("name", name || (billDetails === null || billDetails === void 0 ? void 0 : billDetails.payerName) || "");
+          setValue("mobileNumber", mobileNumber || (billDetails === null || billDetails === void 0 ? void 0 : billDetails.mobileNumber) || "");
+        } else if (val === "OTHER") {
+          props.onChange(val);
+          setValue("name", "");
+          setValue("mobileNumber", "");
+        }
+      }
+    })
+  })), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    className: "card-label-smaller"
+  }, `${t("PAYMENT_CS_PAYER_NAME")} * `), /*#__PURE__*/React.createElement("div", {
+    className: "field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "name",
+    defaultValue: name || (billDetails === null || billDetails === void 0 ? void 0 : billDetails.payerName) || "",
+    render: props => /*#__PURE__*/React.createElement(TextInput, {
+      className: "text-input-width",
+      value: props.value,
+      onChange: e => {
+        props.onChange(e.target.value);
+      }
+    })
+  }))), /*#__PURE__*/React.createElement(LabelFieldPair, null, /*#__PURE__*/React.createElement(CardLabel, {
+    className: "card-label-smaller"
+  }, `${t("PAYMENT_CS_PAYER_NUMBER")} * `), /*#__PURE__*/React.createElement("div", {
+    className: "field"
+  }, /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "mobileNumber",
+    defaultValue: mobileNumber || (billDetails === null || billDetails === void 0 ? void 0 : billDetails.mobileNumber) || "",
+    render: props => /*#__PURE__*/React.createElement(MobileNumber, {
+      value: props.value,
+      onChange: e => {
+        props.onChange(e);
+      },
+      componentInFront: /*#__PURE__*/React.createElement("div", {
+        className: "employee-card-input employee-card-input--front numberdisplay"
+      }, "+91")
+    })
+  })))), !showToast && /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(SubmitBar, {
+    label: t("PAYMENT_CS_BUTTON_LABEL"),
+    submit: true
+  }))), /*#__PURE__*/React.createElement(InfoBanner, {
+    label: t("CS_COMMON_INFO"),
+    text: t("CS_PAYMENT_REDIRECT_NOTICE")
+  }), showToast && /*#__PURE__*/React.createElement(Toast, {
+    error: showToast.key,
+    label: t(showToast.label),
+    onClose: () => {
+      setShowToast(null);
+    },
+    isDleteBtn: true
+  }), showOwnerToast && /*#__PURE__*/React.createElement(Toast, {
+    isDleteBtn: true,
+    error: showOwnerToast.key,
+    label: t(showOwnerToast.label),
+    onClose: () => {
+      setShowOwnerToast(null);
+    }
+  }));
+};
+
 function toInteger(dirtyNumber) {
   if (dirtyNumber === null || dirtyNumber === true || dirtyNumber === false) {
     return NaN;
@@ -13412,8 +13800,9 @@ const convertEpochToDate$1 = dateEpoch => {
   }
 };
 const SuccessfulPayment$1 = props => {
-  var _location, _location$pathname, _JSON$parse, _JSON$parse$value, _JSON$parse$value$inf, _data$, _data$2, _data$8, _data$9, _data$0, _data$1, _data$10, _data$11, _data$12, _data$13, _data$14;
+  var _location$pathname, _receiptNumber, _JSON$parse, _JSON$parse$value, _JSON$parse$value$inf, _data$, _data$2, _dataCheck$payments, _dataCheck$payments$P, _dataCheck$payments$P2, _dataCheck$payments$P3, _data$8, _data$9, _data$0, _data$1, _data$10, _data$11, _data$12, _data$13, _data$14;
   const history = useHistory();
+  const location = useLocation();
   const {
     t
   } = useTranslation();
@@ -13423,19 +13812,27 @@ const SuccessfulPayment$1 = props => {
   } = Digit.Hooks.useQueryParams();
   const [displayMenu, setDisplayMenu] = useState(false);
   const [selectedAction, setSelectedAction] = useState(null);
-  const isFSMResponse = (_location = location) === null || _location === void 0 ? void 0 : (_location$pathname = _location.pathname) === null || _location$pathname === void 0 ? void 0 : _location$pathname.includes("payment/success/FSM.TRIP_CHARGES");
+  const isFSMResponse = location === null || location === void 0 ? void 0 : (_location$pathname = location.pathname) === null || _location$pathname === void 0 ? void 0 : _location$pathname.includes("payment/success/FSM.TRIP_CHARGES");
   const combineResponseFSM = isFSMResponse ? `${t("PAYMENT_COLLECT_LABEL")} / ${t("PAYMENT_COLLECT")}` : t("PAYMENT_LOCALIZATION_RESPONSE");
   const [printing, setPrinting] = useState(false);
   const [chbPermissionLoading, setChbPermissionLoading] = useState(false);
   props.setLink(combineResponseFSM);
+  const checkParam = useParams();
+  const queryParams = new URLSearchParams(location.search);
+  const egPgTxnId = queryParams.get("eg_pg_txnid");
+  const razorpayPaymentId = queryParams.get("razorpayPaymentId");
+  const razorpayOrderId = queryParams.get("razorpayOrderId");
+  const razorpaySignature = queryParams.get("razorpaySignature");
   let {
     consumerCode,
     receiptNumber,
     businessService
   } = useParams();
-  console.log("consummennene", consumerCode);
+  console.log("checkParam", checkParam);
+  console.log("egPgTxnId", egPgTxnId);
+  console.log("businessService", businessService);
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  receiptNumber = receiptNumber.replace(/%2F/g, "/");
+  receiptNumber = (_receiptNumber = receiptNumber) === null || _receiptNumber === void 0 ? void 0 : _receiptNumber.replace(/%2F/g, "/");
   const {
     data = {},
     isLoading: isBpaSearchLoading,
@@ -13455,6 +13852,18 @@ const SuccessfulPayment$1 = props => {
     const selectedTenantData = cities.data.find(item => item.city.districtTenantCode === loginCity);
     ulbType = selectedTenantData === null || selectedTenantData === void 0 ? void 0 : (_selectedTenantData$c = selectedTenantData.city) === null || _selectedTenantData$c === void 0 ? void 0 : _selectedTenantData$c.ulbGrade;
   }
+  const {
+    isLoading,
+    data: dataCheck,
+    isError
+  } = Digit.Hooks.usePaymentUpdate({
+    egId: egPgTxnId
+  }, businessService, {
+    enabled: !!egPgTxnId,
+    retry: false,
+    staleTime: Infinity,
+    refetchOnWindowFocus: false
+  });
   const mutation = Digit.Hooks.chb.useChbCreateAPI(tenantId, false);
   const FSM_EDITOR = Digit.UserService.hasAccess("FSM_EDITOR_EMP") || false;
   function onActionSelect(action) {
@@ -13570,45 +13979,11 @@ const SuccessfulPayment$1 = props => {
       setTimeout(() => URL.revokeObjectURL(link.href), 7000);
     }
   };
-  const printRLReceipt = async () => {
-    if (printing) return;
-    setPrinting(true);
-    try {
-      var _payments$Payments$3;
-      const applicationDetails = await Digit.RentAndLeaseService.search({
-        tenantId,
-        filters: {
-          applicationNumbers: consumerCode
-        }
-      });
-      let application = applicationDetails;
-      const payments = await Digit.PaymentService.getReciept(tenantId, businessService, {
-        receiptNumbers: receiptNumber
-      });
-      let fileStoreId = payments === null || payments === void 0 ? void 0 : (_payments$Payments$3 = payments.Payments[0]) === null || _payments$Payments$3 === void 0 ? void 0 : _payments$Payments$3.fileStoreId;
-      if (!fileStoreId) {
-        var _payments$Payments;
-        let response = await Digit.PaymentService.generatePdf(tenantId, {
-          Payments: [{
-            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments = payments.Payments) === null || _payments$Payments === void 0 ? void 0 : _payments$Payments[0]) || {}),
-            ...application
-          }]
-        }, "rentandlease-receipt");
-        fileStoreId = response === null || response === void 0 ? void 0 : response.filestoreIds[0];
-      }
-      const fileStore = await Digit.PaymentService.printReciept(tenantId, {
-        fileStoreIds: fileStoreId
-      });
-      window.open(fileStore[fileStoreId], "_blank");
-    } finally {
-      setPrinting(false);
-    }
-  };
   const printChallanReceipt = async () => {
     if (printing) return;
     setPrinting(true);
     try {
-      var _payments$Payments$4;
+      var _applicationDetails$A, _applicationDetails$A2;
       const applicationDetails = await Digit.ChallanGenerationService.search({
         tenantId,
         filters: {
@@ -13619,16 +13994,17 @@ const SuccessfulPayment$1 = props => {
         ...applicationDetails,
         ...challanEmpData
       };
+      console.log("applicationDetails", applicationDetails);
       let application = challan;
-      const payments = await Digit.PaymentService.getReciept(tenantId, businessService, {
-        receiptNumbers: receiptNumber
-      });
-      let fileStoreId = payments === null || payments === void 0 ? void 0 : (_payments$Payments$4 = payments.Payments[0]) === null || _payments$Payments$4 === void 0 ? void 0 : _payments$Payments$4.fileStoreId;
+      let fileStoreId = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A = applicationDetails.Applications) === null || _applicationDetails$A === void 0 ? void 0 : (_applicationDetails$A2 = _applicationDetails$A[0]) === null || _applicationDetails$A2 === void 0 ? void 0 : _applicationDetails$A2.paymentReceiptFilestoreId;
       if (!fileStoreId) {
-        var _payments$Payments2;
+        var _payments$Payments;
+        const payments = await Digit.PaymentService.getReciept(tenantId, businessService, {
+          receiptNumbers: receiptNumber
+        });
         let response = await Digit.PaymentService.generatePdf(tenantId, {
           Payments: [{
-            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments2 = payments.Payments) === null || _payments$Payments2 === void 0 ? void 0 : _payments$Payments2[0]) || {}),
+            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments = payments.Payments) === null || _payments$Payments === void 0 ? void 0 : _payments$Payments[0]) || {}),
             challan: application
           }]
         }, "challangeneration-receipt");
@@ -13646,7 +14022,7 @@ const SuccessfulPayment$1 = props => {
     if (chbPermissionLoading) return;
     setChbPermissionLoading(true);
     try {
-      var _applicationDetails$c, _applicationDetails$c2, _applicationDetails$c3, _applicationDetails$c4, _applicationDetails$c5, _applicationDetails$c6, _applicationDetails$A, _applicationDetails$A2;
+      var _applicationDetails$c, _applicationDetails$c2, _applicationDetails$c3, _applicationDetails$c4, _applicationDetails$c5, _applicationDetails$c6, _applicationDetails$A3, _applicationDetails$A4;
       const applicationDetails = await Digit.ChallanGenerationService.search({
         tenantId,
         filters: {
@@ -13654,23 +14030,23 @@ const SuccessfulPayment$1 = props => {
         }
       });
       const location = await getLocationName(applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$c = applicationDetails.challans) === null || _applicationDetails$c === void 0 ? void 0 : (_applicationDetails$c2 = _applicationDetails$c[0]) === null || _applicationDetails$c2 === void 0 ? void 0 : (_applicationDetails$c3 = _applicationDetails$c2.additionalDetail) === null || _applicationDetails$c3 === void 0 ? void 0 : _applicationDetails$c3.latitude, applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$c4 = applicationDetails.challans) === null || _applicationDetails$c4 === void 0 ? void 0 : (_applicationDetails$c5 = _applicationDetails$c4[0]) === null || _applicationDetails$c5 === void 0 ? void 0 : (_applicationDetails$c6 = _applicationDetails$c5.additionalDetail) === null || _applicationDetails$c6 === void 0 ? void 0 : _applicationDetails$c6.longitude);
-      console.log('location', location);
+      console.log("location", location);
       const challan = {
         ...applicationDetails,
         ...challanEmpData
       };
       console.log("applicationDetails", applicationDetails);
       let application = challan;
-      let fileStoreId = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A = applicationDetails.Applications) === null || _applicationDetails$A === void 0 ? void 0 : (_applicationDetails$A2 = _applicationDetails$A[0]) === null || _applicationDetails$A2 === void 0 ? void 0 : _applicationDetails$A2.paymentReceiptFilestoreId;
+      let fileStoreId = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A3 = applicationDetails.Applications) === null || _applicationDetails$A3 === void 0 ? void 0 : (_applicationDetails$A4 = _applicationDetails$A3[0]) === null || _applicationDetails$A4 === void 0 ? void 0 : _applicationDetails$A4.paymentReceiptFilestoreId;
       if (!fileStoreId) {
-        var _payments$Payments3;
+        var _payments$Payments2;
         const payments = await Digit.PaymentService.getReciept(tenantId, businessService, {
           receiptNumbers: receiptNumber
         });
         let response = await Digit.PaymentService.generatePdf(tenantId, {
           challan: {
             ...application,
-            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments3 = payments.Payments) === null || _payments$Payments3 === void 0 ? void 0 : _payments$Payments3[0]) || {}),
+            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments2 = payments.Payments) === null || _payments$Payments2 === void 0 ? void 0 : _payments$Payments2[0]) || {}),
             location
           }
         }, "challan-notice");
@@ -13710,13 +14086,13 @@ const SuccessfulPayment$1 = 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 = "chb-permissionletter";
       if (!fileStoreId) {
-        var _payments$Payments4;
+        var _payments$Payments3;
         const payments = await Digit.PaymentService.getReciept(tenantId, businessService, {
           receiptNumbers: receiptNumber
         });
         const response = await Digit.PaymentService.generatePdf(tenantId, {
           Payments: [{
-            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments4 = payments.Payments) === null || _payments$Payments4 === void 0 ? void 0 : _payments$Payments4[0]) || {}),
+            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments3 = payments.Payments) === null || _payments$Payments3 === void 0 ? void 0 : _payments$Payments3[0]) || {}),
             ...application
           }]
         }, generatePdfKeyForTL);
@@ -13762,16 +14138,16 @@ const SuccessfulPayment$1 = 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;
       if (!fileStoreId) {
-        var _payments$Payments$5, _payments$Payments5, _response, _response2;
+        var _payments$Payments$3, _payments$Payments4, _response, _response2;
         const payments = await Digit.PaymentService.getReciept(tenantId, businessService, {
           receiptNumbers: receiptNumber
         });
         let response = {
-          filestoreIds: [(_payments$Payments$5 = payments.Payments[0]) === null || _payments$Payments$5 === void 0 ? void 0 : _payments$Payments$5.fileStoreId]
+          filestoreIds: [(_payments$Payments$3 = payments.Payments[0]) === null || _payments$Payments$3 === void 0 ? void 0 : _payments$Payments$3.fileStoreId]
         };
         response = await Digit.PaymentService.generatePdf(tenantId, {
           Payments: [{
-            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments5 = payments.Payments) === null || _payments$Payments5 === void 0 ? void 0 : _payments$Payments5[0]) || {}),
+            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments4 = payments.Payments) === null || _payments$Payments4 === void 0 ? void 0 : _payments$Payments4[0]) || {}),
             ...application
           }]
         }, "chbservice-receipt");
@@ -13807,13 +14183,13 @@ const SuccessfulPayment$1 = props => {
       let application = new_data;
       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.paymentReceiptFilestoreId;
       if (!fileStoreId) {
-        var _payments$Payments6;
+        var _payments$Payments5;
         const payments = await Digit.PaymentService.getReciept(tenantId, businessService, {
           receiptNumbers: receiptNumber
         });
         let response = await Digit.PaymentService.generatePdf(tenantId, {
           Payments: [{
-            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments6 = payments.Payments) === null || _payments$Payments6 === void 0 ? void 0 : _payments$Payments6[0]) || {}),
+            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments5 = payments.Payments) === null || _payments$Payments5 === void 0 ? void 0 : _payments$Payments5[0]) || {}),
             ...application
           }]
         }, "adv-bill");
@@ -13834,13 +14210,13 @@ const SuccessfulPayment$1 = props => {
       receiptNumbers: receiptNumber
     });
     try {
-      var _payments$Payments$6;
-      let fileStoreId = (_payments$Payments$6 = payments.Payments[0]) === null || _payments$Payments$6 === void 0 ? void 0 : _payments$Payments$6.fileStoreId;
+      var _payments$Payments$4;
+      let fileStoreId = (_payments$Payments$4 = payments.Payments[0]) === null || _payments$Payments$4 === void 0 ? void 0 : _payments$Payments$4.fileStoreId;
       if (!fileStoreId) {
-        var _payments$Payments7;
+        var _payments$Payments6;
         let response = await Digit.PaymentService.generatePdf(tenantId, {
           Payments: [{
-            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments7 = payments.Payments) === null || _payments$Payments7 === void 0 ? void 0 : _payments$Payments7[0]) || {})
+            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments6 = payments.Payments) === null || _payments$Payments6 === void 0 ? void 0 : _payments$Payments6[0]) || {})
           }]
         }, "pet-receipt-employee");
         fileStoreId = response === null || response === void 0 ? void 0 : response.filestoreIds[0];
@@ -13857,7 +14233,7 @@ const SuccessfulPayment$1 = props => {
     if (printing) return;
     setPrinting(true);
     try {
-      var _applicationDetails$A3, _applicationDetails$A4, _applicationDetails$A5;
+      var _applicationDetails$A5, _applicationDetails$A6, _applicationDetails$A7;
       console.log("consumerCode for ndc", consumerCode);
       console.log("tenantId for ndc", tenantId);
       const applicationDetails = await Digit.NDCService.NDCsearch({
@@ -13866,16 +14242,16 @@ const SuccessfulPayment$1 = props => {
           applicationNo: consumerCode
         }
       });
-      let application = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A3 = applicationDetails.Applications) === null || _applicationDetails$A3 === void 0 ? void 0 : _applicationDetails$A3[0];
-      let fileStoreId = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A4 = applicationDetails.Applications) === null || _applicationDetails$A4 === void 0 ? void 0 : (_applicationDetails$A5 = _applicationDetails$A4[0]) === null || _applicationDetails$A5 === void 0 ? void 0 : _applicationDetails$A5.paymentReceiptFilestoreId;
+      let application = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A5 = applicationDetails.Applications) === null || _applicationDetails$A5 === void 0 ? void 0 : _applicationDetails$A5[0];
+      let fileStoreId = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$A6 = applicationDetails.Applications) === null || _applicationDetails$A6 === void 0 ? void 0 : (_applicationDetails$A7 = _applicationDetails$A6[0]) === null || _applicationDetails$A7 === void 0 ? void 0 : _applicationDetails$A7.paymentReceiptFilestoreId;
       if (!fileStoreId) {
-        var _payments$Payments8;
+        var _payments$Payments7;
         const payments = await Digit.PaymentService.getReciept(tenantId, businessService, {
           receiptNumbers: receiptNumber
         });
         let response = await Digit.PaymentService.generatePdf(tenantId, {
           Payments: [{
-            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments8 = payments.Payments) === null || _payments$Payments8 === void 0 ? void 0 : _payments$Payments8[0]) || {}),
+            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments7 = payments.Payments) === null || _payments$Payments7 === void 0 ? void 0 : _payments$Payments7[0]) || {}),
             ...application
           }]
         }, "ndc-receipt");
@@ -14011,7 +14387,7 @@ const SuccessfulPayment$1 = props => {
     }
   };
   const printReciept = async () => {
-    var _payments$Payments$7, _payments$Payments$8;
+    var _payments$Payments$5, _payments$Payments$6;
     if (printing) return;
     setPrinting(true);
     const tenantId = Digit.ULBService.getCurrentTenantId();
@@ -14020,10 +14396,10 @@ const SuccessfulPayment$1 = props => {
       receiptNumbers: receiptNumber
     });
     let response = {
-      filestoreIds: [(_payments$Payments$7 = payments.Payments[0]) === null || _payments$Payments$7 === void 0 ? void 0 : _payments$Payments$7.fileStoreId]
+      filestoreIds: [(_payments$Payments$5 = payments.Payments[0]) === null || _payments$Payments$5 === void 0 ? void 0 : _payments$Payments$5.fileStoreId]
     };
     let fileStoreTenant;
-    if (!((_payments$Payments$8 = payments.Payments[0]) !== null && _payments$Payments$8 !== void 0 && _payments$Payments$8.fileStoreId)) {
+    if (!((_payments$Payments$6 = payments.Payments[0]) !== null && _payments$Payments$6 !== void 0 && _payments$Payments$6.fileStoreId)) {
       let assessmentYear = "";
       let count = 0;
       let toDate, fromDate;
@@ -14090,7 +14466,7 @@ const SuccessfulPayment$1 = props => {
     await Digit.Utils.downloadReceipt(consumercode, businessService, "consolidatedreceipt", tenantid);
   };
   const printRecieptNew = async payment => {
-    var _payments$Payments$9;
+    var _payments$Payments$7;
     console.log("paymentpayment", payment, payment.Payments[0].paymentDetails[0].receiptNumber, payment.Payments[0]);
     const tenantId = Digit.ULBService.getCurrentTenantId();
     const state = Digit.ULBService.getStateId();
@@ -14099,7 +14475,7 @@ const SuccessfulPayment$1 = props => {
       receiptNumbers: payment.Payments[0].paymentDetails[0].receiptNumber
     });
     let response = {
-      filestoreIds: [(_payments$Payments$9 = payments.Payments[0]) === null || _payments$Payments$9 === void 0 ? void 0 : _payments$Payments$9.fileStoreId]
+      filestoreIds: [(_payments$Payments$7 = payments.Payments[0]) === null || _payments$Payments$7 === void 0 ? void 0 : _payments$Payments$7.fileStoreId]
     };
     {
       let assessmentYear = "",
@@ -14302,18 +14678,19 @@ const SuccessfulPayment$1 = props => {
     });
     window.open(fileStore[response.filestoreIds[0]], "_blank");
   };
-  if (businessService !== null && businessService !== void 0 && businessService.includes("BPA") && isBpaSearchLoading) return /*#__PURE__*/React.createElement(Loader, null);
+  if (isLoading) return /*#__PURE__*/React.createElement(Loader, null);
+  const checkRecieptNumber = dataCheck === null || dataCheck === void 0 ? void 0 : (_dataCheck$payments = dataCheck.payments) === null || _dataCheck$payments === void 0 ? void 0 : (_dataCheck$payments$P = _dataCheck$payments.Payments) === null || _dataCheck$payments$P === void 0 ? void 0 : (_dataCheck$payments$P2 = _dataCheck$payments$P[0]) === null || _dataCheck$payments$P2 === void 0 ? void 0 : (_dataCheck$payments$P3 = _dataCheck$payments$P2.paymentDetails[0]) === null || _dataCheck$payments$P3 === void 0 ? void 0 : _dataCheck$payments$P3.receiptNumber;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(Banner, {
     message: getMessage(),
     info: t("PAYMENT_LOCALIZATION_RECIEPT_NO"),
-    applicationNumber: receiptNumber,
+    applicationNumber: receiptNumber || checkRecieptNumber,
     successful: true
   }), /*#__PURE__*/React.createElement(CardText, null, getCardText()), generatePdfKey ? /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
       justifyContent: "space-evenly"
     }
-  }, businessService !== "chb-services" && businessService !== "adv-services" && businessService !== "pet-services" && businessService !== "NDC" && businessService !== "Challan_Generation" && businessService !== "rl-services" && /*#__PURE__*/React.createElement("div", {
+  }, businessService !== "chb-services" && businessService !== "adv-services" && businessService !== "pet-services" && businessService !== "NDC" && businessService !== "Challan_Generation" && /*#__PURE__*/React.createElement("div", {
     className: "primary-label-btn d-grid",
     style: {
       marginLeft: "unset",
@@ -14542,29 +14919,7 @@ const SuccessfulPayment$1 = props => {
     fill: "none"
   }), /*#__PURE__*/React.createElement("path", {
     d: "M19 8H5c-1.66 0-3 1.34-3 3v6h4v4h12v-4h4v-6c0-1.66-1.34-3-3-3zm-3 11H8v-5h8v5zm3-7c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm-1-9H6v4h12V3z"
-  })), t("Challan_Notice")))) : null, businessService == "rl-services" ? /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "flex",
-      justifyContent: "flex-end",
-      gap: "20px",
-      marginRight: "20px",
-      marginTop: "15px",
-      marginBottom: "15px"
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "primary-label-btn d-grid",
-    onClick: printing ? undefined : printRLReceipt
-  }, printing ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    height: "24",
-    viewBox: "0 0 24 24",
-    width: "24"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M0 0h24v24H0z",
-    fill: "none"
-  }), /*#__PURE__*/React.createElement("path", {
-    d: "M19 8H5c-1.66 0-3 1.34-3 3v6h4v4h12v-4h4v-6c0-1.66-1.34-3-3-3zm-3 11H8v-5h8v5zm3-7c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm-1-9H6v4h12V3z"
-  })), t("CHB_FEE_RECEIPT")))) : null, businessService == "sv-services" && /*#__PURE__*/React.createElement(Link, {
+  })), t("Challan_Notice")))) : null, businessService == "sv-services" && /*#__PURE__*/React.createElement(Link, {
     to: `/digit-ui/citizen`
   }, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("CORE_COMMON_GO_TO_HOME"),
@@ -14880,8 +15235,15 @@ const EmployeePayment = ({
     path: `${currentPath}/collect/:businessService/:consumerCode`
   }, /*#__PURE__*/React.createElement(CollectPayment, Object.assign({}, commonProps, {
     basePath: currentPath
+  }))), /*#__PURE__*/React.createElement(Route, {
+    path: `${currentPath}/challan/collect/:businessService/:consumerCode`
+  }, /*#__PURE__*/React.createElement(SelectPaymentType$2, Object.assign({}, commonProps, {
+    basePath: currentPath,
+    stateCode: stateCode
   }))), /*#__PURE__*/React.createElement(Route, {
     path: `${currentPath}/success/:businessService/:receiptNumber/:consumerCode`
+  }, /*#__PURE__*/React.createElement(SuccessfulPayment$1, commonProps)), /*#__PURE__*/React.createElement(Route, {
+    path: `${currentPath}/challan/success/:businessService/:consumerCode`
   }, /*#__PURE__*/React.createElement(SuccessfulPayment$1, commonProps)), /*#__PURE__*/React.createElement(Route, {
     path: `${currentPath}/integration/:moduleName/:pageName`
   }, /*#__PURE__*/React.createElement(IFrameInterface, commonProps)), /*#__PURE__*/React.createElement(Route, {