Merge remote-tracking branch 'origin/ACP2E-4036' into PR_2025_07_10_chittima

Author: chittima

app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ConfigurablePriceTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -10,6 +10,7 @@
 use Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier\AbstractModifierTestCase;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier\ConfigurablePrice as ConfigurablePriceModifier;
+use Magento\Catalog\Model\Locator\LocatorInterface;
 
 class ConfigurablePriceTest extends AbstractModifierTestCase
 {
@@ -111,4 +112,44 @@ public static function metaDataProvider()
             ]
         ];
     }
+
+    public function testModifyMetaRemovesScopeLabelAndServiceForConfigurable()
+    {
+        $locator = $this->createMock(LocatorInterface::class);
+        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $product->method('getTypeId')->willReturn(Configurable::TYPE_CODE);
+        $locator->method('getProduct')->willReturn($product);
+
+        $modifier = new ConfigurablePriceModifier($locator);
+
+        $meta = [
+            'product_details' => [
+                'children' => [
+                    ConfigurablePriceModifier::CODE_GROUP_PRICE => [
+                        'children' => [
+                            'price' => [
+                                'arguments' => [
+                                    'data' => [
+                                        'config' => [
+                                            'scopeLabel' => 'Some Label',
+                                            'service' => 'Some Service'
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ];
+
+        $result = $modifier->modifyMeta($meta);
+
+        $config = $result['group']['children'][ConfigurablePriceModifier::CODE_GROUP_PRICE]
+            ['children']['price']['arguments']['data']['config'] ?? [];
+        $this->assertArrayNotHasKey('scopeLabel', $config);
+        $this->assertArrayNotHasKey('service', $config);
+    }
 }

app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePrice.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
 
@@ -15,7 +15,7 @@
  */
 class ConfigurablePrice extends AbstractModifier
 {
-    const CODE_GROUP_PRICE = 'container_price';
+    public const CODE_GROUP_PRICE = 'container_price';
 
     /**
      * @var string
@@ -87,6 +87,14 @@ public function modifyMeta(array $meta)
                     ];
                 $config = $visibilityConfig;
                 $config['componentType'] = 'container';
+                if ($productTypeId === ConfigurableType::TYPE_CODE &&
+                    isset($meta[$groupCode]['children'][self::CODE_GROUP_PRICE]
+                        ['children']['price']['arguments']['data']['config']['scopeLabel'])) {
+                    unset($meta[$groupCode]['children'][self::CODE_GROUP_PRICE]
+                        ['children']['price']['arguments']['data']['config']['scopeLabel']);
+                    unset($meta[$groupCode]['children'][self::CODE_GROUP_PRICE]
+                        ['children']['price']['arguments']['data']['config']['service']);
+                }
                 $meta[$groupCode]['children'][self::CODE_GROUP_PRICE] = array_replace_recursive(
                     $meta[$groupCode]['children'][self::CODE_GROUP_PRICE],
                     [