Merge pull request #7 from AleksandrsKondratjevs/issue-2473

issue-2473 - Return null in case if product not assigned to website
scandipwa · Jun 9, 2021 · 0d45cb2 · 0d45cb2
2 parents e585e8f + df3414e
commit 0d45cb2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Model/Resolver/EntityUrl.php b/src/Model/Resolver/EntityUrl.php
@@ -112,7 +112,8 @@ public function resolve(
             if ($type === 'PRODUCT') {
                 // Using this instead of factory due https://github.com/magento/magento2/issues/12278
                 $collection = $this->productCollectionFactory->create()
-                    ->addAttributeToFilter('status', ['eq' => Status::STATUS_ENABLED]);
+                    ->addAttributeToFilter('status', ['eq' => Status::STATUS_ENABLED])
+                    ->addWebsiteFilter($this->storeManager->getWebsite());
                 $product = $collection->addIdFilter($id)->getFirstItem();
                 if (!$product->hasData()) {
                     return null;