@mseva/digit-ui-module-common 1.1.88-dev.1.30 → 1.1.88-dev.1.31

package/dist/index.modern.js

@@ -7290,6 +7290,7 @@ const WrapPaymentComponent = props => {
     },
     enabled: allowFetchBill
   });
+  console.log('reciept_data in citizen response', reciept_data);
   const {
     data: generatePdfKey
   } = Digit.Hooks.useCommonMDMS(newTenantId, "common-masters", "ReceiptKey", {
@@ -7830,9 +7831,10 @@ const WrapPaymentComponent = props => {
         const payments = await Digit.PaymentService.getReciept(tenantId, business_service, {
           receiptNumbers: receiptNumber
         });
+        const pdfPayments = fixAdjustedAmount(payments === null || payments === void 0 ? void 0 : (_payments$Payments4 = payments.Payments) === null || _payments$Payments4 === void 0 ? void 0 : _payments$Payments4[0]);
         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]) || {}),
+            ...pdfPayments,
             ...application
           }]
         }, generatePdfKeyForTL);
@@ -7879,12 +7881,13 @@ 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;
       if (!fileStoreId) {
         var _payments$Payments5, _response, _response2;
+        const pdfPayments = fixAdjustedAmount(payments === null || payments === void 0 ? void 0 : (_payments$Payments5 = payments.Payments) === null || _payments$Payments5 === void 0 ? void 0 : _payments$Payments5[0]);
         let response = {
           filestoreIds: [payments === null || payments === void 0 ? void 0 : payments.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]) || {}),
+            ...pdfPayments,
             ...application
           }]
         }, "chbservice-receipt");
@@ -8487,8 +8490,9 @@ const WrapPaymentComponent = props => {
     className: "primary-label-btn d-grid",
     onClick: printing ? undefined : () => printBillReceipt({
       businessService: business_service,
-      receiptNumber: receiptNumber,
-      rootKey: "PAYMENTS"
+      receiptNumber: receiptNumber || consumerCode,
+      rootKey: "PAYMENTS",
+      billOrPaymentResponse: reciept_data
     })
   }, printing ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("svg", {
     xmlns: "http://www.w3.org/2000/svg",
@@ -8566,7 +8570,7 @@ const WrapPaymentComponent = props => {
     to: `/digit-ui/citizen`
   }, /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("CORE_COMMON_GO_TO_HOME")
-  }))) : !(business_service === "GC.ONE_TIME_FEE") && /*#__PURE__*/React.createElement("div", {
+  }))) : !(business_service === "adv-services" || business_service === "pet-services" || business_service === "chb-services" || business_service === "NDC" || business_service === "Challan_Generation" || business_service === "rl-services" || business_service === "GC.ONE_TIME_FEE") && /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
       justifyContent: "space-between",
@@ -10604,8 +10608,8 @@ var _DataView = DataView;
 var Promise$1 = _getNative(_root, 'Promise');
 var _Promise = Promise$1;
 
-var Set = _getNative(_root, 'Set');
-var _Set = Set;
+var Set$1 = _getNative(_root, 'Set');
+var _Set = Set$1;
 
 var WeakMap = _getNative(_root, 'WeakMap');
 var _WeakMap = WeakMap;
@@ -13826,7 +13830,7 @@ const convertEpochToDate$1 = dateEpoch => {
   }
 };
 const SuccessfulPayment$1 = props => {
-  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;
+  var _location$pathname, _receiptNumber, _JSON$parse, _JSON$parse$value, _JSON$parse$value$inf, _dataCheck$payments, _dataCheck$payments$P, _dataCheck$payments$P2, _dataCheck$payments$P3, _data$, _data$2, _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 {
@@ -13845,6 +13849,7 @@ const SuccessfulPayment$1 = props => {
   props.setLink(combineResponseFSM);
   const checkParam = useParams();
   const queryParams = new URLSearchParams(location.search);
+  const [allowFetchBill, setallowFetchBill] = useState(false);
   const egPgTxnId = queryParams.get("eg_pg_txnid");
   const razorpayPaymentId = queryParams.get("razorpayPaymentId");
   const razorpayOrderId = queryParams.get("razorpayOrderId");
@@ -13860,6 +13865,7 @@ const SuccessfulPayment$1 = props => {
   console.log("businessService", businessService);
   const tenantId = Digit.ULBService.getCurrentTenantId();
   receiptNumber = (_receiptNumber = receiptNumber) === null || _receiptNumber === void 0 ? void 0 : _receiptNumber.replace(/%2F/g, "/");
+  console.log('receiptNumber in response page', receiptNumber);
   const {
     data = {},
     isLoading: isBpaSearchLoading,
@@ -13891,6 +13897,28 @@ const SuccessfulPayment$1 = props => {
     staleTime: Infinity,
     refetchOnWindowFocus: false
   });
+  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;
+  const {
+    data: reciept_data,
+    isLoading: recieptDataLoading
+  } = Digit.Hooks.useRecieptSearch({
+    tenantId,
+    businessService: businessService,
+    receiptNumbers: checkRecieptNumber
+  }, {
+    retry: false,
+    staleTime: Infinity,
+    refetchOnWindowFocus: false,
+    select: dat => {
+      return dat.Payments[0];
+    },
+    enabled: allowFetchBill
+  });
+  useEffect(() => {
+    if (dataCheck && dataCheck.txnStatus && dataCheck.txnStatus !== "FAILURE") {
+      setallowFetchBill(true);
+    }
+  }, [dataCheck]);
   const mutation = Digit.Hooks.chb.useChbCreateAPI(tenantId, false);
   const FSM_EDITOR = Digit.UserService.hasAccess("FSM_EDITOR_EMP") || false;
   function onActionSelect(action) {
@@ -13951,7 +13979,7 @@ const SuccessfulPayment$1 = props => {
   } = Digit.Hooks.useCommonMDMS(tenantId, "common-masters", "ReceiptKey", {
     select: data => {
       var _data$commonMasters, _data$commonMasters$u, _data$commonMasters$u2;
-      return businessService === "GC.ONE_TIME_FEE" ? "garbage-receipt" : businessService === "rl-services" ? "rentandlease-receipt" : ((_data$commonMasters = data["common-masters"]) === null || _data$commonMasters === void 0 ? void 0 : (_data$commonMasters$u = _data$commonMasters.uiCommonPay) === null || _data$commonMasters$u === void 0 ? void 0 : (_data$commonMasters$u2 = _data$commonMasters$u.filter(({
+      return businessService === "GC.ONE_TIME_FEE" || businessService === "GC" ? "garbage-receipt" : businessService === "rl-services" ? "rentandlease-receipt" : ((_data$commonMasters = data["common-masters"]) === null || _data$commonMasters === void 0 ? void 0 : (_data$commonMasters$u = _data$commonMasters.uiCommonPay) === null || _data$commonMasters$u === void 0 ? void 0 : (_data$commonMasters$u2 = _data$commonMasters$u.filter(({
         code
       }) => businessService === null || businessService === void 0 ? void 0 : businessService.includes(code))[0]) === null || _data$commonMasters$u2 === void 0 ? void 0 : _data$commonMasters$u2.receiptKey) || "consolidatedreceipt";
     }
@@ -14120,9 +14148,10 @@ const SuccessfulPayment$1 = props => {
         const payments = await Digit.PaymentService.getReciept(tenantId, businessService, {
           receiptNumbers: receiptNumber
         });
+        const pdfPayments = fixAdjustedAmount(payments === null || payments === void 0 ? void 0 : (_payments$Payments3 = payments.Payments) === null || _payments$Payments3 === void 0 ? void 0 : _payments$Payments3[0]);
         const response = await Digit.PaymentService.generatePdf(tenantId, {
           Payments: [{
-            ...((payments === null || payments === void 0 ? void 0 : (_payments$Payments3 = payments.Payments) === null || _payments$Payments3 === void 0 ? void 0 : _payments$Payments3[0]) || {}),
+            ...pdfPayments,
             ...application
           }]
         }, generatePdfKeyForTL);
@@ -14168,16 +14197,17 @@ 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$3, _payments$Payments4, _response, _response2;
+        var _payments$Payments4, _payments$Payments$3, _response, _response2;
         const payments = await Digit.PaymentService.getReciept(tenantId, businessService, {
           receiptNumbers: receiptNumber
         });
+        const pdfPayments = fixAdjustedAmount(payments === null || payments === void 0 ? void 0 : (_payments$Payments4 = payments.Payments) === null || _payments$Payments4 === void 0 ? void 0 : _payments$Payments4[0]);
         let response = {
           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$Payments4 = payments.Payments) === null || _payments$Payments4 === void 0 ? void 0 : _payments$Payments4[0]) || {}),
+            ...pdfPayments,
             ...application
           }]
         }, "chbservice-receipt");
@@ -14740,8 +14770,7 @@ const SuccessfulPayment$1 = props => {
     });
     window.open(fileStore[response.filestoreIds[0]], "_blank");
   };
-  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;
+  if (isLoading || recieptDataLoading) return /*#__PURE__*/React.createElement(Loader, null);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(Banner, {
     message: getMessage(),
     info: t("PAYMENT_LOCALIZATION_RECIEPT_NO"),
@@ -14752,7 +14781,7 @@ const SuccessfulPayment$1 = props => {
       display: "flex",
       justifyContent: "space-evenly"
     }
-  }, businessService !== "chb-services" && businessService !== "adv-services" && businessService !== "GC.ONE_TIME_FEE" && businessService !== "pet-services" && businessService !== "NDC" && businessService !== "Challan_Generation" && businessService !== "rl-services" && !isMCollectService && /*#__PURE__*/React.createElement("div", {
+  }, businessService !== "chb-services" && businessService !== "adv-services" && businessService !== "GC.ONE_TIME_FEE" && businessService !== "GC" && businessService !== "pet-services" && businessService !== "NDC" && businessService !== "Challan_Generation" && businessService !== "rl-services" && !isMCollectService && /*#__PURE__*/React.createElement("div", {
     className: "primary-label-btn d-grid",
     style: {
       marginLeft: "unset",
@@ -14952,7 +14981,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("CS_COMMON_PRINT_RECEIPT")))) : null, businessService === "rl-services" || businessService === "GC.ONE_TIME_FEE" ? /*#__PURE__*/React.createElement("div", {
+  })), t("CS_COMMON_PRINT_RECEIPT")))) : null, businessService === "rl-services" || businessService === "GC.ONE_TIME_FEE" || businessService === "GC" ? /*#__PURE__*/React.createElement("div", {
     style: {
       display: "flex",
       justifyContent: "flex-end",
@@ -14966,7 +14995,8 @@ const SuccessfulPayment$1 = props => {
     onClick: printing ? undefined : () => printBillReceipt({
       businessService: businessService,
       receiptNumber: receiptNumber,
-      rootKey: "PAYMENTS"
+      rootKey: "PAYMENTS",
+      billOrPaymentResponse: reciept_data
     })
   }, printing ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("svg", {
     xmlns: "http://www.w3.org/2000/svg",
@@ -15549,6 +15579,46 @@ const formatDate = dateStr => {
   const [year, month, day] = dateStr.split("-");
   return `${day}/${month}/${year}`;
 };
+const REQUIRED_TAX_CODES = ["CHB_SECURITY_DEPOSIT", "SGST", "CHB_COW_CESS", "BOOKING_FEES", "CHB_DISCOUNT", "CGST"];
+const formatAmount = (value, code) => {
+  const num = Number(value) || 0;
+  if (code === "CHB_DISCOUNT") {
+    return Math.abs(num).toLocaleString("en-IN");
+  }
+  return Math.max(0, num).toLocaleString("en-IN");
+};
+const fixAdjustedAmount = (payments = {}) => ({
+  ...payments,
+  totalAmountPaid: Math.max(0, Number(payments === null || payments === void 0 ? void 0 : payments.totalAmountPaid) || 0).toLocaleString("en-IN"),
+  totalDue: Math.max(0, Number(payments === null || payments === void 0 ? void 0 : payments.totalDue) || 0).toLocaleString("en-IN"),
+  paymentDetails: ((payments === null || payments === void 0 ? void 0 : payments.paymentDetails) || []).map(pd => {
+    var _pd$bill;
+    return {
+      ...pd,
+      totalAmountPaid: Math.max(0, Number(pd === null || pd === void 0 ? void 0 : pd.totalAmountPaid) || 0).toLocaleString("en-IN"),
+      bill: {
+        ...(pd === null || pd === void 0 ? void 0 : pd.bill),
+        billDetails: ((pd === null || pd === void 0 ? void 0 : (_pd$bill = pd.bill) === null || _pd$bill === void 0 ? void 0 : _pd$bill.billDetails) || []).map(bd => {
+          var _REQUIRED_TAX_CODES$f, _ref;
+          const existing = (bd === null || bd === void 0 ? void 0 : bd.billAccountDetails) || [];
+          const existingCodes = new Set(existing === null || existing === void 0 ? void 0 : existing.map(acc => acc === null || acc === void 0 ? void 0 : acc.taxHeadCode));
+          const missing = REQUIRED_TAX_CODES === null || REQUIRED_TAX_CODES === void 0 ? void 0 : (_REQUIRED_TAX_CODES$f = REQUIRED_TAX_CODES.filter(code => !existingCodes.has(code))) === null || _REQUIRED_TAX_CODES$f === void 0 ? void 0 : _REQUIRED_TAX_CODES$f.map(code => ({
+            taxHeadCode: code,
+            adjustedAmount: formatAmount(0, code)
+          }));
+          const updatedAccounts = (_ref = [...existing, ...missing]) === null || _ref === void 0 ? void 0 : _ref.map(acc => ({
+            ...acc,
+            adjustedAmount: formatAmount(acc === null || acc === void 0 ? void 0 : acc.adjustedAmount, acc === null || acc === void 0 ? void 0 : acc.taxHeadCode)
+          }));
+          return {
+            ...bd,
+            billAccountDetails: updatedAccounts
+          };
+        })
+      }
+    };
+  })
+});
 
-export { ChallanData, PaymentLinks, PaymentModule, amountToWords, formatDate, getCurrentEpoch, getLocationName, groupKeyForCart, paymentConfigs, transformBookingResponseToBookingData };
+export { ChallanData, PaymentLinks, PaymentModule, amountToWords, fixAdjustedAmount, formatDate, getCurrentEpoch, getLocationName, groupKeyForCart, paymentConfigs, transformBookingResponseToBookingData };
 //# sourceMappingURL=index.modern.js.map