diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php index 7f6790835..c7a696916 100755 --- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php @@ -64,8 +64,8 @@ $field['options'] = ''; } - $selectedOption = core()->getConfigData($name) ?? ''; - $dependSelectedOption = core()->getConfigData(implode('.', [$firstField, $secondField, $thirdField, $dependField])) ?? ''; + $selectedOption = core()->getConfigData($name, $channel, $locale) ?? ''; + $dependSelectedOption = core()->getConfigData(implode('.', [$firstField, $secondField, $thirdField, $dependField]), $channel, $locale) ?? ''; ?> @if (strpos($field['validation'], 'required_if') !== false) @@ -110,31 +110,31 @@ @if ($field['type'] == 'text') - + @elseif ($field['type'] == 'password') - + @elseif ($field['type'] == 'number') - + @elseif ($field['type'] == 'color') - + @elseif ($field['type'] == 'textarea') - + @elseif ($field['type'] == 'select') getConfigData($name) ?? ''; + $selectedOption = core()->getConfigData($name, $channel, $locale) ?? ''; ?> @if (isset($field['repository'])) @@ -208,7 +208,7 @@ @elseif ($field['type'] == 'country') getConfigData($name) ?? ''; + $countryCode = core()->getConfigData($name, $channel, $locale) ?? ''; ?> getConfigData($name) ?? ''; + $stateCode = core()->getConfigData($name, $channel, $locale) ?? ''; ?> getConfigData($name) ?? (isset($field['default_value']) ? $field['default_value'] : ''); ?> + getConfigData($name, $channel, $locale) ?? (isset($field['default_value']) ? $field['default_value'] : ''); ?>