Merge remote-tracking branch 'public/115_Users_can_see_sales_orders_from_other_company' into pap-b2b-prs

Author: rganin

app/code/Magento/Sales/Block/Order/Recent.php

@@ -6,9 +6,9 @@
 namespace Magento\Sales\Block\Order;
 
 use Magento\Framework\View\Element\Template\Context;
-use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
 use Magento\Customer\Model\Session;
 use Magento\Sales\Model\Order\Config;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\ObjectManager;
 
@@ -26,7 +26,7 @@ class Recent extends \Magento\Framework\View\Element\Template
     const ORDER_LIMIT = 5;
 
     /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
+     * @var CollectionFactoryInterface
      */
     protected $_orderCollectionFactory;
 
@@ -47,15 +47,15 @@ class Recent extends \Magento\Framework\View\Element\Template
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory
+     * @param CollectionFactoryInterface $orderCollectionFactory
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param array $data
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         Context $context,
-        CollectionFactory $orderCollectionFactory,
+        CollectionFactoryInterface $orderCollectionFactory,
         Session $customerSession,
         Config $orderConfig,
         array $data = [],
@@ -84,11 +84,12 @@ protected function _construct()
      */
     private function getRecentOrders()
     {
-        $orders = $this->_orderCollectionFactory->create()->addAttributeToSelect(
+        $customerId = $this->_customerSession->getCustomerId();
+        $orders = $this->_orderCollectionFactory->create($customerId)->addAttributeToSelect(
             '*'
         )->addAttributeToFilter(
             'customer_id',
-            $this->_customerSession->getCustomerId()
+            $customerId
         )->addAttributeToFilter(
             'store_id',
             $this->storeManager->getStore()->getId()

app/code/Magento/Sales/CustomerData/LastOrderedItems.php

@@ -23,7 +23,7 @@ class LastOrderedItems implements SectionSourceInterface
     const SIDEBAR_ORDER_LIMIT = 5;
 
     /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
+     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface
      */
     protected $_orderCollectionFactory;
 
@@ -68,7 +68,7 @@ class LastOrderedItems implements SectionSourceInterface
     private $logger;
 
     /**
-     * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory
+     * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface $orderCollectionFactory
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
@@ -77,7 +77,7 @@ class LastOrderedItems implements SectionSourceInterface
      * @param LoggerInterface $logger
      */
     public function __construct(
-        \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory,
+        \Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface $orderCollectionFactory,
         \Magento\Sales\Model\Order\Config $orderConfig,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
@@ -103,7 +103,7 @@ protected function initOrders()
     {
         $customerId = $this->_customerSession->getCustomerId();
 
-        $orders = $this->_orderCollectionFactory->create()
+        $orders = $this->_orderCollectionFactory->create($customerId)
             ->addAttributeToFilter('customer_id', $customerId)
             ->addAttributeToFilter('status', ['in' => $this->_orderConfig->getVisibleOnFrontStatuses()])
             ->addAttributeToSort('created_at', 'desc')
@@ -138,7 +138,7 @@ protected function getItems()
                     $this->logger->critical($noEntityException);
                     continue;
                 }
-                if (isset($product) && in_array($website, $product->getWebsiteIds())) {
+                if (in_array($website, $product->getWebsiteIds())) {
                     $url = $product->isVisibleInSiteVisibility() ? $product->getProductUrl() : null;
                     $items[] = [
                         'id' => $item->getId(),
@@ -188,7 +188,7 @@ protected function getLastOrder()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSectionData()
     {