MC-36405: Reorder is not working with custom options date with JavaScript Calendar enabled

Author: rostyslav-hymon

app/code/Magento/Catalog/Model/Product/Option/Type/Date.php

@@ -72,6 +72,8 @@ public function validateUserValue($values)
         $dateValid = true;
         if ($this->_dateExists()) {
             if ($this->useCalendar()) {
+                /* Fixed validation if the date was not saved correctly after re-saved the order
+                for example: "09\/24\/2020,2020-09-24 00:00:00" */
                 if (is_string($value) && preg_match('/^\d{1,4}.+\d{1,4}.+\d{1,4},+(\w|\W)*$/', $value)) {
                     $value = [
                         'date' => preg_replace('/,([^,]+),?$/', '', $value),

app/code/Magento/Catalog/Model/ProductOptionProcessor.php

@@ -32,27 +32,16 @@ class ProductOptionProcessor implements ProductOptionProcessorInterface
      */
     private $urlBuilder;
 
-    /**
-     * Serializer interface instance.
-     *
-     * @var Json
-     */
-    private $serializer;
-
     /**
      * @param DataObjectFactory $objectFactory
      * @param CustomOptionFactory $customOptionFactory
-     * @param Json|null $serializer
      */
     public function __construct(
         DataObjectFactory $objectFactory,
-        CustomOptionFactory $customOptionFactory,
-        Json $serializer = null
+        CustomOptionFactory $customOptionFactory
     ) {
         $this->objectFactory = $objectFactory;
         $this->customOptionFactory = $customOptionFactory;
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -642,6 +642,7 @@ protected function _initShippingAddressFromOrder(\Magento\Sales\Model\Order $ord
      * @param \Magento\Sales\Model\Order\Item $orderItem
      * @param int $qty
      * @return \Magento\Quote\Model\Quote\Item|string|$this
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function initFromOrderItem(\Magento\Sales\Model\Order\Item $orderItem, $qty = null)
     {
@@ -667,9 +668,15 @@ public function initFromOrderItem(\Magento\Sales\Model\Order\Item $orderItem, $q
             if ($productOptions !== null && !empty($productOptions['options'])) {
                 $formattedOptions = [];
                 foreach ($productOptions['options'] as $option) {
+                    if (in_array($option['option_type'], ['date', 'date_time']) && $this->useFrontendCalendar()) {
+                        $product->setSkipCheckRequiredOption(false);
+                        break;
+                    }
                     $formattedOptions[$option['option_id']] = $option['option_value'];
                 }
-                $buyRequest->setData('options', $formattedOptions);
+                if (!empty($formattedOptions)) {
+                    $buyRequest->setData('options', $formattedOptions);
+                }
             }
             $item = $this->getQuote()->addProduct($product, $buyRequest);
             if (is_string($item)) {
@@ -2113,4 +2120,17 @@ private function isAddressesAreEqual(Order $order)
 
         return $shippingData == $billingData;
     }
+
+    /**
+     * Use Calendar on frontend or not
+     *
+     * @return bool
+     */
+    private function useFrontendCalendar(): bool
+    {
+        return (bool)$this->_scopeConfig->getValue(
+            'catalog/custom_options/use_calendar',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
 }