Skip to content

Commit 6f1c7e3

Browse files
zakdmazakdma
authored
Merge pull request magento#4941 from magento-tsg/2.3-develop-pr78
[TSG] Fixes for 2.3 (pr78) (2.3-develop)
2 parents 23bd4d6 + 0d6b2a0 commit 6f1c7e3

File tree

16 files changed

+102
-74
lines changed

16 files changed

+102
-74
lines changed

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php

+29-5
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ public function modifyMeta(array $meta)
149149

150150
$this->specialPriceDataToInline();
151151
$this->customizeTierPrice();
152+
$this->customizePrice();
152153

153154
if (isset($this->meta['advanced-pricing'])) {
154155
$this->addAdvancedPriceLink();
@@ -197,6 +198,29 @@ protected function preparePriceFields($fieldCode)
197198
return $this;
198199
}
199200

201+
/**
202+
* Customize price field.
203+
*
204+
* @return $this
205+
*/
206+
private function customizePrice(): AdvancedPricing
207+
{
208+
$pathFrom = $this->arrayManager->findPath('price', $this->meta, null, 'children');
209+
210+
if ($pathFrom) {
211+
$this->meta = $this->arrayManager->merge(
212+
$this->arrayManager->slicePath($pathFrom, 0, -2) . '/arguments/data/config',
213+
$this->meta,
214+
[
215+
'label' => false,
216+
'required' => false,
217+
]
218+
);
219+
}
220+
221+
return $this;
222+
}
223+
200224
/**
201225
* Customize tier price field
202226
*
@@ -573,21 +597,21 @@ private function specialPriceDataToInline()
573597
$this->arrayManager->slicePath($pathFrom, 0, -2) . '/arguments/data/config',
574598
$this->meta,
575599
[
576-
'label' => __('Special Price From'),
600+
'label' => false,
601+
'required' => false,
577602
'additionalClasses' => 'admin__control-grouped-date',
578603
'breakLine' => false,
579604
'component' => 'Magento_Ui/js/form/components/group',
580-
'scopeLabel' =>
581-
$this->arrayManager->get($pathFrom . '/arguments/data/config/scopeLabel', $this->meta),
582605
]
583606
);
584607
$this->meta = $this->arrayManager->merge(
585608
$pathFrom . '/arguments/data/config',
586609
$this->meta,
587610
[
588611
'label' => __('Special Price From'),
589-
'scopeLabel' => null,
590-
'additionalClasses' => 'admin__field-date'
612+
'scopeLabel' =>
613+
$this->arrayManager->get($pathFrom . '/arguments/data/config/scopeLabel', $this->meta),
614+
'additionalClasses' => 'admin__field-date',
591615
]
592616
);
593617
$this->meta = $this->arrayManager->merge(

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,14 @@ protected function customizeCategoriesField(array $meta)
243243
'arguments' => [
244244
'data' => [
245245
'config' => [
246-
'label' => __('Categories'),
246+
'label' => false,
247+
'required' => false,
247248
'dataScope' => '',
248249
'breakLine' => false,
249250
'formElement' => 'container',
250251
'componentType' => 'container',
251252
'component' => 'Magento_Ui/js/form/components/group',
252-
'scopeLabel' => __('[GLOBAL]'),
253+
'disabled' => $this->locator->getProduct()->isLockedAttribute($fieldCode),
253254
],
254255
],
255256
],

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,9 @@ public function setupAttributeContainerMeta(ProductAttributeInterface $attribute
861861
'arguments/data/config',
862862
$containerMeta,
863863
[
864-
'component' => 'Magento_Ui/js/form/components/group'
864+
'component' => 'Magento_Ui/js/form/components/group',
865+
'label' => false,
866+
'required' => false,
865867
]
866868
);
867869
}

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ protected function customizeWeightField(array $meta)
224224
'validate-zero-or-greater' => true
225225
],
226226
'additionalClasses' => 'admin__field-small',
227+
'sortOrder' => 0,
227228
'addafter' => $this->locator->getStore()->getConfig('general/locale/weight_unit'),
228229
'imports' => $disabled ? [] : [
229230
'disabled' => '!${$.provider}:' . self::DATA_SCOPE_PRODUCT
@@ -242,6 +243,8 @@ protected function customizeWeightField(array $meta)
242243
$containerPath . static::META_CONFIG_PATH,
243244
$meta,
244245
[
246+
'label' => false,
247+
'required' => false,
245248
'component' => 'Magento_Ui/js/form/components/group',
246249
]
247250
);
@@ -269,6 +272,7 @@ protected function customizeWeightField(array $meta)
269272
],
270273
],
271274
'value' => (int)$this->locator->getProduct()->getTypeInstance()->hasWeight(),
275+
'sortOrder' => 10,
272276
'disabled' => $disabled,
273277
]
274278
);
@@ -317,7 +321,8 @@ protected function customizeNewDateRangeField(array $meta)
317321
$fromContainerPath . self::META_CONFIG_PATH,
318322
$meta,
319323
[
320-
'label' => __('Set Product as New From'),
324+
'label' => false,
325+
'required' => false,
321326
'additionalClasses' => 'admin__control-grouped-date',
322327
'breakLine' => false,
323328
'component' => 'Magento_Ui/js/form/components/group',

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdate.php

+6-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ public function __construct(ArrayManager $arrayManager)
3737
}
3838

3939
/**
40-
* {@inheritdoc}
40+
* @inheritdoc
41+
*
4142
* @since 101.0.0
4243
*/
4344
public function modifyMeta(array $meta)
@@ -47,7 +48,8 @@ public function modifyMeta(array $meta)
4748
}
4849

