Merge pull request #1627 from magento-engcom/develop-prs

[EngCom] Public Pull Requests - develop
 - MAGETWO-82721 Fix datetime type product that show current date when is empty in grids #11636
 - MAGETWO-82653 GitHub 11380 #11683
 - MAGETWO-82558 FIX show visual swatches in admin - product attribute #11661

Author: ishakhsuvarov

app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml

@@ -55,9 +55,7 @@
             'Magento_Sales/order/create/form'
         ], function(mage) {
             mage.apply();
-        <?php if ($_methodsCount != 1) : ?>
             order.setPaymentMethod('<?= $block->escapeHtml($block->getSelectedMethodCode()); ?>');
-        <?php endif; ?>
         });
     </script>
 <?php else : ?>

app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css

@@ -3,6 +3,10 @@
  * See COPYING.txt for license details.
  */
 
+#swatch-visual-options-panel{
+    overflow: visible;
+}
+
 .swatch_sub-menu_container {
     position: absolute;
     z-index: 9999;

app/code/Magento/Ui/view/base/web/js/grid/columns/date.js

@@ -39,7 +39,7 @@ define([
         getLabel: function (value, format) {
             var date = moment(this._super());
 
-            date = date.isValid() ?
+            date = date.isValid() && value[this.index] ?
                 date.format(format || this.dateFormat) :
                 '';
 

dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method/FormTest.php

@@ -45,6 +45,11 @@ public function testContentUpdated()
         $block = $this->layout->createBlock(Form::class, 'order_billing_method');
         $block->setTemplate('Magento_Sales::order/create/billing/method/form.phtml');
 
-        $this->assertContains('mage.apply()', $block->toHtml());
+        $html = $block->toHtml();
+        $this->assertContains('mage.apply()', $html);
+        $this->assertContains(
+            "order.setPaymentMethod('" . $block->escapeHtml($block->getSelectedMethodCode()) . "')",
+            $html
+        );
     }
 }