diff --git a/business-services/billing-service/src/main/java/org/egov/demand/service/DemandService.java b/business-services/billing-service/src/main/java/org/egov/demand/service/DemandService.java index fc68a687b..2a3467e3b 100644 --- a/business-services/billing-service/src/main/java/org/egov/demand/service/DemandService.java +++ b/business-services/billing-service/src/main/java/org/egov/demand/service/DemandService.java @@ -250,12 +250,13 @@ public DemandResponse updateAsync(DemandRequest demandRequest, PaymentBackUpdate */ newDemands.add(demand); } else { - AuditDetails currAuditDetails = demand.getAuditDetails(); - if (currAuditDetails != null) { - auditDetail.setCreatedTime(currAuditDetails.getCreatedTime()); - auditDetail.setCreatedBy(currAuditDetails.getCreatedBy()); + AuditDetails updateAuditDetail = util.getAuditDetail(requestInfo); + AuditDetails demandAuditDetails = demand.getAuditDetails(); + if (demandAuditDetails != null) { + updateAuditDetail.setCreatedTime(demandAuditDetails.getCreatedTime()); + updateAuditDetail.setCreatedBy(demandAuditDetails.getCreatedBy()); } - demand.setAuditDetails(auditDetail); + demand.setAuditDetails(updateAuditDetail); for (DemandDetail detail : demand.getDemandDetails()) { if (StringUtils.isEmpty(detail.getId())) { @@ -265,7 +266,13 @@ public DemandResponse updateAsync(DemandRequest demandRequest, PaymentBackUpdate detail.setId(UUID.randomUUID().toString()); detail.setCollectionAmount(BigDecimal.ZERO); } - detail.setAuditDetails(auditDetail); + AuditDetails demandDetailAuditDetail = detail.getAuditDetails(); + if (demandDetailAuditDetail != null) { + updateAuditDetail.setCreatedTime(demandDetailAuditDetail.getCreatedTime()); + updateAuditDetail.setCreatedBy(demandDetailAuditDetail.getCreatedBy()); + } + + detail.setAuditDetails(updateAuditDetail); detail.setDemandId(demandId); detail.setTenantId(demand.getTenantId()); } diff --git a/frontend/mgramseva/lib/screeens/reports/monthly_ledger_report.dart b/frontend/mgramseva/lib/screeens/reports/monthly_ledger_report.dart index 90f3f5c02..03a6bf054 100644 --- a/frontend/mgramseva/lib/screeens/reports/monthly_ledger_report.dart +++ b/frontend/mgramseva/lib/screeens/reports/monthly_ledger_report.dart @@ -89,21 +89,24 @@ class _MonthlyLedgerReportState extends State SizedBox( width: 10, ), - TextButton.icon( - onPressed: () { - if (reportProvider.selectedBillPeriod == null) { - Notifiers.getToastMessage( - context, - '${ApplicationLocalizations.of(context).translate(i18.common.SELECT_BILLING_CYCLE)}', - 'ERROR'); - } else { - reportProvider.getMonthlyLedgerReport( - download: true); - } - }, - icon: Icon(Icons.download_sharp), - label: Text(ApplicationLocalizations.of(context) - .translate(i18.common.CORE_DOWNLOAD))), + Opacity( + opacity: 0, + child: TextButton.icon( + onPressed: () { + // if (reportProvider.selectedBillPeriod == null) { + // Notifiers.getToastMessage( + // context, + // '${ApplicationLocalizations.of(context).translate(i18.common.SELECT_BILLING_CYCLE)}', + // 'ERROR'); + // } else { + // reportProvider.getMonthlyLedgerReport( + // download: true); + // } + }, + icon: Icon(Icons.download_sharp), + label: Text(ApplicationLocalizations.of(context) + .translate(i18.common.CORE_DOWNLOAD))), + ), ], ), ],