ENGCOM-2763: [Forwardport] Doesn't work if use date as condition for Catalog Price Rules #17502

magento-engcom-team · magento-engcom-team · commit 23618137f413 · 2018-08-12T15:50:31.000-05:00
- Merge Pull Request #17502 from mage2pratik/magento2:2.3-develop-PR-port-16855 - Merged commits: 1. ddf2509
diff --git a/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php
@@ -99,6 +99,10 @@ protected function _prepareDatetimeValue($value, \Magento\Framework\Model\Abstra
     {
         $attribute = $model->getResource()->getAttribute($this->getAttribute());
         if ($attribute && $attribute->getBackendType() == 'datetime') {
+            if (!$value) {
+                return null;
+            }
+            $this->setValue(strtotime($this->getValue()));
             $value = strtotime($value);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,10 @@ protected function _prepareDatetimeValue($value, \Magento\Framework\Model\Abstra`
`99`	`99`	`{`
`100`	`100`	`$attribute = $model->getResource()->getAttribute($this->getAttribute());`
`101`	`101`	`if ($attribute && $attribute->getBackendType() == 'datetime') {`
	`102`	`+ if (!$value) {`
	`103`	`+ return null;`
	`104`	`+ }`
	`105`	`+ $this->setValue(strtotime($this->getValue()));`
`102`	`106`	`$value = strtotime($value);`
`103`	`107`	`}`
`104`	`108`