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

Tasks

This commit is contained in:
Hillel Coren 2020-10-19 18:06:04 +03:00
parent 999204f170
commit 9a297a028d
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/redux/project/project_actions.dart
View File

@ -7,6 +7,7 @@ import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/redux/project/project_selectors.dart';
import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart';
import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/completers.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
@ -279,11 +280,6 @@ void handleProjectAction(
..clientId = project.clientId)); ..clientId = project.clientId));
break; break;
case EntityAction.newInvoice: case EntityAction.newInvoice:
createEntity(
context: context,
entity: InvoiceEntity(state: state, client: client)
.rebuild((b) => b..clientId = project.clientId));
/*
final items = final items =
convertProjectToInvoiceItem(project: project, context: context); convertProjectToInvoiceItem(project: project, context: context);
createEntity( createEntity(
@ -291,8 +287,7 @@ void handleProjectAction(
entity: InvoiceEntity(state: state).rebuild((b) => b entity: InvoiceEntity(state: state).rebuild((b) => b
..hasTasks = true ..hasTasks = true
..clientId = project.clientId ..clientId = project.clientId
..lineItems.addAll(items))); ..lineItems.addAll(items)));
*/
break; break;
case EntityAction.newExpense: case EntityAction.newExpense:
createEntity( createEntity(

5
lib/ui/project/view/project_view.dart
View File

@ -41,6 +41,7 @@ class _ProjectViewState extends State<ProjectView>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final viewModel = widget.viewModel; final viewModel = widget.viewModel;
final state = viewModel.state;
final project = viewModel.project; final project = viewModel.project;
final localization = AppLocalization.of(context); final localization = AppLocalization.of(context);
final documents = project.documents; final documents = project.documents;
@ -89,7 +90,9 @@ class _ProjectViewState extends State<ProjectView>
BottomButtons( BottomButtons(
entity: project, entity: project,
action1: EntityAction.newTask, action1: EntityAction.newTask,
action2: EntityAction.archive, action2: state.company.isModuleEnabled(EntityType.expense)
? EntityAction.newExpense
: EntityAction.newInvoice,
), ),
], ],
); );