Revert "WIP Scheduled price rule time zone correction"

This reverts commit 5972daa.

Author: AntonEvers

app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php

@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
-use DateTime;
 use Magento\Catalog\Model\Product;
 use Magento\CatalogRule\Model\ResourceModel\Rule\Collection as RuleCollection;
 use Magento\CatalogRule\Model\ResourceModel\Rule\CollectionFactory as RuleCollectionFactory;
@@ -15,8 +14,6 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\CatalogRule\Model\Indexer\IndexBuilder\ProductLoader;
 use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Magento\Store\Model\ScopeInterface;
 
 /**
  * Catalog rule index builder
@@ -153,11 +150,6 @@ class IndexBuilder
      */
     private $productLoader;
 
-    /**
-     * @var TimezoneInterface|mixed
-     */
-    private $localeDate;
-
     /**
      * @param RuleCollectionFactory $ruleCollectionFactory
      * @param PriceCurrencyInterface $priceCurrency
@@ -178,7 +170,6 @@ class IndexBuilder
      * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|null $activeTableSwitcher
      * @param ProductLoader|null $productLoader
      * @param TableSwapper|null $tableSwapper
-     * @param TimezoneInterface|null $localeDate
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -200,8 +191,7 @@ public function __construct(
         RuleProductPricesPersistor $pricesPersistor = null,
         \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher = null,
         ProductLoader $productLoader = null,
-        TableSwapper $tableSwapper = null,
-        ?TimezoneInterface $localeDate = null
+        TableSwapper $tableSwapper = null
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
@@ -241,8 +231,6 @@ public function __construct(
         );
         $this->tableSwapper = $tableSwapper ??
             ObjectManager::getInstance()->get(TableSwapper::class);
-        $this->localeDate = $localeDate ??
-            ObjectManager::getInstance()->get(TimezoneInterface::class);
     }
 
     /**
@@ -393,7 +381,6 @@ protected function cleanByIds($productIds)
      * @param Rule $rule
      * @param int $productEntityId
      * @param array $websiteIds
-     *
      * @return void
      * @throws \Exception
      * @deprecated
@@ -412,23 +399,16 @@ private function assignProductToRule(Rule $rule, int $productEntityId, array $we
         );
 
         $customerGroupIds = $rule->getCustomerGroupIds();
+        $fromTime = strtotime($rule->getFromDate());
+        $toTime = strtotime($rule->getToDate());
+        $toTime = $toTime ? $toTime + self::SECONDS_IN_DAY - 1 : 0;
         $sortOrder = (int)$rule->getSortOrder();
         $actionOperator = $rule->getSimpleAction();
         $actionAmount = $rule->getDiscountAmount();
         $actionStop = $rule->getStopRulesProcessing();
 
         $rows = [];
         foreach ($websiteIds as $websiteId) {
-            $scopeTz = new \DateTimeZone(
-                $this->localeDate->getConfigTimezone(ScopeInterface::SCOPE_WEBSITE, $websiteId)
-            );
-            $fromTime = $rule->getFromDate()
-                ? (new DateTime($rule->getFromDate(), $scopeTz))->getTimestamp()
-                : 0;
-            $toTime = $rule->getToDate()
-                ? (new DateTime($rule->getToDate(), $scopeTz))->getTimestamp() + IndexBuilder::SECONDS_IN_DAY - 1
-                : 0;
-
             foreach ($customerGroupIds as $customerGroupId) {
                 $rows[] = [
                     'rule_id' => $ruleId,