MAGETWO-96488: Wrong price calculation for bundle product on creating order from the admin panel

Author: viktym

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php

@@ -20,9 +20,7 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
     protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/checkbox.phtml';
 
     /**
-     * @param  string $elementId
-     * @param  string $containerId
-     * @return string
+     * @inheritdoc
      */
     public function setValidationContainer($elementId, $containerId)
     {
@@ -34,4 +32,15 @@ public function setValidationContainer($elementId, $containerId)
             '\';
             </script>';
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSelectionPrice($selection)
+    {
+        $price = parent::getSelectionPrice($selection);
+        $qty = $selection->getSelectionQty();
+
+        return $price * $qty;
+    }
 }

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php

@@ -20,9 +20,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/multi.phtml';
 
     /**
-     * @param  string $elementId
-     * @param  string $containerId
-     * @return string
+     * @inheritdoc
      */
     public function setValidationContainer($elementId, $containerId)
     {
@@ -34,4 +32,15 @@ public function setValidationContainer($elementId, $containerId)
             '\';
             </script>';
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSelectionPrice($selection)
+    {
+        $price = parent::getSelectionPrice($selection);
+        $qty = $selection->getSelectionQty();
+
+        return $price * $qty;
+    }
 }

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php

@@ -264,7 +264,8 @@ public function getSelectionPrice($selection)
         if ($selection) {
             $price = $this->getProduct()->getPriceModel()->getSelectionPreFinalPrice(
                 $this->getProduct(),
-                $selection
+                $selection,
+                1
             );
             if (is_numeric($price)) {
                 $price = $this->pricingHelper->currencyByStore($price, $store, false);

app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml

@@ -32,14 +32,14 @@
 
             <!--Create bundle product with checkbox bundle option-->
             <createData entity="ApiBundleProduct" stepKey="product"/>
-            <createData entity="CheckboxOption" stepKey="bundleOption">
+            <createData entity="CheckboxOption" stepKey="checkboxBundleOption">
                 <requiredEntity createDataKey="product"/>
             </createData>
 
             <!--Link simple product 1 to bundle option with default quantity 2-->
             <createData entity="ApiBundleLink" stepKey="createBundleLink1">
                 <requiredEntity createDataKey="product"/>
-                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="checkboxBundleOption"/>
                 <requiredEntity createDataKey="simple1"/>
                 <field key="qty">2</field>
                 <field key="is_default">1</field>
@@ -48,11 +48,33 @@
             <!--Link simple product 2 to bundle option with default quantity 2-->
             <createData entity="ApiBundleLink" stepKey="createBundleLink2">
                 <requiredEntity createDataKey="product"/>
-                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="checkboxBundleOption"/>
                 <requiredEntity createDataKey="simple2"/>
                 <field key="qty">2</field>
                 <field key="is_default">1</field>
             </createData>
+
+            <!--Add drop-down bundle option-->
+            <createData entity="DropDownBundleOption" stepKey="dropDownBundleOption">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+
+            <!--Link simple product 1 to drop-down bundle option with default quantity 2-->
+            <createData entity="ApiBundleLink" stepKey="createBundleLink3">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="dropDownBundleOption"/>
+                <requiredEntity createDataKey="simple1"/>
+                <field key="qty">2</field>
+                <field key="is_default">1</field>
+            </createData>
+
+            <!--Link simple product 2 to drop-down bundle option with default quantity 2-->
+            <createData entity="ApiBundleLink" stepKey="createBundleLink4">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="dropDownBundleOption"/>
+                <requiredEntity createDataKey="simple2"/>
+                <field key="qty">2</field>
+            </createData>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
 
@@ -65,7 +87,7 @@
         <actionGroup ref="addBundleProductToOrderAndCheckPriceInGrid" stepKey="addBundleProductToOrder">
             <argument name="product" value="$$product$$"/>
             <argument name="quantity" value="1"/>
-            <argument name="price" value="$492.00"/>
+            <argument name="price" value="$738.00"/>
         </actionGroup>
 
         <!--Select FlatRate shipping method-->

app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml

@@ -16,6 +16,9 @@
             <severity value="AVERAGE"/>
             <testCaseId value="MAGETWO-59633"/>
             <group value="Sales"/>
+            <skip>
+                <issueId value="MAGETWO-96196"/>
+            </skip>
         </annotations>
 
         <before>