diff --git a/lib/colors.dart b/lib/colors.dart index 9f4dad0d4..f9e18c824 100644 --- a/lib/colors.dart +++ b/lib/colors.dart @@ -101,6 +101,7 @@ class ExpenseStatusColors { kExpenseStatusLogged: _colorTheme.colorGray, kExpenseStatusPending: _colorTheme.colorPrimary, kExpenseStatusInvoiced: _colorTheme.colorSuccess, + kExpenseStatusPaid: _colorTheme.colorInfo, }; } } diff --git a/lib/data/models/expense_model.dart b/lib/data/models/expense_model.dart index 27feac4d1..96b365461 100644 --- a/lib/data/models/expense_model.dart +++ b/lib/data/models/expense_model.dart @@ -638,6 +638,11 @@ abstract class ExpenseEntity extends Object @BuiltValueField(compare: false) int get loadedAt; + bool get isPaid => + paymentDate.isNotEmpty || + paymentTypeId.isNotEmpty || + transactionReference.isNotEmpty; + bool isBetween(String startDate, String endDate) { return (startDate ?? '').compareTo(date ?? '') <= 0 && (endDate ?? '').compareTo(date ?? '') >= 0; @@ -787,6 +792,8 @@ abstract class ExpenseEntity extends Object return kExpenseStatusInvoiced; } else if (shouldBeInvoiced) { return kExpenseStatusPending; + } else if (isPaid) { + return kExpenseStatusPaid; } else { return kExpenseStatusLogged; }