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

Expenses

This commit is contained in:
Hillel Coren 2019-06-12 18:39:04 +03:00
parent c7191bf202
commit b45ffe6bd3
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/redux/client/client_middleware.dart
View File

@ -69,9 +69,6 @@ Middleware<AppState> _viewClientList() {
store.dispatch(UpdateCurrentRoute(ClientScreen.route)); store.dispatch(UpdateCurrentRoute(ClientScreen.route));
//Navigator.of(action.context).pushNamedAndRemoveUntil(
// ClientScreen.route, ModalRoute.withName(DashboardScreen.route));
Navigator.of(action.context).pushNamedAndRemoveUntil( Navigator.of(action.context).pushNamedAndRemoveUntil(
ClientScreen.route, (Route<dynamic> route) => false); ClientScreen.route, (Route<dynamic> route) => false);
}; };

2
lib/ui/client/edit/client_edit_vm.dart
View File

@ -11,6 +11,7 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart';
import 'package:invoiceninja_flutter/ui/client/client_screen.dart'; import 'package:invoiceninja_flutter/ui/client/client_screen.dart';
import 'package:invoiceninja_flutter/ui/client/edit/client_edit.dart'; import 'package:invoiceninja_flutter/ui/client/edit/client_edit.dart';
import 'package:invoiceninja_flutter/ui/client/view/client_view_vm.dart'; import 'package:invoiceninja_flutter/ui/client/view/client_view_vm.dart';
import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_vm.dart';
import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart';
import 'package:invoiceninja_flutter/ui/project/edit/project_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/project/edit/project_edit_vm.dart';
import 'package:invoiceninja_flutter/ui/quote/edit/quote_edit_vm.dart'; import 'package:invoiceninja_flutter/ui/quote/edit/quote_edit_vm.dart';
@ -109,6 +110,7 @@ class ClientEditVM {
QuoteEditScreen.route, QuoteEditScreen.route,
ProjectEditScreen.route, ProjectEditScreen.route,
TaskEditScreen.route, TaskEditScreen.route,
ExpenseEditScreen.route,
].contains(store.state.uiState.currentRoute)) { ].contains(store.state.uiState.currentRoute)) {
Navigator.of(context).pop(savedClient); Navigator.of(context).pop(savedClient);
} else { } else {

15
lib/ui/vendor/edit/vendor_edit_vm.dart vendored
View File

@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
import 'package:invoiceninja_flutter/ui/vendor/vendor_screen.dart'; import 'package:invoiceninja_flutter/ui/vendor/vendor_screen.dart';
import 'package:invoiceninja_flutter/ui/expense/edit/expense_edit_vm.dart';
import 'package:redux/redux.dart'; import 'package:redux/redux.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart'; import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart';
@ -70,10 +71,18 @@ class VendorEditVM {
store.dispatch(SaveVendorRequest(completer: completer, vendor: vendor)); store.dispatch(SaveVendorRequest(completer: completer, vendor: vendor));
return completer.future.then((_) { return completer.future.then((_) {
return completer.future.then((savedVendor) { return completer.future.then((savedVendor) {
store.dispatch(UpdateCurrentRoute(VendorViewScreen.route)); if (state.uiState.currentRoute.contains(VendorScreen.route)) {
store.dispatch(UpdateCurrentRoute(VendorViewScreen.route));
}
if (vendor.isNew) { if (vendor.isNew) {
Navigator.of(context) if ([
.pushReplacementNamed(VendorViewScreen.route); ExpenseEditScreen.route,
].contains(store.state.uiState.currentRoute)) {
Navigator.of(context).pop(savedVendor);
} else {
Navigator.of(context)
.pushReplacementNamed(VendorViewScreen.route);
}
} else { } else {
Navigator.of(context).pop(savedVendor); Navigator.of(context).pop(savedVendor);
} }