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

Clarify gateway settings

This commit is contained in:
Hillel Coren 2021-05-28 09:55:18 +03:00
parent c769b55431
commit ef90b8f35e
2 changed files with 61 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
lib/ui/company_gateway/edit/company_gateway_edit.dart
View File

@ -12,6 +12,7 @@ import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart';
import 'package:invoiceninja_flutter/ui/app/forms/color_picker.dart';
import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart';
import 'package:invoiceninja_flutter/ui/app/help_text.dart';
import 'package:invoiceninja_flutter/ui/app/invoice/tax_rate_dropdown.dart';
import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart';
import 'package:invoiceninja_flutter/ui/company_gateway/edit/company_gateway_edit_vm.dart';
@ -56,8 +57,15 @@ class _CompanyGatewayEditState extends State<CompanyGatewayEdit>
final companyGateway = widget.viewModel.companyGateway;
final gateway =
widget.viewModel.state.staticState.gatewayMap[companyGateway.gatewayId];
final enabledGatewayIds = gateway.options.keys.where((gatewayTypeId) =>
companyGateway.getSettingsForGatewayTypeId(gatewayTypeId).isEnabled);
if (enabledGatewayIds.isNotEmpty) {
_gatewayTypeId = enabledGatewayIds.first;
} else {
_gatewayTypeId = gateway?.defaultGatewayTypeId ?? kGatewayTypeCreditCard;
}
_gatewayTypeId = gateway?.defaultGatewayTypeId ?? kGatewayTypeCreditCard;
super.didChangeDependencies();
}
@ -83,6 +91,8 @@ class _CompanyGatewayEditState extends State<CompanyGatewayEdit>
final disableSave = connectGateways.contains(companyGateway.gatewayId) &&
companyGateway.isNew;
final enabledGatewayIds = gateway.options.keys.where((gatewayTypeId) =>
companyGateway.getSettingsForGatewayTypeId(gatewayTypeId).isEnabled);
return EditScaffold(
title: viewModel.companyGateway.isNew
@ -341,46 +351,50 @@ class _CompanyGatewayEditState extends State<CompanyGatewayEdit>
)
],
),
ScrollableListView(
children: <Widget>[
if (gateway?.options != null && gateway.options.length > 1)
FormCard(
children: <Widget>[
AppDropdownButton(
labelText: localization.paymentType,
value: _gatewayTypeId,
items: gateway.options.keys
.where((gatewayTypeId) => companyGateway
.getSettingsForGatewayTypeId(gatewayTypeId)
.isEnabled)
.map((gatewayTypeId) => DropdownMenuItem(
child: Text(localization.lookup(
kGatewayTypes[gatewayTypeId] ?? '')),
value: gatewayTypeId,
))
.toList(),
onChanged: (dynamic value) {
setState(() {
_gatewayTypeId = value;
});
},
),
],
),
LimitEditor(
key: ValueKey('__limits_${_gatewayTypeId}__'),
gatewayTypeId: _gatewayTypeId,
viewModel: viewModel,
companyGateway: companyGateway,
),
FeesEditor(
key: ValueKey('__fees_${_gatewayTypeId}__'),
gatewayTypeId: _gatewayTypeId,
viewModel: viewModel,
companyGateway: companyGateway,
),
],
),
if (enabledGatewayIds.isEmpty)
Center(
child: HelpText(localization.noPaymentTypesEnabled),
)
else
ScrollableListView(
children: <Widget>[
if (gateway?.options != null && gateway.options.length > 1)
FormCard(
children: <Widget>[
AppDropdownButton(
labelText: localization.paymentType,
value: _gatewayTypeId,
items: enabledGatewayIds
.map((gatewayTypeId) => DropdownMenuItem(
child: Text(localization.lookup(
kGatewayTypes[gatewayTypeId] ?? '')),
value: gatewayTypeId,
))
.toList(),
onChanged: (dynamic value) {
setState(() {
_gatewayTypeId = value;
});
},
),
],
),
if (enabledGatewayIds.contains(_gatewayTypeId)) ...[
LimitEditor(
key: ValueKey('__limits_${_gatewayTypeId}__'),
gatewayTypeId: _gatewayTypeId,
viewModel: viewModel,
companyGateway: companyGateway,
),
FeesEditor(
key: ValueKey('__fees_${_gatewayTypeId}__'),
gatewayTypeId: _gatewayTypeId,
viewModel: viewModel,
companyGateway: companyGateway,
),
],
],
),
],
),
);

6
lib/utils/i18n.dart
View File

@ -15,6 +15,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
static final Map<String, Map<String, String>> _localizedValues = {
'en': {
// STARTER: lang key - do not remove comment
'no_payment_types_enabled': 'No payment types enabled',
'wait_for_data': 'Please wait for the data to finish loading',
'net_total': 'Net Total',
'has_taxes': 'Has Taxes',
@ -60423,6 +60424,11 @@ mixin LocalizationsProvider on LocaleCodeAware {
_localizedValues[localeCode]['wait_for_data'] ??
_localizedValues['en']['wait_for_data'];
String get noPaymentTypesEnabled =>
_localizedValues[localeCode]['no_payment_types_enabled'] ??
_localizedValues['en']['no_payment_types_enabled'];
String lookup(String key) {
final lookupKey = toSnakeCase(key);