MAGETWO-94196: [2.1] The fix of incorrect date format was lost since 2.1.13

Author: Bohdan Korablov

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php

@@ -255,22 +255,36 @@ protected function customizeNewDateRangeField(array $meta)
             $fromContainerPath = $this->arrayManager->slicePath($fromFieldPath, 0, -2);
             $toContainerPath = $this->arrayManager->slicePath($toFieldPath, 0, -2);
 
+            $commonFieldsMeta = [
+                'outputDateTimeToISO' => false,
+                'inputDateTimeFormat' => 'YYYY-MM-DD h:mm',
+                'options' => [
+                    'showsTime' => true,
+                ]
+            ];
+
             $meta = $this->arrayManager->merge(
                 $fromFieldPath . self::META_CONFIG_PATH,
                 $meta,
-                [
-                    'label' => __('Set Product as New From'),
-                    'additionalClasses' => 'admin__field-date',
-                ]
+                array_merge(
+                    [
+                        'label' => __('Set Product as New From'),
+                        'additionalClasses' => 'admin__field-date',
+                    ],
+                    $commonFieldsMeta
+                )
             );
             $meta = $this->arrayManager->merge(
                 $toFieldPath . self::META_CONFIG_PATH,
                 $meta,
-                [
-                    'label' => __('To'),
-                    'scopeLabel' => null,
-                    'additionalClasses' => 'admin__field-date',
-                ]
+                array_merge(
+                    [
+                        'label' => __('To'),
+                        'scopeLabel' => null,
+                        'additionalClasses' => 'admin__field-date',
+                    ],
+                    $commonFieldsMeta
+                )
             );
             $meta = $this->arrayManager->merge(
                 $fromContainerPath . self::META_CONFIG_PATH,

app/code/Magento/Ui/Component/Form/Element/DataType/Date.php

@@ -65,6 +65,11 @@ public function prepare()
             $storeTimeZone = $this->localeDate->getConfigTimezone();
             $config['storeTimeZone'] = $storeTimeZone;
         }
+
+        if (!empty($config['options']['showsTime'])) {
+            $config['options']['timeFormat'] = $this->localeDate->getTimeFormat();
+        }
+
         // Set date format pattern by current locale
         $localeDateFormat = $this->localeDate->getDateFormat();
         $config['options']['dateFormat'] = $localeDateFormat;

app/code/Magento/Ui/view/base/web/js/form/element/date.js

@@ -31,6 +31,17 @@ define([
              */
             inputDateFormat: 'y-MM-dd',
 
+            /**
+             * Format of date that comes from the
+             * server (ICU Date Format).
+             *
+             * Used only in date/time picker mode
+             * (this.options.showsTime == false).
+             *
+             * @type {String}
+             */
+            inputDateTimeFormat: 'y-MM-dd h:mm',
+
             /**
              * Format of date that should be sent to the
              * server (ICU Date Format).
@@ -42,6 +53,25 @@ define([
              */
             outputDateFormat: 'MM/dd/y',
 
+            /**
+             * Format of date that should be sent to the
+             * server (ICU Date Format).
+             *
+             * Used only in datetime picker mode with disabled ISO format.
+             * (this.options.showsTime == true, this.options.outputDateTimeToISO == false)
+             *
+             * @type {String}
+             */
+            outputDateTimeFormat: '',
+
+            /**
+             * Converts output date/time to ISO string
+             *
+             * Used only in datetime picker mode
+             * (this.options.showsTime == false)
+            */
+            outputDateTimeToISO: true,
+
             /**
              * Date/time format that is used to display date in
              * the input field.
@@ -114,10 +144,20 @@ define([
                 shiftedValue;
 
             if (value) {
+                if (this.options.showsTime && !this.outputDateTimeToISO) {
+                    dateFormat = this.shiftedValue() ?
+                        this.outputDateTimeFormat :
+                        this.inputDateTimeFormat;
+
+                    value = moment(value, dateFormat).format(this.timezoneFormat);
+                }
+
                 if (this.options.showsTime) {
                     shiftedValue = moment.tz(value, 'UTC').tz(this.storeTimeZone);
                 } else {
-                    dateFormat = this.shiftedValue() ? this.outputDateFormat : this.inputDateFormat;
+                    dateFormat = this.shiftedValue() ?
+                        this.outputDateTimeFormat :
+                        this.inputDateTimeFormat;
 
                     shiftedValue = moment(value, dateFormat);
                 }