[Forwardport] Fix for Issue #4136, MAGETWO-53440

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

@@ -62,7 +62,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
     protected $_layout;
 
     /**
-     * Base name for hidden elements
+     * Base name for hidden elements.
+     *
      * @var string
      */
     protected $elementName = 'rule';
@@ -116,8 +117,9 @@ public function getDefaultOperatorInputByType()
     }
 
     /**
-     * Default operator options getter
-     * Provides all possible operator options
+     * Default operator options getter.
+     *
+     * Provides all possible operator options.
      *
      * @return array
      */
@@ -141,6 +143,8 @@ public function getDefaultOperatorOptions()
     }
 
     /**
+     * Get rule form.
+     *
      * @return Form
      */
     public function getForm()
@@ -149,6 +153,8 @@ public function getForm()
     }
 
     /**
+     * Get condition as array.
+     *
      * @param array $arrAttributes
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -195,6 +201,8 @@ public function getMappedSqlField()
     }
 
     /**
+     * Get condition as xml.
+     *
      * @return string
      */
     public function asXml()
@@ -214,6 +222,8 @@ public function asXml()
     }
 
     /**
+     * Load condition from array.
+     *
      * @param array $arr
      * @return $this
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -229,6 +239,8 @@ public function loadArray($arr)
     }
 
     /**
+     * Load condition from xml.
+     *
      * @param string|array $xml
      * @return $this
      */
@@ -242,6 +254,8 @@ public function loadXml($xml)
     }
 
     /**
+     * Load attribute options.
+     *
      * @return $this
      */
     public function loadAttributeOptions()
@@ -250,6 +264,8 @@ public function loadAttributeOptions()
     }
 
     /**
+     * Get attribute options.
+     *
      * @return array
      */
     public function getAttributeOptions()
@@ -258,6 +274,8 @@ public function getAttributeOptions()
     }
 
     /**
+     * Get attribute select options.
+     *
      * @return array
      */
     public function getAttributeSelectOptions()
@@ -270,6 +288,8 @@ public function getAttributeSelectOptions()
     }
 
     /**
+     * Get attribute name.
+     *
      * @return string
      */
     public function getAttributeName()
@@ -278,6 +298,8 @@ public function getAttributeName()
     }
 
     /**
+     * Load operator options.
+     *
      * @return $this
      */
     public function loadOperatorOptions()
@@ -300,6 +322,8 @@ public function getInputType()
     }
 
     /**
+     * Get operator select options.
+     *
      * @return array
      */
     public function getOperatorSelectOptions()
@@ -316,6 +340,8 @@ public function getOperatorSelectOptions()
     }
 
     /**
+     * Get operator name.
+     *
      * @return array
      */
     public function getOperatorName()
@@ -324,6 +350,8 @@ public function getOperatorName()
     }
 
     /**
+     * Load value options.
+     *
      * @return $this
      */
     public function loadValueOptions()
@@ -333,6 +361,8 @@ public function loadValueOptions()
     }
 
     /**
+     * Get value select options.
+     *
      * @return array
      */
     public function getValueSelectOptions()
@@ -380,6 +410,8 @@ public function isArrayOperatorType()
     }
 
     /**
+     * Get value.
+     *
      * @return mixed
      */
     public function getValue()
@@ -395,6 +427,8 @@ public function getValue()
     }
 
     /**
+     * Get value name.
+     *
      * @return array|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -446,6 +480,8 @@ public function getNewChildSelectOptions()
     }
 
     /**
+     * Get new child name.
+     *
      * @return string
      */
     public function getNewChildName()
@@ -454,6 +490,8 @@ public function getNewChildName()
     }
 
     /**
+     * Get this condition as html.
+     *
      * @return string
      */
     public function asHtml()
@@ -467,6 +505,8 @@ public function asHtml()
     }
 
     /**
+     * Get this condition with subconditions as html.
+     *
      * @return string
      */
     public function asHtmlRecursive()
@@ -475,6 +515,8 @@ public function asHtmlRecursive()
     }
 
     /**
+     * Get type element.
+     *
      * @return AbstractElement
      */
     public function getTypeElement()
@@ -493,6 +535,8 @@ public function getTypeElement()
     }
 
     /**
+     * Get type element html.
+     *
      * @return string
      */
     public function getTypeElementHtml()
@@ -501,6 +545,8 @@ public function getTypeElementHtml()
     }
 
     /**
+     * Get attribute element.
+     *
      * @return $this
      */
     public function getAttributeElement()
@@ -528,6 +574,8 @@ public function getAttributeElement()
     }
 
     /**
+     * Get attribute element html.
+     *
      * @return string
      */
     public function getAttributeElementHtml()
@@ -536,8 +584,9 @@ public function getAttributeElementHtml()
     }
 
     /**
-     * Retrieve Condition Operator element Instance
-     * If the operator value is empty - define first available operator value as default
+     * Retrieve Condition Operator element Instance.
+     *
+     * If the operator value is empty - define first available operator value as default.
      *
      * @return \Magento\Framework\Data\Form\Element\Select
      */
@@ -568,6 +617,8 @@ public function getOperatorElement()
     }
 
     /**
+     * Get operator element html.
+     *
      * @return string
      */
     public function getOperatorElementHtml()
@@ -587,6 +638,8 @@ public function getValueElementType()
     }
 
     /**
+     * Get value element renderer.
+     *
      * @return \Magento\Rule\Block\Editable
      */
     public function getValueElementRenderer()
@@ -598,6 +651,8 @@ public function getValueElementRenderer()
     }
 
     /**
+     * Get value element.
+     *
      * @return $this
      */
     public function getValueElement()
@@ -615,6 +670,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',
@@ -626,6 +684,8 @@ public function getValueElement()
     }
 
     /**
+     * Get value element html.
+     *
      * @return string
      */
     public function getValueElementHtml()
@@ -634,6 +694,8 @@ public function getValueElementHtml()
     }
 
     /**
+     * Get add link html.
+     *
      * @return string
      */
     public function getAddLinkHtml()
@@ -643,6 +705,8 @@ public function getAddLinkHtml()
     }
 
     /**
+     * Get remove link html.
+     *
      * @return string
      */
     public function getRemoveLinkHtml()
@@ -655,6 +719,8 @@ public function getRemoveLinkHtml()
     }
 
     /**
+     * Get chooser container html.
+     *
      * @return string
      */
     public function getChooserContainerHtml()
@@ -664,6 +730,8 @@ public function getChooserContainerHtml()
     }
 
     /**
+     * Get this condition as string.
+     *
      * @param string $format
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -674,6 +742,8 @@ public function asString($format = '')
     }
 
     /**
+     * Get this condition with subconditions as string.
+     *
      * @param int $level
      * @return string
      */
@@ -816,6 +886,8 @@ protected function _compareValues($validatedValue, $value, $strict = true)
     }
 
     /**
+     * Validate model.
+     *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return bool
      */

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

@@ -3845,6 +3845,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 {