Merge remote-tracking branch 'origin/MC-33427' into 2.4-develop-pr23

Author: serhii-balko

app/code/Magento/MsrpGroupedProduct/Plugin/Model/Product/Type/Grouped.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MsrpGroupedProduct\Plugin\Model\Product\Type;
+
+use Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection;
+
+/**
+ * Minimum advertised price plugin for grouped product
+ */
+class Grouped
+{
+    /**
+     * Add minimum advertised price to the attribute selection for associated products
+     *
+     * @param \Magento\GroupedProduct\Model\Product\Type\Grouped $subject
+     * @param Collection $collection
+     * @return Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetAssociatedProductCollection(
+        \Magento\GroupedProduct\Model\Product\Type\Grouped $subject,
+        Collection $collection
+    ): Collection {
+        $collection->addAttributeToSelect(['msrp']);
+        return $collection;
+    }
+}

app/code/Magento/MsrpGroupedProduct/Pricing/MsrpPriceCalculator.php

@@ -31,6 +31,6 @@ public function getMsrpPriceValue(ProductInterface $product): float
         /** @var Grouped $groupedProduct */
         $groupedProduct = $product->getTypeInstance();
 
-        return $groupedProduct->getChildrenMsrp($product);
+        return (float) $groupedProduct->getChildrenMsrp($product);
     }
 }

app/code/Magento/MsrpGroupedProduct/etc/di.xml

@@ -16,4 +16,7 @@
             </argument>
         </arguments>
     </type>
-</config>
+    <type name="\Magento\GroupedProduct\Model\Product\Type\Grouped">
+        <plugin name="grouped_product_minimum_advertised_price" type="\Magento\MsrpGroupedProduct\Plugin\Model\Product\Type\Grouped"/>
+    </type>
+</config>

dev/tests/integration/testsuite/Magento/MsrpGroupedProduct/Pricing/MsrpPriceCalculatorTest.php

@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MsrpGroupedProduct\Pricing;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test group product minimum advertised price model
+ */
+class MsrpPriceCalculatorTest extends TestCase
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+    /**
+     * @var MsrpPriceCalculator
+     */
+    private $model;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        $this->model = $objectManager->get(MsrpPriceCalculator::class);
+    }
+
+    /**
+     * Test grouped product minimum advertised price
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/GroupedProduct/_files/product_grouped.php
+     * @dataProvider getMsrpPriceValueDataProvider
+     * @param float|null $simpleProductPriceMsrp
+     * @param float|null $virtualProductMsrp
+     * @param float|null $expectedMsrp
+     */
+    public function testGetMsrpPriceValue(
+        ?float $simpleProductPriceMsrp,
+        ?float $virtualProductMsrp,
+        ?float $expectedMsrp
+    ): void {
+        $this->setProductMinimumAdvertisedPrice('simple', $simpleProductPriceMsrp);
+        $this->setProductMinimumAdvertisedPrice('virtual-product', $virtualProductMsrp);
+        $groupedProduct = $this->getProduct('grouped-product');
+        $this->assertEquals($expectedMsrp, $this->model->getMsrpPriceValue($groupedProduct));
+    }
+
+    /**
+     * Set product minimum advertised price by sku
+     *
+     * @param string $sku
+     * @param float|null $msrp
+     */
+    private function setProductMinimumAdvertisedPrice(string $sku, ?float $msrp): void
+    {
+        $product = $this->getProduct($sku);
+        $product->setMsrp($msrp);
+        $this->productRepository->save($product);
+    }
+
+    /**
+     * Get product by sku
+     *
+     * @param string $sku
+     * @return ProductInterface
+     */
+    private function getProduct(string $sku): ProductInterface
+    {
+        return $this->productRepository->get($sku, false, null, true);
+    }
+
+    /**
+     * @return array
+     */
+    public function getMsrpPriceValueDataProvider(): array
+    {
+        return [
+            [
+                12.0,
+                8.0,
+                8.0
+            ],
+            [
+                12.0,
+                null,
+                12.0
+            ],
+            [
+                null,
+                null,
+                0.0
+            ]
+        ];
+    }
+}