Skip to content

Commit eca89b7

Browse files
author
Ivan Gavryshko
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-47940-bunch-of-publick-prs
2 parents 44182f7 + 31af91c commit eca89b7

File tree

247 files changed

+6128
-4928
lines changed

Some content is hidden

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

247 files changed

+6128
-4928
lines changed

‎app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,65 +5,59 @@
55
define(
66
[
77
'jquery',
8-
'Magento_Payment/js/view/payment/iframe',
9-
'Magento_Checkout/js/action/set-payment-information',
10-
'Magento_Checkout/js/model/payment/additional-validators',
11-
'Magento_Checkout/js/model/full-screen-loader'
8+
'Magento_Payment/js/view/payment/iframe'
129
],
13-
function ($, Component, setPaymentInformationAction, additionalValidators, fullScreenLoader) {
10+
function ($, Component) {
1411
'use strict';
1512

1613
return Component.extend({
1714
defaults: {
18-
template: 'Magento_Authorizenet/payment/authorizenet-directpost'
15+
template: 'Magento_Authorizenet/payment/authorizenet-directpost',
16+
timeoutMessage: 'Sorry, but something went wrong. Please contact the seller.'
1917
},
2018
placeOrderHandler: null,
2119
validateHandler: null,
2220

23-
setPlaceOrderHandler: function(handler) {
21+
/**
22+
* @param {Object} handler
23+
*/
24+
setPlaceOrderHandler: function (handler) {
2425
this.placeOrderHandler = handler;
2526
},
2627

27-
setValidateHandler: function(handler) {
28+
/**
29+
* @param {Object} handler
30+
*/
31+
setValidateHandler: function (handler) {
2832
this.validateHandler = handler;
2933
},
3034

31-
context: function() {
35+
/**
36+
* @returns {Object}
37+
*/
38+
context: function () {
3239
return this;
3340
},
3441

35-
isShowLegend: function() {
42+
/**
43+
* @returns {Boolean}
44+
*/
45+
isShowLegend: function () {
3646
return true;
3747
},
3848

39-
getCode: function() {
49+
/**
50+
* @returns {String}
51+
*/
52+
getCode: function () {
4053
return 'authorizenet_directpost';
4154
},
4255

43-
isActive: function() {
44-
return true;
45-
},
46-
4756
/**
48-
* @override
57+
* @returns {Boolean}
4958
*/
50-
placeOrder: function () {
51-
var self = this;
52-
53-
if (this.validateHandler() && additionalValidators.validate()) {
54-
fullScreenLoader.startLoader();
55-
this.isPlaceOrderActionAllowed(false);
56-
$.when(setPaymentInformationAction(this.messageContainer, {
57-
'method': self.getCode()
58-
})).done(function () {
59-
self.placeOrderHandler().fail(function () {
60-
fullScreenLoader.stopLoader();
61-
});
62-
}).fail(function () {
63-
fullScreenLoader.stopLoader();
64-
self.isPlaceOrderActionAllowed(true);
65-
});
66-
}
59+
isActive: function () {
60+
return true;
6761
}
6862
});
6963
}

‎app/code/Magento/Backend/Block/System/Account/Edit/Form.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected function _prepareForm()
100100
'name' => 'password',
101101
'label' => __('New Password'),
102102
'title' => __('New Password'),
103-
'class' => 'input-text validate-admin-password'
103+
'class' => 'validate-admin-password admin__control-text'
104104
]
105105
);
106106

@@ -110,7 +110,7 @@ protected function _prepareForm()
110110
[
111111
'name' => 'password_confirmation',
112112
'label' => __('Password Confirmation'),
113-
'class' => 'input-text validate-cpassword'
113+
'class' => 'validate-cpassword admin__control-text'
114114
]
115115
);
116116

@@ -138,7 +138,7 @@ protected function _prepareForm()
138138
'label' => __('Your Password'),
139139
'id' => self::IDENTITY_VERIFICATION_PASSWORD_FIELD,
140140
'title' => __('Your Password'),
141-
'class' => 'input-text validate-current-password required-entry',
141+
'class' => 'validate-current-password required-entry admin__control-text',
142142
'required' => true
143143
]
144144
);

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,10 @@
164164
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
165165
<comment>Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.</comment>
166166
</field>
167-
<field id="minify_html" translate="label" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
167+
<field id="minify_html" translate="label comment" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
168168
<label>Minify Html</label>
169169
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
170+
<comment>Minification is not applied in developer mode.</comment>
170171
</field>
171172
</group>
172173
<group id="translate_inline" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -193,9 +194,10 @@
193194
<label>Enable JavaScript Bundling</label>
194195
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
195196
</field>
196-
<field id="minify_files" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
197+
<field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
197198
<label>Minify JavaScript Files</label>
198199
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
200+
<comment>Minification is not applied in developer mode.</comment>
199201
</field>
200202
</group>
201203
<group id="css" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -204,9 +206,10 @@
204206
<label>Merge CSS Files</label>
205207
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
206208
</field>
207-
<field id="minify_files" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
209+
<field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
208210
<label>Minify CSS Files</label>
209211
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
212+
<comment>Minification is not applied in developer mode.</comment>
210213
</field>
211214
</group>
212215
<group id="image" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="0" showInStore="0">

‎app/code/Magento/Backend/view/adminhtml/templates/menu.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
?>
1010

11-
<nav data-mage-init='{"globalNavigation": {}}' class="admin__menu" role="navigation">
11+
<nav data-mage-init='{"globalNavigation": {}}' class="admin__menu">
1212
<?php /* @escapeNotVerified */ echo $block->renderNavigation($block->getMenuModel(), 0, 12); ?>
1313
</nav>
1414

0 commit comments

Comments
 (0)