From 06443f99c0de046ac67f484709fe7be147b3e5df Mon Sep 17 00:00:00 2001 From: saphal Date: Sat, 27 Oct 2018 15:42:40 +0530 Subject: [PATCH] #18192, Fixed rating issue website wise --- .../Review/Model/ResourceModel/Rating.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating.php b/app/code/Magento/Review/Model/ResourceModel/Rating.php index 3f54c17f6ff7c..5232a7fa33af4 100644 --- a/app/code/Magento/Review/Model/ResourceModel/Rating.php +++ b/app/code/Magento/Review/Model/ResourceModel/Rating.php @@ -34,12 +34,18 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb */ protected $_logger; + /** + * @var \Magento\Framework\App\State + */ + protected $_state; + /** * @param \Magento\Framework\Model\ResourceModel\Db\Context $context * @param \Psr\Log\LoggerInterface $logger * @param \Magento\Framework\Module\Manager $moduleManager * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\Review\Model\ResourceModel\Review\Summary $reviewSummary + * @param \Magento\Framework\App\State * @param string $connectionName */ public function __construct( @@ -48,12 +54,14 @@ public function __construct( \Magento\Framework\Module\Manager $moduleManager, \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\Review\Model\ResourceModel\Review\Summary $reviewSummary, + \Magento\Framework\App\State $state, $connectionName = null ) { $this->moduleManager = $moduleManager; $this->_storeManager = $storeManager; $this->_logger = $logger; $this->_reviewSummary = $reviewSummary; + $this->_state = $state; parent::__construct($context, $connectionName); } @@ -425,9 +433,15 @@ public function getReviewSummary($object, $onlyForCurrentStore = true) $data = $connection->fetchAll($select, [':review_id' => $object->getReviewId()]); + if ($this->_state->getAreaCode() == "adminhtml") { + $currentStore = false; + } else { + $currentStore = $this->_storeManager->getStore()->setId(); + } + if ($onlyForCurrentStore) { foreach ($data as $row) { - if ($row['store_id'] == $this->_storeManager->getStore()->getId()) { + if ($row['store_id'] == $currentStore) { $object->addData($row); } }