MAGETWO-98886: Gift Card Accounts: expiration date subtracts one day

Author: yelahin-serhiy

lib/internal/Magento/Framework/Data/Form/Element/Date.php

@@ -53,6 +53,19 @@ public function __construct(
         }
     }
 
+    /**
+     * Check if a string is a date value
+     *
+     * @param string $value
+     * @return bool
+     */
+    private function isDate(string $value): bool
+    {
+        $date = date_parse($value);
+
+        return !empty($date['year']) && !empty($date['month']) && !empty($date['day']);
+    }
+
     /**
      * If script executes on x64 system, converts large numeric values to timestamp limit
      *
@@ -85,13 +98,13 @@ public function setValue($value)
             $this->_value = $value;
             return $this;
         }
-
         try {
             if (preg_match('/^[0-9]+$/', $value)) {
                 $this->_value = (new \DateTime())->setTimestamp($this->_toTimestamp($value));
+            } else if (is_string($value) && $this->isDate($value)) {
+                $this->_value = new \DateTime($value, new \DateTimeZone($this->localeDate->getConfigTimezone()));
             } else {
-                $this->_value = new \DateTime($value);
-                $this->_value->setTimezone(new \DateTimeZone($this->localeDate->getConfigTimezone()));
+                $this->_value = '';
             }
         } catch (\Exception $e) {
             $this->_value = '';