MAGETWO-70921: Date sets to 2020 year after save

Author: OlgaVasyltsun

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

@@ -60,14 +60,15 @@ public function __construct(
     public function prepare()
     {
         $config = $this->getData('config');
+
         if (!isset($config['storeTimeZone'])) {
             $storeTimeZone = $this->localeDate->getConfigTimezone();
             $config['storeTimeZone'] = $storeTimeZone;
         }
         // Set date format pattern by current locale
         $localeDateFormat = $this->localeDate->getDateFormat();
         $config['options']['dateFormat'] = $localeDateFormat;
-        $config['outputDateFormat'] = $localeDateFormat;
+        $config['options']['storeLocale'] = $this->locale;
         $this->setData('config', $config);
         parent::prepare();
     }

app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php

@@ -76,9 +76,6 @@ public function testPrepareWithTimeOffset()
         $this->assertArrayHasKey('options', $config);
         $this->assertArrayHasKey('dateFormat', $config['options']);
         $this->assertEquals($localeDateFormat, $config['options']['dateFormat']);
-
-        $this->assertArrayHasKey('outputDateFormat', $config);
-        $this->assertEquals($localeDateFormat, $config['outputDateFormat']);
     }
 
     /**
@@ -121,15 +118,14 @@ public function testPrepareWithoutTimeOffset()
         $this->assertArrayHasKey('dateFormat', $config['options']);
         $this->assertEquals($localeDateFormat, $config['options']['dateFormat']);
 
-        $this->assertArrayHasKey('outputDateFormat', $config);
-        $this->assertEquals($localeDateFormat, $config['outputDateFormat']);
     }
 
     /**
      * This test ensures that userTimeZone is properly saved in the configuration.
      */
     public function testPrepare()
     {
+        $this->localeResolverMock->expects($this->any())->method('getLocale')->willReturn('de-DE');
         $this->date = $this->objectManagerHelper->getObject(
             Date::class,
             [
@@ -142,5 +138,6 @@ public function testPrepare()
         $this->date->prepare();
         $configArray = $this->date->getData('config');
         $this->assertEquals('America/Chicago', $configArray['storeTimeZone']);
+        $this->assertEquals('de-DE', $configArray['options']['storeLocale']);
     }
 }

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

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 define([
@@ -53,6 +53,11 @@ define([
             pickerDefaultDateFormat: 'MM/dd/y', // ICU Date Format
             pickerDefaultTimeFormat: 'h:mm a', // ICU Time Format
 
+            /**
+             * Format needed by moment timezone for conversion.
+             */
+            timezoneFormat: 'YYYY-MM-DD HH:mm',
+
             elementTmpl: 'ui/form/element/date',
 
             listens: {
@@ -135,15 +140,17 @@ define([
          */
         onShiftedValueChange: function (shiftedValue) {
             var value,
-                formattedValue;
+                formattedValue,
+                momentValue;
 
             if (shiftedValue) {
+                momentValue = moment(shiftedValue, this.pickerDateTimeFormat);
+
                 if (this.options.showsTime) {
-                    formattedValue = moment(shiftedValue).format('YYYY-MM-DD HH:mm');
+                    formattedValue = moment(momentValue).format(this.timezoneFormat);
                     value = moment.tz(formattedValue, this.storeTimeZone).tz('UTC').toISOString();
                 } else {
-                    value = moment(shiftedValue, this.pickerDateTimeFormat);
-                    value = value.format(this.outputDateFormat);
+                    value = momentValue.format(this.outputDateFormat);
                 }
             } else {
                 value = '';
@@ -165,14 +172,14 @@ define([
                 this.pickerDateTimeFormat += ' ' + this.options.timeFormat;
             }
 
-            this.pickerDateTimeFormat = utils.normalizeDate(this.pickerDateTimeFormat);
+            this.pickerDateTimeFormat = utils.convertToMomentFormat(this.pickerDateTimeFormat);
 
-            if (this.dateFormat) {
-                this.inputDateFormat = this.dateFormat;
+            if (this.options.dateFormat) {
+                this.outputDateFormat = this.options.dateFormat;
             }
 
-            this.inputDateFormat = utils.normalizeDate(this.inputDateFormat);
-            this.outputDateFormat = utils.normalizeDate(this.outputDateFormat);
+            this.inputDateFormat = utils.convertToMomentFormat(this.inputDateFormat);
+            this.outputDateFormat = utils.convertToMomentFormat(this.outputDateFormat);
 
             this.validationParams.dateFormat = this.outputDateFormat;
         }

dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml

@@ -78,8 +78,8 @@
         <field name="custom_options" is_required="0" group="customer-options" source="Magento\Catalog\Test\Fixture\Product\CustomOptions" repository="Magento\Catalog\Test\Repository\Product\CustomOptions" />
         <field name="website_ids" group="websites"  source="Magento\Catalog\Test\Fixture\Product\WebsiteIds" />
         <field name="is_returnable" is_required="0" group="product-details" />
-        <field name="news_from_date" is_required="0" source="Magento\Backend\Test\Fixture\Source\Date" />
-        <field name="news_to_date" is_required="0" source="Magento\Backend\Test\Fixture\Source\Date" />
+        <field name="news_from_date" is_required="0" group="product-details" source="Magento\Backend\Test\Fixture\Source\Date" />
+        <field name="news_to_date" is_required="0" group="product-details" source="Magento\Backend\Test\Fixture\Source\Date" />
         <field name="stock_data" group="advanced-inventory" />
         <field name="checkout_data" group="null" repository="Magento\Catalog\Test\Repository\CatalogProductSimple\CheckoutData" />
         <field name="cross_sell_products" group="related" source="Magento\Catalog\Test\Fixture\Product\RelatedProducts" />

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml

@@ -162,5 +162,13 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage" />
         </variation>
+        <variation name="UpdateSimpleProductEntityTestVariation14" summary="Verify product date attributes are saved and displayed correctly." ticketId="MAGETWO-70929">
+            <data name="initialProduct/dataset" xsi:type="string">default</data>
+            <data name="product/data/sku" xsi:type="string">test_simple_product_%isolation%</data>
+            <data name="product/data/news_from_date" xsi:type="string">12/12/2018</data>
+            <data name="product/data/news_to_date" xsi:type="string">12/25/2018</data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
+        </variation>
     </testCase>
 </config>

lib/web/mage/utils/misc.js

@@ -234,6 +234,21 @@ define([
             }, this);
 
             return data;
+        },
+
+        /**
+         * Converts PHP IntlFormatter format to moment format.
+         *
+         * @param {String} format - PHP format
+         * @returns {String} - moment compatible formatting
+         */
+        convertToMomentFormat: function (format) {
+            var newFormat;
+
+            newFormat = format.replace(/yy|y/gi, 'YYYY'); // replace the year
+            newFormat = newFormat.replace(/dd|d/g, 'DD'); // replace the date
+
+            return newFormat;
         }
     };
 });