Merge remote-tracking branch 'remotes/mainline_ce/develop' into MAGETWO-35076

Author: Pechenushko

app/code/Magento/Backend/Block/Menu.php

@@ -410,7 +410,7 @@ protected function _addSubMenu($menuItem, $level, $limit)
         if ($level == 0 && $limit) {
             $colStops = $this->_columnBrake($menuItem->getChildren(), $limit);
             $output .= '<strong class="submenu-title">' . $this->_getAnchorLabel($menuItem) . '</strong>';
-            $output .= '<button class="submenu-close _close"></button>';
+            $output .= '<a href="#" class="submenu-close _close" data-role="close-submenu"></a>';
         }
 
         $output .= $this->renderNavigation($menuItem->getChildren(), $level + 1, $limit, $colStops);

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

@@ -22,7 +22,8 @@ define([
         ' +<%- finalPrice.formatted %>' +
         '<% } %>',
         controlContainer: 'dd', // should be eliminated
-        priceFormat: {}
+        priceFormat: {},
+        isFixedPrice: false
     };
 
     $.widget('mage.priceBundle', {
@@ -116,17 +117,17 @@ define([
          */
         _applyQtyFix: function applyQtyFix() {
             var config = this.options.optionConfig;
-            _.each(config.options, function (option) {
-                _.each(option.selections, function (item) {
-                    if (item.priceType === '0') {
+            if (config.isFixedPrice) {
+                _.each(config.options, function (option) {
+                    _.each(option.selections, function (item) {
                         if (item.qty && item.qty !== 1) {
                             _.each(item.prices, function (price) {
                                 price.amount = price.amount / item.qty;
                             });
                         }
-                    }
+                    });
                 });
-            });
+            }
         },
 
         /**

app/code/Magento/Catalog/Pricing/Price/TierPrice.php

@@ -162,7 +162,8 @@ protected function filterTierPrices(array $priceList)
         $qtyCache = [];
         foreach ($priceList as $priceKey => $price) {
             /* filter price by customer group */
-            if ($price['cust_group'] !== $this->customerGroup && $price['cust_group'] !== $this->groupManagement->getAllCustomersGroup()->getId()) {
+            if ($price['cust_group'] != $this->customerGroup &&
+                $price['cust_group'] != $this->groupManagement->getAllCustomersGroup()->getId()) {
                 unset($priceList[$priceKey]);
                 continue;
             }

app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml

@@ -73,8 +73,8 @@ $product = $block->getSaleableItem();
                     );
                 ?><?php echo __('each') ?>
                 <?php if ($block->getShowDetailedPrice() !== false): ?>
-                    <?php echo __('and') ?>&nbsp;<strong class="benefit"><?php echo __('save')?>
-                        <span class="percent tier-<?php echo $index ?>"><?php echo $tierPriceModel->getSavePercent($price['price']) ?></span>%
+                    &nbsp;<?php echo __('and') ?>&nbsp;<strong class="benefit"><?php echo __('save')?>
+                        <span class="percent tier-<?php echo $index ?>">&nbsp;<?php echo $tierPriceModel->getSavePercent($price['price']) ?></span>%
                     </strong>
                 <?php endif ?>
             <?php endif; ?>

app/code/Magento/Sales/Api/Data/ShipmentInterface.php

@@ -253,7 +253,7 @@ public function getComments();
      * @param \Magento\Sales\Api\Data\ShipmentCommentInterface[] $comments
      * @return $this
      */
-    public function setComments(array $comments = null);
+    public function setComments($comments = null);
 
     /**
      * Sets the store ID for the shipment.

app/code/Magento/Sales/Model/Order/Creditmemo/Item.php

@@ -167,7 +167,7 @@ public function setQty($qty)
     /**
      * Applying qty to order item
      *
-     * @return \Magento\Sales\Model\Order\Shipment\Item
+     * @return \Magento\Sales\Model\Order\Creditmemo\Item
      */
     public function register()
     {

app/code/Magento/Sales/Model/Order/Shipment.php

@@ -733,7 +733,7 @@ public function getComments()
      * @param \Magento\Sales\Api\Data\ShipmentCommentInterface[] $comments
      * @return $this
      */
-    public function setComments(array $comments = null)
+    public function setComments($comments = null)
     {
         return $this->setData(ShipmentInterface::COMMENTS, $comments);
     }

app/code/Magento/Sales/Test/Unit/Model/Order/Admin/ItemTest.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Unit\Model\Order\Admin;
+
+/**
+ * Class ValidatorTest
+ */
+class ItemTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $orderItemMock;
+
+    /** @var \Magento\Sales\Model\Order\Admin\Item */
+    protected $item;
+
+
+    public function setUp()
+    {
+        $this->orderItemMock = $this->getMockBuilder('Magento\Sales\Model\Order\Item')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->item = new \Magento\Sales\Model\Order\Admin\Item();
+    }
+
+    public function testGetSku()
+    {
+        $sku = 'sku';
+        $this->orderItemMock->expects($this->once())
+            ->method('getSku')
+            ->willReturn($sku);
+        $result = $this->item->getSku($this->orderItemMock);
+        $this->assertEquals($sku, $result);
+    }
+
+    public function testGetName()
+    {
+        $name = 'name';
+        $this->orderItemMock->expects($this->once())
+            ->method('getName')
+            ->willReturn($name);
+        $result = $this->item->getName($this->orderItemMock);
+        $this->assertEquals($name, $result);
+    }
+
+    public function testGetProductId()
+    {
+        $productId = 1;
+        $this->orderItemMock->expects($this->once())
+            ->method('getProductId')
+            ->willReturn($productId);
+        $result = $this->item->getProductId($this->orderItemMock);
+        $this->assertEquals($productId, $result);
+    }
+}