Merge branch 'ACP2E-2034' of https://github.com/magento-l3/magento2ce into L3-PR-2023-06-23

Author: ArtemVasyliev

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

@@ -85,7 +85,10 @@ public function getPriceList(Product $bundleProduct, $searchMin, $useRegularPric
                 [(int)$option->getOptionId()],
                 $bundleProduct
             );
-            $selectionsCollection->setFlag('has_stock_status_filter', true);
+
+            if ((int)$bundleProduct->getPriceType() !== Price::PRICE_TYPE_FIXED) {
+                $selectionsCollection->setFlag('has_stock_status_filter', true);
+            }
             $selectionsCollection->removeAttributeToSelect();
 
             if (!$useRegularPrice) {

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

@@ -8,6 +8,7 @@
 namespace Magento\Bundle\Test\Unit\Pricing\Adjustment;
 
 use Magento\Bundle\Model\Option;
+use Magento\Bundle\Model\Product\Price;
 use Magento\Bundle\Model\Product\Type;
 use Magento\Bundle\Model\ResourceModel\Option\Collection;
 use Magento\Bundle\Model\ResourceModel\Selection\Collection as SelectionCollection;
@@ -109,6 +110,8 @@ protected function setUp(): void
 
         $this->product = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
+            ->addMethods(['getPriceType'])
+            ->onlyMethods(['getTypeInstance', 'isSalable'])
             ->getMock();
         $this->optionsCollection = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
@@ -142,6 +145,54 @@ public function testGetPriceList(): void
     {
         $optionId = 1;
 
+        $this->typeInstance->expects($this->any())
+            ->method('getOptionsCollection')
+            ->with($this->product)
+            ->willReturn($this->optionsCollection);
+        $this->product->expects($this->any())
+            ->method('getTypeInstance')
+            ->willReturn($this->typeInstance);
+        $this->product->expects($this->once())
+            ->method('getPriceType')->willReturn(Price::PRICE_TYPE_FIXED);
+        $this->optionsCollection->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator([$this->option]));
+        $this->option->expects($this->once())
+            ->method('getOptionId')
+            ->willReturn($optionId);
+        $this->typeInstance->expects($this->once())
+            ->method('getSelectionsCollection')
+            ->with([$optionId], $this->product)
+            ->willReturn($this->selectionCollection);
+        $this->option->expects($this->once())
+            ->method('isMultiSelection')
+            ->willReturn(true);
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->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);
+        $this->selectionCollection->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator([]));
+        $this->selectionCollection->expects($this->never())
+            ->method('setFlag')
+            ->with('has_stock_status_filter', true);
+
+        $this->model->getPriceList($this->product, false, false);
+    }
+
+    public function testGetPriceListForFixedPriceType(): void
+    {
+        $optionId = 1;
+
         $this->typeInstance->expects($this->any())
             ->method('getOptionsCollection')
             ->with($this->product)