Merge pull request #268 from magento-firedrakes/MAGETWO-47215

[Firedrakes] Fix L2 MAGETWO-47215

Author: mlogvin

app/code/Magento/Catalog/Model/Product/Type/AbstractType.php

@@ -574,8 +574,12 @@ protected function _prepareOptions(\Magento\Framework\DataObject $buyRequest, $p
     {
         $transport = new \StdClass();
         $transport->options = [];
+        $options = null;
         if ($product->getHasOptions()) {
-            foreach ($product->getOptions() as $option) {
+            $options = $product->getOptions();
+        }
+        if ($options !== null) {
+            foreach ($options as $option) {
                 /* @var $option \Magento\Catalog\Model\Product\Option */
                 $group = $option->groupFactory($option->getType())
                     ->setOption($option)

dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php

@@ -8,7 +8,9 @@
 require dirname(dirname(__DIR__)) . '/Store/_files/second_store.php';
 require dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute.php';
 
-$productModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$productModel = $objectManager->create('Magento\Catalog\Model\Product');
 
 $customOptions = [
     1 => [
@@ -57,4 +59,17 @@
     [$product->getId() => ['position' => 1]]
 );
 
-$product->setOptions($customOptions)->save();
+$options = [];
+
+/** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory */
+$customOptionFactory = $objectManager->create('Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory');
+
+foreach ($customOptions as $option) {
+    /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterface $option */
+    $option = $customOptionFactory->create(['data' => $option]);
+    $option->setProductSku($productModel->getSku());
+
+    $options[] = $option;
+}
+
+$productModel->setOptions($options)->save();

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php

@@ -17,7 +17,6 @@ class QuoteManagementTest extends \PHPUnit_Framework_TestCase
      */
     public function testSubmit()
     {
-        $this->markTestSkipped('Skipped because of MAGETWO-47215');
         /**
          * Preconditions:
          * Load quote with Bundle product that has at least to child products

dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_bundle.php

@@ -33,7 +33,10 @@
     ->setCategoryIds([2])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->save();
-
+$productRepository = $objectManager->get(Magento\Catalog\Api\ProductRepositoryInterface::class);
+/**
+ * @var \Magento\Catalog\Model\Product $product
+ */
 $product = $objectManager->create('Magento\Catalog\Model\Product');
 $product
     ->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE)
@@ -96,24 +99,66 @@
                 ]
             ],
         ]
-    )
+    )->setCustomAttributes([
+        "price_type" => [
+            'attribute_code' => 'price_type',
+            'value' => \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC
+        ],
+        "price_view" => [
+            "attribute_code" => "price_view",
+            "value" => "1",
+        ],
+    ])
     ->setCanSaveBundleSelections(true)
-    ->setAffectBundleProductSelections(true)
-    ->save();
+    ->setHasOptions(false)
+    ->setAffectBundleProductSelections(true);
+if ($product->getBundleOptionsData()) {
+    $options = [];
+    foreach ($product->getBundleOptionsData() as $key => $optionData) {
+        if (!(bool)$optionData['delete']) {
+            $option = $objectManager->create('Magento\Bundle\Api\Data\OptionInterfaceFactory')
+                ->create(['data' => $optionData]);
+            $option->setSku($product->getSku());
+            $option->setOptionId(null);
 
-//Load options
-$typeInstance = $product->getTypeInstance();
-$typeInstance->setStoreFilter($product->getStoreId(), $product);
-$optionCollection = $typeInstance->getOptionsCollection($product);
-$selectionCollection = $typeInstance->getSelectionsCollection($typeInstance->getOptionsIds($product), $product);
+            $links = [];
+            $bundleLinks = $product->getBundleSelectionsData();
+            if (!empty($bundleLinks[$key])) {
+                foreach ($bundleLinks[$key] as $linkData) {
+                    if (!(bool)$linkData['delete']) {
+                        /** @var \Magento\Bundle\Api\Data\LinkInterface$link */
+                        $link = $objectManager->create('Magento\Bundle\Api\Data\LinkInterfaceFactory')
+                            ->create(['data' => $linkData]);
+                        $linkProduct = $productRepository->getById($linkData['product_id']);
+                        $link->setSku($linkProduct->getSku());
+                        $link->setQty($linkData['selection_qty']);
+                        if (isset($linkData['selection_can_change_qty'])) {
+                            $link->setCanChangeQuantity($linkData['selection_can_change_qty']);
+                        }
+                        $links[] = $link;
+                    }
+                }
+                $option->setProductLinks($links);
+                $options[] = $option;
+            }
+        }
+    }
+    $extension = $product->getExtensionAttributes();
+    $extension->setBundleProductOptions($options);
+    $product->setExtensionAttributes($extension);
+}
+$productRepository->save($product);
 
+$product = $productRepository->get($product->getSku());
 $bundleOptions = [];
 $bundleOptionsQty = [];
 /** @var $option \Magento\Bundle\Model\Option */
-foreach ($optionCollection as $option) {
-    /** @var $selection \Magento\Bundle\Model\Selection */
-    foreach ($selectionCollection as $selection) {
-        $bundleOptions[$option->getId()][] = $selection->getSelectionId();
+foreach ($product->getExtensionAttributes()->getBundleProductOptions() as $option) {
+    foreach ($option->getProductLinks() as $selection) {
+        /**
+         * @var \Magento\Bundle\Api\Data\LinkInterface $selection
+         */
+        $bundleOptions[$option->getId()][] = $selection->getId();
         $bundleOptionsQty[$option->getId()][] = 1;
     }
 }