Skip to content

Commit 1a3fd9b

Browse files
author
Bohdan Korablov
committed
Merge remote-tracking branch 'mainlinec/develop' into MAGETWO-52386
2 parents 0528e48 + f10c7c8 commit 1a3fd9b

File tree

268 files changed

+3690
-1835
lines changed

Some content is hidden

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

268 files changed

+3690
-1835
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
atlassian*
77
/nbproject
88
/sitemap
9+
/sitemap.xml
910
/.idea
1011
/.gitattributes
1112
/app/config_sandbox

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<section id="system">
1111
<group id="adminnotification" translate="label" type="text" sortOrder="250" showInDefault="1" showInWebsite="0" showInStore="0">
1212
<label>Notifications</label>
13-
<field id="use_https" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
13+
<field id="use_https" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
1414
<label>Use HTTPS to Get Feed</label>
1515
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
1616
</field>
17-
<field id="frequency" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0">
17+
<field id="frequency" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
1818
<label>Update Frequency</label>
1919
<source_model>Magento\AdminNotification\Model\Config\Source\Frequency</source_model>
2020
</field>

‎app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,18 @@
1212
* @see \Magento\AdminNotification\Block\Window
1313
*/
1414
?>
15-
<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification">
16-
<div class="popup popup-<?php /* @escapeNotVerified */ echo preg_replace('#[^a-z0-9]+#', '-', strtolower($block->getSeverityText())) ?>">
17-
<div class="popup-inner">
18-
<div class="popup-header">
19-
<div class="popup-title"><?php /* @escapeNotVerified */ echo $block->getHeaderText(); ?></div>
20-
</div>
21-
<div class="popup-content">
22-
<span><?php /* @escapeNotVerified */ echo $block->getSeverityText();?></span>
23-
24-
<p class="message-text"><?php /* @escapeNotVerified */ echo $block->getNoticeMessageText(); ?></p>
25-
26-
<a href="<?php /* @escapeNotVerified */ echo $block->getNoticeMessageUrl(); ?>"><?php /* @escapeNotVerified */ echo $block->getReadDetailsText(); ?></a>
27-
</div>
28-
<span class="action close" data-dismiss="popup" title="<?php echo $block->escapeHtml(__('Close popup'));?>"><?php /* @escapeNotVerified */ echo __('Close'); ?></span>
29-
</div>
30-
</div>
31-
</div>
15+
<ul class="message-system-list"
16+
style="display: none;"
17+
data-mage-init='{
18+
"Magento_Ui/js/modal/modal": {
19+
"autoOpen": true,
20+
"buttons": false,
21+
"modalClass": "modal-system-messages",
22+
"title": "<?php /* @escapeNotVerified */ echo $block->getHeaderText(); ?>"
23+
}
24+
}'>
25+
<li class="message message-warning warning">
26+
<?php /* @escapeNotVerified */ echo $block->getNoticeMessageText(); ?><br/>
27+
<a href="<?php /* @escapeNotVerified */ echo $block->getNoticeMessageUrl(); ?>"><?php /* @escapeNotVerified */ echo $block->getReadDetailsText(); ?></a>
28+
</li>
29+
</ul>

‎app/code/Magento/Authorization/etc/di.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@
2424
<argument name="aclBuilder" xsi:type="object">Magento\Framework\Acl\Builder\Proxy</argument>
2525
</arguments>
2626
</type>
27+
<preference for="Magento\Authorization\Model\UserContextInterface" type="Magento\Authorization\Model\CompositeUserContext"/>
2728
</config>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
<section id="payment">
1111
<group id="authorizenet_directpost" translate="label" type="text" sortOrder="34" showInDefault="1" showInWebsite="1" showInStore="1">
1212
<label>Authorize.net Direct Post</label>
13-
<field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
13+
<field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
1414
<label>Enabled</label>
1515
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
1616
</field>
17-
<field id="payment_action" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
17+
<field id="payment_action" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
1818
<label>Payment Action</label>
1919
<source_model>Magento\Authorizenet\Model\Source\PaymentAction</source_model>
2020
</field>
21-
<field id="title" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
21+
<field id="title" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
2222
<label>Title</label>
2323
</field>
2424
<field id="login" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -33,45 +33,45 @@
3333
<label>Merchant MD5</label>
3434
<backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
3535
</field>
36-
<field id="order_status" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
36+
<field id="order_status" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
3737
<label>New Order Status</label>
3838
<source_model>Magento\Sales\Model\Config\Source\Order\Status\Processing</source_model>
3939
</field>
40-
<field id="test" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="0">
40+
<field id="test" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
4141
<label>Test Mode</label>
4242
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
4343
</field>
44-
<field id="cgi_url" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0">
44+
<field id="cgi_url" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
4545
<label>Gateway URL</label>
4646
</field>
47-
<field id="cgi_url_td" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
47+
<field id="cgi_url_td" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
4848
<label>Transaction Details URL</label>
4949
</field>
50-
<field id="currency" translate="label" type="select" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
50+
<field id="currency" translate="label" type="select" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
5151
<label>Accepted Currency</label>
5252
<source_model>Magento\Config\Model\Config\Source\Locale\Currency</source_model>
5353
</field>
54-
<field id="debug" translate="label" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
54+
<field id="debug" translate="label" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
5555
<label>Debug</label>
5656
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
5757
</field>
58-
<field id="email_customer" translate="label" type="select" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="0">
58+
<field id="email_customer" translate="label" type="select" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
5959
<label>Email Customer</label>
6060
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
6161
</field>
6262
<field id="merchant_email" translate="label" type="text" sortOrder="140" showInDefault="1" showInWebsite="1" showInStore="0">
6363
<label>Merchant's Email</label>
6464
<validate>validate-email</validate>
6565
</field>
66-
<field id="cctypes" translate="label" type="multiselect" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
66+
<field id="cctypes" translate="label" type="multiselect" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
6767
<label>Credit Card Types</label>
6868
<source_model>Magento\Authorizenet\Model\Source\Cctype</source_model>
6969
</field>
7070
<field id="useccv" translate="label" type="select" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="0">
7171
<label>Credit Card Verification</label>
7272
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
7373
</field>
74-
<field id="allowspecific" translate="label" type="allowspecific" sortOrder="170" showInDefault="1" showInWebsite="1" showInStore="0">
74+
<field id="allowspecific" translate="label" type="allowspecific" sortOrder="170" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
7575
<label>Payment from Applicable Countries</label>
7676
<source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
7777
</field>

0 commit comments

Comments
 (0)