diff --git a/lib/data/models/group_model.dart b/lib/data/models/group_model.dart index 617dc9041..d2ebbbc07 100644 --- a/lib/data/models/group_model.dart +++ b/lib/data/models/group_model.dart @@ -137,7 +137,7 @@ abstract class GroupEntity extends Object } if (userCompany.canEditEntity(this)) { - actions.add(EntityAction.configureSettings); + actions.add(EntityAction.settings); } if (userCompany.canCreate(EntityType.client)) { diff --git a/lib/data/models/models.dart b/lib/data/models/models.dart index 62c2e3da5..6df06c72a 100644 --- a/lib/data/models/models.dart +++ b/lib/data/models/models.dart @@ -53,7 +53,7 @@ class EntityAction extends EnumClass { static const EntityAction viewInvoice = _$viewInvoice; static const EntityAction clientPortal = _$clientPortal; static const EntityAction enterPayment = _$enterPayment; - static const EntityAction configureSettings = _$configureSettings; + static const EntityAction settings = _$settings; static const EntityAction pdf = _$pdf; static const EntityAction more = _$more; static const EntityAction start = _$start; diff --git a/lib/data/models/models.g.dart b/lib/data/models/models.g.dart index c6e19583a..1cc5e7cc2 100644 --- a/lib/data/models/models.g.dart +++ b/lib/data/models/models.g.dart @@ -24,8 +24,7 @@ const EntityAction _$newTask = const EntityAction._('newTask'); const EntityAction _$viewInvoice = const EntityAction._('viewInvoice'); const EntityAction _$clientPortal = const EntityAction._('clientPortal'); const EntityAction _$enterPayment = const EntityAction._('enterPayment'); -const EntityAction _$configureSettings = - const EntityAction._('configureSettings'); +const EntityAction _$settings = const EntityAction._('settings'); const EntityAction _$pdf = const EntityAction._('pdf'); const EntityAction _$more = const EntityAction._('more'); const EntityAction _$start = const EntityAction._('start'); @@ -70,8 +69,8 @@ EntityAction _$valueOf(String name) { return _$clientPortal; case 'enterPayment': return _$enterPayment; - case 'configureSettings': - return _$configureSettings; + case 'settings': + return _$settings; case 'pdf': return _$pdf; case 'more': @@ -107,7 +106,7 @@ final BuiltSet _$values = _$viewInvoice, _$clientPortal, _$enterPayment, - _$configureSettings, + _$settings, _$pdf, _$more, _$start, diff --git a/lib/redux/group/group_actions.dart b/lib/redux/group/group_actions.dart index 46ac0fc48..00c87566a 100644 --- a/lib/redux/group/group_actions.dart +++ b/lib/redux/group/group_actions.dart @@ -1,12 +1,14 @@ import 'dart:async'; import 'package:flutter/widgets.dart'; import 'package:built_collection/built_collection.dart'; +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; +import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'; import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/completers.dart'; @@ -246,6 +248,10 @@ void handleGroupAction( case EntityAction.edit: store.dispatch(EditGroup(context: context, group: group)); break; + case EntityAction.settings: + store.dispatch(ViewSettings( + context: context, group: group, section: kSettingsCompanyDetails)); + break; case EntityAction.newClient: store.dispatch(EditClient( context: context, diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart index 366a625ec..c32895d69 100644 --- a/lib/utils/i18n.dart +++ b/lib/utils/i18n.dart @@ -14,7 +14,6 @@ abstract class LocaleCodeAware { mixin LocalizationsProvider on LocaleCodeAware { static final Map> _localizedValues = { 'en': { - 'configure_settings': 'Configure Settings', 'group_settings': 'Group Settings', 'groups': 'Groups', 'new_group': 'New Group', @@ -14716,9 +14715,6 @@ mixin LocalizationsProvider on LocaleCodeAware { String get groupSettings => _localizedValues[localeCode]['group_settings']; - String get configureSettings => - _localizedValues[localeCode]['configure_settings']; - 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 4ea23f38d..6025c9936 100644 --- a/lib/utils/icons.dart +++ b/lib/utils/icons.dart @@ -39,7 +39,7 @@ IconData getEntityActionIcon(EntityAction entityAction) { return Icons.play_arrow; case EntityAction.stop: return Icons.stop; - case EntityAction.configureSettings: + case EntityAction.settings: return Icons.settings; default: return null;