Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Correct upgrade banner

This commit is contained in:
Hillel Coren 2022-08-04 15:48:42 +03:00
parent 685f9b7d2e
commit 35cf4edcf5
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/ui/app/menu_drawer.dart
View File

@ -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/reports/reports_actions.dart';
import 'package:invoiceninja_flutter/redux/settings/settings_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/sms_verification.dart';
import 'package:invoiceninja_flutter/ui/app/upgrade_dialog.dart';
import 'package:invoiceninja_flutter/utils/app_review.dart'; import 'package:invoiceninja_flutter/utils/app_review.dart';
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
import 'package:pointer_interceptor/pointer_interceptor.dart'; import 'package:pointer_interceptor/pointer_interceptor.dart';
@ -480,7 +479,13 @@ class _MenuDrawerState extends State<MenuDrawer> {
const EdgeInsets.only(left: 12), const EdgeInsets.only(left: 12),
tileColor: Colors.green, tileColor: Colors.green,
leading: IconButton( leading: IconButton(
onPressed: () => null, onPressed: () => store.dispatch(
ViewSettings(
clearFilter: true,
company: company,
user: state.user,
section:
kSettingsAccountManagement)),
icon: Icon( icon: Icon(
Icons.arrow_circle_up, Icons.arrow_circle_up,
color: Colors.white, color: Colors.white,
@ -499,18 +504,18 @@ class _MenuDrawerState extends State<MenuDrawer> {
), ),
), ),
onTap: () { onTap: () {
/*
showDialog<void>( showDialog<void>(
context: context, context: context,
builder: (BuildContext context) => builder: (BuildContext context) =>
UpgradeDialog()); UpgradeDialog());
*/
/*
store.dispatch(ViewSettings( store.dispatch(ViewSettings(
clearFilter: true, clearFilter: true,
company: company, company: company,
user: state.user, user: state.user,
section: kSettingsAccountManagement)); section: kSettingsAccountManagement));
*/
}, },
), ),
), ),

1
lib/ui/reports/reports_screen.dart
View File

@ -113,6 +113,7 @@ class ReportsScreen extends StatelessWidget {
kReportProfitAndLoss, kReportProfitAndLoss,
kReportTask, kReportTask,
if (state.company.isModuleEnabled(EntityType.vendor)) ...[ if (state.company.isModuleEnabled(EntityType.vendor)) ...[
kReportVendor,
if (state.company.isModuleEnabled(EntityType.purchaseOrder)) if (state.company.isModuleEnabled(EntityType.purchaseOrder))
kReportPurchaseOrder, kReportPurchaseOrder,
], ],

11
lib/ui/reports/reports_screen_vm.dart
View File

@ -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/purchase_order_report.dart';
import 'package:invoiceninja_flutter/ui/reports/recurring_expense_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/recurring_invoice_report.dart';
import 'package:invoiceninja_flutter/ui/reports/vendor_report.dart';
import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart';
import 'package:memoize/memoize.dart'; import 'package:memoize/memoize.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
@ -325,6 +326,16 @@ class ReportsScreenVM {
state.staticState, state.staticState,
); );
break; 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( final groupTotals = memoizeedGroupTotals(