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

Remove cancelled invoices from dashboard

This commit is contained in:
Hillel Coren 2021-09-12 18:16:30 +03:00
parent 1567611d93
commit 3ac894633e
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/data/models/payment_model.dart
View File

@ -450,6 +450,11 @@ abstract class PaymentEntity extends Object
bool get isOnline => (companyGatewayId ?? '').isNotEmpty;
bool get isCompletedOrPartiallyRefunded => [
kPaymentStatusCompleted,
kPaymentStatusPartiallyRefunded
].contains(statusId);
@override
FormatNumberType get listDisplayAmountType => FormatNumberType.money;

9
lib/redux/dashboard/dashboard_selectors.dart
View File

@ -83,7 +83,10 @@ List<ChartDataGroup> _chartInvoices({
final client =
clientMap[invoice.clientId] ?? ClientEntity(id: invoice.clientId);
if (!invoice.isSent || invoice.isDeleted || client.isDeleted) {
if (!invoice.isSent ||
invoice.isDeleted ||
invoice.isCancelledOrReversed ||
client.isDeleted) {
// skip it
} else if (!invoice.isBetween(
settings.startDate(company), settings.endDate(company))) {
@ -380,7 +383,9 @@ List<ChartDataGroup> chartPayments(
clientMap[payment.clientId] ?? ClientEntity(id: payment.clientId);
final date = payment.date;
if (payment.isDeleted || client.isDeleted) {
if (payment.isDeleted ||
!payment.isCompletedOrPartiallyRefunded ||
client.isDeleted) {
// skip it
} else if (!payment.isBetween(
settings.startDate(company), settings.endDate(company))) {