MAGETWO-44710: Billing Agreement view page is empty on separate DBs

Author: Vladyslav Shcherbyna

app/code/Magento/Paypal/Model/ResourceModel/Billing/Agreement.php

@@ -46,14 +46,16 @@ public function addOrderRelation($agreementId, $orderId)
     public function addOrdersFilter(\Magento\Framework\Data\Collection\AbstractDb $orderCollection, $agreementIds)
     {
         $agreementIds = is_array($agreementIds) ? $agreementIds : [$agreementIds];
-        $orderCollection->getSelect()->joinInner(
-            ['pbao' => $this->getTable('paypal_billing_agreement_order')],
-            'main_table.entity_id = pbao.order_id',
-            []
-        )->where(
-            'pbao.agreement_id IN(?)',
-            $agreementIds
+        $orderIds = $this->getConnection()->fetchCol(
+            $this->getConnection()->select()
+                ->from(['pbao' => $this->getTable('paypal_billing_agreement_order')], ['order_id'])
+                ->where(
+                    'pbao.agreement_id IN(?)',
+                    $agreementIds
+                )
         );
+        $orderCollection->getSelect()
+            ->where('main_table.entity_id IN (?)', $orderIds);
         return $this;
     }
 }

app/code/Magento/Paypal/Test/Unit/Model/ResourceModel/Billing/AgreementTest.php

@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Test\Unit\Model\ResourceModel;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Class AgreementTest
+ */
+class AgreementTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Paypal\Model\ResourceModel\Billing\Agreement
+     */
+    protected $agreementResource;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $connectionMock;
+
+    /**
+     * @var \Magento\Framework\Data\Collection\AbstractDb|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $collectionMock;
+
+    /**
+     * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $selectMock;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resourceConnectionMock;
+
+    public function setUp()
+    {
+        $objectManager = new ObjectManagerHelper($this);
+        $contextMock = $this->getMockBuilder('Magento\Framework\Model\ResourceModel\Db\Context')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resourceConnectionMock = $this->getMock(
+            'Magento\Framework\App\ResourceConnection',
+            [
+                'getConnection',
+                'getTableName'
+            ],
+            [],
+            '',
+            false
+        );
+        $this->collectionMock = $this->getMockBuilder('Magento\Framework\Data\Collection\AbstractDb')
+            ->disableOriginalConstructor()
+            ->setMethods(['getSelect'])
+            ->getMockForAbstractClass();
+        $this->connectionMock = $this->getMock(
+            'Magento\Framework\DB\Adapter\Pdo\Mysql',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->selectMock = $this->getMock('Magento\Framework\DB\Select', [], [], '', false);
+        $contextMock->expects($this->once())->method('getResources')->willReturn($this->resourceConnectionMock);
+        $this->agreementResource = $objectManager->getObject(
+            'Magento\Paypal\Model\ResourceModel\Billing\Agreement',
+            [
+                'context' => $contextMock,
+            ]
+        );
+    }
+
+    public function testAddOrdersFilter()
+    {
+        $this->resourceConnectionMock->expects($this->exactly(2))
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+        $this->resourceConnectionMock->expects($this->once())
+            ->method('getTableName')
+            ->with('paypal_billing_agreement_order')
+            ->willReturn('pref_paypal_billing_agreement_order');
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->selectMock);
+        $this->selectMock->expects($this->once())
+            ->method('from')
+            ->with(['pbao' => 'pref_paypal_billing_agreement_order'], ['order_id'], null)
+            ->willReturnSelf();
+        $this->selectMock->expects($this->exactly(2))
+            ->method('where')
+            ->withConsecutive(
+                ['pbao.agreement_id IN(?)', [100]],
+                ['main_table.entity_id IN (?)', [500]]
+                )
+            ->willReturnSelf();
+        $this->connectionMock->expects($this->once())
+            ->method('fetchCol')
+            ->with($this->selectMock, [])
+            ->willReturn([500]);
+        $this->collectionMock->expects($this->once())
+            ->method('getSelect')
+            ->willReturn($this->selectMock);
+        $this->assertEquals(
+            $this->agreementResource,
+            $this->agreementResource->addOrdersFilter($this->collectionMock, 100)
+        );
+    }
+}

app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php

@@ -56,7 +56,7 @@ public function execute(EventObserver $observer)
     {
         $storeId = $observer->getData('store')->getId();
         foreach ($this->entityPool->getEntities() as $entityType) {
-            $this->sequenceBuilder->setPrefix($this->sequenceConfig->get('prefix'))
+            $this->sequenceBuilder->setPrefix($storeId)
                 ->setSuffix($this->sequenceConfig->get('suffix'))
                 ->setStartValue($this->sequenceConfig->get('startValue'))
                 ->setStoreId($storeId)