Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

Merging Develop into Master #970

Merged
merged 20 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions build/build-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,6 @@ config:
dockerfile: "build/maven/Dockerfile"
- work-dir: "core-services/boundary-service/src/main/resources/db"
image-name: "boundary-service-db"

- name: "builds/mGramSeva/utilities/egov-bff"
build:
- work-dir: "utilities/boundary-bulk-bff"
image-name: "boundary-bulk-bff"
- work-dir: "utilities/boundary-bulk-bff/migration"
image-name: "boundary-bulk-bff-db"

- name: "builds/mGramSeva/core-services/user-otp"
build:
- work-dir: "core-services/user-otp"
Expand Down
33 changes: 15 additions & 18 deletions frontend/mgramseva/lib/screeens/reports/monthly_ledger_report.dart
Original file line number Diff line number Diff line change
Expand Up @@ -89,24 +89,21 @@ class _MonthlyLedgerReportState extends State<MonthlyLedgerReport>
SizedBox(
width: 10,
),
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))),
),
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))),
],
),
],
Expand Down
Loading
Loading