Merge pull request #4778 from magento-tango/MC-19873

MC-19873: [Sample Data Function Test] Sample data test failed with Incorrect final price

Author: dhorytskyi

app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php

@@ -12,6 +12,7 @@
 use Magento\Framework\Registry;
 use Magento\Framework\Stdlib\DateTime\Filter\Date;
 use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
  * Save action for catalog rule
@@ -25,19 +26,27 @@ class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog imple
      */
     protected $dataPersistor;
 
+    /**
+     * @var TimezoneInterface
+     */
+    private $localeDate;
+
     /**
      * @param Context $context
      * @param Registry $coreRegistry
      * @param Date $dateFilter
      * @param DataPersistorInterface $dataPersistor
+     * @param TimezoneInterface $localeDate
      */
     public function __construct(
         Context $context,
         Registry $coreRegistry,
         Date $dateFilter,
-        DataPersistorInterface $dataPersistor
+        DataPersistorInterface $dataPersistor,
+        TimezoneInterface $localeDate
     ) {
         $this->dataPersistor = $dataPersistor;
+        $this->localeDate = $localeDate;
         parent::__construct($context, $coreRegistry, $dateFilter);
     }
 
@@ -46,16 +55,15 @@ public function __construct(
      *
      * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function execute()
     {
         if ($this->getRequest()->getPostValue()) {
-
             /** @var \Magento\CatalogRule\Api\CatalogRuleRepositoryInterface $ruleRepository */
             $ruleRepository = $this->_objectManager->get(
                 \Magento\CatalogRule\Api\CatalogRuleRepositoryInterface::class
             );
-
             /** @var \Magento\CatalogRule\Model\Rule $model */
             $model = $this->_objectManager->create(\Magento\CatalogRule\Model\Rule::class);
 
@@ -65,7 +73,9 @@ public function execute()
                     ['request' => $this->getRequest()]
                 );
                 $data = $this->getRequest()->getPostValue();
-
+                if (!$this->getRequest()->getParam('from_date')) {
+                    $data['from_date'] = $this->localeDate->formatDate();
+                }
                 $filterValues = ['from_date' => $this->_dateFilter];
                 if ($this->getRequest()->getParam('to_date')) {
                     $filterValues['to_date'] = $this->_dateFilter;

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

@@ -101,7 +101,9 @@ public function execute(Rule $rule, $batchCount, $useAdditionalTable = false)
             $scopeTz = new \DateTimeZone(
                 $this->localeDate->getConfigTimezone(ScopeInterface::SCOPE_WEBSITE, $websiteId)
             );
-            $fromTime = (new \DateTime($rule->getFromDate(), $scopeTz))->getTimestamp();
+            $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;