Merge branch 'MAGETWO-75222' into MPI-PR-2.1.10

Author: YevSent

app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php

@@ -13,7 +13,7 @@
 
 /**
  * Cron operation is responsible for deleting all product prices on WEBSITE level
- * in case 'Catalog Price Scope' configuratoin parameter is set to GLOBAL.
+ * in case 'Catalog Price Scope' configuration parameter is set to GLOBAL.
  */
 class DeleteOutdatedPriceValues
 {
@@ -48,27 +48,46 @@ public function __construct(
     }
 
     /**
-     * Delete all price values for non-admin stores if PRICE_SCOPE is global
+     * Delete all price values for non-admin stores if PRICE_SCOPE is set to global.
      *
      * @return void
      */
     public function execute()
     {
-        $priceScope = $this->scopeConfig->getValue(Store::XML_PATH_PRICE_SCOPE);
-        if ($priceScope == Store::PRICE_SCOPE_GLOBAL) {
-            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $priceAttribute */
-            $priceAttribute = $this->attributeRepository
-                ->get(ProductAttributeInterface::ENTITY_TYPE_CODE, ProductAttributeInterface::CODE_PRICE);
-            $connection = $this->resource->getConnection();
-            $conditions = [
-                $connection->quoteInto('attribute_id = ?', $priceAttribute->getId()),
-                $connection->quoteInto('store_id != ?', Store::DEFAULT_STORE_ID),
-            ];
+        if ($this->isPriceScopeSetToGlobal() === false) {
+            return;
+        }
+
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $priceAttribute */
+        $priceAttribute = $this->attributeRepository
+            ->get(ProductAttributeInterface::ENTITY_TYPE_CODE, ProductAttributeInterface::CODE_PRICE);
+        $connection = $this->resource->getConnection();
+        $conditions = [
+            $connection->quoteInto('attribute_id = ?', $priceAttribute->getId()),
+            $connection->quoteInto('store_id != ?', Store::DEFAULT_STORE_ID),
+        ];
 
-            $connection->delete(
-                $priceAttribute->getBackend()->getTable(),
-                $conditions
-            );
+        $connection->delete(
+            $priceAttribute->getBackend()->getTable(),
+            $conditions
+        );
+    }
+
+    /**
+     * Checks if price scope config option explicitly equal to global value.
+     *
+     * Such strict comparision is required to prevent price deleting when
+     * price scope config option is null for some reason.
+     *
+     * @return bool
+     */
+    private function isPriceScopeSetToGlobal()
+    {
+        $priceScope = $this->scopeConfig->getValue(Store::XML_PATH_PRICE_SCOPE);
+        if ($priceScope === null) {
+            return false;
         }
+
+        return (int)$priceScope === Store::PRICE_SCOPE_GLOBAL;
     }
 }

dev/tests/integration/testsuite/Magento/Catalog/Cron/DeleteOutdatedPriceValuesTest.php

@@ -42,11 +42,13 @@ public function setUp()
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
-     * @magentoConfigFixture current_store catalog/price/scope 2
+     * @magentoConfigFixture current_store catalog/price/scope 1
      * @magentoDbIsolation enabled
      */
     public function testExecute()
     {
+        $defaultStorePrice = 10.00;
+        $secondStorePrice = 9.99;
         $secondStoreId = $this->store->load('fixture_second_store')->getId();
         /** @var \Magento\Catalog\Model\Product\Action $productAction */
         $productAction = $this->objectManager->create(
@@ -64,7 +66,7 @@ public function testExecute()
         );
         $product->setOrigData();
         $product->setStoreId($secondStoreId);
-        $product->setPrice(9.99);
+        $product->setPrice($secondStorePrice);
 
         $productResource->save($product);
         $attribute = $this->objectManager->get(\Magento\Eav\Model\Config::class)
@@ -73,22 +75,33 @@ public function testExecute()
                 'price'
             );
         $this->assertEquals(
-            '9.99',
+            $secondStorePrice,
             $productResource->getAttributeRawValue($productId, $attribute->getId(), $secondStoreId)
         );
         /** @var MutableScopeConfigInterface $config */
         $config = $this->objectManager->get(
             MutableScopeConfigInterface::class
         );
+
+        $config->setValue(
+            \Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
+            null,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+        );
+        $this->cron->execute();
+        $this->assertEquals(
+            $secondStorePrice,
+            $productResource->getAttributeRawValue($productId, $attribute->getId(), $secondStoreId)
+        );
+
         $config->setValue(
             \Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
             \Magento\Store\Model\Store::PRICE_SCOPE_GLOBAL,
             ScopeConfigInterface::SCOPE_TYPE_DEFAULT
         );
-        /** @var \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig */
         $this->cron->execute();
         $this->assertEquals(
-            '10.0000',
+            $defaultStorePrice,
             $productResource->getAttributeRawValue($productId, $attribute->getId(), $secondStoreId)
         );
     }