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

Support next_send_datetime being blank

This commit is contained in:
Hillel Coren 2023-05-23 09:02:13 +03:00
parent 352f0a90b1
commit fd9e9318cf
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/data/models/invoice_model.dart
View File

@ -828,8 +828,13 @@ abstract class InvoiceEntity extends Object
response = invoiceA.dueDate.compareTo(invoiceB.dueDate);
break;
case InvoiceFields.nextSendDate:
response =
invoiceA.nextSendDatetime.compareTo(invoiceB.nextSendDatetime);
if (invoiceA.nextSendDatetime.isNotEmpty &&
invoiceB.nextSendDatetime.isNotEmpty) {
response =
invoiceA.nextSendDatetime.compareTo(invoiceB.nextSendDatetime);
} else {
response = invoiceA.nextSendDate.compareTo(invoiceB.nextSendDate);
}
break;
case EntityFields.assignedTo:
final userA = userMap[invoiceA.assignedUserId] ?? UserEntity();

6
lib/ui/invoice/invoice_presenter.dart
View File

@ -97,8 +97,10 @@ class InvoicePresenter extends EntityPresenter {
case InvoiceFields.nextSendDate:
return Text(invoice.isPaid
? ''
: formatDate(invoice.nextSendDatetime, context,
showTime: true, showSeconds: false));
: invoice.nextSendDatetime.isNotEmpty
? formatDate(invoice.nextSendDatetime, context,
showTime: true, showSeconds: false)
: formatDate(invoice.nextSendDate, context));
case InvoiceFields.reminder1Sent:
return Text(formatDate(invoice.reminder1Sent, context));
case InvoiceFields.reminder2Sent:

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

@ -182,9 +182,10 @@ class InvoiceOverview extends StatelessWidget {
formatDate(invoice.lastSentDate, context),
RecurringInvoiceFields.nextSendDate:
formatDate(invoice.nextSendDate, context),
RecurringInvoiceFields.nextSendTime: formatDate(
invoice.nextSendDatetime, context,
showDate: false, showTime: true, showSeconds: false),
if (invoice.nextSendDatetime.isNotEmpty)
RecurringInvoiceFields.nextSendTime: formatDate(
invoice.nextSendDatetime, context,
showDate: false, showTime: true, showSeconds: false),
RecurringInvoiceFields.remainingCycles: invoice.remainingCycles == -1
? localization.endless
: '${invoice.remainingCycles}',

6
lib/ui/recurring_invoice/recurring_invoice_presenter.dart
View File

@ -114,8 +114,10 @@ class RecurringInvoicePresenter extends EntityPresenter {
? localization.endless
: '${invoice.remainingCycles}');
case RecurringInvoiceFields.nextSendDate:
return Text(formatDate(invoice.nextSendDatetime, context,
showTime: true, showSeconds: false));
return Text(invoice.nextSendDatetime.isNotEmpty
? formatDate(invoice.nextSendDatetime, context,
showTime: true, showSeconds: false)
: formatDate(invoice.nextSendDate, context));
case RecurringInvoiceFields.frequency:
return Text(localization.lookup(kFrequencies[invoice.frequencyId]));
case RecurringInvoiceFields.dueDateDays: