From eed398ba9f153b83c1567b3380cb7c5d19bce326 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 17 Nov 2019 16:19:30 +0200 Subject: [PATCH] Settings --- lib/data/models/client_model.dart | 2 +- lib/data/models/invoice_model.dart | 2 +- lib/data/models/models.dart | 2 +- lib/data/models/models.g.dart | 8 ++++---- lib/data/models/quote_model.dart | 2 +- lib/redux/app/app_middleware.dart | 2 +- lib/redux/client/client_actions.dart | 2 +- lib/redux/invoice/invoice_actions.dart | 2 +- lib/utils/i18n.dart | 3 +++ lib/utils/icons.dart | 2 +- 10 files changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/data/models/client_model.dart b/lib/data/models/client_model.dart index 904861d52..fb96adbf3 100644 --- a/lib/data/models/client_model.dart +++ b/lib/data/models/client_model.dart @@ -389,7 +389,7 @@ abstract class ClientEntity extends Object } if (userCompany.canCreate(EntityType.payment)) { - actions.add(EntityAction.enterPayment); + actions.add(EntityAction.newPayment); } } diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart index 9b7e70f53..543312acb 100644 --- a/lib/data/models/invoice_model.dart +++ b/lib/data/models/invoice_model.dart @@ -415,7 +415,7 @@ abstract class InvoiceEntity extends Object if (userCompany.canEditEntity(this) && userCompany.canCreate(EntityType.payment) && isUnpaid) { - actions.add(EntityAction.enterPayment); + actions.add(EntityAction.newPayment); } if (invitations.isNotEmpty) { diff --git a/lib/data/models/models.dart b/lib/data/models/models.dart index e464c9d84..22590853f 100644 --- a/lib/data/models/models.dart +++ b/lib/data/models/models.dart @@ -54,7 +54,7 @@ class EntityAction extends EnumClass { static const EntityAction viewInvoice = _$viewInvoice; static const EntityAction viewQuote = _$viewQuote; static const EntityAction clientPortal = _$clientPortal; - static const EntityAction enterPayment = _$enterPayment; + static const EntityAction newPayment = _$newPayment; static const EntityAction settings = _$settings; static const EntityAction pdf = _$pdf; static const EntityAction more = _$more; diff --git a/lib/data/models/models.g.dart b/lib/data/models/models.g.dart index b71ed0314..fbd192909 100644 --- a/lib/data/models/models.g.dart +++ b/lib/data/models/models.g.dart @@ -24,7 +24,7 @@ const EntityAction _$newTask = const EntityAction._('newTask'); const EntityAction _$viewInvoice = const EntityAction._('viewInvoice'); const EntityAction _$viewQuote = const EntityAction._('viewQuote'); const EntityAction _$clientPortal = const EntityAction._('clientPortal'); -const EntityAction _$enterPayment = const EntityAction._('enterPayment'); +const EntityAction _$newPayment = const EntityAction._('newPayment'); const EntityAction _$settings = const EntityAction._('settings'); const EntityAction _$pdf = const EntityAction._('pdf'); const EntityAction _$more = const EntityAction._('more'); @@ -72,8 +72,8 @@ EntityAction _$valueOf(String name) { return _$viewQuote; case 'clientPortal': return _$clientPortal; - case 'enterPayment': - return _$enterPayment; + case 'newPayment': + return _$newPayment; case 'settings': return _$settings; case 'pdf': @@ -113,7 +113,7 @@ final BuiltSet _$values = _$viewInvoice, _$viewQuote, _$clientPortal, - _$enterPayment, + _$newPayment, _$settings, _$pdf, _$more, diff --git a/lib/data/models/quote_model.dart b/lib/data/models/quote_model.dart index 7374fc20e..100eaef04 100644 --- a/lib/data/models/quote_model.dart +++ b/lib/data/models/quote_model.dart @@ -403,7 +403,7 @@ abstract class QuoteEntity extends Object if (userCompany.canEditEntity(this) && userCompany.canCreate(EntityType.payment)) { - actions.add(EntityAction.enterPayment); + actions.add(EntityAction.newPayment); } if ((quoteInvoiceId ?? '').isNotEmpty) { diff --git a/lib/redux/app/app_middleware.dart b/lib/redux/app/app_middleware.dart index 25fc46c70..94e0804c1 100644 --- a/lib/redux/app/app_middleware.dart +++ b/lib/redux/app/app_middleware.dart @@ -484,7 +484,7 @@ bool hasChanges({ if (store.state.hasChanges() && !isMobile(context)) { showDialog( context: context, - builder: (BuildContext context) { + builder: (BuildContext dialogContext) { return MessageDialog(localization.errorUnsavedChanges, dismissLabel: localization.continueEditing, onDiscard: () { store.dispatch(DiscardChanges()); diff --git a/lib/redux/client/client_actions.dart b/lib/redux/client/client_actions.dart index d060e99c6..9a5b1b504 100644 --- a/lib/redux/client/client_actions.dart +++ b/lib/redux/client/client_actions.dart @@ -306,7 +306,7 @@ void handleClientAction( company: company, client: client, prefState: state.prefState), context: context)); break; - case EntityAction.enterPayment: + case EntityAction.newPayment: store.dispatch(EditPayment( payment: PaymentEntity(company: company) .rebuild((b) => b.clientId = client.id), diff --git a/lib/redux/invoice/invoice_actions.dart b/lib/redux/invoice/invoice_actions.dart index 06302f6cf..4d26e5928 100644 --- a/lib/redux/invoice/invoice_actions.dart +++ b/lib/redux/invoice/invoice_actions.dart @@ -393,7 +393,7 @@ void handleInvoiceAction(BuildContext context, List invoices, store.dispatch( EditQuote(context: context, quote: invoice.clone)); // TODO fix this break; - case EntityAction.enterPayment: + case EntityAction.newPayment: store.dispatch(EditPayment( context: context, payment: invoice.createPayment(company))); break; diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart index fde52f849..43541c739 100644 --- a/lib/utils/i18n.dart +++ b/lib/utils/i18n.dart @@ -699,6 +699,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'payment_type': 'Payment Type', 'transaction_reference': 'Transaction Reference', 'enter_payment': 'Enter Payment', + 'new_payment': 'Enter Payment', 'created_payment': 'Successfully created payment', 'updated_payment': 'Successfully updated payment', 'archived_payment': 'Successfully archived payment', @@ -15763,6 +15764,8 @@ mixin LocalizationsProvider on LocaleCodeAware { String get selectCompany => _localizedValues[localeCode]['select_company']; + String get newPayment => _localizedValues[localeCode]['new_payment']; + String lookup(String key) { final lookupKey = toSnakeCase(key); return _localizedValues[localeCode][lookupKey] ?? diff --git a/lib/utils/icons.dart b/lib/utils/icons.dart index b84bbeea0..1bea79755 100644 --- a/lib/utils/icons.dart +++ b/lib/utils/icons.dart @@ -34,7 +34,7 @@ IconData getEntityActionIcon(EntityAction entityAction) { case EntityAction.newExpense: case EntityAction.newTask: case EntityAction.newClient: - case EntityAction.enterPayment: + case EntityAction.newPayment: return Icons.add_circle_outline; case EntityAction.resume: case EntityAction.start: