Merge remote-tracking branch '39690/fix-for-issue-39169' into comprs_june

engcom-Charlie · engcom-Charlie · commit c75187542b56 · 2025-07-01T18:27:10.000+05:30
diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
+use Magento\Catalog\Model\Pricing\SpecialPriceService;
 
 /**
  * Bundle product type price model
@@ -66,6 +67,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory
+     * @param SpecialPriceService|null $specialPriceService
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -80,7 +82,8 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
         \Magento\Catalog\Helper\Data $catalogData,
         ?\Magento\Framework\Serialize\Serializer\Json $serializer = null,
-        ?ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null
+        ?ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null,
+        ?SpecialPriceService $specialPriceService = null
     ) {
         $this->_catalogData = $catalogData;
         $this->serializer = $serializer ?: ObjectManager::getInstance()
@@ -95,7 +98,8 @@ public function __construct(
             $groupManagement,
             $tierPriceFactory,
             $config,
-            $tierPriceExtensionFactory
+            $tierPriceExtensionFactory,
+            $specialPriceService
         );
     }
 
@@ -629,6 +633,9 @@ public function calculateSpecialPrice(
         $store = null
     ) {
         if ($specialPrice !== null && $specialPrice != false) {
+
+            $specialPriceTo = $this->getSpecialPriceService()->execute($specialPriceTo);
+
             if ($this->_localeDate->isScopeDateInInterval($store, $specialPriceFrom, $specialPriceTo)) {
                 $specialPrice = $finalPrice * ($specialPrice / 100);
                 $finalPrice = min($finalPrice, $specialPrice);
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php
@@ -14,6 +14,7 @@
 use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
 use Magento\Catalog\Helper\Data;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Pricing\SpecialPriceService;
 use Magento\CatalogRule\Model\ResourceModel\RuleFactory;
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Customer\Model\Session;
@@ -135,6 +136,17 @@ function ($value) {
             ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
+
+        $specialPriceService = $this->getMockBuilder(SpecialPriceService::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $specialPriceService->expects($this->any())
+            ->method('execute')
+            ->willReturnCallback(function ($value) {
+                return $value;
+            });
+
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->model = $objectManagerHelper->getObject(
             Price::class,
@@ -150,7 +162,8 @@ function ($value) {
                 'config' => $scopeConfig,
                 'catalogData' => $this->catalogHelperMock,
                 'serializer' => $this->serializer,
-                'tierPriceExtensionFactory' => $tierPriceExtensionFactoryMock
+                'tierPriceExtensionFactory' => $tierPriceExtensionFactoryMock,
+                'specialPriceService' => $specialPriceService
             ]
         );
     }
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php
@@ -10,6 +10,7 @@
 use Magento\Bundle\Pricing\Price\SpecialPrice;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Pricing\Price\RegularPrice;
+use Magento\Catalog\Model\Pricing\SpecialPriceService;
 use Magento\Framework\Pricing\Price\PriceInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Pricing\PriceInfo\Base;
@@ -47,6 +48,11 @@ class SpecialPriceTest extends TestCase
      */
     protected $priceCurrencyMock;
 
