From 9b5ddd68c23985b8f8a5f5b8b4d2d1db860d55f0 Mon Sep 17 00:00:00 2001
From: "LENOVO-PC\\Vishal" <vishalsutariya7037@gmail.com>
Date: Sat, 19 May 2018 15:38:11 +0530
Subject: [PATCH 1/3] Fixed date displauy issue after filteration on sales
 order page.

---
 app/code/Magento/Ui/view/base/web/js/form/element/date.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
index 586cc28b3abf1..d7f26def01cd5 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/date.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
@@ -95,7 +95,7 @@ define([
             timezoneFormat: 'YYYY-MM-DD HH:mm',
 
             listens: {
-                'value': 'onValueChange',
+                //'value': 'onValueChange',
                 'shiftedValue': 'onShiftedValueChange'
             },
 

From 11130517531674fcaca152bd03a4eb2afa07ee66 Mon Sep 17 00:00:00 2001
From: vishal-sutariya <vishal.sutariya@aureatelabs.com>
Date: Mon, 21 May 2018 18:43:21 +0530
Subject: [PATCH 2/3] Fixed Date dispaly issue after filtearation then page
 reload.

---
 .../Magento/Ui/view/base/web/js/form/element/date.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
index d7f26def01cd5..979eadf8c10fc 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/date.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
@@ -106,7 +106,12 @@ define([
              *
              * @type {String}
              */
-            shiftedValue: ''
+            shiftedValue: '',
+
+            /**
+             * @type {bool}
+             */
+            ispageLoad: true
         },
 
         /**
@@ -147,6 +152,11 @@ define([
             var dateFormat,
                 shiftedValue;
 
+            if (this.ispageLoad == true) {
+                this.ispageLoad = false;
+                return false;
+            }
+
             if (value) {
                 if (this.options.showsTime && !this.outputDateTimeToISO) {
                     dateFormat = this.shiftedValue() ?

From ee0037573f5231a4a5a1f138007511fad2687e12 Mon Sep 17 00:00:00 2001
From: vishal-7037 <vishalsutariya7037@gmail.com>
Date: Mon, 21 May 2018 23:44:57 +0530
Subject: [PATCH 3/3] Add Parameter to shiftedValue properly.

---
 .../Ui/view/base/web/js/form/element/date.js     | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 app/code/Magento/Ui/view/base/web/js/form/element/date.js

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
old mode 100644
new mode 100755
index 979eadf8c10fc..ab7efde4ab03f
--- a/app/code/Magento/Ui/view/base/web/js/form/element/date.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
@@ -95,7 +95,7 @@ define([
             timezoneFormat: 'YYYY-MM-DD HH:mm',
 
             listens: {
-                //'value': 'onValueChange',
+                'value': 'onValueChange',
                 'shiftedValue': 'onShiftedValueChange'
             },
 
@@ -106,12 +106,7 @@ define([
              *
              * @type {String}
              */
-            shiftedValue: '',
-
-            /**
-             * @type {bool}
-             */
-            ispageLoad: true
+            shiftedValue: ''
         },
 
         /**
@@ -152,11 +147,6 @@ define([
             var dateFormat,
                 shiftedValue;
 
-            if (this.ispageLoad == true) {
-                this.ispageLoad = false;
-                return false;
-            }
-
             if (value) {
                 if (this.options.showsTime && !this.outputDateTimeToISO) {
                     dateFormat = this.shiftedValue() ?
@@ -169,7 +159,7 @@ define([
                 if (this.options.showsTime) {
                     shiftedValue = moment.tz(value, 'UTC').tz(this.storeTimeZone);
                 } else {
-                    dateFormat = this.shiftedValue() ?
+                    dateFormat = this.shiftedValue(value) ?
                         this.outputDateFormat :
                         this.inputDateFormat;