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

Author: rostyslav-hymon

dev/tests/integration/testsuite/Magento/Sales/Controller/Order/ReorderTest.php

@@ -136,6 +136,33 @@ public function testReorderByAnotherCustomer(): void
         }
     }
 
+    /**
+     * Reorder with JS calendar options
+     *
+     * @magentoDataFixture Magento/Sales/_files/order_with_js_date_option_product.php
+     * @magentoConfigFixture current_store catalog/custom_options/use_calendar 1
+     *
+     * @return void
+     */
+    public function testReorderWithJSCalendar(): void
+    {
+        $order = $this->orderFactory->create()->loadByIncrementId('100000001');
+        $items = $order->getItems();
+        $orderItem = array_pop($items);
+        $orderRequestOptions = $orderItem->getProductOptionByCode('info_buyRequest')['options'];
+        $order->save();
+        $this->customerSession->setCustomerId($order->getCustomerId());
+        $this->dispatchReorderRequest((int)$order->getId());
+        $this->assertRedirect($this->stringContains('checkout/cart'));
+        $this->quote = $this->checkoutSession->getQuote();
+        $quoteItemsCollection = $this->quote->getItemsCollection();
+        $this->assertCount(1, $quoteItemsCollection);
+        $items = $this->quote->getItems();
+        $quoteItem = array_pop($items);
+        $quoteRequestOptions = $quoteItem->getBuyRequest()->getOptions();
+        $this->assertEquals($orderRequestOptions, $quoteRequestOptions);
+    }
+
     /**
      * Dispatch reorder request.
      *

dev/tests/integration/testsuite/Magento/Sales/_files/order_with_js_date_option_product.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple.php');
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$addressData = include __DIR__ . '/../../../Magento/Sales/_files/address_data.php';
+
+$billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class);
+$payment->setMethod('checkmo');
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$repository = $objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
+$product = $repository->get('simple');
+
+$optionValuesByType = [
+    'field' => 'Test value',
+    'date_time' => [
+        'date' => '09/30/2022',
+        'hour' => '2',
+        'minute' => '15',
+        'day_part' => 'am',
+        'date_internal' => '2020-09-30 02:15:00'
+    ],
+    'drop_down' => '3-1-select',
+    'radio' => '4-1-radio',
+];
+
+$requestInfo = ['options' => []];
+$productOptions = $product->getOptions();
+foreach ($productOptions as $option) {
+    $requestInfo['options'][$option->getOptionId()] = $optionValuesByType[$option->getType()];
+}
+
+/** @var \Magento\Sales\Model\Order\Item $orderItem */
+$orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
+$orderItem->setProductId($product->getId());
+$orderItem->setSku($product->getSku());
+$orderItem->setQtyOrdered(1);
+$orderItem->setBasePrice($product->getPrice());
+$orderItem->setPrice($product->getPrice());
+$orderItem->setRowTotal($product->getPrice());
+$orderItem->setProductType($product->getTypeId());
+$orderItem->setProductOptions(['info_buyRequest' => $requestInfo]);
+
+/** @var \Magento\Sales\Model\Order $order */
+$order = $objectManager->create(\Magento\Sales\Model\Order::class);
+$order->setIncrementId('100000001');
+$order->setState(\Magento\Sales\Model\Order::STATE_NEW);
+$order->setStatus($order->getConfig()->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_NEW));
+$order->setCustomerIsGuest(true);
+$order->setCustomerEmail('customer@null.com');
+$order->setCustomerFirstname('firstname');
+$order->setCustomerLastname('lastname');
+$order->setBillingAddress($billingAddress);
+$order->setShippingAddress($shippingAddress);
+$order->setAddresses([$billingAddress, $shippingAddress]);
+$order->setPayment($payment);
+$order->addItem($orderItem);
+$order->setStoreId($objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore()->getId());
+$order->setSubtotal(100);
+$order->setBaseSubtotal(100);
+$order->setBaseGrandTotal(100);
+$order->setCustomerId(1)
+    ->setCustomerIsGuest(false)
+    ->save();

dev/tests/integration/testsuite/Magento/Sales/_files/order_with_js_date_option_product_rollback.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/default_rollback.php');