Skip to content

Commit ece58a4

Browse files
author
Stanislav Idolov
authored
ENGCOM-2587: [Backport] Fixed ability to set field config from layout xml #11302 #17211
2 parents 00a357b + 19d0412 commit ece58a4

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -164,20 +164,19 @@ protected function getFieldConfig(
164164

165165
$element = [
166166
'component' => isset($additionalConfig['component']) ? $additionalConfig['component'] : $uiComponent,
167-
'config' => [
168-
// customScope is used to group elements within a single form (e.g. they can be validated separately)
169-
'customScope' => $dataScopePrefix,
170-
'customEntry' => isset($additionalConfig['config']['customEntry'])
171-
? $additionalConfig['config']['customEntry']
172-
: null,
173-
'template' => 'ui/form/field',
174-
'elementTmpl' => isset($additionalConfig['config']['elementTmpl'])
175-
? $additionalConfig['config']['elementTmpl']
176-
: $elementTemplate,
177-
'tooltip' => isset($additionalConfig['config']['tooltip'])
178-
? $additionalConfig['config']['tooltip']
179-
: null
180-
],
167+
'config' => $this->mergeConfigurationNode(
168+
'config',
169+
$additionalConfig,
170+
[
171+
'config' => [
172+
// customScope is used to group elements within a single
173+
// form (e.g. they can be validated separately)
174+
'customScope' => $dataScopePrefix,
175+
'template' => 'ui/form/field',
176+
'elementTmpl' => $elementTemplate,
177+
],
178+
]
179+
),
181180
'dataScope' => $dataScopePrefix . '.' . $attributeCode,
182181
'label' => $attributeConfig['label'],
183182
'provider' => $providerName,

0 commit comments

Comments
 (0)