ENGCOM-3357: Fix for Issue #4136, MAGETWO-53440 #14485

 - Merge Pull Request #14485 from vasilii-b/magento2:issue-4136-2.2-develop
 - Merged commits:
   1. cc1e013
   2. ff4b005
   3. 6c87bb3
   4. 1d1d061

Author: magento-engcom-team

app/code/Magento/Rule/Model/Condition/AbstractCondition.php

@@ -615,6 +615,9 @@ public function getValueElement()
             // date format intentionally hard-coded
             $elementParams['input_format'] = \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT;
             $elementParams['date_format'] = \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT;
+            $elementParams['placeholder'] = \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT;
+            $elementParams['autocomplete'] = 'off';
+            $elementParams['readonly'] = 'true';
         }
         return $this->getForm()->addField(
             $this->getPrefix() . '__' . $this->getId() . '__value',

app/code/Magento/Rule/view/adminhtml/web/rules.js

@@ -220,6 +220,8 @@ define([
 
             var elem = Element.down(elemContainer, 'input.input-text');
 
+            jQuery(elem).trigger('contentUpdated');
+
             if (elem) {
                 elem.focus();
 

app/design/adminhtml/Magento/backend/web/css/styles-old.less

@@ -3840,6 +3840,26 @@
 
     .rule-param-edit .element {
         display: inline;
+        position: relative;
+    }
+
+    .rule-param-edit .element input.input-date,
+    .rule-param-edit .element input.input-date[readonly] {
+        background-color: @color-white;
+        min-width: 140px;
+        width: 140px !important;
+        cursor: pointer;
+        text-align: center;
+        opacity: 1;
+        margin-right: 10px;
+        padding-right: 40px;
+
+        + .ui-datepicker-trigger {
+            position: absolute;
+            width: 140px;
+            text-align: right;
+            left: 0;
+        }
     }
 
     .rule-param-edit .element .addafter {

lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php

@@ -238,6 +238,7 @@ public function getHtmlAttributes()
             'onchange',
             'disabled',
             'readonly',
+            'autocomplete',
             'tabindex',
             'placeholder',
             'data-form-part',

lib/internal/Magento/Framework/Data/Form/Element/Date.php

@@ -146,7 +146,7 @@ public function getValueInstance()
      */
     public function getElementHtml()
     {
-        $this->addClass('admin__control-text  input-text');
+        $this->addClass('admin__control-text input-text input-date');
         $dateFormat = $this->getDateFormat() ?: $this->getFormat();
         $timeFormat = $this->getTimeFormat();
         if (empty($dateFormat)) {

lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php

@@ -195,6 +195,7 @@ public function testGetHtmlAttributes()
             'onchange',
             'disabled',
             'readonly',
+            'autocomplete',
             'tabindex',
             'placeholder',
             'data-form-part',

lib/web/mage/calendar.js

@@ -66,6 +66,9 @@
      * Widget calendar
      */
     $.widget('mage.calendar', {
+        options: {
+            autoComplete: true
+        },
 
         /**
          * Merge global options with options passed to widget invoke
@@ -379,6 +382,9 @@
                 .addClass('v-middle')
                 .text('') // Remove jQuery UI datepicker generated image
                 .append('<span>' + pickerButtonText + '</span>');
+
+            $(element).attr('autocomplete', this.options.autoComplete ? 'on' : 'off');
+
             this._setCurrentDate(element);
         },