Merge remote-tracking branch 'mainline/develop' into BUGS

Author: slavvka

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php

@@ -52,7 +52,7 @@ public function __construct(
     protected function _getFormat()
     {
         $format = $this->getColumn()->getFormat();
-        if (!$format) {
+        if ($format === null) {
             if (self::$_format === null) {
                 try {
                     self::$_format = $this->_localeDate->getDateFormat(

app/code/Magento/Checkout/etc/acl.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Config::config">
+                            <resource id="Magento_Checkout::checkout" title="Checkout Section" translate="true" sortOrder="57" />
+                        </resource>
+                    </resource>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>

app/code/Magento/Checkout/i18n/en_US.csv

@@ -27,6 +27,7 @@ State/Province,State/Province
 "One-page checkout is turned off.","One-page checkout is turned off."
 "Guest checkout is disabled.","Guest checkout is disabled."
 Checkout,Checkout
+"Checkout Section","Checkout Section"
 "Page not found.","Page not found."
 "Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order."
 "Something went wrong while processing your order. Please try again later.","Something went wrong while processing your order. Please try again later."

app/code/Magento/ConfigurableProduct/Model/Product/Validator/Plugin.php

@@ -112,9 +112,11 @@ protected function _validateProductVariations(Product $parentProduct, array $pro
             $product->addData($productData);
             $product->setCollectExceptionMessages(true);
             $configurableAttribute = [];
-            $encodedData = $productData['configurable_attribute'];
-            if ($encodedData) {
-                $configurableAttribute = $this->jsonHelper->jsonDecode($encodedData);
+            if (!empty($productData['configurable_attribute'])) {
+                $encodedData = $productData['configurable_attribute'];
+                if ($encodedData) {
+                    $configurableAttribute = $this->jsonHelper->jsonDecode($encodedData);
+                }
             }
             $configurableAttribute = implode('-', $configurableAttribute);
 

app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php

@@ -121,6 +121,15 @@ public function execute()
                 $this->validateGuestSubscription();
                 $this->validateEmailAvailable($email);
 
+                $subscriber = $this->_subscriberFactory->create()->loadByEmail($email);
+                if ($subscriber->getId()
+                    && $subscriber->getSubscriberStatus() == \Magento\Newsletter\Model\Subscriber::STATUS_SUBSCRIBED
+                ) {
+                    throw new \Magento\Framework\Exception\LocalizedException(
+                        __('This email address is already subscribed.')
+                    );
+                }
+
                 $status = $this->_subscriberFactory->create()->subscribe($email);
                 if ($status == \Magento\Newsletter\Model\Subscriber::STATUS_NOT_ACTIVE) {
                     $this->messageManager->addSuccess(__('The confirmation request has been sent.'));

app/code/Magento/Newsletter/i18n/en_US.csv

@@ -146,3 +146,4 @@ Unconfirmed,Unconfirmed
 Store,Store
 "Store View","Store View"
 "Newsletter Subscriptions","Newsletter Subscriptions"
+"This email address is already subscribed.","This email address is already subscribed."

app/code/Magento/Swatches/view/frontend/layout/catalogsearch_result_index.xml

@@ -9,4 +9,9 @@
     <head>
         <css src="Magento_Swatches::css/swatches.css"/>
     </head>
+    <body>
+        <referenceBlock name="category.product.type.details.renderers">
+            <block class="Magento\Swatches\Block\Product\Renderer\Listing\Configurable" as="configurable" template="Magento_Swatches::product/listing/renderer.phtml" />
+        </referenceBlock>
+    </body>
 </page>

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less

@@ -112,6 +112,8 @@
 @icon-stores__content: '\e60d';
 @icon-systems__content: '\e610';
 @icon-views__content: '\e60f';
+@icon-module__content: '\e647';
+@icon-alert-round__content: '\e648';
 
 @icons-round__size: 2.5rem;
 

app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_data-grid.less

@@ -7,7 +7,7 @@
 //  Variables
 //  _____________________________________________
 
-@component-indicator__size: 20px;
+@component-indicator__size: 16px;
 
 //
 //  Component grid elements
@@ -19,6 +19,7 @@
     display: inline-block;
     height: @component-indicator__size;
     text-align: center;
+    vertical-align: middle;
     width: @component-indicator__size;
 
     &::before,
@@ -37,7 +38,7 @@
         box-shadow: 0 0 2px rgba(0,0,0,.4);
         content: attr(data-label);
         font-size: @font-size__s;
-        margin: 34px 0 0 -10px;
+        margin: 30px 0 0 -10px;
         min-width: 50px;
         padding: 4px 5px;
     }
@@ -73,7 +74,7 @@
             content: '';
             display: block;
             font-family: @icons__font-family;
-            font-size: 20px;
+            font-size: @component-indicator__size;
             height: 100%;
             line-height: @component-indicator__size;
             width: 100%;
@@ -105,10 +106,105 @@
 
             &:before {
                 color: @color-info;
-                content: @icon-notice-messages__content;
+                content: @icon-alert-round__content;
                 font-family: @icons__font-family;
-                font-size: 21px;
+                font-size: @component-indicator__size;
             }
         }
     }
 }
+
+.col-manager-item-name {
+    .data-grid-data {
+        padding-left: 5px;
+    }
+
+    .ng-hide {
+        + .data-grid-data {
+            padding-left: 24px;
+        }
+    }
+
+    ._show-dependencies,
+    ._hide-dependencies {
+        cursor: pointer;
+        padding-left: 24px;
+        position: relative;
+
+        &:before {
+            display: block;
+            font-family: @icons__font-family;
+            font-size: 12px;
+            left: 0;
+            position: absolute;
+            top: 1px;
+        }
+    }
+
+    ._show-dependencies {
+        &:before {
+            content: @icon-caret-up__content;
+        }
+    }
+
+    ._hide-dependencies {
+        &:before {
+            content: @icon-caret-down__content;
+        }
+    }
+
+    ._no-dependencies {
+        padding-left: 24px;
+    }
+}
+
+.product-modules-block {
+    .lib-font-size(12);
+    padding: 15px 0 0;
+
+    .col-manager-item-name & {
+        padding-left: @indent__s;
+    }
+}
+
+.product-modules-title,
+.product-modules-descriprion {
+    font-weight: @font-weight__bold;
+    margin: 0 0 7px;
+}
+
+.product-modules-list {
+    .lib-font-size(11);
+    list-style: none;
+    margin: 0;
+
+    .col-manager-item-name & {
+        margin-left: 15px;
+
+        li {
+            padding: 0 0 0 15px;
+            position: relative;
+        }
+    }
+
+    li {
+        margin: 0 0 @indent__xs;
+    }
+
+    .component-indicator {
+        height: 10px;
+        left: 0;
+        position: absolute;
+        top: 3px;
+        width: 10px;
+    }
+}
+
+.module-summary {
+    white-space: nowrap;
+}
+
+.module-summary-title {
+    .lib-font-size(21);
+    margin-right: @indent__s;
+}

app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_header.less

@@ -9,7 +9,7 @@
 
 @page-header__border-color: @color-gray89;
 @page-header__border-width: 1px;
-@page-header__padding-bottom: 2.9rem;
+@page-header__padding-bottom: 2rem;
 @page-header__margin-bottom: 2.7rem;
 
 @search-global-label-icon__color: @color-very-dark-gray1;