Merge remote-tracking branch 'remotes/github/MC-10968' into EPAM-PR-37

VeronikaYarats · VeronikaYarats · commit a963a0b21601 · 2019-02-04T20:22:36.000+03:00
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php b/app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php
@@ -203,7 +203,9 @@ protected function fillSimpleProductData(
         $postData['stock_data'] = array_diff_key((array)$parentProduct->getStockData(), array_flip($keysFilter));
         if (!isset($postData['stock_data']['is_in_stock'])) {
             $stockStatus = $parentProduct->getQuantityAndStockStatus();
-            $postData['stock_data']['is_in_stock'] = $stockStatus['is_in_stock'];
+            if (isset($stockStatus['is_in_stock'])) {
+                $postData['stock_data']['is_in_stock'] = $stockStatus['is_in_stock'];
+            }
         }
         $postData = $this->processMediaGallery($product, $postData);
         $postData['status'] = isset($postData['status'])
@@ -262,6 +264,8 @@ public function duplicateImagesForVariations($productsData)
     }
 
     /**
+     * Process media gallery for product
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @param array $productData
      *

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,9 @@ protected function fillSimpleProductData(`
`203`	`203`	`$postData['stock_data'] = array_diff_key((array)$parentProduct->getStockData(), array_flip($keysFilter));`
`204`	`204`	`if (!isset($postData['stock_data']['is_in_stock'])) {`
`205`	`205`	`$stockStatus = $parentProduct->getQuantityAndStockStatus();`
`206`		`- $postData['stock_data']['is_in_stock'] = $stockStatus['is_in_stock'];`
	`206`	`+ if (isset($stockStatus['is_in_stock'])) {`
	`207`	`+ $postData['stock_data']['is_in_stock'] = $stockStatus['is_in_stock'];`
	`208`	`+ }`
`207`	`209`	`}`
`208`	`210`	`$postData = $this->processMediaGallery($product, $postData);`
`209`	`211`	`$postData['status'] = isset($postData['status'])`
`@@ -262,6 +264,8 @@ public function duplicateImagesForVariations($productsData)`
`262`	`264`	`}`
`263`	`265`
`264`	`266`	`/**`
	`267`	`+ * Process media gallery for product`
	`268`	`+ *`
`265`	`269`	`* @param \Magento\Catalog\Model\Product $product`
`266`	`270`	`* @param array $productData`
`267`	`271`	`*`