4950
/**
50-
* {@inheritdoc}
51+
* @inheritdoc
52+
*
5153
* @since 101.0.0
5254
*/
5355
public function modifyData(array $data)
@@ -96,7 +98,8 @@ protected function customizeDateRangeField(array $meta)
9698
$fromContainerPath . self::META_CONFIG_PATH,
9799
$meta,
98100
[
99-
'label' => __('Schedule Update From'),
101+
'label' => false,
102+
'required' => false,
100103
'additionalClasses' => 'admin__control-grouped-date',
101104
'breakLine' => false,
102105
'component' => 'Magento_Ui/js/form/components/group',

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private function getUpdatedTierPriceStructure(array $priceMeta)
115115
'dataType' => Price::NAME,
116116
'component' => 'Magento_Ui/js/form/components/group',
117117
'label' => __('Price'),
118-
'enableLabel' => true,
118+
'showLabel' => false,
119119
'dataScope' => '',
120120
'additionalClasses' => 'control-grouped',
121121
'sortOrder' => isset($priceMeta['arguments']['data']['config']['sortOrder'])

‎app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -528,10 +528,7 @@
528528
<item name="type" xsi:type="string">group</item>
529529
<item name="config" xsi:type="array">
530530
<item name="additionalClasses" xsi:type="string">admin__control-grouped-date</item>
531-
<item name="label" xsi:type="string" translate="true">Schedule Update From</item>
532-
<item name="required" xsi:type="boolean">false</item>
533531
<item name="breakLine" xsi:type="boolean">false</item>
534-
<item name="scopeLabel" xsi:type="string">[STORE VIEW]</item>
535532
</item>
536533
</argument>
537534
<field name="custom_design_from" sortOrder="230" formElement="date">
@@ -541,6 +538,7 @@
541538
</additionalClasses>
542539
<dataType>string</dataType>
543540
<label translate="true">Schedule Update From</label>
541+
<scopeLabel>[STORE VIEW]</scopeLabel>
544542
</settings>
545543
</field>
546544
<field name="custom_design_to" sortOrder="240" formElement="date">

‎app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php

+2-7
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public function modifyMeta(array $meta)
177177
}
178178

179179
/**
180-
* Prepare Meta
180+
* Modify UI Quantity and Stock status attribute meta.
181181
*
182182
* @return void
183183
*/
@@ -187,10 +187,6 @@ private function prepareMeta()
187187
$pathField = $this->arrayManager->findPath($fieldCode, $this->meta, null, 'children');
188188

