Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-72415

Author: le0n4eg

app/bootstrap.php

@@ -62,6 +62,6 @@
 
 date_default_timezone_set('UTC');
 
-/*  Adjustment of precision value for several versions of PHP */
-ini_set('precision', 17);
-ini_set('serialize_precision', 17);
+/*  For data consistency between displaying (printing) and serialization a float number */
+ini_set('precision', 14);
+ini_set('serialize_precision', 14);

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

@@ -149,7 +149,8 @@ $numColumns = sizeof($block->getColumns());
     <?php endif; ?>
 
     <?php if (strpos($block->getRowClickCallback(), 'order.') !== false): ?>
-    deps.push('Magento_Sales/order/create/form')
+    deps.push('Magento_Sales/order/create/form');
+    deps.push('jquery');
     <?php endif; ?>
 
     deps.push('mage/adminhtml/grid');

app/code/Magento/Bundle/Test/Unit/Pricing/Price/TierPriceTest.php

@@ -180,19 +180,28 @@ public function providerForGetterTierPriceList()
     /**
      * @dataProvider providerForTestGetSavePercent
      */
-    public function testGetSavePercent($baseAmount, $savePercent)
+    public function testGetSavePercent($baseAmount, $tierPrice, $savePercent)
     {
-        $basePrice = 10.;
+        /** @var \Magento\Framework\Pricing\Amount\AmountInterface|\PHPUnit_Framework_MockObject_MockObject $amount */
         $amount = $this->getMockForAbstractClass(\Magento\Framework\Pricing\Amount\AmountInterface::class);
-        $amount->expects($this->once())->method('getBaseAmount')->willReturn($baseAmount);
+        $amount->expects($this->any())
+            ->method('getValue')
+            ->will($this->returnValue($tierPrice));
+
+        $priceAmount = $this->getMockForAbstractClass(\Magento\Framework\Pricing\Amount\AmountInterface::class);
+        $priceAmount->expects($this->any())
+            ->method('getValue')
+            ->will($this->returnValue($baseAmount));
+
         $price = $this->createMock(\Magento\Framework\Pricing\Price\PriceInterface::class);
         $price->expects($this->any())
-            ->method('getValue')
-            ->will($this->returnValue($basePrice));
+            ->method('getAmount')
+            ->will($this->returnValue($priceAmount));
 
         $this->priceInfo->expects($this->any())
             ->method('getPrice')
             ->will($this->returnValue($price));
+
         $this->assertEquals($savePercent, $this->model->getSavePercent($amount));
     }
 
@@ -202,8 +211,8 @@ public function testGetSavePercent($baseAmount, $savePercent)
     public function providerForTestGetSavePercent()
     {
         return [
-            'no fraction' => [9.0000, 10],
-            'lower half'  => [9.1234, 9],
+            'no fraction' => [9.0000, 8.1, 10],
+            'lower half'  => [9.1234, 8.3, 9],
         ];
     }
 }

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

@@ -168,6 +168,10 @@ public function __construct(
      */
     protected function parseSelections($rowData, $entityId)
     {
+        if (empty($rowData['bundle_values'])) {
+            return [];
+        }
+
         $rowData['bundle_values'] = str_replace(
             self::BEFORE_OPTION_VALUE_DELIMITER,
             $this->_entityModel->getMultipleValueSeparator(),

app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php

@@ -294,6 +294,11 @@ public function saveDataProvider()
                 'bunch' => ['bundle_values' => 'value1', 'sku' => 'sku', 'name' => 'name'],
                 'allowImport' => false
             ],
+            'Import without bundle values' => [
+                'skus' => ['newSku' => ['sku' => ['sku' => 'sku', 'entity_id' => 3, 'type_id' => 'bundle']]],
+                'bunch' => ['sku' => 'sku', 'name' => 'name'],
+                'allowImport' => true,
+            ],
             [
                 'skus' => ['newSku' => [
                     'sku' => ['sku' => 'sku', 'entity_id' => 3, 'type_id' => 'bundle'],

app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php

@@ -14,6 +14,21 @@
  */
 class Price implements ProductPriceOptionsInterface
 {
+    /**
+     * Store manager.
+     *
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     */
+    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+    {
+        $this->storeManager = $storeManager;
+    }
+
     /**
      * {@inheritdoc}
      *
@@ -26,4 +41,27 @@ public function toOptionArray()
             ['value' => self::VALUE_PERCENT, 'label' => __('Percent')],
         ];
     }
+
+    /**
+     * Get option array of prefixes.
+     *
+     * @return array
+     */
+    public function prefixesToOptionArray()
+    {
+        return [
+            ['value' => self::VALUE_FIXED, 'label' => $this->getCurrencySymbol()],
+            ['value' => self::VALUE_PERCENT, 'label' => '%'],
+        ];
+    }
+
+    /**
+     * Get currency symbol.
+     *
+     * @return string
+     */
+    private function getCurrencySymbol()
+    {
+        return $this->storeManager->getStore()->getBaseCurrency()->getCurrencySymbol();
+    }
 }

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

@@ -215,14 +215,21 @@ protected function getBasePrice()
     }
 
     /**
+     * Calculates savings percentage according to the given tier price amount
+     * and related product price amount.
+     *
      * @param AmountInterface $amount
+     *
      * @return float
      */
     public function getSavePercent(AmountInterface $amount)
     {
+        $productPriceAmount = $this->priceInfo->getPrice(
+            FinalPrice::PRICE_CODE
+        )->getAmount();
+
         return round(
-            100 - ((100 / $this->priceInfo->getPrice(FinalPrice::PRICE_CODE)->getValue())
-                * $amount->getBaseAmount())
+            100 - ((100 / $productPriceAmount->getValue()) * $amount->getValue())
         );
     }
 

app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php

@@ -21,7 +21,8 @@ class DefaultValidatorTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
-        $priceConfigMock = new \Magento\Catalog\Model\Config\Source\Product\Options\Price();
+        $storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $priceConfigMock = new \Magento\Catalog\Model\Config\Source\Product\Options\Price($storeManagerMock);
         $config = [
             [
                 'label' => 'group label 1',

app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php

@@ -21,7 +21,8 @@ class FileTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
-        $priceConfigMock = new \Magento\Catalog\Model\Config\Source\Product\Options\Price();
+        $storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $priceConfigMock = new \Magento\Catalog\Model\Config\Source\Product\Options\Price($storeManagerMock);
         $config = [
             [
                 'label' => 'group label 1',

app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php

@@ -21,7 +21,8 @@ class SelectTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
-        $priceConfigMock = new \Magento\Catalog\Model\Config\Source\Product\Options\Price();
+        $storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $priceConfigMock = new \Magento\Catalog\Model\Config\Source\Product\Options\Price($storeManagerMock);
         $config = [
             [
                 'label' => 'group label 1',