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

Transaction rules

This commit is contained in:
Hillel Coren 2022-11-21 22:05:47 +02:00
parent 31d1fee253
commit 24105cc873
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/redux/expense_category/expense_category_selectors.dart
View File

@ -13,9 +13,9 @@ var memoizedDropdownExpenseCategoryList = memo5(
BuiltList<String> expenseCategoryList,
StaticState staticState,
BuiltMap<String, UserEntity> userMap,
String clientId) =>
String categoryId) =>
dropdownExpenseCategoriesSelector(expenseCategoryMap,
expenseCategoryList, staticState, userMap, clientId));
expenseCategoryList, staticState, userMap, categoryId));
List<String> dropdownExpenseCategoriesSelector(
BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,

29
lib/ui/transaction_rule/edit/transaction_rule_edit.dart
View File

@ -1,8 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/data/models/entities.dart';
import 'package:invoiceninja_flutter/data/models/expense_category_model.dart';
import 'package:invoiceninja_flutter/data/models/vendor_model.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/redux/expense_category/expense_category_actions.dart';
import 'package:invoiceninja_flutter/redux/expense_category/expense_category_selectors.dart';
import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart';
import 'package:invoiceninja_flutter/redux/vendor/vendor_selectors.dart';
import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart';
@ -119,7 +122,7 @@ class _TransactionRuleEditState extends State<TransactionRuleEdit> {
labelText: localization.vendor,
onSelected: (vendor) {
viewModel.onChanged(transactionRule
.rebuild((b) => b..vendorId = vendor.id));
.rebuild((b) => b..vendorId = vendor?.id ?? ''));
},
onCreateNew: (completer, name) {
store.dispatch(SaveVendorRequest(
@ -127,7 +130,29 @@ class _TransactionRuleEditState extends State<TransactionRuleEdit> {
VendorEntity().rebuild((b) => b..name = name),
completer: completer));
},
)
),
EntityDropdown(
entityType: EntityType.expenseCategory,
entityId: transactionRule.categoryId,
entityList: memoizedDropdownExpenseCategoryList(
state.expenseCategoryState.map,
state.expenseCategoryState.list,
state.staticState,
state.userState.map,
transactionRule.categoryId,
),
labelText: localization.category,
onSelected: (category) {
viewModel.onChanged(transactionRule.rebuild(
(b) => b..categoryId = category?.id ?? ''));
},
onCreateNew: (completer, name) {
store.dispatch(SaveExpenseCategoryRequest(
expenseCategory: ExpenseCategoryEntity()
.rebuild((b) => b..name = name),
completer: completer));
},
),
],
),
],