Merge remote-tracking branch 'upstream/2.3-develop' into MQE-1690

jilu1 · jilu1 · commit 487188c7db9c · 2019-08-12T15:41:20.000-05:00
diff --git a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
@@ -30,7 +30,7 @@
                 </div>
             </div>
             <div class="actions">
-                <button class="action subscribe primary sr-only"
+                <button class="action subscribe primary"
                         title="<?= $block->escapeHtmlAttr(__('Subscribe')) ?>"
                         type="submit"
                         aria-label="Subscribe">
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php
@@ -9,14 +9,23 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
+declare(strict_types=1);
+
 namespace Magento\Reports\Controller\Adminhtml\Report;
 
 /**
+ * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart
+ *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @since 100.0.2
  */
 abstract class Shopcart extends \Magento\Backend\App\Action
 {
+    /**
+     * Authorization of a shop cart report
+     */
+    const ADMIN_RESOURCE = 'Magento_Reports::shopcart';
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
      */
@@ -46,27 +55,4 @@ public function _initAction()
         $this->_addBreadcrumb(__('Shopping Cart'), __('Shopping Cart'));
         return $this;
     }
-
-    /**
-     * Determine if action is allowed for reports module
-     *
-     * @return bool
-     */
-    protected function _isAllowed()
-    {
-        switch ($this->getRequest()->getActionName()) {
-            case 'customer':
-                return $this->_authorization->isAllowed(null);
-                break;
-            case 'product':
-                return $this->_authorization->isAllowed('Magento_Reports::product');
-                break;
-            case 'abandoned':
-                return $this->_authorization->isAllowed('Magento_Reports::abandoned');
-                break;
-            default:
-                return $this->_authorization->isAllowed('Magento_Reports::shopcart');
-                break;
-        }
-    }
 }
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Abandoned.php
@@ -4,12 +4,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 
+/**
+ * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\Abandoned
+ */
 class Abandoned extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart implements HttpGetActionInterface
 {
+    /**
+     * Authorization of an abandoned report
+     */
+    const ADMIN_RESOURCE = 'Magento_Reports::abandoned';
+
     /**
      * Abandoned carts action
      *
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Customer.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Customer.php
@@ -4,9 +4,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
-class Customer extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+/**
+ * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\Customer
+ */
+class Customer extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart implements HttpGetActionInterface
 {
     /**
      * Customer shopping carts action
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php
@@ -4,12 +4,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Reports\Controller\Adminhtml\Report\Shopcart\Abandoned as ShopCartAbandoned;
 
-class ExportAbandonedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
+/**
+ * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\ExportAbandonedCsv
+ */
+class ExportAbandonedCsv extends ShopCartAbandoned implements HttpGetActionInterface
 {
     /**
      * Export abandoned carts report grid to CSV format
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedExcel.php
@@ -4,12 +4,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Reports\Controller\Adminhtml\Report\Shopcart\Abandoned as ShopCartAbandoned;
 
-class ExportAbandonedExcel extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
+/**
+ * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\ExportAbandonedExcel
+ */
+class ExportAbandonedExcel extends ShopCartAbandoned implements HttpGetActionInterface
 {
     /**
      * Export abandoned carts report to Excel XML format
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerCsv.php
@@ -4,11 +4,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
 use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Reports\Controller\Adminhtml\Report\Shopcart\Customer as ShopCartCustomer;
 
-class ExportCustomerCsv extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
+/**
+ * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\ExportCustomerCsv
+ */
+class ExportCustomerCsv extends ShopCartCustomer implements HttpGetActionInterface
 {
     /**
      * Export shopcart customer report to CSV format
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportCustomerExcel.php
@@ -4,11 +4,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
 use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Reports\Controller\Adminhtml\Report\Shopcart\Customer as ShopCartCustomer;
 
-class ExportCustomerExcel extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
+/**
+ * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\ExportCustomerExcel
+ */
+class ExportCustomerExcel extends ShopCartCustomer implements HttpGetActionInterface
 {
     /**
      * Export shopcart customer report to Excel XML format
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductCsv.php
@@ -4,12 +4,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Reports\Controller\Adminhtml\Report\Shopcart\Product as ShopCartProduct;
 
-class ExportProductCsv extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
+/**
+ * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\ExportProductCsv
+ */
+class ExportProductCsv extends ShopCartProduct implements HttpGetActionInterface
 {
     /**
      * Export products report grid to CSV format
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductExcel.php
@@ -4,12 +4,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Reports\Controller\Adminhtml\Report\Shopcart\Product as ShopCartProduct;
 
-class ExportProductExcel extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
+/**
+ * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\ExportProductExcel
+ */
+class ExportProductExcel extends ShopCartProduct implements HttpGetActionInterface
 {
     /**
      * Export products report to Excel XML format
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/Product.php
@@ -4,12 +4,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 
+/**
+ * Class \Magento\Reports\Controller\Adminhtml\Report\Shopcart\Product
+ */
 class Product extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart implements HttpGetActionInterface
 {
+    /**
+     * Authorization of a product report
+     */
+    const ADMIN_RESOURCE = 'Magento_Reports::product';
+
     /**
      * Products in carts action
      *
diff --git a/app/code/Magento/Review/Block/Adminhtml/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Grid.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Review\Block\Adminhtml;
+
 /**
  * Adminhtml reviews grid
  *
@@ -16,8 +18,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Review\Block\Adminhtml;
-
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
@@ -176,7 +176,7 @@ protected function _prepareColumns()
                 'type' => 'datetime',
                 'filter_index' => 'rt.created_at',
                 'index' => 'review_created_at',
-                'header_css_class' => 'col-date',
+                'header_css_class' => 'col-date col-date-min-width',
                 'column_css_class' => 'col-date'
             ]
         );
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
@@ -3,8 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types = 1);
+
 namespace Magento\Review\Block\Adminhtml\Rating\Edit\Tab;
 
+/**
+ * Class Magento\Review\Block\Adminhtml\Rating\Edit\Tab\Form
+ */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
@@ -227,7 +232,15 @@ protected function addVisibilityFieldset()
             ['label' => __('Is Active'), 'name' => 'is_active', 'value' => 1]
         );
         $this->getFieldset('visibility_form')
-            ->addField('position', 'text', ['label' => __('Sort Order'), 'name' => 'position']);
+            ->addField(
+                'position',
+                'text',
+                [
+                    'label' => __('Sort Order'),
+                    'name' => 'position',
+                    'class' => 'validate-not-negative-number'
+                ]
+            );
     }
 
     /**
@@ -242,8 +255,6 @@ protected function initFieldset($formId, array $config)
         if (!isset($this->fieldset[$formId])) {
             if (!$this->getForm()->getElement($formId)) {
                 $this->fieldset[$formId] = $this->getForm()->addFieldset($formId, $config);
-            } elseif ($this->getForm()->getElement($formId)) {
-                //do nothing
             }
         }
     }
diff --git a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
@@ -48,7 +48,7 @@
                        data-validate="{required:true, 'validate-email':true}"/>
             </div>
         </div>
-        <div id="oar-zip" class="field zip required">
+        <div id="oar-zip" style="display: none;" class="field zip required">
             <label class="label" for="oar_zip"><span><?= $block->escapeHtml(__('Billing ZIP Code')) ?></span></label>
 
             <div class="control">
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles.less b/app/design/adminhtml/Magento/backend/web/css/styles.less
@@ -49,6 +49,10 @@
     }
 }
 
+td.col-date.col-date-min-width.col-created_at {
+    min-width: 14rem;
+}
+
 //  ToDo UI: Temporary. Should be changed
 @import 'source/components/_calendar-temp.less';
 @import 'source/components/_rules-temp.less';
