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

Hide credit.due_date

This commit is contained in:
Hillel Coren 2020-03-04 12:39:44 +02:00
parent 4870314df6
commit 05459cc496
4 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,11 +235,10 @@ class InvoiceEditDesktopState extends State<InvoiceEditDesktop>
.onChanged(invoice.rebuild((b) => b..date = date)); .onChanged(invoice.rebuild((b) => b..date = date));
}, },
), ),
if (widget.entityType != EntityType.credit)
DatePicker( DatePicker(
allowClearing: true, allowClearing: true,
labelText: widget.entityType == EntityType.credit labelText: widget.entityType == EntityType.quote
? localization.appliedDate
: widget.entityType == EntityType.quote
? localization.validUntil ? localization.validUntil
: localization.dueDate, : localization.dueDate,
selectedDate: invoice.dueDate, selectedDate: invoice.dueDate,

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

@ -170,15 +170,15 @@ 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.credit labelText: widget.entityType == EntityType.quote
? localization.appliedDate
: widget.entityType == EntityType.quote
? localization.validUntil ? localization.validUntil
: localization.dueDate, : localization.dueDate,
selectedDate: invoice.dueDate, selectedDate: invoice.dueDate,
onSelected: (date) { onSelected: (date) {
viewModel.onChanged(invoice.rebuild((b) => b..dueDate = date)); viewModel
.onChanged(invoice.rebuild((b) => b..dueDate = date));
}, },
), ),
DecoratedFormField( DecoratedFormField(

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

@ -53,9 +53,7 @@ class InvoiceOverview extends StatelessWidget {
]; ];
String dueDateField = InvoiceFields.dueDate; String dueDateField = InvoiceFields.dueDate;
if (invoice.subEntityType == EntityType.credit) { if (invoice.subEntityType == EntityType.quote) {
dueDateField = CreditFields.appliedDate;
} else if (invoice.subEntityType == EntityType.quote) {
dueDateField = QuoteFields.validUntil; dueDateField = QuoteFields.validUntil;
} }

3
lib/utils/i18n.dart
View File

@ -34,7 +34,6 @@ mixin LocalizationsProvider on LocaleCodeAware {
'recurring_tasks': 'Recurring Tasks', 'recurring_tasks': 'Recurring Tasks',
'recurring_expenses': 'Recurring Expenses', 'recurring_expenses': 'Recurring Expenses',
'account_management': 'Account Management', 'account_management': 'Account Management',
'applied_date': 'Applied Date',
'credit_date': 'Credit Date', 'credit_date': 'Credit Date',
'credit': 'Credit', 'credit': 'Credit',
'credits': 'Credits', 'credits': 'Credits',
@ -32823,8 +32822,6 @@ mixin LocalizationsProvider on LocaleCodeAware {
String get creditDate => _localizedValues[localeCode]['credit_date']; String get creditDate => _localizedValues[localeCode]['credit_date'];
String get appliedDate => _localizedValues[localeCode]['applied_date'];
String get accountManagement => String get accountManagement =>
_localizedValues[localeCode]['account_management']; _localizedValues[localeCode]['account_management'];