@mseva/digit-ui-module-challangeneration 1.0.30 → 1.0.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6040,13 +6040,13 @@ const ChallanData = (tenantId, consumerCode) => {
6040
6040
  const getLocationName = async (lat, lng) => {
6041
6041
  try {
6042
6042
  if (lat == null || lng == null || lat === 0 && lng === 0) {
6043
- return "Address not provided";
6043
+ return null;
6044
6044
  }
6045
6045
  const res = await fetch(`https://nominatim.openstreetmap.org/reverse?format=json&lat=${lat}&lon=${lng}`);
6046
6046
  const data = await res.json();
6047
- return (data === null || data === void 0 ? void 0 : data.display_name) || "Address not provided";
6047
+ return (data === null || data === void 0 ? void 0 : data.display_name) || null;
6048
6048
  } catch {
6049
- return "Address not provided";
6049
+ return null;
6050
6050
  }
6051
6051
  };
6052
6052
  const stringReplaceAll = (str = "", searcher = "", replaceWith = "") => {
@@ -10240,7 +10240,7 @@ function NewApplicationTimeline({
10240
10240
  }))), /*#__PURE__*/React.createElement("div", {
10241
10241
  className: "custom-timeline-entries"
10242
10242
  }, sortedData === null || sortedData === void 0 ? void 0 : sortedData.map((item, index) => {
10243
- var _item$auditDetails, _item$auditDetails2, _item$assigner2, _item$assigner3, _item$assigner4, _item$assigner5, _item$assigner6, _item$wfComment, _item$wfComment2, _item$wfComment3, _item$assignes, _item$assignes$, _item$assignes$2, _item$assignes$3, _item$wfDocuments, _item$wfDocuments2;
10243
+ var _item$auditDetails, _item$auditDetails2, _item$assigner2, _item$assigner3, _item$assigner4, _item$wfComment, _item$wfComment2, _item$wfComment3, _item$assignes, _item$assignes$, _item$assignes$2, _item$assignes$3, _item$wfDocuments, _item$wfDocuments2;
10244
10244
  return /*#__PURE__*/React.createElement("div", {
10245
10245
  key: index,
10246
10246
  className: "custom-timeline-entry"
@@ -10277,13 +10277,9 @@ function NewApplicationTimeline({
10277
10277
  className: "custom-officer-info"
10278
10278
  }, /*#__PURE__*/React.createElement("div", {
10279
10279
  className: "custom-officer-name"
10280
- }, (item === null || item === void 0 ? void 0 : (_item$assigner2 = item.assigner) === null || _item$assigner2 === void 0 ? void 0 : _item$assigner2.name) || t("CS_COMMON_NA"), deptMap[item === null || item === void 0 ? void 0 : (_item$assigner3 = item.assigner) === null || _item$assigner3 === void 0 ? void 0 : _item$assigner3.userName] && /*#__PURE__*/React.createElement("span", {
10280
+ }, (item === null || item === void 0 ? void 0 : (_item$assigner2 = item.assigner) === null || _item$assigner2 === void 0 ? void 0 : _item$assigner2.name) || t("CS_COMMON_NA")), deptMap[item === null || item === void 0 ? void 0 : (_item$assigner3 = item.assigner) === null || _item$assigner3 === void 0 ? void 0 : _item$assigner3.userName] && /*#__PURE__*/React.createElement("div", {
10281
10281
  className: "custom-officer-name"
10282
- }, "- ", t(deptMap[item === null || item === void 0 ? void 0 : (_item$assigner4 = item.assigner) === null || _item$assigner4 === void 0 ? void 0 : _item$assigner4.userName]))), (item === null || item === void 0 ? void 0 : (_item$assigner5 = item.assigner) === null || _item$assigner5 === void 0 ? void 0 : _item$assigner5.emailId) && /*#__PURE__*/React.createElement("div", {
10283
- className: "custom-officer-email"
10284
- }, /*#__PURE__*/React.createElement("span", {
10285
- className: "custom-email-label"
10286
- }, t("Email")), " ", item === null || item === void 0 ? void 0 : (_item$assigner6 = item.assigner) === null || _item$assigner6 === void 0 ? void 0 : _item$assigner6.emailId))), /*#__PURE__*/React.createElement("div", {
10282
+ }, t(deptMap[item === null || item === void 0 ? void 0 : (_item$assigner4 = item.assigner) === null || _item$assigner4 === void 0 ? void 0 : _item$assigner4.userName])))), /*#__PURE__*/React.createElement("div", {
10287
10283
  className: "custom-card-column custom-card-column-mid"
10288
10284
  }, (item === null || item === void 0 ? void 0 : item.sla) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("h3", {
10289
10285
  className: "custom-action-title"
@@ -10486,15 +10482,28 @@ const ChallanApplicationDetails = () => {
10486
10482
  }) {
10487
10483
  setLoader(true);
10488
10484
  try {
10489
- var _applicationDetails$c, _applicationDetails$c2, _applicationDetails$c3, _applicationDetails$c4, _applicationDetails$c5, _applicationDetails$c6, _applicationDetails$A, _applicationDetails$A2;
10485
+ var _applicationDetails$c, _challanDetails$addit, _challanDetails$addit2, _challanDetails$addre, _applicationDetails$A, _applicationDetails$A2;
10490
10486
  const applicationDetails = await Digit.ChallanGenerationService.search({
10491
10487
  tenantId,
10492
10488
  filters: {
10493
10489
  challanNo: acknowledgementIds
10494
10490
  }
10495
10491
  });
10496
- 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);
10497
- console.log("location", location);
10492
+ const challanDetails = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$c = applicationDetails.challans) === null || _applicationDetails$c === void 0 ? void 0 : _applicationDetails$c[0];
10493
+ const latitude = challanDetails === null || challanDetails === void 0 ? void 0 : (_challanDetails$addit = challanDetails.additionalDetail) === null || _challanDetails$addit === void 0 ? void 0 : _challanDetails$addit.latitude;
10494
+ const longitude = challanDetails === null || challanDetails === void 0 ? void 0 : (_challanDetails$addit2 = challanDetails.additionalDetail) === null || _challanDetails$addit2 === void 0 ? void 0 : _challanDetails$addit2.longitude;
10495
+ const addressFallback = challanDetails === null || challanDetails === void 0 ? void 0 : (_challanDetails$addre = challanDetails.address) === null || _challanDetails$addre === void 0 ? void 0 : _challanDetails$addre.addressLine1;
10496
+ let location = addressFallback;
10497
+ if (latitude && longitude) {
10498
+ try {
10499
+ const geoLocation = await getLocationName(latitude, longitude);
10500
+ if (geoLocation) {
10501
+ location = geoLocation;
10502
+ }
10503
+ } catch (err) {
10504
+ console.warn("Reverse geocoding failed, using address fallback", err);
10505
+ }
10506
+ }
10498
10507
  const challan = {
10499
10508
  ...applicationDetails,
10500
10509
  ...challanEmpData
@@ -13645,6 +13654,7 @@ const ChallanApplicationDetails$1 = () => {
13645
13654
  setChallanData(responseData === null || responseData === void 0 ? void 0 : (_responseData$challan = responseData.challans) === null || _responseData$challan === void 0 ? void 0 : _responseData$challan[0]);
13646
13655
  setLoader(false);
13647
13656
  } catch (error) {
13657
+ console.log("error", error);
13648
13658
  setLoader(false);
13649
13659
  }
13650
13660
  };
@@ -13705,14 +13715,29 @@ const ChallanApplicationDetails$1 = () => {
13705
13715
  if (chbPermissionLoading) return;
13706
13716
  setChbPermissionLoading(true);
13707
13717
  try {
13708
- var _applicationDetails$c, _applicationDetails$c2, _applicationDetails$c3, _applicationDetails$c4, _applicationDetails$c5, _applicationDetails$c6, _applicationDetails$A, _applicationDetails$A2;
13718
+ var _applicationDetails$c, _challanDetails$addit, _challanDetails$addit2, _challanDetails$addre, _applicationDetails$A, _applicationDetails$A2;
13709
13719
  const applicationDetails = await Digit.ChallanGenerationService.search({
13710
13720
  tenantId,
13711
13721
  filters: {
13712
13722
  challanNo: acknowledgementIds
13713
13723
  }
13714
13724
  });
13715
- 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);
13725
+ const challanDetails = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$c = applicationDetails.challans) === null || _applicationDetails$c === void 0 ? void 0 : _applicationDetails$c[0];
13726
+ const latitude = challanDetails === null || challanDetails === void 0 ? void 0 : (_challanDetails$addit = challanDetails.additionalDetail) === null || _challanDetails$addit === void 0 ? void 0 : _challanDetails$addit.latitude;
13727
+ const longitude = challanDetails === null || challanDetails === void 0 ? void 0 : (_challanDetails$addit2 = challanDetails.additionalDetail) === null || _challanDetails$addit2 === void 0 ? void 0 : _challanDetails$addit2.longitude;
13728
+ const addressFallback = challanDetails === null || challanDetails === void 0 ? void 0 : (_challanDetails$addre = challanDetails.address) === null || _challanDetails$addre === void 0 ? void 0 : _challanDetails$addre.addressLine1;
13729
+ let location = addressFallback;
13730
+ if (latitude && longitude) {
13731
+ try {
13732
+ const geoLocation = await getLocationName(latitude, longitude);
13733
+ if (geoLocation) {
13734
+ location = geoLocation;
13735
+ }
13736
+ } catch (err) {
13737
+ console.warn("Reverse geocoding failed, using address fallback", err);
13738
+ }
13739
+ }
13740
+ console.log("location", location);
13716
13741
  const challan = {
13717
13742
  ...applicationDetails,
13718
13743
  ...challanEmpData
@@ -13795,6 +13820,7 @@ const ChallanApplicationDetails$1 = () => {
13795
13820
  });
13796
13821
  }
13797
13822
  function onActionSelect(action) {
13823
+ console.log("action", action);
13798
13824
  if (action.action == "PAY") {
13799
13825
  const code = getChallanData === null || getChallanData === void 0 ? void 0 : getChallanData.challanNo;
13800
13826
  history.push(`/digit-ui/employee/payment/collect/Challan_Generation/${code}/${tenantId}?tenantId=${tenantId}`);
@@ -13807,6 +13833,7 @@ const ChallanApplicationDetails$1 = () => {
13807
13833
  }
13808
13834
  const payLater = async () => {
13809
13835
  setLoader(true);
13836
+ console.log("pay later", getChallanData);
13810
13837
  const payload = {
13811
13838
  Challan: {
13812
13839
  ...getChallanData,
@@ -13831,6 +13858,7 @@ const ChallanApplicationDetails$1 = () => {
13831
13858
  };
13832
13859
  const submitAction = async modalData => {
13833
13860
  var _getChallanData$amoun, _getChallanData$amoun2;
13861
+ console.log("modalData", modalData);
13834
13862
  if (!(modalData !== null && modalData !== void 0 && modalData.amount)) {
13835
13863
  setErrorOne(`Please Enter Amount`);
13836
13864
  setShowErrorToastt(true);
@@ -13847,6 +13875,7 @@ const ChallanApplicationDetails$1 = () => {
13847
13875
  setShowErrorToastt(true);
13848
13876
  setError(`Amount must be less than or equal to ${finalAmount}`);
13849
13877
  } else {
13878
+ console.log("nothing");
13850
13879
  setLoader(true);
13851
13880
  const payload = {
13852
13881
  Challan: {
@@ -13858,6 +13887,7 @@ const ChallanApplicationDetails$1 = () => {
13858
13887
  feeWaiver: modalData === null || modalData === void 0 ? void 0 : modalData.amount
13859
13888
  }
13860
13889
  };
13890
+ console.log("payload", payload);
13861
13891
  try {
13862
13892
  const response = await Digit.ChallanGenerationService.update(payload);
13863
13893
  setLoader(false);
@@ -15449,6 +15479,8 @@ const ChallanStepperForm = () => {
15449
15479
  } = Digit.Hooks.useCustomMDMS(tenantId, "Challan", [{
15450
15480
  name: "Acts"
15451
15481
  }]);
15482
+ console.log("subCategoryData", subCategoryData);
15483
+ console.log("OffenceTypeData", OffenceTypeData);
15452
15484
  const {
15453
15485
  control,
15454
15486
  handleSubmit,
@@ -15475,6 +15507,7 @@ const ChallanStepperForm = () => {
15475
15507
  var _docData$Challan, _docData$Challan$Docu, _data$offenceType, _data$offenceCategory, _data$offenceSubCateg, _documentsData$docume2, _documentsData$docume3, _documentsData$docume4, _documentsData$docume5;
15476
15508
  let missingDocs = [];
15477
15509
  const actString = getActs(data === null || data === void 0 ? void 0 : data.offenceType, OffenceActData);
15510
+ console.log("Resolved Act(s):", actString);
15478
15511
  docData === null || docData === void 0 ? void 0 : (_docData$Challan = docData.Challan) === null || _docData$Challan === void 0 ? void 0 : (_docData$Challan$Docu = _docData$Challan.Documents) === null || _docData$Challan$Docu === void 0 ? void 0 : _docData$Challan$Docu.forEach(doc => {
15479
15512
  if (doc.required) {
15480
15513
  var _documentsData$docume;
@@ -16532,14 +16565,28 @@ const ChallanResponseCitizen = props => {
16532
16565
  if (chbPermissionLoading) return;
16533
16566
  setChbPermissionLoading(true);
16534
16567
  try {
16535
- var _applicationDetails$c, _applicationDetails$c2, _applicationDetails$c3, _applicationDetails$c4, _applicationDetails$c5, _applicationDetails$c6, _applicationDetails$A, _applicationDetails$A2;
16568
+ var _applicationDetails$c, _challanDetails$addit, _challanDetails$addit2, _challanDetails$addre, _applicationDetails$A, _applicationDetails$A2;
16536
16569
  const applicationDetails = await Digit.ChallanGenerationService.search({
16537
16570
  tenantId,
16538
16571
  filters: {
16539
16572
  challanNo: ndcCode
16540
16573
  }
16541
16574
  });
16542
- 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);
16575
+ const challanDetails = applicationDetails === null || applicationDetails === void 0 ? void 0 : (_applicationDetails$c = applicationDetails.challans) === null || _applicationDetails$c === void 0 ? void 0 : _applicationDetails$c[0];
16576
+ const latitude = challanDetails === null || challanDetails === void 0 ? void 0 : (_challanDetails$addit = challanDetails.additionalDetail) === null || _challanDetails$addit === void 0 ? void 0 : _challanDetails$addit.latitude;
16577
+ const longitude = challanDetails === null || challanDetails === void 0 ? void 0 : (_challanDetails$addit2 = challanDetails.additionalDetail) === null || _challanDetails$addit2 === void 0 ? void 0 : _challanDetails$addit2.longitude;
16578
+ const addressFallback = challanDetails === null || challanDetails === void 0 ? void 0 : (_challanDetails$addre = challanDetails.address) === null || _challanDetails$addre === void 0 ? void 0 : _challanDetails$addre.addressLine1;
16579
+ let location = addressFallback;
16580
+ if (latitude && longitude) {
16581
+ try {
16582
+ const geoLocation = await getLocationName(latitude, longitude);
16583
+ if (geoLocation) {
16584
+ location = geoLocation;
16585
+ }
16586
+ } catch (err) {
16587
+ console.warn("Reverse geocoding failed, using address fallback", err);
16588
+ }
16589
+ }
16543
16590
  console.log('location', location);
16544
16591
  const challan = {
16545
16592
  ...applicationDetails,