ENGCOM-1397: [Forwardport] Fix issue #13944. Show Store Views in Terms and Conditions grid. #14868

Author: Stanislav Idolov

app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php

@@ -5,27 +5,42 @@
  */
 namespace Magento\CheckoutAgreements\Block\Adminhtml\Agreement;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Grid\CollectionFactory as GridCollectionFactory;
+
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory
+     * @deprecated
      */
     protected $_collectionFactory;
 
+    /**
+     * @param GridCollectionFactory
+     */
+    private $gridCollectionFactory;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory $collectionFactory
      * @param array $data
+     * @param GridCollectionFactory $gridColFactory
      * @codeCoverageIgnore
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Helper\Data $backendHelper,
         \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory $collectionFactory,
-        array $data = []
+        array $data = [],
+        GridCollectionFactory $gridColFactory = null
     ) {
+
         $this->_collectionFactory = $collectionFactory;
+        $this->gridCollectionFactory = $gridColFactory
+            ? : ObjectManager::getInstance()->get(GridCollectionFactory::class);
+
         parent::__construct($context, $backendHelper, $data);
     }
 
@@ -47,7 +62,7 @@ protected function _construct()
      */
     protected function _prepareCollection()
     {
-        $this->setCollection($this->_collectionFactory->create());
+        $this->setCollection($this->gridCollectionFactory->create());
         return parent::_prepareCollection();
     }
 

app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Grid;
+
+/**
+ * CheckoutAgreement Grid Collection
+ */
+class Collection extends \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function load($printQuery = false, $logQuery = false)
+    {
+        if ($this->isLoaded()) {
+            return $this;
+        }
+
+        parent::load($printQuery, $logQuery);
+
+        $this->addStoresToResult();
+
+        return $this;
+    }
+
+    /**
+     * @return void
+     */
+    private function addStoresToResult()
+    {
+        $stores = $this->getStoresForAgreements();
+
+        if (!empty($stores)) {
+            $storesByAgreementId = [];
+
+            foreach ($stores as $storeData) {
+                $storesByAgreementId[$storeData['agreement_id']][] = $storeData['store_id'];
+            }
+
+            foreach ($this as $item) {
+                $agreementId = $item->getData('agreement_id');
+
+                if (!isset($storesByAgreementId[$agreementId])) {
+                    continue;
+                }
+
+                $item->setData('stores', $storesByAgreementId[$agreementId]);
+            }
+        }
+    }
+
+    /**
+     * @return array
+     */
+    private function getStoresForAgreements()
+    {
+        $agreementId = $this->getColumnValues('agreement_id');
+
+        if (!empty($agreementId)) {
+            $select = $this->getConnection()->select()->from(
+                ['agreement_store' => 'checkout_agreement_store']
+            )->where(
+                'agreement_store.agreement_id IN (?)',
+                $agreementId
+            );
+
+            return $this->getConnection()->fetchAll($select);
+        }
+
+        return [];
+    }
+}