Merge remote-tracking branch 'origin/MC-24693' into 2.4-develop-pr144

Author: zakdma

app/code/Magento/Catalog/Model/Product/Type/Price.php

@@ -298,7 +298,7 @@ public function getTierPrice($qty, $product)
 
         $custGroup = $this->_getCustomerGroupId($product);
         if ($qty) {
-            $prevQty = 1;
+            $prevQty = 0;
             $prevPrice = $product->getPrice();
             $prevGroup = $allGroupsId;
 

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceTest.php

@@ -222,4 +222,17 @@ private function prepareBuyRequest(Product $product): DataObject
 
         return $this->objectManager->create(DataObject::class, ['data' => ['qty' => 1, 'options' => $options]]);
     }
+
+    /**
+     * Assert price for different product with decimal qty.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/simple_product_with_tier_price_and_decimal_qty.php
+     * @magentoAppIsolation enabled
+     * @return void
+     */
+    public function testTierPriceWithDecimalInventory(): void
+    {
+        $product = $this->productRepository->get('simple');
+        $this->assertEquals(2.99, $this->productPrice->getFinalPrice(0.5, $product));
+    }
 }

dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_price_and_decimal_qty.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var ProductTierPriceInterfaceFactory $tierPriceFactory */
+$tierPriceFactory = $objectManager->get(ProductTierPriceInterfaceFactory::class);
+/** @var ProductTierPriceExtensionFactory $tierPriceExtensionAttributesFactory */
+$tierPriceExtensionAttributesFactory = $objectManager->get(ProductTierPriceExtensionFactory::class);
+$product = $productRepository->get('simple', false, null, true);
+$product->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 1, 'is_in_stock' => 1, 'min_sale_qty' => 0.5]);
+$adminWebsite = $objectManager->get(WebsiteRepositoryInterface::class)->get('admin');
+$tierPrices = $product->getTierPrices() ?? [];
+$product->setPrice(3.99);
+$tierPriceExtensionAttributes = $tierPriceExtensionAttributesFactory->create()->setWebsiteId($adminWebsite->getId());
+$tierPrices[] = $tierPriceFactory->create(
+    [
+        'data' => [
+            'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
+            'qty' => 0.5,
+            'value' => 2.99
+        ]
+    ]
+)->setExtensionAttributes($tierPriceExtensionAttributes);
+$product->setTierPrices($tierPrices);
+$productRepository->save($product);

dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_price_and_decimal_qty_rollback.php

@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple_rollback.php');