diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart index 352325876..f769882e3 100644 --- a/lib/data/models/invoice_model.dart +++ b/lib/data/models/invoice_model.dart @@ -800,7 +800,8 @@ abstract class InvoiceEntity extends Object double get requestedAmount => partial > 0 ? partial : amount; - bool get isRunning => isRecurring && statusId == kRecurringInvoiceStatusActive; + bool get isRunning => + isRecurring && statusId == kRecurringInvoiceStatusActive; bool get isSent => statusId != kInvoiceStatusDraft; @@ -827,6 +828,12 @@ abstract class InvoiceEntity extends Object return kInvoiceStatusPastDue; } + if (isRecurring && + statusId == kRecurringInvoiceStatusActive && + (lastSentDate ?? '').isEmpty) { + return kRecurringInvoiceStatusPending; + } + /* if (subEntityType == EntityType.quote && (invoiceId ?? '').isNotEmpty) { return kQuoteStatusApproved;