🔃 [EngCom] Public Pull Requests - 2.3-develop

magento-engcom-team · web-flow · commit d3248d027165 · 2018-04-25T18:20:05.000+03:00
Accepted Public Pull Requests: - #14812: [Forwardport] Fixed setting of triggerRecollection flag (by @ihor-sviziev) - #14805: Fix for issue 911 found on MSI project - Cannot read property source_� (by @phoenix128) - #14775: MSI-920: Fixed incorrect test (during order cancellation) (by @seruymt) - #14846: Updated readme.md file 2.3-develop (by @sidolov) - #14834: Remove unused namespace from Ui Export model (by @williankeller) - #14842: For MSI-377: fix test fixture and mark return processor as @api (by @seruymt) - #14806: FIX for MSI issue #74 on qty increment (by @phoenix128) Fixed GitHub Issues: - #9580: Quote Attribute trigger_recollect causes a timeout (reported by @bh-ref) has been fixed in #14812 by @ihor-sviziev in 2.3-develop branch Related commits: 1. d0ceba3
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ The members of this team have been recognized for their outstanding commitment t
 </a>
 
 <h3>Top Contributors</h3>
-Magento team thanks for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, your contributions are the foundation of the Magento open source platform.
+Magento is thankful for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, as their contributions are the foundation of the Magento Open Source platform.
 <a href="https://magento.com/magento-contributors">
     <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
 </a>
diff --git a/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
@@ -77,7 +77,7 @@ public function getEnableQtyIncrements($storeId = null);
 
     /**
      * @param int $storeId
-     * @return int
+     * @return float
      */
     public function getQtyIncrements($store = null);
 
diff --git a/app/code/Magento/CatalogInventory/Model/Configuration.php b/app/code/Magento/CatalogInventory/Model/Configuration.php
@@ -273,7 +273,7 @@ public function getEnableQtyIncrements($store = null)
 
     /**
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
-     * @return int
+     * @return float
      */
     public function getQtyIncrements($store = null)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
