diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart index 31998e24c..c6f841703 100644 --- a/lib/ui/app/menu_drawer.dart +++ b/lib/ui/app/menu_drawer.dart @@ -13,7 +13,6 @@ import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_actions.dart'; import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/ui/app/sms_verification.dart'; -import 'package:invoiceninja_flutter/ui/app/upgrade_dialog.dart'; import 'package:invoiceninja_flutter/utils/app_review.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:pointer_interceptor/pointer_interceptor.dart'; @@ -480,7 +479,13 @@ class _MenuDrawerState extends State { const EdgeInsets.only(left: 12), tileColor: Colors.green, leading: IconButton( - onPressed: () => null, + onPressed: () => store.dispatch( + ViewSettings( + clearFilter: true, + company: company, + user: state.user, + section: + kSettingsAccountManagement)), icon: Icon( Icons.arrow_circle_up, color: Colors.white, @@ -499,18 +504,18 @@ class _MenuDrawerState extends State { ), ), onTap: () { + /* showDialog( context: context, builder: (BuildContext context) => UpgradeDialog()); + */ - /* store.dispatch(ViewSettings( clearFilter: true, company: company, user: state.user, section: kSettingsAccountManagement)); - */ }, ), ), diff --git a/lib/ui/reports/reports_screen.dart b/lib/ui/reports/reports_screen.dart index a5f3f8619..e297dc04d 100644 --- a/lib/ui/reports/reports_screen.dart +++ b/lib/ui/reports/reports_screen.dart @@ -113,6 +113,7 @@ class ReportsScreen extends StatelessWidget { kReportProfitAndLoss, kReportTask, if (state.company.isModuleEnabled(EntityType.vendor)) ...[ + kReportVendor, if (state.company.isModuleEnabled(EntityType.purchaseOrder)) kReportPurchaseOrder, ], diff --git a/lib/ui/reports/reports_screen_vm.dart b/lib/ui/reports/reports_screen_vm.dart index 655704ace..e6d55c24a 100644 --- a/lib/ui/reports/reports_screen_vm.dart +++ b/lib/ui/reports/reports_screen_vm.dart @@ -14,6 +14,7 @@ import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:invoiceninja_flutter/ui/reports/purchase_order_report.dart'; import 'package:invoiceninja_flutter/ui/reports/recurring_expense_report.dart'; import 'package:invoiceninja_flutter/ui/reports/recurring_invoice_report.dart'; +import 'package:invoiceninja_flutter/ui/reports/vendor_report.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:memoize/memoize.dart'; import 'package:path_provider/path_provider.dart'; @@ -325,6 +326,16 @@ class ReportsScreenVM { state.staticState, ); break; + case kReportVendor: + reportResult = memoizedVendorReport( + state.userCompany, + state.uiState.reportsUIState, + state.vendorState.map, + state.userState.map, + state.groupState.map, + state.staticState, + ); + break; } final groupTotals = memoizeedGroupTotals(