Merge branch 'MC-17014' of git.epam.com:magn-m23/magn-m23 into MC-17014

Author: Lusine-Papyan

app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php

@@ -7,7 +7,6 @@
 
 namespace Magento\Weee\Model\Attribute\Backend\Weee;
 
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
 
@@ -70,9 +69,11 @@ public function __construct(
      * Get backend model name.
      *
      * @return string
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     public static function getBackendModelName()
     {
+        // phpcs:enable Magento2.Functions.StaticFunction
         return \Magento\Weee\Model\Attribute\Backend\Weee\Tax::class;
     }
 
@@ -202,16 +203,4 @@ public function getEntityIdField()
     {
         return $this->_attributeTax->getIdFieldName();
     }
-
-    /**
-     * Don't need to change scope for tax.
-     *
-     * @param Attribute $attribute
-     * @return $this
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function setScope($attribute)
-    {
-        return $this;
-    }
 }

app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Manager/Website.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Weee\Ui\DataProvider\Product\Form\Modifier\Manager;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -12,6 +14,8 @@
 use Magento\Directory\Model\Currency;
 use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Helper\Data;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Website
@@ -23,19 +27,27 @@ class Website
      */
     private $websites;
 
+    /**
+     * @var Data
+     */
+    private $catalogHelper;
+
     /**
      * @param LocatorInterface $locator
      * @param StoreManagerInterface $storeManager
      * @param DirectoryHelper $directoryHelper
+     * @param Data|null $catalogHelper
      */
     public function __construct(
         LocatorInterface $locator,
         StoreManagerInterface $storeManager,
-        DirectoryHelper $directoryHelper
+        DirectoryHelper $directoryHelper,
+        Data $catalogHelper = null
     ) {
         $this->locator = $locator;
         $this->storeManager = $storeManager;
         $this->directoryHelper = $directoryHelper;
+        $this->catalogHelper = $catalogHelper ?: ObjectManager::getInstance()->get(Data::class);
     }
 
     /**
@@ -60,6 +72,7 @@ public function getWebsites(ProductInterface $product, EavAttribute $eavAttribut
 
         if ($this->storeManager->hasSingleStore()
             || ($eavAttribute->getEntityAttribute() && $eavAttribute->getEntityAttribute()->isScopeGlobal()
+            || $this->catalogHelper->isPriceGlobal()
             )
         ) {
             return $this->websites = $websites;