Show if expense are paid
This commit is contained in:
parent
e7b7ab7428
commit
99622320c8
|
|
@ -529,11 +529,15 @@ const kPaymentStatuses = {
|
||||||
const String kExpenseStatusLogged = '1';
|
const String kExpenseStatusLogged = '1';
|
||||||
const String kExpenseStatusPending = '2';
|
const String kExpenseStatusPending = '2';
|
||||||
const String kExpenseStatusInvoiced = '3';
|
const String kExpenseStatusInvoiced = '3';
|
||||||
|
const String kExpenseStatusUnpaid = '4';
|
||||||
|
const String kExpenseStatusPaid = '5';
|
||||||
|
|
||||||
const kExpenseStatuses = {
|
const kExpenseStatuses = {
|
||||||
kExpenseStatusLogged: 'logged',
|
kExpenseStatusLogged: 'logged',
|
||||||
kExpenseStatusPending: 'pending',
|
kExpenseStatusPending: 'pending',
|
||||||
kExpenseStatusInvoiced: 'invoiced',
|
kExpenseStatusInvoiced: 'invoiced',
|
||||||
|
kExpenseStatusUnpaid: 'unpaid',
|
||||||
|
kExpenseStatusPaid: 'paid',
|
||||||
};
|
};
|
||||||
|
|
||||||
const String kDefaultCurrencyId = '1';
|
const String kDefaultCurrencyId = '1';
|
||||||
|
|
|
||||||
|
|
@ -609,6 +609,10 @@ abstract class ExpenseEntity extends Object
|
||||||
!isInvoiced &&
|
!isInvoiced &&
|
||||||
!isPending) {
|
!isPending) {
|
||||||
return true;
|
return true;
|
||||||
|
} else if (status.id == kExpenseStatusUnpaid && paymentDate.isEmpty) {
|
||||||
|
return true;
|
||||||
|
} else if (status.id == kExpenseStatusPaid && paymentDate.isNotEmpty) {
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,16 @@ class ExpenseScreen extends StatelessWidget {
|
||||||
..id = kExpenseStatusInvoiced
|
..id = kExpenseStatusInvoiced
|
||||||
..name = localization.invoiced,
|
..name = localization.invoiced,
|
||||||
),
|
),
|
||||||
|
ExpenseStatusEntity().rebuild(
|
||||||
|
(b) => b
|
||||||
|
..id = kExpenseStatusPaid
|
||||||
|
..name = localization.paid,
|
||||||
|
),
|
||||||
|
ExpenseStatusEntity().rebuild(
|
||||||
|
(b) => b
|
||||||
|
..id = kExpenseStatusUnpaid
|
||||||
|
..name = localization.unpaid,
|
||||||
|
),
|
||||||
];
|
];
|
||||||
|
|
||||||
return ListScaffold(
|
return ListScaffold(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue