Merge remote-tracking branch 'origin/ACP2E-4334' into PR_2025_12_03_chittima

Author: chittima

app/code/Magento/Catalog/Model/Product/Price/Validation/TierPriceValidator.php

@@ -20,6 +20,7 @@
 use Magento\Catalog\Helper\Data;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Validate Tier Price and check duplication
@@ -88,6 +89,11 @@ class TierPriceValidator implements ResetAfterRequestInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private StoreManagerInterface $storeManager;
+
     /**
      * TierPriceValidator constructor.
      *
@@ -99,6 +105,7 @@ class TierPriceValidator implements ResetAfterRequestInterface
      * @param array $allowedProductTypes [optional]
      * @param ResourceConnection|null $resourceConnection
      * @param ScopeConfigInterface|null $scopeConfig
+     * @param StoreManagerInterface|null $storeManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -109,7 +116,8 @@ public function __construct(
         ProductRepositoryInterface $productRepository,
         array $allowedProductTypes = [],
         ?ResourceConnection $resourceConnection = null,
-        ?ScopeConfigInterface $scopeConfig = null
+        ?ScopeConfigInterface $scopeConfig = null,
+        ?StoreManagerInterface $storeManager = null
     ) {
         $this->productIdLocator = $productIdLocator;
         $this->websiteRepository = $websiteRepository;
@@ -119,6 +127,7 @@ public function __construct(
         $this->allowedProductTypes = $allowedProductTypes;
         $this->resourceConnection = $resourceConnection ?: ObjectManager::getInstance()->get(ResourceConnection::class);
         $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -354,12 +363,12 @@ private function checkWebsite(TierPriceInterface $price, $key, Result $validatio
     {
         try {
             $this->websiteRepository->getById($price->getWebsiteId());
-            $isWebsiteScope = $this->scopeConfig
-                ->isSetFlag(
-                    Data::XML_PATH_PRICE_SCOPE,
-                    ScopeInterface::SCOPE_STORE,
-                    ScopeConfigInterface::SCOPE_TYPE_DEFAULT
-                );
+            $defaultStoreView = $this->storeManager->getDefaultStoreView();
+            $isWebsiteScope = $this->scopeConfig->isSetFlag(
+                Data::XML_PATH_PRICE_SCOPE,
+                ScopeInterface::SCOPE_STORE,
+                $defaultStoreView->getCode()
+            );
             if (!$isWebsiteScope && (int) $this->allWebsitesValue !== $price->getWebsiteId()) {
                 throw NoSuchEntityException::singleField('website_id', $price->getWebsiteId());
             }

app/code/Magento/Catalog/Test/Unit/Model/Product/Price/Validation/TierPriceValidatorTest.php

@@ -19,8 +19,10 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -76,6 +78,11 @@ class TierPriceValidatorTest extends TestCase
      */
     private $adapterInterface;
 
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private StoreManagerInterface $storeManager;
+
     /**
      * {@inheritdoc}
      */
@@ -107,6 +114,7 @@ protected function setUp(): void
         $this->adapterInterface = $this->getMockBuilder(AdapterInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
 
         $objectManagerHelper = new ObjectManager($this);
         $this->tierPriceValidator = $objectManagerHelper->getObject(
@@ -117,7 +125,8 @@ protected function setUp(): void
                 'validationResult' => $this->validationResult,
                 'invalidSkuProcessor' => $this->invalidSkuProcessor,
                 'productRepository' => $this->productRepository,
-                'resourceConnection' => $this->resourceConnectionMock
+                'resourceConnection' => $this->resourceConnectionMock,
+                'storeManager' => $this->storeManager
             ]
         );
     }
@@ -237,8 +246,12 @@ public function testValidateSkus()
     public function testRetrieveValidationResult(array $returned)
     {
         $sku = 'ASDF234234';
+        $defaultStoreViewCode = 'default';
         $prices = [$this->tierPrice];
         $existingPrices = [$this->tierPrice];
+        $defaultStoreView = $this->createMock(StoreInterface::class);
+        $defaultStoreView->expects($this->once())->method('getCode')->willReturn($defaultStoreViewCode);
+        $this->storeManager->expects($this->once())->method('getDefaultStoreView')->willReturn($defaultStoreView);
         $this->prepareRetrieveValidationResultMethod($sku, $returned);
         $website = $this->getMockBuilder(WebsiteInterface::class)
             ->disableOriginalConstructor()