Merge pull request #683 from magento-firedrakes/MAGETWO-41948

[Firedrakes][South][Tango][FearlessKiwis] MAGETWO-41984 MAGETWO-41944 Convert Quoteitem to order item with product options

Author: dkvashninbay

app/code/Magento/Backend/App/AbstractAction.php

@@ -300,7 +300,6 @@ protected function _processLocaleSettings()
     /**
      * Set redirect into response
      *
-     * @deprecated
      * @TODO MAGETWO-28356: Refactor controller actions to new ResultInterface
      * @param   string $path
      * @param   array $arguments
@@ -316,7 +315,6 @@ protected function _redirect($path, $arguments = [])
     /**
      * Forward to action
      *
-     * @deprecated
      * @TODO MAGETWO-28356: Refactor controller actions to new ResultInterface
      * @param string $action
      * @param string|null $controller

app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php

@@ -11,7 +11,6 @@
  * @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
  * @method boolean getHideFormElement()
  * @author      Magento Core Team <[email protected]>
- * @deprecated support Magento 1.x grid massaction implementation
  * @TODO MAGETWO-31510: Remove deprecated class
  */
 class Extended extends \Magento\Backend\Block\Widget

app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml

@@ -6,9 +6,6 @@
 
 // @codingStandardsIgnoreFile
 
-/**
-* @deprecated support Magento 1.x grid massaction implementation
- */
 ?>
 <div id="<?php echo $block->getHtmlId() ?>" class="admin__grid-massaction">
 

app/code/Magento/Bundle/Model/CartItemProcessor.php

