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

Add credit valid until

This commit is contained in:
Hillel Coren 2021-06-30 17:37:12 +03:00
parent 99cdc55a00
commit 847fd8d8d7
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/data/models/credit_model.dart
View File

@ -51,6 +51,7 @@ class CreditFields {
static const String discount = 'discount'; static const String discount = 'discount';
static const String poNumber = 'po_number'; static const String poNumber = 'po_number';
static const String date = 'date'; static const String date = 'date';
static const String validUntil = 'valid_until';
static const String terms = 'terms'; static const String terms = 'terms';
static const String footer = 'footer'; static const String footer = 'footer';
static const String partial = 'partial'; static const String partial = 'partial';

3
lib/ui/credit/credit_presenter.dart
View File

@ -25,6 +25,7 @@ class CreditPresenter extends EntityPresenter {
...getDefaultTableFields(userCompany), ...getDefaultTableFields(userCompany),
...EntityPresenter.getBaseFields(), ...EntityPresenter.getBaseFields(),
CreditFields.discount, CreditFields.discount,
CreditFields.validUntil,
CreditFields.poNumber, CreditFields.poNumber,
CreditFields.publicNotes, CreditFields.publicNotes,
CreditFields.privateNotes, CreditFields.privateNotes,
@ -58,6 +59,8 @@ class CreditPresenter extends EntityPresenter {
.listDisplayName); .listDisplayName);
case CreditFields.date: case CreditFields.date:
return Text(formatDate(credit.date, context)); return Text(formatDate(credit.date, context));
case CreditFields.validUntil:
return Text(formatDate(credit.dueDate, context));
case CreditFields.amount: case CreditFields.amount:
return Align( return Align(
alignment: Alignment.centerRight, alignment: Alignment.centerRight,

7
lib/ui/invoice/edit/invoice_edit_desktop.dart
View File

@ -350,12 +350,11 @@ class InvoiceEditDesktopState extends State<InvoiceEditDesktop>
.onChanged(invoice.rebuild((b) => b..date = date)); .onChanged(invoice.rebuild((b) => b..date = date));
}, },
), ),
if (entityType != EntityType.credit)
DatePicker( DatePicker(
key: ValueKey('__terms_${client.id}__'), key: ValueKey('__terms_${client.id}__'),
labelText: entityType == EntityType.quote labelText: entityType == EntityType.invoice
? localization.validUntil ? localization.dueDate
: localization.dueDate, : localization.validUntil,
selectedDate: invoice.dueDate, selectedDate: invoice.dueDate,
message: termsString, message: termsString,
onSelected: (date) { onSelected: (date) {

7
lib/ui/invoice/edit/invoice_edit_details.dart
View File

@ -248,11 +248,10 @@ class InvoiceEditDetailsState extends State<InvoiceEditDetails> {
viewModel.onChanged(invoice.rebuild((b) => b..date = date)); viewModel.onChanged(invoice.rebuild((b) => b..date = date));
}, },
), ),
if (widget.entityType != EntityType.credit)
DatePicker( DatePicker(
labelText: widget.entityType == EntityType.quote labelText: widget.entityType == EntityType.invoice
? localization.validUntil ? localization.dueDate
: localization.dueDate, : localization.validUntil,
selectedDate: invoice.dueDate, selectedDate: invoice.dueDate,
onSelected: (date) { onSelected: (date) {
viewModel viewModel

6
lib/ui/reports/credit_report.dart
View File

@ -26,7 +26,7 @@ enum CreditReportFields {
discount, discount,
po_number, po_number,
date, date,
due_date, valid_until,
partial, partial,
partial_due_date, partial_due_date,
auto_bill, auto_bill,
@ -79,7 +79,7 @@ ReportResult creditReport(
CreditReportFields.amount, CreditReportFields.amount,
CreditReportFields.balance, CreditReportFields.balance,
CreditReportFields.date, CreditReportFields.date,
CreditReportFields.due_date, CreditReportFields.valid_until,
CreditReportFields.client CreditReportFields.client
]; ];
@ -151,7 +151,7 @@ ReportResult creditReport(
case CreditReportFields.date: case CreditReportFields.date:
value = credit.date; value = credit.date;
break; break;
case CreditReportFields.due_date: case CreditReportFields.valid_until:
value = credit.dueDate; value = credit.dueDate;
break; break;
case CreditReportFields.partial: case CreditReportFields.partial: