tonyair
/
cms-niceties
mirror of https://github.com/a2nt/cms-niceties.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FIX: allowed countries/states at SiteConfig

This commit is contained in:
Tony Air 2022-06-15 22:29:21 +02:00
parent f54eec1802
commit 883e0c193d
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Extensions/SiteConfigExtension.php
View File

@ -111,7 +111,7 @@ class SiteConfigExtension extends DataExtension
if (\class_exists(Addressable::class)) {
$stateLabel = _t('Addressable.STATE', 'State');
$allowedStates = Config::inst()->get(SiteConfig::class, 'allowed_states');
if (count($allowedStates) >= 1) {
if ($allowedStates && count($allowedStates) >= 1) {
// If allowed states are restricted, only allow those
$addrFields[] = DropdownField::create('State', $stateLabel, $allowedStates);
} elseif (!$allowedStates) {
@ -120,11 +120,17 @@ class SiteConfigExtension extends DataExtension
}
// Get country field
$addrFields[] = DropdownField::create(
'Country',
_t('Addressable.COUNTRY', 'Country'),
Config::inst()->get(SiteConfig::class, 'allowed_countries')
);
$countryLabel = _t('Addressable.COUNTRY', 'Country');
$allowedCountries = Config::inst()->get(SiteConfig::class, 'allowed_countries');
if($allowedCountries && count($allowedCountries) >= 1) {
$addrFields[] = DropdownField::create(
'Country',
$countryLabel,
$allowedCountries
);
} else {
$addrFields[] = TextField::create('Country', $countryLabel);
}
} else {
$addrFields[] = TextField::create('State');
$addrFields[] = TextField::create('Country');