Skip to content

Commit e164e56

Browse files
author
Yaroslav Onischenko
committed
Merge remote-tracking branch 'mainline/develop' into develop
2 parents 234153d + 10f06c6 commit e164e56

File tree

700 files changed

+22117
-16348
lines changed

Some content is hidden

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

700 files changed

+22117
-16348
lines changed

‎CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
0.74.0-beta7
2+
=============
3+
* Framework improvements
4+
* Exceptions are caught and logged before reaching the Phrase::__toString() method
5+
* Refactored controller actions in the Checkout area
6+
* Refactored controller actions in the Tax area
7+
* Implemented new look & feel for the Edit Order page (View/Edit Order)
8+
* Replaced the end-to-end test for Onepage Checkout with online shipment methods with the scenario test
9+
* Fixed bugs
10+
* Fixed an issue where a success message was absent when adding a product with options from Wishlist to Shopping Cart
11+
* Fixed an issue where an exception was thrown when trying to sort Customer Groups by Tax Class
12+
* Fixed an issue where the background color changed to the “on focus” state when clicking the Admin Menu logo
13+
* Fixed an issue with Mini Shopping Cart containing extra empty space
14+
* GitHub issues
15+
* [#1173] (https://github.com/magento/magento2/pull/1173) -- Change to HttpClient4 from Java client; fix regex issues
16+
* [#1185] (https://github.com/magento/magento2/pull/1185) -- Error message for duplicated phrases not allowed in Generator.php
17+
* [#1199] (https://github.com/magento/magento2/pull/1199) -- Add Event for sales_order_state_change_before during Order->saveState()
18+
* [#1201] (https://github.com/magento/magento2/pull/1101) -- Add customer_validate event
19+
* [#1202] (https://github.com/magento/magento2/pull/1102) -- Email sending events
20+
121
0.74.0-beta6
222
=============
323
* Framework improvements

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta6",
7-
"magento/module-backend": "0.74.0-beta6",
8-
"magento/module-media-storage": "0.74.0-beta6",
9-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-store": "0.74.0-beta7",
7+
"magento/module-backend": "0.74.0-beta7",
8+
"magento/module-media-storage": "0.74.0-beta7",
9+
"magento/framework": "0.74.0-beta7",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta6",
14+
"version": "0.74.0-beta7",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
?>
1515
<div
1616
data-mage-init='{"toolbarEntry": {}}'
17-
class="notifications-wrapper"
17+
class="notifications-wrapper admin__action-dropdown-wrap"
1818
data-notification-count="<?php echo $notificationCount; ?>">
1919
<?php if ($notificationCount > 0) : ?>
2020
<a
2121
href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>"
22-
class="notifications-action"
22+
class="notifications-action admin__action-dropdown"
2323
data-mage-init='{"dropdown":{}}'
2424
title="<?php echo __('Notifications'); ?>"
2525
data-toggle="dropdown">
@@ -28,7 +28,7 @@
2828
</span>
2929
</a>
3030
<ul
31-
class="notifications-list"
31+
class="admin__action-dropdown-menu"
3232
data-mark-as-read-url="<?php echo $block->getUrl('adminhtml/notification/ajaxMarkAsRead'); ?>">
3333
<?php foreach ($block->getLatestUnreadNotifications() as $notification) : ?>
3434
<?php /** @var $notification \Magento\AdminNotification\Model\Inbox*/ ?>
@@ -76,7 +76,7 @@
7676
</ul>
7777
<?php else : ?>
7878
<a
79-
class="notifications-action"
79+
class="notifications-action admin__action-dropdown"
8080
href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>"
8181
title="<?php echo __('Notifications'); ?>">
8282
</a>

‎app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ define([
1111

1212
// Mark notification as read via AJAX call
1313
var markNotificationAsRead = function (notificationId) {
14-
var requestUrl = $('.notifications-wrapper .notifications-list').attr('data-mark-as-read-url');
14+
var requestUrl = $('.notifications-wrapper .admin__action-dropdown-menu').attr('data-mark-as-read-url');
1515
$.ajax({
1616
url: requestUrl,
1717
type: 'POST',
@@ -33,7 +33,7 @@ define([
3333

3434
if (notificationCount == 0) {
3535
// Change appearance of the bubble and its behavior when the last notification is removed
36-
$('.notifications-wrapper .notifications-list').remove();
36+
$('.notifications-wrapper .admin__action-dropdown-menu').remove();
3737
var notificationIcon = $('.notifications-wrapper .notifications-icon');
3838
notificationIcon.removeAttr('data-toggle');
3939
notificationIcon.off('click.dropdown');
@@ -45,7 +45,7 @@ define([
4545
}
4646
$('.notifications-entry-last .notifications-counter').text(notificationCount);
4747
// Modify caption of the 'See All' link
48-
var actionElement = $('.notifications-wrapper .notifications-list .last .action-more');
48+
var actionElement = $('.notifications-wrapper .admin__action-dropdown-menu .last .action-more');
4949
actionElement.text(actionElement.text().replace(/\d+/, notificationCount));
5050
}
5151
},
@@ -65,7 +65,7 @@ define([
6565
};
6666

6767
// Show notification description when corresponding item is clicked
68-
$('.notifications-wrapper .notifications-list .notifications-entry').on('click.showNotification', function (event) {
68+
$('.notifications-wrapper .admin__action-dropdown-menu .notifications-entry').on('click.showNotification', function (event) {
6969
// hide notification dropdown
7070
$('.notifications-wrapper .notifications-icon').trigger('click.dropdown');
7171

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.74.0-beta6",
7-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-backend": "0.74.0-beta7",
7+
"magento/framework": "0.74.0-beta7",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta6",
11+
"version": "0.74.0-beta7",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/Block/Menu.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ protected function _addSubMenu($menuItem, $level, $limit, $id = null)
419419
if ($level == 0 && $limit) {
420420
$colStops = $this->_columnBrake($menuItem->getChildren(), $limit);
421421
$output .= '<strong class="submenu-title">' . $this->_getAnchorLabel($menuItem) . '</strong>';
422-
$output .= '<a href="#" class="submenu-close _close" data-role="close-submenu"></a>';
422+
$output .= '<a href="#" class="action-close _close" data-role="close-submenu"></a>';
423423
}
424424

425425
$output .= $this->renderNavigation($menuItem->getChildren(), $level + 1, $limit, $colStops);

‎app/code/Magento/Backend/Block/Widget/Grid.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,10 @@ protected function _preparePage()
391391
*/
392392
protected function _prepareGrid()
393393
{
394+
$this->_eventManager->dispatch(
395+
'backend_block_widget_grid_prepare_grid_before',
396+
['grid' => $this, 'collection' => $this->getCollection()]
397+
);
394398
if ($this->getChildBlock('grid.massaction') && $this->getChildBlock('grid.massaction')->isAvailable()) {
395399
$this->getChildBlock('grid.massaction')->prepareMassactionColumn();
396400
}
@@ -433,6 +437,10 @@ protected function _prepareFilterButtons()
433437
'Magento\Backend\Block\Widget\Button'
434438
)->setData(
435439
['label' => __('Reset Filter'), 'onclick' => $this->getJsObjectName() . '.resetFilter()', 'class' => 'action-reset']
440+
)->setDataAttribute(
441+
[
442+
'action' => 'grid-filter-reset'
443+
]
436444
)
437445
);
438446
$this->setChild(
@@ -445,6 +453,10 @@ protected function _prepareFilterButtons()
445453
'onclick' => $this->getJsObjectName() . '.doFilter()',
446454
'class' => 'task',
447455
]
456+
)->setDataAttribute(
457+
[
458+
'action' => 'grid-filter-apply'
459+
]
448460
)
449461
);
450462
}

‎app/code/Magento/Backend/Block/Widget/Grid/Extended.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,10 @@ protected function _prepareLayout()
208208
'onclick' => $this->getJsObjectName() . '.resetFilter()',
209209
'class' => 'action-reset'
210210
]
211+
)->setDataAttribute(
212+
[
213+
'action' => 'grid-filter-reset'
214+
]
211215
)
212216
);
213217
$this->setChild(
@@ -218,6 +222,10 @@ protected function _prepareLayout()
218222
'onclick' => $this->getJsObjectName() . '.doFilter()',
219223
'class' => 'task',
220224
]
225+
)->setDataAttribute(
226+
[
227+
'action' => 'grid-filter-apply'
228+
]
221229
)
222230
);
223231
return parent::_prepareLayout();

‎app/code/Magento/Backend/composer.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta6",
7-
"magento/module-directory": "0.74.0-beta6",
8-
"magento/module-developer": "0.74.0-beta6",
9-
"magento/module-eav": "0.74.0-beta6",
10-
"magento/module-cron": "0.74.0-beta6",
11-
"magento/module-theme": "0.74.0-beta6",
12-
"magento/module-reports": "0.74.0-beta6",
13-
"magento/module-sales": "0.74.0-beta6",
14-
"magento/module-quote": "0.74.0-beta6",
15-
"magento/module-catalog": "0.74.0-beta6",
16-
"magento/module-user": "0.74.0-beta6",
17-
"magento/module-backup": "0.74.0-beta6",
18-
"magento/module-customer": "0.74.0-beta6",
19-
"magento/module-translation": "0.74.0-beta6",
20-
"magento/module-require-js": "0.74.0-beta6",
21-
"magento/module-config": "0.74.0-beta6",
22-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-store": "0.74.0-beta7",
7+
"magento/module-directory": "0.74.0-beta7",
8+
"magento/module-developer": "0.74.0-beta7",
9+
"magento/module-eav": "0.74.0-beta7",
10+
"magento/module-cron": "0.74.0-beta7",
11+
"magento/module-theme": "0.74.0-beta7",
12+
"magento/module-reports": "0.74.0-beta7",
13+
"magento/module-sales": "0.74.0-beta7",
14+
"magento/module-quote": "0.74.0-beta7",
15+
"magento/module-catalog": "0.74.0-beta7",
16+
"magento/module-user": "0.74.0-beta7",
17+
"magento/module-backup": "0.74.0-beta7",
18+
"magento/module-customer": "0.74.0-beta7",
19+
"magento/module-translation": "0.74.0-beta7",
20+
"magento/module-require-js": "0.74.0-beta7",
21+
"magento/module-config": "0.74.0-beta7",
22+
"magento/framework": "0.74.0-beta7",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.74.0-beta6",
26+
"version": "0.74.0-beta7",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,41 @@
77
// @codingStandardsIgnoreFile
88

99
?>
10+
1011
<form method="post" action="" id="login-form" data-mage-init='{"form": {}, "validation": {}}' autocomplete="off">
1112
<fieldset class="admin__fieldset">
1213
<legend class="admin__legend"><span><?php echo __('Welcome, please sign in') ?></span></legend><br/>
1314
<input name="form_key" type="hidden" value="<?php echo $block->getFormKey() ?>" />
1415
<div class="admin__field _required field-username">
1516
<label for="username" class="admin__field-label"><span><?php echo __('Username') ?></span></label>
1617
<div class="admin__field-control">
17-
<input type="text" id="username" name="login[username]" autofocus value="" data-validate="{required:true}" class="admin__control-text" placeholder="<?php echo __('user name') ?>" />
18+
<input
19+
id="username"
20+
class="admin__control-text"
21+
type="text"
22+
name="login[username]"
23+
autofocus
24+
value=""
25+
data-validate="{required:true}"
26+
placeholder="<?php echo __('user name') ?>"/>
1827
</div>
1928
</div>
2029
<div class="admin__field _required field-password">
2130
<label for="login" class="admin__field-label"><span><?php echo __('Password') ?></span></label>
2231
<div class="admin__field-control">
2332
<!-- This is a dummy hidden field to trick firefox from auto filling the password -->
24-
<input type="text" class="admin__control-dummy" name="dummy" id="dummy" />
25-
<input type="password" id="login" name="login[password]" data-validate="{required:true}" class="admin__control-text" value="" placeholder="<?php echo __('password') ?>" />
33+
<input
34+
id="dummy"
35+
class="admin__control-dummy"
36+
type="text"
37+
name="dummy"/>
38+
<input
39+
id="login"
40+
class="admin__control-text"
41+
type="password"
42+
name="login[password]"
43+
data-validate="{required:true}"
44+
value="" placeholder="<?php echo __('password') ?>" />
2645
</div>
2746
</div>
2847
<?php echo $block->getChildHtml('form.additional.info'); ?>

‎app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121
</a>
2222
<?php break; ?>
2323
<?php case 'user': ?>
24-
<div class="admin-user">
24+
<div class="admin-user admin__action-dropdown-wrap">
2525
<a
2626
href="<?php echo $block->getUrl('adminhtml/system_account/index') ?>"
27-
class="admin-user-account"
27+
class="admin__action-dropdown"
2828
title="<?php echo $block->escapeHtml(__('My Account')) ?>"
2929
data-mage-init='{"dropdown":{}}'
3030
data-toggle="dropdown">
31-
<span class="admin-user-account-text-wrapper">
31+
<span class="admin__action-dropdown-text">
3232
<span class="admin-user-account-text"><?php echo $block->escapeHtml($block->getUser()->getUsername()); ?></span>
3333
</span>
3434
</a>
35-
<ul class="admin-user-menu">
35+
<ul class="admin__action-dropdown-menu">
3636
<?php if ($block->getAuthorization()->isAllowed('Magento_Backend::myaccount')): ?>
3737
<li>
3838
<a

‎app/code/Magento/Backup/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta6",
7-
"magento/module-backend": "0.74.0-beta6",
8-
"magento/module-cron": "0.74.0-beta6",
9-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-store": "0.74.0-beta7",
7+
"magento/module-backend": "0.74.0-beta7",
8+
"magento/module-cron": "0.74.0-beta7",
9+
"magento/framework": "0.74.0-beta7",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.74.0-beta6",
13+
"version": "0.74.0-beta7",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

‎app/code/Magento/Bundle/composer.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta6",
7-
"magento/module-catalog": "0.74.0-beta6",
8-
"magento/module-tax": "0.74.0-beta6",
9-
"magento/module-backend": "0.74.0-beta6",
10-
"magento/module-sales": "0.74.0-beta6",
11-
"magento/module-checkout": "0.74.0-beta6",
12-
"magento/module-catalog-inventory": "0.74.0-beta6",
13-
"magento/module-customer": "0.74.0-beta6",
14-
"magento/module-catalog-rule": "0.74.0-beta6",
15-
"magento/module-eav": "0.74.0-beta6",
16-
"magento/module-config": "0.74.0-beta6",
17-
"magento/module-gift-message": "0.74.0-beta6",
18-
"magento/framework": "0.74.0-beta6",
19-
"magento/module-quote": "0.74.0-beta6",
20-
"magento/module-media-storage": "0.74.0-beta6",
6+
"magento/module-store": "0.74.0-beta7",
7+
"magento/module-catalog": "0.74.0-beta7",
8+
"magento/module-tax": "0.74.0-beta7",
9+
"magento/module-backend": "0.74.0-beta7",
10+
"magento/module-sales": "0.74.0-beta7",
11+
"magento/module-checkout": "0.74.0-beta7",
12+
"magento/module-catalog-inventory": "0.74.0-beta7",
13+
"magento/module-customer": "0.74.0-beta7",
14+
"magento/module-catalog-rule": "0.74.0-beta7",
15+
"magento/module-eav": "0.74.0-beta7",
16+
"magento/module-config": "0.74.0-beta7",
17+
"magento/module-gift-message": "0.74.0-beta7",
18+
"magento/framework": "0.74.0-beta7",
19+
"magento/module-quote": "0.74.0-beta7",
20+
"magento/module-media-storage": "0.74.0-beta7",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"suggest": {
24-
"magento/module-webapi": "0.74.0-beta6"
24+
"magento/module-webapi": "0.74.0-beta7"
2525
},
2626
"type": "magento2-module",
27-
"version": "0.74.0-beta6",
27+
"version": "0.74.0-beta7",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

‎app/code/Magento/CacheInvalidate/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-page-cache": "0.74.0-beta6",
7-
"magento/framework": "0.74.0-beta6",
6+
"magento/module-page-cache": "0.74.0-beta7",
7+
"magento/framework": "0.74.0-beta7",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta6",
11+
"version": "0.74.0-beta7",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

0 commit comments

Comments
 (0)