189189
if ($pathField) {
190-
$labelField = $this->arrayManager->get(
191-
$this->arrayManager->slicePath($pathField, 0, -2) . '/arguments/data/config/label',
192-
$this->meta
193-
);
194190
$fieldsetPath = $this->arrayManager->slicePath($pathField, 0, -4);
195191

196192
$this->meta = $this->arrayManager->merge(
@@ -218,10 +214,9 @@ private function prepareMeta()
218214
'formElement' => 'container',
219215
'componentType' => 'container',
220216
'component' => "Magento_Ui/js/form/components/group",
221-
'label' => $labelField,
217+
'label' => false,
222218
'breakLine' => false,
223219
'dataScope' => $fieldCode,
224-
'scopeLabel' => '[GLOBAL]',
225220
'source' => 'product_details',
226221
'sortOrder' => (int) $this->arrayManager->get(
227222
$this->arrayManager->slicePath($pathField, 0, -2) . '/arguments/data/config/sortOrder',

‎app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

-16
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
<argument name="data" xsi:type="array">
3636
<item name="config" xsi:type="array">
3737
<item name="formElement" xsi:type="string">container</item>
38-
<item name="label" xsi:type="string" translate="true">Manage Stock</item>
3938
<item name="dataScope" xsi:type="string">stock_data</item>
40-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
4139
</item>
4240
</argument>
4341
<field name="manage_stock" formElement="select">
@@ -117,9 +115,7 @@
117115
<argument name="data" xsi:type="array">
118116
<item name="config" xsi:type="array">
119117
<item name="formElement" xsi:type="string">container</item>
120-
<item name="label" xsi:type="string" translate="true">Out-of-Stock Threshold</item>
121118
<item name="dataScope" xsi:type="string">stock_data</item>
122-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
123119
<item name="imports" xsi:type="array">
124120
<item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.manage_stock</item>
125121
</item>
@@ -290,9 +286,7 @@
290286
<argument name="data" xsi:type="array">
291287
<item name="config" xsi:type="array">
292288
<item name="formElement" xsi:type="string">container</item>
293-
<item name="label" xsi:type="string" translate="true">Maximum Qty Allowed in Shopping Cart</item>
294289
<item name="dataScope" xsi:type="string">stock_data</item>
295-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
296290
</item>
297291
</argument>
298292
<field name="max_sale_qty" formElement="input">
@@ -396,9 +390,7 @@
396390
<argument name="data" xsi:type="array">
397391
<item name="config" xsi:type="array">
398392
<item name="formElement" xsi:type="string">container</item>
399-
<item name="label" xsi:type="string" translate="true">Backorders</item>
400393
<item name="dataScope" xsi:type="string">stock_data</item>
401-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
402394
<item name="imports" xsi:type="array">
403395
<item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.manage_stock</item>
404396
</item>
@@ -465,9 +457,7 @@
465457
<argument name="data" xsi:type="array">
466458
<item name="config" xsi:type="array">
467459
<item name="formElement" xsi:type="string">container</item>
468-
<item name="label" xsi:type="string" translate="true">Notify for Quantity Below</item>
469460
<item name="dataScope" xsi:type="string">stock_data</item>
470-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
471461
<item name="imports" xsi:type="array">
472462
<item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.manage_stock</item>
473463
</item>
@@ -526,9 +516,7 @@
526516
<argument name="data" xsi:type="array">
527517
<item name="config" xsi:type="array">
528518
<item name="formElement" xsi:type="string">container</item>
529-
<item name="label" xsi:type="string" translate="true">Enable Qty Increments</item>
530519
<item name="dataScope" xsi:type="string">stock_data</item>
531-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
532520
</item>
533521
</argument>
534522
<field name="enable_qty_increments" formElement="select">
@@ -589,9 +577,7 @@
589577
<argument name="data" xsi:type="array">
590578
<item name="config" xsi:type="array">
591579
<item name="formElement" xsi:type="string">container</item>
592-
<item name="label" xsi:type="string" translate="true">Qty Increments</item>
593580
<item name="dataScope" xsi:type="string">stock_data</item>
594-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
595581
<item name="imports" xsi:type="array">
596582
<item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.enable_qty_increments</item>
597583
</item>
@@ -654,9 +640,7 @@
654640
<argument name="data" xsi:type="array">
655641
<item name="config" xsi:type="array">
656642
<item name="formElement" xsi:type="string">container</item>
657-
<item name="label" xsi:type="string" translate="true">Stock Status</item>
658643
<item name="dataScope" xsi:type="string">quantity_and_stock_status</item>
659-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
660644
<item name="imports" xsi:type="array">
661645
<item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.manage_stock</item>
662646
</item>

‎app/code/Magento/CatalogUrlRewrite/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewrite.php

+15-10
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function __construct(
5353
}
5454

5555
/**
56-
* {@inheritdoc}
56+
* @inheritdoc
5757
*/
5858
public function modifyMeta(array $meta)
5959
{
@@ -65,7 +65,7 @@ public function modifyMeta(array $meta)
6565
}
6666

6767
/**
68-
* {@inheritdoc}
68+
* @inheritdoc
6969
*/
7070
public function modifyData(array $data)
7171
{
@@ -95,16 +95,21 @@ protected function addUrlRewriteCheckbox(array $meta)
9595
ScopeInterface::SCOPE_STORE,
9696
$this->locator->getProduct()->getStoreId()
9797
);
98-
99-
$meta = $this->arrayManager->merge($containerPath, $meta, [
100-
'arguments' => [
101-
'data' => [
102-
'config' => [
103-
'component' => 'Magento_Ui/js/form/components/group',
98+
$meta = $this->arrayManager->merge(
99+
$containerPath,
100+
$meta,
101+
[
102+
'arguments' => [
103+
'data' => [
104+
'config' => [
105+
'component' => 'Magento_Ui/js/form/components/group',
106+
'label' => false,
107+
'required' => false,
108+
],
104109
],
105110
],
106-
],
107-
]);
111+
]
112+
);
108113

109114
$checkbox['arguments']['data']['config'] = [
110115
'componentType' => Field::NAME,

‎app/code/Magento/Customer/view/base/ui_component/customer_form.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,6 @@
152152
<argument name="data" xsi:type="array">
153153
<item name="type" xsi:type="string">group</item>
154154
<item name="config" xsi:type="array">
155-
<item name="label" xsi:type="string" translate="true">Group</item>
156-
<item name="required" xsi:type="boolean">true</item>
157155
<item name="dataScope" xsi:type="boolean">false</item>
158156
<item name="validateWholeGroup" xsi:type="boolean">true</item>
159157
</item>
@@ -166,6 +164,7 @@
166164
</item>
167165
</argument>
168166
<settings>
167+
<required>true</required>
169168
<dataType>number</dataType>
170169
</settings>
171170
</field>

0 commit comments

Comments
 (0)