ACP2E-3534: [page builder]Adding Product Listing to block results in errors

- fixed
- unit test modified

Author: o-dubovyk

app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Bundle\Pricing\Adjustment;
@@ -173,12 +173,9 @@ private function addMiniMaxPriceList(Product $bundleProduct, $selectionsCollecti
      */
     private function addMaximumMultiSelectionPriceList(Product $bundleProduct, $selectionsCollection, $useRegularPrice)
     {
-        $websiteId = null;
-        if (!$this->catalogData->isPriceGlobal()) {
-            $websiteId = (int)$this->storeManager->getStore()->getWebsiteId();
-            if ($websiteId === 0) {
-                $websiteId = $this->websiteRepository->getDefault()->getId();
-            }
+        $websiteId = (int)$this->storeManager->getStore()->getWebsiteId();
+        if ($websiteId === 0) {
+            $websiteId = $this->websiteRepository->getDefault()->getId();
         }
         $selectionsCollection->addPriceData(null, $websiteId);
 

app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/DefaultSelectionPriceListProviderTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -189,7 +189,10 @@ public function testGetPriceList(): void
         $this->model->getPriceList($this->product, false, false);
     }
 
-    public function testGetPriceListForFixedPriceType(): void
+    /**
+     * @dataProvider dataProvider
+     */
+    public function testGetPriceListForFixedPriceType($websiteId): void
     {
         $optionId = 1;
 
@@ -218,13 +221,19 @@ public function testGetPriceListForFixedPriceType(): void
             ->willReturn($this->store);
         $this->store->expects($this->once())
             ->method('getWebsiteId')
-            ->willReturn(0);
-        $this->websiteRepository->expects($this->once())
-            ->method('getDefault')
-            ->willReturn($this->website);
-        $this->website->expects($this->once())
-            ->method('getId')
-            ->willReturn(1);
+            ->willReturn($websiteId);
+
+        if ($websiteId) {
+            $this->websiteRepository->expects($this->never())
+                ->method('getDefault');
+        } else {
+            $this->websiteRepository->expects($this->once())
+                ->method('getDefault')
+                ->willReturn($this->website);
+            $this->website->expects($this->once())
+                ->method('getId')
+                ->willReturn(1);
+        }
         $this->selectionCollection->expects($this->once())
             ->method('getIterator')
             ->willReturn(new \ArrayIterator([]));
@@ -271,4 +280,12 @@ public function testGetPriceListWithSearchMin(): void
 
         $this->model->getPriceList($this->product, true, false);
     }
+
+    public static function dataProvider()
+    {
+        return [
+            'website provided' => [1],
+            'website not provided' => [0]
+        ];
+    }
 }