Skip to content

Commit e80858c

Browse files
author
Stanislav Idolov
committed
Merge remote-tracking branch 'mainline/develop' into literal_classname_to_namespace
2 parents 0cbca31 + a7bcac3 commit e80858c

File tree

161 files changed

+10613
-5828
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+10613
-5828
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function __construct(
5252
protected function _getFormat()
5353
{
5454
$format = $this->getColumn()->getFormat();
55-
if (!$format) {
55+
if ($format === null) {
5656
if (self::$_format === null) {
5757
try {
5858
self::$_format = $this->_localeDate->getDateFormat(

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

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
9+
<acl>
10+
<resources>
11+
<resource id="Magento_Backend::admin">
12+
<resource id="Magento_Backend::stores">
13+
<resource id="Magento_Backend::stores_settings">
14+
<resource id="Magento_Config::config">
15+
<resource id="Magento_Checkout::checkout" title="Checkout Section" translate="true" sortOrder="57" />
16+
</resource>
17+
</resource>
18+
</resource>
19+
</resource>
20+
</resources>
21+
</acl>
22+
</config>

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

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ State/Province,State/Province
2727
"One-page checkout is turned off.","One-page checkout is turned off."
2828
"Guest checkout is disabled.","Guest checkout is disabled."
2929
Checkout,Checkout
30+
"Checkout Section","Checkout Section"
3031
"Page not found.","Page not found."
3132
"Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order."
3233
"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

+5-3
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,11 @@ protected function _validateProductVariations(Product $parentProduct, array $pro
112112
$product->addData($productData);
113113
$product->setCollectExceptionMessages(true);
114114
$configurableAttribute = [];
115-
$encodedData = $productData['configurable_attribute'];
116-
if ($encodedData) {
117-
$configurableAttribute = $this->jsonHelper->jsonDecode($encodedData);
115+
if (!empty($productData['configurable_attribute'])) {
116+
$encodedData = $productData['configurable_attribute'];
117+
if ($encodedData) {
118+
$configurableAttribute = $this->jsonHelper->jsonDecode($encodedData);
119+
}
118120
}
119121
$configurableAttribute = implode('-', $configurableAttribute);
120122

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

+9
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,15 @@ public function execute()
124124
$this->validateGuestSubscription();
125125
$this->validateEmailAvailable($email);
126126

127+
$subscriber = $this->_subscriberFactory->create()->loadByEmail($email);
128+
if ($subscriber->getId()
129+
&& $subscriber->getSubscriberStatus() == \Magento\Newsletter\Model\Subscriber::STATUS_SUBSCRIBED
130+
) {
131+
throw new \Magento\Framework\Exception\LocalizedException(
132+
__('This email address is already subscribed.')
133+
);
134+
}
135+
127136
$status = $this->_subscriberFactory->create()->subscribe($email);
128137
if ($status == \Magento\Newsletter\Model\Subscriber::STATUS_NOT_ACTIVE) {
129138
$this->messageManager->addSuccess(__('The confirmation request has been sent.'));

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

+1
Original file line numberDiff line numberDiff line change
@@ -146,3 +146,4 @@ Unconfirmed,Unconfirmed
146146
Store,Store
147147
"Store View","Store View"
148148
"Newsletter Subscriptions","Newsletter Subscriptions"
149+
"This email address is already subscribed.","This email address is already subscribed."

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

+5
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,9 @@
99
<head>
1010
<css src="Magento_Swatches::css/swatches.css"/>
1111
</head>
12+
<body>
13+
<referenceBlock name="category.product.type.details.renderers">
14+
<block class="Magento\Swatches\Block\Product\Renderer\Listing\Configurable" as="configurable" template="Magento_Swatches::product/listing/renderer.phtml" />
15+
</referenceBlock>
16+
</body>
1217
</page>

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

+2
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@
112112
@icon-stores__content: '\e60d';
113113
@icon-systems__content: '\e610';
114114
@icon-views__content: '\e60f';
115+
@icon-module__content: '\e647';
116+
@icon-alert-round__content: '\e648';
115117

116118
@icons-round__size: 2.5rem;
117119

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

+101-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Variables
88
// _____________________________________________
99

10-
@component-indicator__size: 20px;
10+
@component-indicator__size: 16px;
1111

1212
//
1313
// Component grid elements
@@ -19,6 +19,7 @@
1919
display: inline-block;
2020
height: @component-indicator__size;
2121
text-align: center;
22+
vertical-align: middle;
2223
width: @component-indicator__size;
2324

2425
&::before,
@@ -37,7 +38,7 @@
3738
box-shadow: 0 0 2px rgba(0,0,0,.4);
3839
content: attr(data-label);
3940
font-size: @font-size__s;
40-
margin: 34px 0 0 -10px;
41+
margin: 30px 0 0 -10px;
4142
min-width: 50px;
4243
padding: 4px 5px;
4344
}
@@ -73,7 +74,7 @@
7374
content: '';
7475
display: block;
7576
font-family: @icons__font-family;
76-
font-size: 20px;
77+
font-size: @component-indicator__size;
7778
height: 100%;
7879
line-height: @component-indicator__size;
7980
width: 100%;
@@ -105,10 +106,105 @@
105106

106107
&:before {
107108
color: @color-info;
108-
content: @icon-notice-messages__content;
109+
content: @icon-alert-round__content;
109110
font-family: @icons__font-family;
110-
font-size: 21px;
111+
font-size: @component-indicator__size;
111112
}
112113
}
113114
}
114115
}
116+
117+
.col-manager-item-name {
118+
.data-grid-data {
119+
padding-left: 5px;
120+
}
121+
122+
.ng-hide {
123+
+ .data-grid-data {
124+
padding-left: 24px;
125+
}
126+
}
127+
128+
._show-dependencies,
129+
._hide-dependencies {
130+
cursor: pointer;
131+
padding-left: 24px;
132+
position: relative;
133+
134+
&:before {
135+
display: block;
136+
font-family: @icons__font-family;
137+
font-size: 12px;
138+
left: 0;
139+
position: absolute;
140+
top: 1px;
141+
}
142+
}
143+
144+
._show-dependencies {
145+
&:before {
146+
content: @icon-caret-up__content;
147+
}
148+
}
149+
150+
._hide-dependencies {
151+
&:before {
152+
content: @icon-caret-down__content;
153+
}
154+
}
155+
156+
._no-dependencies {
157+
padding-left: 24px;
158+
}
159+
}
160+
161+
.product-modules-block {
162+
.lib-font-size(12);
163+
padding: 15px 0 0;
164+
165+
.col-manager-item-name & {
166+
padding-left: @indent__s;
167+
}
168+
}
169+
170+
.product-modules-title,
171+
.product-modules-descriprion {
172+
font-weight: @font-weight__bold;
173+
margin: 0 0 7px;
174+
}
175+
176+
.product-modules-list {
177+
.lib-font-size(11);
178+
list-style: none;
179+
margin: 0;
180+
181+
.col-manager-item-name & {
182+
margin-left: 15px;
183+
184+
li {
185+
padding: 0 0 0 15px;
186+
position: relative;
187+
}
188+
}
189+
190+
li {
191+
margin: 0 0 @indent__xs;
192+
}
193+
194+
.component-indicator {
195+
height: 10px;
196+
left: 0;
197+
position: absolute;
198+
top: 3px;
199+
width: 10px;
200+
}
201+
}
202+
203+
.module-summary {
204+
white-space: nowrap;
205+
}
206+
207+
.module-summary-title {
208+
.lib-font-size(21);
209+
margin-right: @indent__s;
210+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
@page-header__border-color: @color-gray89;
1111
@page-header__border-width: 1px;
12-
@page-header__padding-bottom: 2.9rem;
12+
@page-header__padding-bottom: 2rem;
1313
@page-header__margin-bottom: 2.7rem;
1414

1515
@search-global-label-icon__color: @color-very-dark-gray1;

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

+8
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@
6464
}
6565
}
6666

67+
.item-extension {
68+
> a {
69+
&:before {
70+
content: @icon-module__content;
71+
}
72+
}
73+
}
74+
6775
.item-upgrade {
6876
> a {
6977
&:before {

‎app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_component-manager.less

-99
This file was deleted.

0 commit comments

Comments
 (0)