Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce in…

…to MAGETWO-36037
magento · May 5, 2015 · 7dc6ee9 · 7dc6ee9
2 parents 38cbb58 + 99dca3e
commit 7dc6ee9
Show file tree

Hide file tree

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

diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta6",
-        "magento/module-backend": "0.74.0-beta6",
-        "magento/module-media-storage": "0.74.0-beta6",
-        "magento/framework": "0.74.0-beta6",
+        "magento/module-store": "0.74.0-beta7",
+        "magento/module-backend": "0.74.0-beta7",
+        "magento/module-media-storage": "0.74.0-beta7",
+        "magento/framework": "0.74.0-beta7",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta6",
+    "version": "0.74.0-beta7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
@@ -14,12 +14,12 @@
 ?>
 <div
     data-mage-init='{"toolbarEntry": {}}'
-    class="notifications-wrapper"
+    class="notifications-wrapper admin__action-dropdown-wrap"
     data-notification-count="<?php echo $notificationCount; ?>">
     <?php if ($notificationCount > 0) : ?>
         <a
             href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>"
-            class="notifications-action"
+            class="notifications-action admin__action-dropdown"
             data-mage-init='{"dropdown":{}}'
             title="<?php echo __('Notifications'); ?>"
             data-toggle="dropdown">
@@ -28,7 +28,7 @@
             </span>
         </a>
         <ul
-            class="notifications-list"
+            class="admin__action-dropdown-menu"
             data-mark-as-read-url="<?php echo $block->getUrl('adminhtml/notification/ajaxMarkAsRead'); ?>">
             <?php foreach ($block->getLatestUnreadNotifications() as $notification) : ?>
             <?php /** @var $notification \Magento\AdminNotification\Model\Inbox*/ ?>
@@ -76,7 +76,7 @@
         </ul>
     <?php else : ?>
         <a
-            class="notifications-action"
+            class="notifications-action admin__action-dropdown"
             href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>"
             title="<?php echo __('Notifications'); ?>">
         </a>