+    /**
+     * @var SpecialPriceService|MockObject
+     */
+    private $specialPriceService;
+
     protected function setUp(): void
     {
         $this->saleable = $this->getMockBuilder(Product::class)
@@ -62,13 +68,18 @@ protected function setUp(): void
 
         $this->priceCurrencyMock = $this->getMockForAbstractClass(PriceCurrencyInterface::class);
 
+        $this->specialPriceService = $this->getMockBuilder(SpecialPriceService::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $objectHelper = new ObjectManager($this);
         $this->model = $objectHelper->getObject(
             SpecialPrice::class,
             [
                 'saleableItem' => $this->saleable,
                 'localeDate' => $this->localeDate,
-                'priceCurrency' => $this->priceCurrencyMock
+                'priceCurrency' => $this->priceCurrencyMock,
+                'specialPriceService' => $this->specialPriceService
             ]
         );
     }
@@ -102,6 +113,11 @@ public function testGetValue($regularPrice, $specialPrice, $isScopeDateInInterva
             ->with(WebsiteInterface::ADMIN_CODE, $specialFromDate, $specialToDate)
             ->willReturn($isScopeDateInInterval);
 
+        $this->specialPriceService->expects($this->once())
+            ->method('execute')
+            ->with($specialToDate)
+            ->willReturn($specialToDate);
+
         $this->priceCurrencyMock->expects($this->never())
             ->method('convertAndRound');
 
diff --git a/app/code/Magento/Catalog/Model/Pricing/SpecialPriceService.php b/app/code/Magento/Catalog/Model/Pricing/SpecialPriceService.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Pricing;
+
+/**
+ * This class provides functionality to normalize the end date/time of special prices
+ */
+class SpecialPriceService
+{
+    /**
+     * This class subtracts one day from $dateTo if it contains a specific time (hours, minutes, seconds)
+     * because \Magento\Framework\Stdlib\DateTime\Timezone::isScopeDateInInterval adds one day.
+     * This ensures that the special price expires exactly at the specified time
+     *
+     * For example,
+     * - If $dateTo is "2025-05-12 17:00:00", it will be converted to "2025-05-11 17:00:00"
+     * - If $dateTo is "2024-05-12 00:00:00", it will remain unchanged
+     *
+     * @param mixed $dateTo
+     * @return mixed|string
+     */
+    public function execute(mixed $dateTo): mixed
+    {
+        if ($dateTo
+            && strtotime($dateTo) !== false
+            && date('H:i:s', strtotime($dateTo)) !== '00:00:00') {
+            $dateToTimestamp = strtotime($dateTo);
+            $dateTo = date('Y-m-d H:i:s', $dateToTimestamp - 86400);
+        }
+
+        return $dateTo;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -15,6 +15,7 @@
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Catalog\Model\Pricing\SpecialPriceService;
 
 /**
  * Product type price model
@@ -88,6 +89,11 @@ class Price implements ResetAfterRequestInterface
      */
     private $tierPriceExtensionFactory;
 
+    /**
+     * @var SpecialPriceService|null
+     */
+    private ?SpecialPriceService $specialPriceService;
+
     /**
      * Constructor
      *
@@ -101,6 +107,7 @@ class Price implements ResetAfterRequestInterface
      * @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory
+     * @param SpecialPriceService|null $specialPriceService
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -113,7 +120,8 @@ public function __construct(
         GroupManagementInterface $groupManagement,
         \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        ?ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null
+        ?ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null,
+        ?SpecialPriceService $specialPriceService = null
     ) {
         $this->_ruleFactory = $ruleFactory;
         $this->_storeManager = $storeManager;
@@ -126,6 +134,18 @@ public function __construct(
         $this->config = $config;
         $this->tierPriceExtensionFactory = $tierPriceExtensionFactory ?: ObjectManager::getInstance()
             ->get(ProductTierPriceExtensionFactory::class);
+        $this->specialPriceService = $specialPriceService ?: ObjectManager::getInstance()
+            ->get(SpecialPriceService::class);
+    }
+
+    /**
+     * Returns the SpecialPriceService instance
+     *
+     * @return SpecialPriceService|null
+     */
+    protected function getSpecialPriceService(): ?SpecialPriceService
+    {
+        return $this->specialPriceService;
     }
 
     /**
@@ -642,6 +662,9 @@ public function calculateSpecialPrice(
         $store = null
     ) {
         if ($specialPrice !== null && $specialPrice != false) {
+
+            $specialPriceTo = $this->specialPriceService->execute($specialPriceTo);
+
             if ($this->_localeDate->isScopeDateInInterval($store, $specialPriceFrom, $specialPriceTo)) {
                 $finalPrice = min($finalPrice, (float) $specialPrice);
             }
diff --git a/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php b/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php
@@ -7,11 +7,13 @@
 namespace Magento\Catalog\Pricing\Price;
 
 use Magento\Catalog\Model\Product;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 use Magento\Framework\Pricing\Price\AbstractPrice;
 use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Catalog\Model\Pricing\SpecialPriceService;
 
 /**
  * Special price model
@@ -21,29 +23,38 @@ class SpecialPrice extends AbstractPrice implements SpecialPriceInterface, BaseP
     /**
      * Price type special
      */
-    const PRICE_CODE = 'special_price';
+    public const PRICE_CODE = 'special_price';
 
     /**
      * @var TimezoneInterface
      */
     protected $localeDate;
 
+    /**
+     * @var SpecialPriceService
+     */
+    private SpecialPriceService $specialPriceService;
+
     /**
      * @param Product $saleableItem
      * @param float $quantity
      * @param CalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param TimezoneInterface $localeDate
+     * @param SpecialPriceService|null $specialPriceService
      */
     public function __construct(
         Product $saleableItem,
         $quantity,
         CalculatorInterface $calculator,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-        TimezoneInterface $localeDate
+        TimezoneInterface $localeDate,
+        ?SpecialPriceService $specialPriceService = null
     ) {
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
         $this->localeDate = $localeDate;
+        $this->specialPriceService = $specialPriceService ?: ObjectManager::getInstance()
+            ->get(SpecialPriceService::class);
     }
 
     /**
@@ -103,10 +114,12 @@ public function getSpecialToDate()
      */
     public function isScopeDateInInterval()
     {
+        $dateTo = $this->specialPriceService->execute($this->getSpecialToDate());
+
         return $this->localeDate->isScopeDateInInterval(
             WebsiteInterface::ADMIN_CODE,
             $this->getSpecialFromDate(),
-            $this->getSpecialToDate()
+            $dateTo
         );
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Service/SpecialPriceServiceTest.php b/app/code/Magento/Catalog/Test/Unit/Service/SpecialPriceServiceTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Service;
+
+use Magento\Catalog\Model\Pricing\SpecialPriceService;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for SpecialPriceService
+ */
+class SpecialPriceServiceTest extends TestCase
+{
+    /**
+     * @var SpecialPriceService
+     */
+    private SpecialPriceService $specialPriceService;
+
+    /**
+     * Set up a test environment
+     */
+    protected function setUp(): void
+    {
+        $this->specialPriceService = new SpecialPriceService();
+    }
+
+    /**
+     * Data provider for execute method test
+     *
+     * @return array
+     */
+    public static function executeDataProvider(): array
+    {
+        return [
+            'invalid_date' => [
+                'dateTo' => 'some date to',
+                'expected' => 'some date to'
+            ],
+            'date_without_time' => [
+                'dateTo' => '2025-05-12 00:00:00',
+                'expected' => '2025-05-12 00:00:00'
+            ],
+            'date_with_specific_time' => [
+                'dateTo' => '2025-05-12 17:00:00',
+                'expected' => '2025-05-11 17:00:00'
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider executeDataProvider
+     * @param mixed $dateTo
+     * @param mixed $expected
+     */
+    public function testExecute(mixed $dateTo, mixed $expected): void
+    {
+        $result = $this->specialPriceService->execute($dateTo);
+        $this->assertEquals($expected, $result);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Framework\Stdlib\DateTime;
