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

Quotes

This commit is contained in:
Hillel Coren 2020-03-06 12:36:10 +02:00
parent f4e0ee5f9a
commit d2a64977d4
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ui/credit/credit_list_item.dart
View File

@ -49,10 +49,6 @@ class CreditListItem extends StatelessWidget {
client.matchesFilterValue(filter)) client.matchesFilterValue(filter))
: null; : null;
final creditStatusId = (credit.invoiceId ?? '').isNotEmpty
? kQuoteStatusApproved
: credit.statusId;
return DismissibleEntity( return DismissibleEntity(
isSelected: credit.id == isSelected: credit.id ==
(uiState.isEditing (uiState.isEditing
@ -114,9 +110,9 @@ class CreditListItem extends StatelessWidget {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
), ),
Text(localization.lookup(kCreditStatuses[creditStatusId]), Text(localization.lookup(kCreditStatuses[credit.statusId]),
style: TextStyle( style: TextStyle(
color: CreditStatusColors.colors[creditStatusId], color: CreditStatusColors.colors[credit.statusId],
)), )),
], ],
), ),

8
lib/ui/invoice/invoice_list_item.dart
View File

@ -49,10 +49,6 @@ class InvoiceListItem extends StatelessWidget {
client.matchesFilterValue(filter)) client.matchesFilterValue(filter))
: null; : null;
final invoiceStatusId = (invoice.invoiceId ?? '').isNotEmpty
? kQuoteStatusApproved
: invoice.statusId;
return DismissibleEntity( return DismissibleEntity(
isSelected: invoice.id == isSelected: invoice.id ==
(uiState.isEditing (uiState.isEditing
@ -122,11 +118,11 @@ class InvoiceListItem extends StatelessWidget {
invoice.isPastDue invoice.isPastDue
? localization.pastDue ? localization.pastDue
: localization : localization
.lookup(kInvoiceStatuses[invoiceStatusId]), .lookup(kInvoiceStatuses[invoice.statusId]),
style: TextStyle( style: TextStyle(
color: invoice.isPastDue color: invoice.isPastDue
? Colors.red ? Colors.red
: InvoiceStatusColors.colors[invoiceStatusId], : InvoiceStatusColors.colors[invoice.statusId],
)), )),
], ],
), ),

20
lib/ui/invoice/view/invoice_view_overview.dart
View File

@ -36,10 +36,22 @@ class InvoiceOverview extends StatelessWidget {
final payments = memoizedPaymentsByInvoice( final payments = memoizedPaymentsByInvoice(
invoice.id, state.paymentState.map, state.paymentState.list); invoice.id, state.paymentState.map, state.paymentState.list);
Map<String, String> stauses;
Map<String, MaterialColor> colors;
if (invoice.entityType == EntityType.quote) {
stauses = kQuoteStatuses;
colors = QuoteStatusColors.colors;
} else if (invoice.entityType == EntityType.credit) {
stauses = kCreditStatuses;
colors = CreditStatusColors.colors;
} else {
stauses = kInvoiceStatuses;
colors = InvoiceStatusColors.colors;
}
final userCompany = state.userCompany; final userCompany = state.userCompany;
final color = invoice.isPastDue final color = invoice.isPastDue ? Colors.red : colors[invoice.statusId];
? Colors.red
: InvoiceStatusColors.colors[invoice.statusId];
final widgets = <Widget>[ final widgets = <Widget>[
EntityHeader( EntityHeader(
backgroundColor: color, backgroundColor: color,
@ -60,7 +72,7 @@ class InvoiceOverview extends StatelessWidget {
final Map<String, String> fields = { final Map<String, String> fields = {
InvoiceFields.statusId: invoice.isPastDue InvoiceFields.statusId: invoice.isPastDue
? localization.pastDue ? localization.pastDue
: localization.lookup('invoice_status_${invoice.statusId}'), : localization.lookup(stauses[invoice.statusId]),
InvoiceFields.date: formatDate(invoice.date, context), InvoiceFields.date: formatDate(invoice.date, context),
dueDateField: formatDate(invoice.dueDate, context), dueDateField: formatDate(invoice.dueDate, context),
InvoiceFields.partial: formatNumber(invoice.partial, context, InvoiceFields.partial: formatNumber(invoice.partial, context,

8
lib/ui/quote/quote_list_item.dart
View File

@ -49,10 +49,6 @@ class QuoteListItem extends StatelessWidget {
client.matchesFilterValue(filter)) client.matchesFilterValue(filter))
: null; : null;
final quoteStatusId = (quote.invoiceId ?? '').isNotEmpty
? kQuoteStatusApproved
: quote.statusId;
return DismissibleEntity( return DismissibleEntity(
isSelected: quote.id == isSelected: quote.id ==
(uiState.isEditing (uiState.isEditing
@ -120,11 +116,11 @@ class QuoteListItem extends StatelessWidget {
Text( Text(
quote.isPastDue quote.isPastDue
? localization.expired ? localization.expired
: localization.lookup(kQuoteStatuses[quoteStatusId]), : localization.lookup(kQuoteStatuses[quote.statusId]),
style: TextStyle( style: TextStyle(
color: quote.isPastDue color: quote.isPastDue
? Colors.red ? Colors.red
: QuoteStatusColors.colors[quoteStatusId], : QuoteStatusColors.colors[quote.statusId],
)), )),
], ],
), ),