This commit is contained in:
Hillel Coren 2020-06-03 21:08:26 +03:00
parent dd4149f7e2
commit fd0057a33c
2 changed files with 15 additions and 1 deletions

View File

@ -36,7 +36,7 @@ class EntityListTile extends StatelessWidget {
state.uiState.filterEntityType == entity.entityType;
Widget trailingIcon = Icon(Icons.navigate_next);
if (isNotMobile(context) && !isFilter) {
if (isNotMobile(context) && isFilter != null && !isFilter) {
trailingIcon = Icon(Icons.filter_list,
color: isFilteredBy ? Theme.of(context).accentColor : null);
}

View File

@ -3,6 +3,7 @@ import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/data/models/entities.dart';
import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/data/models/quote_model.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/redux/payment/payment_selectors.dart';
import 'package:invoiceninja_flutter/ui/app/FieldGrid.dart';
@ -114,6 +115,19 @@ class InvoiceOverview extends StatelessWidget {
),
);
if (invoice.subEntityType == EntityType.quote ||
invoice.subEntityType == EntityType.credit) {
final relatedInvoice = state.invoiceState.map[invoice.invoiceId] ??
InvoiceEntity(id: invoice.invoiceId);
if ((invoice.invoiceId ?? '').isNotEmpty) {
widgets.add(EntityListTile(
isFilter: null,
entity: relatedInvoice,
onTap: () => viewEntity(context: context, entity: relatedInvoice),
));
}
}
if (payments.isNotEmpty) {
payments.forEach((payment) {
widgets.add(