MAGETWO-57009: [Backport] [GitHub] Bundle Products - The price calculation fails for user defined quantity #4446 - for 2.0

Author: RomaKis

app/code/Magento/Bundle/view/base/web/js/price-bundle.js

@@ -295,6 +295,10 @@ define([
             case 'hidden':
                 optionHash = 'bundle-option-' + optionName + '##' + optionValue;
                 optionQty = optionConfig[optionValue].qty || 0;
+                canQtyCustomize = optionConfig[optionValue].customQty === '1';
+                qtyField = element.data('qtyField');
+                qtyField.data('option', element);
+                toggleQtyField(qtyField, optionQty, optionId, optionValue, canQtyCustomize);
                 tempChanges = utils.deepClone(optionConfig[optionValue].prices);
                 tempChanges = applyTierPrice(tempChanges, optionQty, optionConfig);
                 tempChanges = applyQty(tempChanges, optionQty);

dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.xml

@@ -28,5 +28,9 @@
         <getProductName>
             <selector>td.col-name</selector>
         </getProductName>
+        <user_defined>
+            <selector>[class$='is-user-defined-qty']</selector>
+            <input>checkbox</input>
+        </user_defined>
     </fields>
 </mapping>

dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php

@@ -7,10 +7,9 @@
 namespace Magento\Bundle\Test\Block\Catalog\Product;
 
 use Magento\Bundle\Test\Block\Catalog\Product\View\Type\Bundle;
-use Magento\Bundle\Test\Fixture\BundleProduct;
+use Magento\Bundle\Test\Block\Catalog\Product\View\Summary;
 use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\FixtureInterface;
-use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Class View
@@ -46,6 +45,13 @@ class View extends \Magento\Catalog\Test\Block\Product\View
      */
     protected $newsletterFormSelector = '#newsletter-validate-detail[novalidate="novalidate"]';
 
+    /**
+     * Summary Block selector.
+     *
+     * @var string
+     */
+    private $summaryBlockSelector = '#bundleSummary';
+
     /**
      * Get bundle options block.
      *
@@ -59,6 +65,19 @@ public function getBundleBlock()
         );
     }
 
+    /**
+     * Get bundle Summary block.
+     *
+     * @return Summary
+     */
+    public function getBundleSummaryBlock()
+    {
+        return $this->blockFactory->create(
+            Summary::class,
+            ['element' => $this->_rootElement->find($this->summaryBlockSelector)]
+        );
+    }
+
     /**
      * Click "Customize and add to cart button".
      *

dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Summary.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Test\Block\Catalog\Product\View;
+
+use Magento\Bundle\Test\Block\Catalog\Product\View\Summary\ConfiguredPrice;
+use Magento\Catalog\Test\Block\Product\View;
+use Magento\Mtf\Client\ElementInterface;
+
+/**
+ * Bundle Summary block.
+ */
+class Summary extends View
+{
+    /**
+     * Configured Price block selector.
+     *
+     * @var string
+     */
+    private $configuredPriceBlockSelector = '.price-configured_price';
+
+    /**
+     * Get configured price block.
+     *
+     * @return ConfiguredPrice
+     */
+    public function getConfiguredPriceBlock()
+    {
+        /** @var ElementInterface $element */
+        $element = $this->_rootElement->find($this->configuredPriceBlockSelector);
+
+        return $this->blockFactory->create(
+            ConfiguredPrice::class,
+            ['element' => $element]
+        );
+    }
+}

dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Summary/ConfiguredPrice.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Test\Block\Catalog\Product\View\Summary;
+
+use Magento\Catalog\Test\Block\AbstractPriceBlock;
+
+/**
+ * This class is used to access the price related information from the storefront.
+ */
+class ConfiguredPrice extends AbstractPriceBlock
+{
+    /**
+     * Mapping for different type of price.
+     *
+     * @var array
+     */
+    protected $mapTypePrices = [
+        'configured_price' => [
+            'selector' => '.price',
+        ]
+    ];
+
+    /**
+     * This method returns the price represented by the block.
+     *
+     * @param string $currency
+     * @return string|null
+     */
+    public function getPrice($currency = '$')
+    {
+        return $this->getTypePrice('configured_price', $currency);
+    }
+}

dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php

@@ -107,11 +107,11 @@ public function getOptions(FixtureInterface $product)
 
             /** @var SimpleElement $optionElement */
             $optionElement = $listFormOptions[$title];
-            $getTypeData = 'get' . $this->optionNameConvert($option['type']) . 'Data';
+            $getTypeData = 'get' . $this->optionNameConvert($option['frontend_type']) . 'Data';
 
             $optionData = $this->$getTypeData($optionElement);
             $optionData['title'] = $title;
-            $optionData['type'] = $option['type'];
+            $optionData['type'] = $option['frontend_type'];
             $optionData['is_require'] = $optionElement->find($this->required, Locator::SELECTOR_XPATH)->isVisible()
                 ? 'Yes'
                 : 'No';
@@ -266,7 +266,7 @@ public function fillBundleOptions($bundleOptions)
             /** @var Option $optionBlock */
             $optionBlock = $this->blockFactory->create(
                 'Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option\\'
-                . $this->optionNameConvert($option['type']),
+                . $this->optionNameConvert($option['frontend_type']),
                 ['element' => $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)]
             );
             $optionBlock->fillOption($option['value']);

dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option/Element/Qty.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option\Element;
+
+use Magento\Mtf\Client\Element\SimpleElement;
+
+/**
+ * Typified element class for qty element.
+ */
+class Qty extends SimpleElement
+{
+    /**
+     * "Backspace" key code.
+     */
+    const BACKSPACE = "\xEE\x80\x83";
+
+    /**
+     * "RIGHT" key code.
+     */
+    const RIGHT = "\xEE\x80\x94";
+
+    /**
+     * Set the value.
+     *
+     * @param string|array $value
+     * @return void
+     */
+    public function setValue($value)
+    {
+        $this->keys([self::RIGHT, self::BACKSPACE, $value]);
+        $this->context->click();
+    }
+}

dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option/Hidden.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option;
+
+use Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option;
+
+/**
+ * Bundle option hidden type.
+ */
+class Hidden extends Option
+{
+    //
+}

dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option/Hidden.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<mapping strict="1">
+    <fields>
+        <qty>
+            <selector>//input[contains(@class,"qty")]</selector>
+            <strategy>xpath</strategy>
+            <class>Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option\Element\Qty</class>
+        </qty>
+    </fields>
+</mapping>

dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php

@@ -61,7 +61,7 @@ protected function prepareBundleOptions(BundleProduct $product)
         foreach ($bundleOptions as $optionKey => $bundleOption) {
             $optionData = [
                 'title' => $bundleOption['title'],
-                'type' => $bundleOption['type'],
+                'type' => $bundleOption['frontend_type'],
                 'is_require' => $bundleOption['required'],
             ];
 

dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceCalculatedOnProductPage.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Test\Constraint;
+
+use Magento\Bundle\Test\Fixture\BundleProduct;
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Catalog\Test\TestStep\ConfigureProductOnProductPageStep;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\TestStep\TestStepFactory;
+
+/**
+ * Assert calculated price after configure bundle product on product page.
+ */
+class AssertBundlePriceCalculatedOnProductPage extends AbstractConstraint
+{
+    /**
+     * Assert calculated price after configure bundle product on product page.
+     *
+     * @param TestStepFactory $stepFactory
+     * @param BundleProduct $product
+     * @param CatalogProductView $catalogProductView
+     */
+    public function processAssert(
+        TestStepFactory $stepFactory,
+        BundleProduct $product,
+        CatalogProductView $catalogProductView
+    ) {
+        $stepFactory->create(
+            ConfigureProductOnProductPageStep::class,
+            ['product' => $product]
+        )->run();
+
+        //Process assertions
+        $this->assertPrice($product, $catalogProductView);
+    }
+
+    /**
+     * Assert prices on the product view Page.
+     *
+     * @param BundleProduct $product
+     * @param CatalogProductView $productView
+     * @return void
+     */
+    protected function assertPrice(
+        BundleProduct $product,
+        CatalogProductView $productView
+    ) {
+        $checkoutData = $product->getCheckoutData();
+
+        $blockPrice = $productView->getBundleViewBlock()
+            ->getBundleSummaryBlock()
+            ->getConfiguredPriceBlock()
+            ->getPrice();
+
+        \PHPUnit_Framework_Assert::assertEquals(
+            $checkoutData['cartItem']['configuredPrice'],
+            $blockPrice,
+            'Bundle price calculated is not correct.'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Bundle price calculates right on product view page.';
+    }
+}

dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductForm.php

@@ -13,6 +13,13 @@
  */
 class AssertBundleProductForm extends AssertProductForm
 {
+    /**
+     * Skipped fields for verify data.
+     *
+     * @var array
+     */
+    protected $skippedFields = ['frontend_type'];
+
     /**
      * Formatting options for array values.
      *

dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Curl.php

@@ -63,6 +63,10 @@ public function __construct(DataInterface $configuration, EventManagerInterface
             'selection_price_type' => [
                 'Fixed' => 0,
                 'Percent' => 1,
+            ],
+            'user_defined' => [
+                'Yes' => 1,
+                'No' => 0
             ]
         ];
     }