diff --git a/app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js b/app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js
@@ -11,7 +11,7 @@ define([
 
     // Mark notification as read via AJAX call
     var markNotificationAsRead = function (notificationId) {
-            var requestUrl = $('.notifications-wrapper .notifications-list').attr('data-mark-as-read-url');
+            var requestUrl = $('.notifications-wrapper .admin__action-dropdown-menu').attr('data-mark-as-read-url');
             $.ajax({
                 url: requestUrl,
                 type: 'POST',
@@ -33,7 +33,7 @@ define([
 
             if (notificationCount == 0) {
                 // Change appearance of the bubble and its behavior when the last notification is removed
-                $('.notifications-wrapper .notifications-list').remove();
+                $('.notifications-wrapper .admin__action-dropdown-menu').remove();
                 var notificationIcon = $('.notifications-wrapper .notifications-icon');
                 notificationIcon.removeAttr('data-toggle');
                 notificationIcon.off('click.dropdown');
@@ -45,7 +45,7 @@ define([
                 }
                 $('.notifications-entry-last .notifications-counter').text(notificationCount);
                 // Modify caption of the 'See All' link
-                var actionElement = $('.notifications-wrapper .notifications-list .last .action-more');
+                var actionElement = $('.notifications-wrapper .admin__action-dropdown-menu .last .action-more');
                 actionElement.text(actionElement.text().replace(/\d+/, notificationCount));
             }
         },
@@ -65,7 +65,7 @@ define([
         };
 
     // Show notification description when corresponding item is clicked
-    $('.notifications-wrapper .notifications-list .notifications-entry').on('click.showNotification', function (event) {
+    $('.notifications-wrapper .admin__action-dropdown-menu .notifications-entry').on('click.showNotification', function (event) {
         // hide notification dropdown
         $('.notifications-wrapper .notifications-icon').trigger('click.dropdown');
 

diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
@@ -3,12 +3,12 @@
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-backend": "0.74.0-beta6",
-        "magento/framework": "0.74.0-beta6",
+        "magento/module-backend": "0.74.0-beta7",
+        "magento/framework": "0.74.0-beta7",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta6",
+    "version": "0.74.0-beta7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php
@@ -419,7 +419,7 @@ protected function _addSubMenu($menuItem, $level, $limit, $id = null)
         if ($level == 0 && $limit) {
             $colStops = $this->_columnBrake($menuItem->getChildren(), $limit);
             $output .= '<strong class="submenu-title">' . $this->_getAnchorLabel($menuItem) . '</strong>';
-            $output .= '<a href="#" class="submenu-close _close" data-role="close-submenu"></a>';
+            $output .= '<a href="#" class="action-close _close" data-role="close-submenu"></a>';
         }
 
         $output .= $this->renderNavigation($menuItem->getChildren(), $level + 1, $limit, $colStops);

diff --git a/app/code/Magento/Backend/Block/Widget/Grid.php b/app/code/Magento/Backend/Block/Widget/Grid.php
@@ -391,6 +391,10 @@ protected function _preparePage()
      */
     protected function _prepareGrid()
     {
+        $this->_eventManager->dispatch(
+            'backend_block_widget_grid_prepare_grid_before',
+            ['grid' => $this, 'collection' => $this->getCollection()]
+        );
         if ($this->getChildBlock('grid.massaction') && $this->getChildBlock('grid.massaction')->isAvailable()) {
             $this->getChildBlock('grid.massaction')->prepareMassactionColumn();
         }
@@ -433,6 +437,10 @@ protected function _prepareFilterButtons()
                 'Magento\Backend\Block\Widget\Button'
             )->setData(
                 ['label' => __('Reset Filter'), 'onclick' => $this->getJsObjectName() . '.resetFilter()', 'class' => 'action-reset']
+            )->setDataAttribute(
+                [
+                    'action' => 'grid-filter-reset'
+                ]
             )
         );
         $this->setChild(
@@ -445,6 +453,10 @@ protected function _prepareFilterButtons()
                     'onclick' => $this->getJsObjectName() . '.doFilter()',
                     'class' => 'task',
                 ]
+            )->setDataAttribute(
+                [
+                    'action' => 'grid-filter-apply'
+                ]
             )
         );
     }

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
@@ -208,6 +208,10 @@ protected function _prepareLayout()
                     'onclick' => $this->getJsObjectName() . '.resetFilter()',
                     'class' => 'action-reset'
                 ]
+            )->setDataAttribute(
+                [
+                    'action' => 'grid-filter-reset'
+                ]
             )
         );
         $this->setChild(
@@ -218,6 +222,10 @@ protected function _prepareLayout()
                     'onclick' => $this->getJsObjectName() . '.doFilter()',
                     'class' => 'task',
                 ]
+            )->setDataAttribute(
+                [
+                    'action' => 'grid-filter-apply'
+                ]
             )
         );
         return parent::_prepareLayout();

diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
@@ -3,27 +3,27 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta6",
-        "magento/module-directory": "0.74.0-beta6",
-        "magento/module-developer": "0.74.0-beta6",
-        "magento/module-eav": "0.74.0-beta6",
-        "magento/module-cron": "0.74.0-beta6",
-        "magento/module-theme": "0.74.0-beta6",
-        "magento/module-reports": "0.74.0-beta6",
-        "magento/module-sales": "0.74.0-beta6",
-        "magento/module-quote": "0.74.0-beta6",
-        "magento/module-catalog": "0.74.0-beta6",
-        "magento/module-user": "0.74.0-beta6",
-        "magento/module-backup": "0.74.0-beta6",
-        "magento/module-customer": "0.74.0-beta6",
-        "magento/module-translation": "0.74.0-beta6",
-        "magento/module-require-js": "0.74.0-beta6",
-        "magento/module-config": "0.74.0-beta6",
-        "magento/framework": "0.74.0-beta6",
+        "magento/module-store": "0.74.0-beta7",
+        "magento/module-directory": "0.74.0-beta7",
+        "magento/module-developer": "0.74.0-beta7",
+        "magento/module-eav": "0.74.0-beta7",
+        "magento/module-cron": "0.74.0-beta7",
+        "magento/module-theme": "0.74.0-beta7",
+        "magento/module-reports": "0.74.0-beta7",
+        "magento/module-sales": "0.74.0-beta7",
+        "magento/module-quote": "0.74.0-beta7",
+        "magento/module-catalog": "0.74.0-beta7",
+        "magento/module-user": "0.74.0-beta7",
+        "magento/module-backup": "0.74.0-beta7",
+        "magento/module-customer": "0.74.0-beta7",
+        "magento/module-translation": "0.74.0-beta7",
+        "magento/module-require-js": "0.74.0-beta7",
+        "magento/module-config": "0.74.0-beta7",
+        "magento/framework": "0.74.0-beta7",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta6",
+    "version": "0.74.0-beta7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
@@ -7,22 +7,41 @@
 // @codingStandardsIgnoreFile
 
 ?>
+
 <form method="post" action="" id="login-form" data-mage-init='{"form": {}, "validation": {}}' autocomplete="off">
     <fieldset class="admin__fieldset">
         <legend class="admin__legend"><span><?php echo __('Welcome, please sign in') ?></span></legend><br/>
         <input name="form_key" type="hidden" value="<?php echo $block->getFormKey() ?>" />
         <div class="admin__field _required field-username">
             <label for="username" class="admin__field-label"><span><?php echo __('Username') ?></span></label>
             <div class="admin__field-control">
-                <input type="text" id="username" name="login[username]" autofocus value="" data-validate="{required:true}" class="admin__control-text" placeholder="<?php echo __('user name') ?>" />
+                <input
+                    id="username"
+                    class="admin__control-text"
+                    type="text"
+                    name="login[username]"
+                    autofocus
+                    value=""
+                    data-validate="{required:true}"
+                    placeholder="<?php echo __('user name') ?>"/>
             </div>
         </div>
         <div class="admin__field _required field-password">
             <label for="login" class="admin__field-label"><span><?php echo __('Password') ?></span></label>
             <div class="admin__field-control">
                 <!-- This is a dummy hidden field to trick firefox from auto filling the password -->
-                <input type="text" class="admin__control-dummy" name="dummy" id="dummy" />
-                <input type="password" id="login" name="login[password]" data-validate="{required:true}" class="admin__control-text" value="" placeholder="<?php echo __('password') ?>" />
+                <input
+                    id="dummy"
+                    class="admin__control-dummy"
+                    type="text"
+                    name="dummy"/>
+                <input
+                    id="login"
+                    class="admin__control-text"
+                    type="password"
+                    name="login[password]"
+                    data-validate="{required:true}"
+                    value="" placeholder="<?php echo __('password') ?>" />
             </div>
         </div>
         <?php echo $block->getChildHtml('form.additional.info'); ?>

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
@@ -21,18 +21,18 @@
         </a>
     <?php break; ?>
     <?php case 'user': ?>
-        <div class="admin-user">
+        <div class="admin-user admin__action-dropdown-wrap">
             <a
                 href="<?php echo $block->getUrl('adminhtml/system_account/index') ?>"
-                class="admin-user-account"
+                class="admin__action-dropdown"
                 title="<?php echo $block->escapeHtml(__('My Account')) ?>"
                 data-mage-init='{"dropdown":{}}'
                 data-toggle="dropdown">
-                <span class="admin-user-account-text-wrapper">
+                <span class="admin__action-dropdown-text">
                     <span class="admin-user-account-text"><?php echo $block->escapeHtml($block->getUser()->getUsername()); ?></span>
                 </span>
             </a>
-            <ul class="admin-user-menu">
+            <ul class="admin__action-dropdown-menu">
                 <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::myaccount')): ?>
                 <li>
                     <a

diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta6",
-        "magento/module-backend": "0.74.0-beta6",
-        "magento/module-cron": "0.74.0-beta6",
-        "magento/framework": "0.74.0-beta6",
+        "magento/module-store": "0.74.0-beta7",
+        "magento/module-backend": "0.74.0-beta7",
+        "magento/module-cron": "0.74.0-beta7",
+        "magento/framework": "0.74.0-beta7",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta6",
+    "version": "0.74.0-beta7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
@@ -3,28 +3,28 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta6",
-        "magento/module-catalog": "0.74.0-beta6",
-        "magento/module-tax": "0.74.0-beta6",
-        "magento/module-backend": "0.74.0-beta6",
-        "magento/module-sales": "0.74.0-beta6",
-        "magento/module-checkout": "0.74.0-beta6",
-        "magento/module-catalog-inventory": "0.74.0-beta6",
-        "magento/module-customer": "0.74.0-beta6",
-        "magento/module-catalog-rule": "0.74.0-beta6",
-        "magento/module-eav": "0.74.0-beta6",
-        "magento/module-config": "0.74.0-beta6",
-        "magento/module-gift-message": "0.74.0-beta6",
-        "magento/framework": "0.74.0-beta6",
-        "magento/module-quote": "0.74.0-beta6",
-        "magento/module-media-storage": "0.74.0-beta6",
+        "magento/module-store": "0.74.0-beta7",
+        "magento/module-catalog": "0.74.0-beta7",
+        "magento/module-tax": "0.74.0-beta7",
+        "magento/module-backend": "0.74.0-beta7",
+        "magento/module-sales": "0.74.0-beta7",
+        "magento/module-checkout": "0.74.0-beta7",
+        "magento/module-catalog-inventory": "0.74.0-beta7",
+        "magento/module-customer": "0.74.0-beta7",
+        "magento/module-catalog-rule": "0.74.0-beta7",
+        "magento/module-eav": "0.74.0-beta7",
+        "magento/module-config": "0.74.0-beta7",
+        "magento/module-gift-message": "0.74.0-beta7",
+        "magento/framework": "0.74.0-beta7",
+        "magento/module-quote": "0.74.0-beta7",
+        "magento/module-media-storage": "0.74.0-beta7",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-webapi": "0.74.0-beta6"
+        "magento/module-webapi": "0.74.0-beta7"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta6",
+    "version": "0.74.0-beta7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
@@ -3,12 +3,12 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-page-cache": "0.74.0-beta6",
-        "magento/framework": "0.74.0-beta6",
+        "magento/module-page-cache": "0.74.0-beta7",
+        "magento/framework": "0.74.0-beta7",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta6",
+    "version": "0.74.0-beta7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"