MAGETWO-44539: Issues with "Orders and Returns" widget

- Renamed method loadByIncrementIdAndStore to loadByIncrementIdAndStoreId;

Author: Dmytro Poperechnyy

app/code/Magento/Sales/Helper/Guest.php

@@ -150,7 +150,7 @@ public function loadValidOrder(App\RequestInterface $request)
             }
 
             if (!$errors) {
-                $order = $order->loadByIncrementIdAndStore($incrementId, $storeId);
+                $order = $order->loadByIncrementIdAndStoreId($incrementId, $storeId);
             }
 
             $errors = true;

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

@@ -444,13 +444,13 @@ public function loadByIncrementId($incrementId)
     }
 
     /**
-     * Load order by system increment identifier and store
+     * Load order by system increment and store identifiers
      *
      * @param string $incrementId
      * @param string $storeId
      * @return \Magento\Sales\Model\Order
      */
-    public function loadByIncrementIdAndStore($incrementId, $storeId)
+    public function loadByIncrementIdAndStoreId($incrementId, $storeId)
     {
         $orderCollection = $this->getSalesOrderCollection(
             [

app/code/Magento/Sales/Test/Unit/Helper/GuestTest.php

@@ -75,7 +75,7 @@ protected function setUp()
         $this->salesOrderMock = $this->getMock(
             'Magento\Sales\Model\Order',
             [
-                'getProtectCode', 'loadByIncrementIdAndStore', 'loadByIncrementId',
+                'getProtectCode', 'loadByIncrementIdAndStoreId', 'loadByIncrementId',
                 'getId', 'getBillingAddress', '__wakeup'
             ],
             [],
@@ -119,7 +119,7 @@ public function testLoadValidOrderNotEmptyPost()
         $this->storeManagerInterfaceMock->expects($this->once())->method('getStore')->willReturn($this->storeModelMock);
         $this->storeModelMock->expects($this->once())->method('getId')->willReturn($storeId);
         $this->orderFactoryMock->expects($this->once())->method('create')->willReturn($this->salesOrderMock);
-        $this->salesOrderMock->expects($this->once())->method('loadByIncrementIdAndStore')->willReturnSelf();
+        $this->salesOrderMock->expects($this->once())->method('loadByIncrementIdAndStoreId')->willReturnSelf();
         $this->salesOrderMock->expects($this->any())->method('getId')->willReturn($incrementId);
 
         $billingAddressMock = $this->getMock(

app/code/Magento/Sales/Test/Unit/Model/OrderTest.php

@@ -743,7 +743,7 @@ public function testGetStatusHistories()
         }
     }
 
-    public function testLoadByIncrementIdAndStore()
+    public function testLoadByIncrementIdAndStoreId()
     {
         $incrementId = '000000001';
         $storeId = '2';
@@ -754,7 +754,7 @@ public function testLoadByIncrementIdAndStore()
         $this->salesOrderCollectionMock->expects($this->any())->method('addFieldToFilter')->willReturnSelf();
         $this->salesOrderCollectionMock->expects($this->once())->method('load')->willReturnSelf();
         $this->salesOrderCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($this->order);
-        $this->assertSame($this->order, $this->order->loadByIncrementIdAndStore($incrementId, $storeId));
+        $this->assertSame($this->order, $this->order->loadByIncrementIdAndStoreId($incrementId, $storeId));
     }
 
     public function notInvoicingStatesProvider()