@@ -392,7 +392,7 @@ public function getUseConfigQtyIncrements()
     /**
      * Retrieve Quantity Increments
      *
-     * @return int|false
+     * @return int|float|false
      */
     public function getQtyIncrements()
     {
@@ -401,7 +401,13 @@ public function getQtyIncrements()
                 if ($this->getUseConfigQtyIncrements()) {
                     $this->qtyIncrements = $this->stockConfiguration->getQtyIncrements($this->getStoreId());
                 } else {
-                    $this->qtyIncrements = (int) $this->getData(static::QTY_INCREMENTS);
+                    $this->qtyIncrements = $this->getData(static::QTY_INCREMENTS);
+                }
+
+                if ($this->getIsQtyDecimal()) { // Cast accordingly to decimal qty usage
+                    $this->qtyIncrements = (float) $this->qtyIncrements;
+                } else {
+                    $this->qtyIncrements = (int) $this->qtyIncrements;
                 }
             }
             if ($this->qtyIncrements <= 0) {
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/ItemTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/ItemTest.php
@@ -394,6 +394,7 @@ public function testGetQtyIncrements($config, $expected)
         $this->setDataArrayValue('qty_increments', $config['qty_increments']);
         $this->setDataArrayValue('enable_qty_increments', $config['enable_qty_increments']);
         $this->setDataArrayValue('use_config_qty_increments', $config['use_config_qty_increments']);
+        $this->setDataArrayValue('is_qty_decimal', $config['is_qty_decimal']);
         if ($config['use_config_qty_increments']) {
             $this->stockConfiguration->expects($this->once())
                 ->method('getQtyIncrements')
@@ -415,23 +416,44 @@ public function getQtyIncrementsDataProvider()
                 [
                     'qty_increments' => 1,
                     'enable_qty_increments' => true,
-                    'use_config_qty_increments' => true
+                    'use_config_qty_increments' => true,
+                    'is_qty_decimal' => false,
+                ],
+                1
+            ],
+            [
+                [
+                    'qty_increments' => 1.5,
+                    'enable_qty_increments' => true,
+                    'use_config_qty_increments' => true,
+                    'is_qty_decimal' => true,
+                ],
+                1.5
+            ],
+            [
+                [
+                    'qty_increments' => 1.5,
+                    'enable_qty_increments' => true,
+                    'use_config_qty_increments' => true,
+                    'is_qty_decimal' => false,
                 ],
                 1
             ],
             [
                 [
                     'qty_increments' => -2,
                     'enable_qty_increments' => true,
-                    'use_config_qty_increments' => true
+                    'use_config_qty_increments' => true,
+                    'is_qty_decimal' => false,
                 ],
                 false
             ],
             [
                 [
                     'qty_increments' => 3,
                     'enable_qty_increments' => true,
-                    'use_config_qty_increments' => false
+                    'use_config_qty_increments' => false,
+                    'is_qty_decimal' => false,
                 ],
                 3
             ],
diff --git a/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml b/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml
@@ -571,7 +571,6 @@
                     <settings>
                         <scopeLabel>[GLOBAL]</scopeLabel>
                         <validation>
-                            <rule name="validate-digits" xsi:type="boolean">true</rule>
                             <rule name="validate-number" xsi:type="boolean">true</rule>
                         </validation>
                         <label translate="true">Qty Increments</label>
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
@@ -2378,8 +2378,9 @@ protected function _afterLoad()
     {
         // collect totals and save me, if required
         if (1 == $this->getTriggerRecollect()) {
-            $this->collectTotals()->save();
-            $this->setTriggerRecollect(0);
+            $this->collectTotals()
+                ->setTriggerRecollect(0)
+                ->save();
         }
         return parent::_afterLoad();
     }
diff --git a/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php b/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
@@ -10,6 +10,8 @@
 
 /**
  * Class ReturnProcessor
+ *
+ * @api
  */
 class ReturnProcessor
 {
diff --git a/app/code/Magento/Ui/Model/Export/ConvertToCsv.php b/app/code/Magento/Ui/Model/Export/ConvertToCsv.php
@@ -8,7 +8,6 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Ui\Component\MassAction\Filter;
 
 /**
@@ -17,7 +16,7 @@
 class ConvertToCsv
 {
     /**
-     * @var WriteInterface
+     * @var DirectoryList
      */
     protected $directory;
 
diff --git a/app/code/Magento/Ui/Model/Export/ConvertToXml.php b/app/code/Magento/Ui/Model/Export/ConvertToXml.php
@@ -12,7 +12,6 @@
 use Magento\Framework\Convert\ExcelFactory;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Ui\Component\MassAction\Filter;
 
 /**
@@ -21,7 +20,7 @@
 class ConvertToXml
 {
     /**
-     * @var WriteInterface
+     * @var DirectoryList
      */
     protected $directory;
 
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js
@@ -109,9 +109,8 @@ define([
          * @param {String|Number} recordId
          */
         deleteRecord: function (index, recordId) {
-            this._super();
-
             this.updateInsertData(recordId);
+            this._super();
         },
 
         /**
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\Sales\Model\Order\ShipmentFactory;
+
 require 'order.php';
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -36,4 +39,10 @@
 
 $order->setIsInProcess(true);
 
-$transaction->addObject($invoice)->addObject($order)->save();
+$items = [];
+foreach ($order->getItems() as $orderItem) {
+    $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
+}
+$shipment = $objectManager->get(ShipmentFactory::class)->create($order, $items);
+
+$transaction->addObject($invoice)->addObject($shipment)->addObject($order)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Block/Adminhtml/CaseInfoTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Block/Adminhtml/CaseInfoTest.php
@@ -8,7 +8,6 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\View\Element\Template\Context;
-use Magento\Framework\View\LayoutInterface;
 use Magento\Sales\Model\Order;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -25,9 +24,9 @@ class CaseInfoTest extends \PHPUnit\Framework\TestCase
     private $order;
 
     /**
-     * @var LayoutInterface
+     * @var \Magento\Framework\View\LayoutFactory
      */
-    private $layout;
+    protected $layoutFactory;
 
     /**
      * @inheritdoc
@@ -36,7 +35,7 @@ protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->order = $this->objectManager->create(Order::class);
-        $this->layout = $this->objectManager->get(LayoutInterface::class);
+        $this->layoutFactory = $this->objectManager->get(\Magento\Framework\View\LayoutFactory::class);
     }
 
     /**
@@ -96,10 +95,12 @@ public function testCaseEntityExists()
      */
     private function getBlock()
     {
-        $this->layout->addContainer('order_additional_info', 'Container');
+        $layout = $this->layoutFactory->create();
+
+        $layout->addContainer('order_additional_info', 'Container');
 
         /** @var CaseInfo $block */
-        $block = $this->layout->addBlock(CaseInfo::class, 'order_case_info', 'order_additional_info');
+        $block = $layout->addBlock(CaseInfo::class, 'order_case_info', 'order_additional_info');
         $block->setAttribute('context', $this->getContext());
         $block->setTemplate('Magento_Signifyd::case_info.phtml');
 
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderTest.php b/dev/tests/integration/testsuite/Magento/Signifyd/Model/SignifydGateway/Request/CreateCaseBuilderTest.php
@@ -64,7 +64,6 @@ public function testCreateCaseBuilderWithFullSetOfData()
         $order->loadByIncrementId('100000001');
 
         $orderItems = $order->getAllItems();
-        $product = $orderItems[0]->getProduct();
         $payment = $order->getPayment();
         $billingAddress = $order->getBillingAddress();
         $shippingAddress = $order->getShippingAddress();
@@ -104,16 +103,16 @@ public function testCreateCaseBuilderWithFullSetOfData()
                         'itemName' => $orderItems[0]->getName(),
                         'itemPrice' => $orderItems[0]->getPrice(),
                         'itemQuantity' => $orderItems[0]->getQtyOrdered(),
-                        'itemUrl' => $product->getProductUrl(),
-                        'itemWeight' => $product->getWeight()
+                        'itemUrl' => $orderItems[0]->getProduct()->getProductUrl(),
+                        'itemWeight' => $orderItems[0]->getProduct()->getWeight()
                     ],
                     1 => [
                         'itemId' => $orderItems[1]->getSku(),
                         'itemName' => $orderItems[1]->getName(),
                         'itemPrice' => $orderItems[1]->getPrice(),
                         'itemQuantity' => $orderItems[1]->getQtyOrdered(),
-                        'itemUrl' => $product->getProductUrl(),
-                        'itemWeight' => $product->getWeight()
+                        'itemUrl' => $orderItems[1]->getProduct()->getProductUrl(),
+                        'itemWeight' => $orderItems[1]->getProduct()->getWeight()
                     ]
                 ],
                 'paymentMethod' => 'PAYPAL_ACCOUNT'
diff --git a/dev/tests/integration/testsuite/Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php b/dev/tests/integration/testsuite/Magento/Signifyd/_files/order_with_customer_and_two_simple_products.php
@@ -10,7 +10,7 @@
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
-require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/multiple_products.php';
 require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
 require __DIR__ . '/store.php';
 
@@ -36,28 +36,33 @@
     ->setCcExpMonth('01')
     ->setCcExpYear('21');
 
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+$product1 = $productRepository->get('simple1');
 /** @var Item $orderItem */
 $orderItem1 = $objectManager->create(Item::class);
-$orderItem1->setProductId($product->getId())
-    ->setSku($product->getSku())
-    ->setName($product->getName())
+$orderItem1->setProductId($product1->getId())
+    ->setSku($product1->getSku())
+    ->setName($product1->getName())
     ->setQtyOrdered(1)
-    ->setBasePrice($product->getPrice())
-    ->setPrice($product->getPrice())
-    ->setRowTotal($product->getPrice())
-    ->setProductType($product->getTypeId());
+    ->setBasePrice($product1->getPrice())
+    ->setPrice($product1->getPrice())
+    ->setRowTotal($product1->getPrice())
+    ->setProductType($product1->getTypeId());
 
+$product2 = $productRepository->get('simple2');
 /** @var Item $orderItem */
 $orderItem2 = $objectManager->create(Item::class);
-$orderItem2->setProductId($product->getId())
-    ->setSku('simple2')
-    ->setName('Simple product')
-    ->setPrice(100)
+$orderItem2->setProductId($product2->getId())
+    ->setSku($product2->getSku())
+    ->setName($product2->getName())
+    ->setPrice($product2->getPrice())
     ->setQtyOrdered(2)
-    ->setBasePrice($product->getPrice())
-    ->setPrice($product->getPrice())
-    ->setRowTotal($product->getPrice())
-    ->setProductType($product->getTypeId());
+    ->setBasePrice($product2->getPrice())
+    ->setPrice($product2->getPrice())
+    ->setRowTotal($product2->getPrice())
+    ->setProductType($product2->getTypeId());
 
 $orderAmount = 100;
 $customerEmail = $billingAddress->getEmail();

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ public function getEnableQtyIncrements($store = null)`
`273`	`273`
`274`	`274`	`/**`
`275`	`275`	`* @param null\|string\|bool\|int\|\Magento\Store\Model\Store $store`
`276`		`- * @return int`
	`276`	`+ * @return float`
`277`	`277`	`*/`
`278`	`278`	`public function getQtyIncrements($store = null)`
`279`	`279`	`{`
Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ public function getUseConfigQtyIncrements()`
`392`	`392`	`/**`
`393`	`393`	`* Retrieve Quantity Increments`
`394`	`394`	`*`
`395`		`- * @return int\|false`
	`395`	`+ * @return int\|float\|false`
`396`	`396`	`*/`
`397`	`397`	`public function getQtyIncrements()`
`398`	`398`	`{`
`@@ -401,7 +401,13 @@ public function getQtyIncrements()`
`401`	`401`	`if ($this->getUseConfigQtyIncrements()) {`
`402`	`402`	`$this->qtyIncrements = $this->stockConfiguration->getQtyIncrements($this->getStoreId());`
`403`	`403`	`} else {`
`404`		`- $this->qtyIncrements = (int) $this->getData(static::QTY_INCREMENTS);`
	`404`	`+ $this->qtyIncrements = $this->getData(static::QTY_INCREMENTS);`
	`405`	`+ }`
	`406`	`+`
	`407`	`+ if ($this->getIsQtyDecimal()) { // Cast accordingly to decimal qty usage`
	`408`	`+ $this->qtyIncrements = (float) $this->qtyIncrements;`
	`409`	`+ } else {`
	`410`	`+ $this->qtyIncrements = (int) $this->qtyIncrements;`
`405`	`411`	`}`
`406`	`412`	`}`
`407`	`413`	`if ($this->qtyIncrements <= 0) {`
Original file line number	Diff line number	Diff line change
`@@ -2378,8 +2378,9 @@ protected function _afterLoad()`
`2378`	`2378`	`{`
`2379`	`2379`	`// collect totals and save me, if required`
`2380`	`2380`	`if (1 == $this->getTriggerRecollect()) {`
`2381`		`- $this->collectTotals()->save();`
`2382`		`- $this->setTriggerRecollect(0);`
	`2381`	`+ $this->collectTotals()`
	`2382`	`+ ->setTriggerRecollect(0)`
	`2383`	`+ ->save();`
`2383`	`2384`	`}`
`2384`	`2385`	`return parent::_afterLoad();`
`2385`	`2386`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`
`11`	`11`	`/**`
`12`	`12`	`* Class ReturnProcessor`
	`13`	`+ *`
	`14`	`+ * @api`
`13`	`15`	`*/`
`14`	`16`	`class ReturnProcessor`
`15`	`17`	`{`