MAGETWO-36882: Stabilizing branch

Author: akaplya

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

@@ -88,25 +88,19 @@ public function __construct(
      */
     public function aggregateProductsByTypes($orderId, $productTypeIds = [], $isProductTypeIn = false)
     {
-//        $adapter = $this->getReadConnection();
-//        $select = $adapter->select()->from(
-//            ['o' => $this->getTable('sales_order_item')],
-//            ['o.product_type', new \Zend_Db_Expr('COUNT(*)')]
-//        )->joinInner(
-//            ['p' => $this->getTable('catalog_product_entity')],
-//            'o.product_id=p.entity_id',
-//            []
-//        )->where(
-//            'o.order_id=?',
-//            $orderId
-//        )->group(
-//            'o.product_type'
-//        );
-//        if ($productTypeIds) {
-//            $select->where(sprintf('(o.product_type %s (?))', $isProductTypeIn ? 'IN' : 'NOT IN'), $productTypeIds);
-//        }
-//        return $adapter->fetchPairs($select);
-        return [];
+        $adapter = $this->getReadConnection();
+        $select = $adapter->select()
+            ->from(
+                ['o' => $this->getTable('sales_order_item')],
+                ['o.product_type', new \Zend_Db_Expr('COUNT(*)')]
+            )
+            ->where('o.order_id=?', $orderId)
+            ->where('o.product_id IS NOT NULL')
+            ->group('o.product_type');
+        if ($productTypeIds) {
+            $select->where(sprintf('(o.product_type %s (?))', $isProductTypeIn ? 'IN' : 'NOT IN'), $productTypeIds);
+        }
+        return $adapter->fetchPairs($select);
     }
 
     /**

app/code/Magento/Sales/Model/Resource/Order/Status.php

@@ -11,6 +11,7 @@
 use Magento\SalesSequence\Model\Manager;
 use \Magento\Sales\Model\Resource\EntityAbstract;
 use \Magento\Sales\Model\Resource\EntitySnapshot;
+
 /**
  * Order status resource model
  *
@@ -62,7 +63,8 @@ public function __construct(
             $sequenceManager,
             $entitySnapshot,
             $resourcePrefix,
-            $gridAggregator);
+            $gridAggregator
+        );
     }
 
     /**

app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php

@@ -135,7 +135,9 @@ public function aggregate($from = null, $to = null)
                 'store_id' => 'source_table.store_id',
                 'product_id' => 'order_item.product_id',
                 'product_name' => new \Zend_Db_Expr('MIN(order_item.name)'),
-                'product_price' => new \Zend_Db_Expr('MIN(order_item.base_price) * MIN(source_table.base_to_global_rate)'),
+                'product_price' => new \Zend_Db_Expr(
+                    'MIN(order_item.base_price) * MIN(source_table.base_to_global_rate)'
+                ),
                 'qty_ordered' => new \Zend_Db_Expr('SUM(order_item.qty_ordered)'),
             ];
 
@@ -150,7 +152,8 @@ public function aggregate($from = null, $to = null)
                 'source_table.state != ?',
                 \Magento\Sales\Model\Order::STATE_CANCELED
             )->where(
-                'order_item.product_type NOT IN(?)', $this->ignoredProductTypes
+                'order_item.product_type NOT IN(?)',
+                $this->ignoredProductTypes
             );
 
             if ($subSelect !== null) {