MC-39134: Custom options date is not populated when editing reorder items

- Fix custom date option is not populated when editing quote item after enabling javascript calendar

Author: bubasuma

app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php

@@ -5,6 +5,11 @@
  */
 namespace Magento\Catalog\Block\Product\View\Options\Type;
 
+use DateTimeZone;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Form\FilterFactory;
+use Magento\Framework\Stdlib\DateTime;
+
 /**
  * Product options text type block
  *
@@ -27,22 +32,30 @@ class Date extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
      */
     protected $_catalogProductOptionTypeDate;
 
+    /**
+     * @var FilterFactory
+     */
+    private $filterFactory;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Catalog\Model\Product\Option\Type\Date $catalogProductOptionTypeDate
      * @param array $data
+     * @param FilterFactory|null $filterFactory
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\Pricing\Helper\Data $pricingHelper,
         \Magento\Catalog\Helper\Data $catalogData,
         \Magento\Catalog\Model\Product\Option\Type\Date $catalogProductOptionTypeDate,
-        array $data = []
+        array $data = [],
+        ?FilterFactory $filterFactory = null
     ) {
         $this->_catalogProductOptionTypeDate = $catalogProductOptionTypeDate;
         parent::__construct($context, $pricingHelper, $catalogData, $data);
+        $this->filterFactory = $filterFactory ?? ObjectManager::getInstance()->get(FilterFactory::class);
     }
 
     /**
@@ -77,14 +90,24 @@ public function getDateHtml()
     public function getCalendarDateHtml()
     {
         $option = $this->getOption();
-        $value = $this->getProduct()->getPreconfiguredValues()->getData('options/' . $option->getId() . '/date');
+        $values = $this->getProduct()->getPreconfiguredValues()->getData('options/' . $option->getId());
 
         $yearStart = $this->_catalogProductOptionTypeDate->getYearStart();
         $yearEnd = $this->_catalogProductOptionTypeDate->getYearEnd();
 
-        $dateFormat = $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT);
+        $dateFormat = $this->_localeDate->getDateFormatWithLongYear();
         /** Escape RTL characters which are present in some locales and corrupt formatting */
         $escapedDateFormat = preg_replace('/[^MmDdYy\/\.\-]/', '', $dateFormat);
+        $value = null;
+        if (is_array($values)) {
+            $date = $this->getInternalDateString($values);
+            if ($date !== null) {
+                $dateFilter = $this->filterFactory->create('date', ['format' => $escapedDateFormat]);
+                $value = $dateFilter->outputFilter($date);
+            } elseif (isset($values['date'])) {
+                $value = $values['date'];
+            }
+        }
         $calendar = $this->getLayout()->createBlock(
             \Magento\Framework\View\Element\Html\Date::class
         )->setId(
@@ -158,8 +181,8 @@ public function getTimeHtml()
      * Return drop-down html with range of values
      *
      * @param string $name Id/name of html select element
-     * @param int $from  Start position
-     * @param int $to    End position
+     * @param int $from Start position
+     * @param int $to End position
      * @param int|null $value Value selected
      * @return string Formatted Html
      */
@@ -209,9 +232,8 @@ protected function _getHtmlSelect($name, $value = null)
 
         $select->setExtraParams($extraParams);
         if ($value === null) {
-            $value = $this->getProduct()->getPreconfiguredValues()->getData(
-                'options/' . $option->getId() . '/' . $name
-            );
+            $values = $this->getProduct()->getPreconfiguredValues()->getData('options/' . $option->getId());
+            $value = is_array($values) ? $this->parseDate($values, $name) : null;
         }
         if ($value !== null) {
             $select->setValue($value);
@@ -233,4 +255,56 @@ protected function _getValueWithLeadingZeros($value)
         }
         return $value < 10 ? '0' . $value : $value;
     }
+
+    /**
+     * Get internal date format of provided value
+     *
+     * @param array $value
+     * @return string|null
+     */
+    private function getInternalDateString(array $value): ?string
+    {
+        $result = null;
+        if (!empty($value['date']) && !empty($value['date_internal'])) {
+            $dateTimeZone = new DateTimeZone($this->_localeDate->getConfigTimezone());
+            $dateTimeObject = date_create_from_format(
+                DateTime::DATETIME_PHP_FORMAT,
+                $value['date_internal'],
+                $dateTimeZone
+            );
+            if ($dateTimeObject !== false) {
+                $result = $dateTimeObject->format(DateTime::DATE_PHP_FORMAT);
+            }
+        } elseif (!empty($value['day']) && !empty($value['month']) && !empty($value['year'])) {
+            $dateTimeObject = $this->_localeDate->date();
+            $dateTimeObject->setDate((int) $value['year'], (int) $value['month'], (int) $value['day']);
+            $result = $dateTimeObject->format(DateTime::DATE_PHP_FORMAT);
+        }
+        return $result;
+    }
+
+    /**
+     * Parse option value and return the requested part
+     *
+     * @param array $value
+     * @param string $part [year, month, day, hour, minute, day_part]
+     * @return string|null
+     */
+    private function parseDate(array $value, string $part): ?string
+    {
+        $result = null;
+        if (!empty($value['date']) && !empty($value['date_internal'])) {
+            $formatDate = explode(' ', $value['date_internal']);
+            $date = explode('-', $formatDate[0]);
+            $value['year'] = $date[0];
+            $value['month'] = $date[1];
+            $value['day'] = $date[2];
+        }
+
+        if (isset($value[$part])) {
+            $result = (string) $value[$part];
+        }
+
+        return $result;
+    }
 }