@@ -76,7 +76,7 @@ public function convertToBuyRequest(CartItemInterface $cartItem)
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function processProductOptions(CartItemInterface $cartItem)
+    public function processOptions(CartItemInterface $cartItem)
     {
         if ($cartItem->getProductType() !== \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
             return $cartItem;

app/code/Magento/Bundle/Model/Product/Price.php

@@ -97,8 +97,6 @@ public function getIsPricesCalculatedByIndex()
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return float
-     *
-     * @deprecated (MAGETWO-31476)
      */
     public function getPrice($product)
     {
@@ -375,7 +373,6 @@ public function getOptions($product)
      * @param null|bool                  $multiplyQty      Whether to multiply selection's price by its quantity
      * @return float
      *
-     * @deprecated after 1.6.2.0 (MAGETWO-31475)
      * @see \Magento\Bundle\Model\Product\Price::getSelectionFinalTotalPrice()
      */
     public function getSelectionPrice($bundleProduct, $selectionProduct, $selectionQty = null, $multiplyQty = true)

app/code/Magento/Bundle/Model/ProductOptionProcessor.php

@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Bundle\Model;
+
+use Magento\Bundle\Api\Data\BundleOptionInterface;
+use Magento\Bundle\Api\Data\BundleOptionInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductOptionInterface;
+use Magento\Catalog\Model\Product\Type as ProductType;
+use Magento\Catalog\Model\ProductOptionProcessorInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\DataObject\Factory as DataObjectFactory;
+
+class ProductOptionProcessor implements ProductOptionProcessorInterface
+{
+    /**
+     * @var DataObjectFactory
+     */
+    protected $objectFactory;
+
+    /**
+     * @var BundleOptionInterfaceFactory
+     */
+    protected $bundleOptionFactory;
+
+    /**
+     * @param DataObjectFactory $objectFactory
+     * @param BundleOptionInterfaceFactory $bundleOptionFactory
+     */
+    public function __construct(
+        DataObjectFactory $objectFactory,
+        BundleOptionInterfaceFactory $bundleOptionFactory
+    ) {
+        $this->objectFactory = $objectFactory;
+        $this->bundleOptionFactory = $bundleOptionFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertToBuyRequest(ProductOptionInterface $productOption)
+    {
+        /** @var DataObject $request */
+        $request = $this->objectFactory->create();
+
+        $bundleOptions = $this->getBundleOptions($productOption);
+        if (!empty($bundleOptions) && is_array($bundleOptions)) {
+            $requestData = [];
+            foreach ($bundleOptions as $option) {
+                /** @var BundleOptionInterface $option */
+                foreach ($option->getOptionSelections() as $selection) {
+                    $requestData['bundle_option'][$option->getOptionId()][] = $selection;
+                    $requestData['bundle_option_qty'][$option->getOptionId()] = $option->getOptionQty();
+                }
+            }
+            $request->addData($requestData);
+        }
+
+        return $request;
+    }
+
+    /**
+     * Retrieve bundle options
+     *
+     * @param ProductOptionInterface $productOption
+     * @return array
+     */
+    protected function getBundleOptions(ProductOptionInterface $productOption)
+    {
+        if ($productOption
+            && $productOption->getExtensionAttributes()
+            && $productOption->getExtensionAttributes()->getBundleOptions()
+        ) {
+            return $productOption->getExtensionAttributes()
+                ->getBundleOptions();
+        }
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertToProductOption(DataObject $request)
+    {
+        $bundleOptions = $request->getBundleOption();
+        $bundleOptionsQty = $request->getBundleOptionQty();
+
+        if (!empty($bundleOptions) && is_array($bundleOptions)) {
+            $data = [];
+            foreach ($bundleOptions as $optionId => $optionSelections) {
+                if (empty($optionSelections)) {
+                    continue;
+                }
+                $optionSelections = is_array($optionSelections) ? $optionSelections : [$optionSelections];
+                $optionQty = isset($bundleOptionsQty[$optionId]) ? $bundleOptionsQty[$optionId] : 1;
+
+                /** @var BundleOptionInterface $productOption */
+                $productOption = $this->bundleOptionFactory->create();
+                $productOption->setOptionId($optionId);
+                $productOption->setOptionSelections($optionSelections);
+                $productOption->setOptionQty($optionQty);
+                $data[] = $productOption;
+            }
+
+            return ['bundle_options' => $data];
+        }
+
+        return [];
+    }
+}

app/code/Magento/Bundle/Pricing/Render/FinalPriceBox.php

@@ -8,21 +8,33 @@
 
 use Magento\Bundle\Pricing\Price;
 use Magento\Catalog\Pricing\Render as CatalogRender;
+use Magento\Catalog\Pricing\Price\CustomOptionPrice;
 
 /**
  * Class for final_price rendering
  */
 class FinalPriceBox extends CatalogRender\FinalPriceBox
 {
     /**
-     * Check if bundle product has one more custom option with different prices
+     * Check if bundle product has one or more options, or custom options, with different prices
      *
      * @return bool
      */
     public function showRangePrice()
     {
-        /** @var Price\BundleOptionPrice $optionPrice */
-        $optionPrice = $this->getPriceType(Price\BundleOptionPrice::PRICE_CODE);
-        return $optionPrice->getValue() !== $optionPrice->getMaxValue();
+        //Check the bundle options
+        /** @var Price\BundleOptionPrice $bundleOptionPrice */
+        $bundleOptionPrice = $this->getPriceType(Price\BundleOptionPrice::PRICE_CODE);
+        $showRange = $bundleOptionPrice->getValue() != $bundleOptionPrice->getMaxValue();
+
+        if (!$showRange) {
+            //Check the custom options, if any
+            /** @var \Magento\Catalog\Pricing\Price\CustomOptionPrice $customOptionPrice */
+            $customOptionPrice = $this->getPriceType(CustomOptionPrice::PRICE_CODE);
+            $showRange =
+                $customOptionPrice->getCustomOptionRange(true) != $customOptionPrice->getCustomOptionRange(false);
+        }
+
+        return $showRange;
     }
 }

app/code/Magento/Bundle/Test/Unit/Model/CartItemProcessorTest.php

@@ -147,13 +147,13 @@ public function testProcessProductOptions()
         $cartItemMock->expects($this->atLeastOnce())->method('getProductOption')->willReturn($productOptionMock);
         $productOptionMock->expects($this->once())->method('setExtensionAttributes')->with($optionExtensionMock);
 
-        $this->assertSame($cartItemMock, $this->model->processProductOptions($cartItemMock));
+        $this->assertSame($cartItemMock, $this->model->processOptions($cartItemMock));
     }
 
     public function testProcessProductOptionsInvalidType()
     {
         $cartItemMock = $this->getMock('\Magento\Quote\Model\Quote\Item', ['getProductType'], [], '', false);
         $cartItemMock->expects($this->once())->method('getProductType')->willReturn(Type::TYPE_SIMPLE);
-        $this->assertSame($cartItemMock, $this->model->processProductOptions($cartItemMock));
+        $this->assertSame($cartItemMock, $this->model->processOptions($cartItemMock));
     }
 }