Merge remote-tracking branch 'troll/MAGETWO-48527' into troll-bugs

Author: vzabaznov

app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php

@@ -156,7 +156,7 @@ public function resolveCustomerNames()
 
         $select->from(
             ['customer' => $this->customerResource->getTable('customer_entity')],
-            ['email']
+            ['entity_id', 'email']
         );
         $select->columns(
             ['customer_name' => $customerName]
@@ -171,8 +171,11 @@ public function resolveCustomerNames()
         $customersData = $this->customerResource->getConnection()->fetchAll($select);
 
         foreach ($this->getItems() as $item) {
-            $item->setData(array_merge($item->getData(), current($customersData)));
-            next($customersData);
+            foreach ($customersData as $customerItemData) {
+                if ($item['customer_id'] == $customerItemData['entity_id']) {
+                    $item->setData(array_merge($item->getData(), $customerItemData));
+                }
+            }
         }
     }
 }

app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Quote/CollectionTest.php

@@ -110,15 +110,14 @@ public function testResolveCustomerNames()
         $customerName = "CONCAT_WS('firstname', 'lastname')";
         $customerTableName = 'customer_entity';
         $customerId = ['customer_id' => ['test_id']];
-        $customersData = [['item_1']];
-        $itemData = ['test'];
+        $customersData = [['entity_id' => 'test_id', 'name' => 'item_1']];
 
         $this->selectMock->expects($this->any())
             ->method('getConnection')
             ->willReturn($this->connectionMock);
         $this->selectMock->expects($this->once())
             ->method('from')
-            ->with(['customer' => $customerTableName], ['email'])
+            ->with(['customer' => $customerTableName], ['entity_id', 'email'])
             ->willReturnSelf();
         $this->selectMock->expects($this->once())
             ->method('columns')
@@ -158,9 +157,6 @@ public function testResolveCustomerNames()
         $itemMock = $this->getMockBuilder('Magento\Framework\Model\AbstractModel')
             ->disableOriginalConstructor()
             ->getMock();
-        $itemMock->expects($this->once())
-            ->method('getData')
-            ->willReturn($itemData);
 
         $this->entityFactoryMock->expects($this->any())
             ->method('create')