diff --git a/vendor/magento/module-wishlist-graph-ql/Model/Resolver/WishlistItems.php b/vendor/magento/module-wishlist-graph-ql/Model/Resolver/WishlistItems.php index f3a611b94a9ef..cc697e3fadb68 100644 --- a/vendor/magento/module-wishlist-graph-ql/Model/Resolver/WishlistItems.php +++ b/vendor/magento/module-wishlist-graph-ql/Model/Resolver/WishlistItems.php @@ -1,7 +1,7 @@ getExtensionAttributes()->getStore() instanceof StoreInterface) { + $args['store_id'] = $context->getExtensionAttributes()->getStore()->getId(); + } + /** @var WishlistItemCollection $wishlistItemCollection */ $wishlistItemsCollection = $this->getWishListItems($wishlist, $args); $wishlistItems = $wishlistItemsCollection->getItems(); @@ -100,12 +103,15 @@ private function getWishListItems(Wishlist $wishlist, array $args): WishlistItem /** @var WishlistItemCollection $wishlistItemCollection */ $wishlistItemCollection = $this->wishlistItemCollectionFactory->create(); - $wishlistItemCollection - ->addWishlistFilter($wishlist) - ->addStoreFilter(array_map(function (StoreInterface $store) { + $wishlistItemCollection->addWishlistFilter($wishlist); + if (isset($args['store_id'])) { + $wishlistItemCollection->addStoreFilter($args['store_id']); + } else { + $wishlistItemCollection->addStoreFilter(array_map(function (StoreInterface $store) { return $store->getId(); - }, $this->storeManager->getStores())) - ->setVisibilityFilter(); + }, $this->storeManager->getStores())); + } + $wishlistItemCollection->setVisibilityFilter(); if ($currentPage > 0) { $wishlistItemCollection->setCurPage($currentPage); } @@ -115,4 +121,4 @@ private function getWishListItems(Wishlist $wishlist, array $args): WishlistItem } return $wishlistItemCollection; } -} \ No newline at end of file +}