Remove cancelled invoices from dashboard
This commit is contained in:
parent
1567611d93
commit
3ac894633e
|
|
@ -450,6 +450,11 @@ abstract class PaymentEntity extends Object
|
||||||
|
|
||||||
bool get isOnline => (companyGatewayId ?? '').isNotEmpty;
|
bool get isOnline => (companyGatewayId ?? '').isNotEmpty;
|
||||||
|
|
||||||
|
bool get isCompletedOrPartiallyRefunded => [
|
||||||
|
kPaymentStatusCompleted,
|
||||||
|
kPaymentStatusPartiallyRefunded
|
||||||
|
].contains(statusId);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
FormatNumberType get listDisplayAmountType => FormatNumberType.money;
|
FormatNumberType get listDisplayAmountType => FormatNumberType.money;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,10 @@ List<ChartDataGroup> _chartInvoices({
|
||||||
final client =
|
final client =
|
||||||
clientMap[invoice.clientId] ?? ClientEntity(id: invoice.clientId);
|
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
|
// skip it
|
||||||
} else if (!invoice.isBetween(
|
} else if (!invoice.isBetween(
|
||||||
settings.startDate(company), settings.endDate(company))) {
|
settings.startDate(company), settings.endDate(company))) {
|
||||||
|
|
@ -380,7 +383,9 @@ List<ChartDataGroup> chartPayments(
|
||||||
clientMap[payment.clientId] ?? ClientEntity(id: payment.clientId);
|
clientMap[payment.clientId] ?? ClientEntity(id: payment.clientId);
|
||||||
final date = payment.date;
|
final date = payment.date;
|
||||||
|
|
||||||
if (payment.isDeleted || client.isDeleted) {
|
if (payment.isDeleted ||
|
||||||
|
!payment.isCompletedOrPartiallyRefunded ||
|
||||||
|
client.isDeleted) {
|
||||||
// skip it
|
// skip it
|
||||||
} else if (!payment.isBetween(
|
} else if (!payment.isBetween(
|
||||||
settings.startDate(company), settings.endDate(company))) {
|
settings.startDate(company), settings.endDate(company))) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue