Skip to content

Commit

Permalink
2.0.0.0-dev73
Browse files Browse the repository at this point in the history 
* Framework Improvements:
  * Eliminated the StoreConfig class, and ability to work with Configuration through the Store object. Scope Config was introduced instead.
  * Fixed performance degradation caused by DI argument processors
  * Covered Magento library components with unit tests:
     * Magento/App/Request
     * Magento/App/Resource directory and Magento/App/Resource.php
     * Magento/App/Response
     * Magento/App/Route
     * Magento/App/Router
     * Magento/App/Http.php
     * Magento/Translate.php
  * Improved the Web API framework based on Customer Service
  * Updated the API Service Exception Handling
  * Changed the conventional notation of Vendor name in theme path: from `app/design/<area>/<vendor>_<theme>` to `app/design/<area>/<vendor>/<theme>`
  * Renamed the 3DSecure library to CardinalCommerce, and removed the unused flex library
* Themes update:
  * Updated the look&feel of the Admin theme
* Modularity improvements:
  * Introduced a new Store module. Moved all Store related logic from Magento_Core to Magento_Store
  * Moved the library part of the Config component from the Magento_Core module to the library
  * Moved the Session related logic from the Magento_Core module to the library
  * Moved the abstract logic related to Magento "Module" from Magento_Core to the library
  * Moved the form key related functionality to the library
  * Introduced a new Magento_UrlRewrite module and moved related classes from Magento_Core to the new module
  * Moved the resource model to Magento_Install module
  * Eliminated the Core\Helper\Js class
  * Moved the Email related logic from Magento_Core module to Magento_Email module
  * Moved the Cache related logic from the Magento_Core module to the library
  * Resolved issues which appeared when an order had been placed before the Magento_Payment module was disabled
  * Eliminated Magento_Catalog dependency on Magento_Rating
  * Removed the Magento_Rating module, its logic moved to Magento_Review
  * Moved the View related components from Magento_Core to the Magento/View library
* Refactored the following modules to use Customer Service
  * Magento_Multishipping
  * Magento_Paypal
  * Magento_Log
  * Magento_RSS
  * Magento_Review
  * Magento_Wishlist
  * Magento_Weee
  * Magento_CatalogInventory
  * Magento_CatalogRule
  * Magento_SalesRule
* GitHub requests:
  * [#520] (#520) -- Fixed spelling in Magento\Payment\Model\Method\AbstractMethod
  * [#481] (#481) -- GD2 Adapter PHP memory_limit
  * [#516] (#516) -- Make Sure That save_before Event Is Dispatched
  * [#465] (#465) -- Absolute path is assembled incorrectly when merging js/css files
  * [#504] (#504) -- Renamed "contacts" module to "contact"
  * [#529] (#529) -- Fixed exception at admin dashboard
  * [#535] (#535) -- Fixed an issue during creating or editing product template
  * [#535] (#535) -- Fixed Typo in the module name
  * [#538] (#538) -- Fixed missing tax amount in the invoice
  * [#518] (#518) -- Change to Magento\Customer\Block\Widget\Dob new version
* Fixed bugs:
  * Fixed implementation issues with Cron task group threading
  * Fixed inability to place order during customer registration flow
  * Fixed an issue where after JS minification errors appeared when loading pages which contained minified JS
  * Fixed an issue where it was impossible for users with restricted permission to export certain entities
  * Fixed an issue where checkout was blocked by the "Please enter the State/Province" pop-up for customers that had saved addresses
  * Fixed an issue where a fatal error appeared when trying to check out the second time with OnePageCheckout
  * Fixed an issue where a fatal error appeared when trying to create an online invoice for an order placed with PayPal Express Checkout (Payment Action = Order)
  * Fixed an issue where the special price for a bundle product was calculated wrongly
  * Fixed an issue where a fatal error appeared when trying to create a shipment for an order if Magento was installed without the USPS module
  * Fixed an issue where the Lifetime Sales and Average Orders sections of the Admin Dashboard were missing
  * Fixed an issue where the active tab changed after changing the attribute set
  * Fixed an issue with incorrect order of product types in the Add Product menu in the backend
  * Fixed an issue with saving the tier price attribute
* JavaScript improvements:
  * Upgraded the frontend jQuery library to version 1.11
  * Upgraded the frontend jQuery UI library to version 1.10.4
  * Modified the loader widget to render content using handlebars
  * Added the 'use strict' mode to the accordion widget
  * Added the 'use strict' mode to the tab widget
  • Loading branch information
@magento-team
magento-team committed Apr 11, 2014
1 parent 342b298 commit 8611ea7
Show file tree
Hide file tree
Showing 2,427 changed files with 79,432 additions and 40,446 deletions.
81 changes: 79 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,80 @@
2.0.0.0-dev73
=============
* Framework Improvements:
* Eliminated the StoreConfig class, and ability to work with Configuration through the Store object. Scope Config was introduced instead.
* Fixed performance degradation caused by DI argument processors
* Covered Magento library components with unit tests:
* Magento/App/Request
* Magento/App/Resource directory and Magento/App/Resource.php
* Magento/App/Response
* Magento/App/Route
* Magento/App/Router
* Magento/App/Http.php
* Magento/Translate.php
* Improved the Web API framework based on Customer Service
* Updated the API Service Exception Handling
* Changed the conventional notation of Vendor name in theme path: from `app/design/<area>/<vendor>_<theme>` to `app/design/<area>/<vendor>/<theme>`
* Renamed the 3DSecure library to CardinalCommerce, and removed the unused flex library
* Themes update:
* Updated the look&feel of the Admin theme
* Modularity improvements:
* Introduced a new Store module. Moved all Store related logic from Magento_Core to Magento_Store
* Moved the library part of the Config component from the Magento_Core module to the library
* Moved the Session related logic from the Magento_Core module to the library
* Moved the abstract logic related to Magento "Module" from Magento_Core to the library
* Moved the form key related functionality to the library
* Introduced a new Magento_UrlRewrite module and moved related classes from Magento_Core to the new module
* Moved the resource model to Magento_Install module
* Eliminated the Core\Helper\Js class
* Moved the Email related logic from Magento_Core module to Magento_Email module
* Moved the Cache related logic from the Magento_Core module to the library
* Resolved issues which appeared when an order had been placed before the Magento_Payment module was disabled
* Eliminated Magento_Catalog dependency on Magento_Rating
* Removed the Magento_Rating module, its logic moved to Magento_Review
* Moved the View related components from Magento_Core to the Magento/View library
* Refactored the following modules to use Customer Service
* Magento_Multishipping
* Magento_Paypal
* Magento_Log
* Magento_RSS
* Magento_Review
* Magento_Wishlist
* Magento_Weee
* Magento_CatalogInventory
* Magento_CatalogRule
* Magento_SalesRule
* GitHub requests:
* [#520] (https://github.com/magento/magento2/issues/520) -- Fixed spelling in Magento\Payment\Model\Method\AbstractMethod
* [#481] (https://github.com/magento/magento2/issues/481) -- GD2 Adapter PHP memory_limit
* [#516] (https://github.com/magento/magento2/issues/516) -- Make Sure That save_before Event Is Dispatched
* [#465] (https://github.com/magento/magento2/issues/465) -- Absolute path is assembled incorrectly when merging js/css files
* [#504] (https://github.com/magento/magento2/issues/504) -- Renamed "contacts" module to "contact"
* [#529] (https://github.com/magento/magento2/issues/529) -- Fixed exception at admin dashboard
* [#535] (https://github.com/magento/magento2/issues/535) -- Fixed an issue during creating or editing product template
* [#535] (https://github.com/magento/magento2/issues/535) -- Fixed Typo in the module name
* [#538] (https://github.com/magento/magento2/issues/538) -- Fixed missing tax amount in the invoice
* [#518] (https://github.com/magento/magento2/issues/518) -- Change to Magento\Customer\Block\Widget\Dob new version
* Fixed bugs:
* Fixed implementation issues with Cron task group threading
* Fixed inability to place order during customer registration flow
* Fixed an issue where after JS minification errors appeared when loading pages which contained minified JS
* Fixed an issue where it was impossible for users with restricted permission to export certain entities
* Fixed an issue where checkout was blocked by the "Please enter the State/Province" pop-up for customers that had saved addresses
* Fixed an issue where a fatal error appeared when trying to check out the second time with OnePageCheckout
* Fixed an issue where a fatal error appeared when trying to create an online invoice for an order placed with PayPal Express Checkout (Payment Action = Order)
* Fixed an issue where the special price for a bundle product was calculated wrongly
* Fixed an issue where a fatal error appeared when trying to create a shipment for an order if Magento was installed without the USPS module
* Fixed an issue where the Lifetime Sales and Average Orders sections of the Admin Dashboard were missing
* Fixed an issue where the active tab changed after changing the attribute set
* Fixed an issue with incorrect order of product types in the Add Product menu in the backend
* Fixed an issue with saving the tier price attribute
* JavaScript improvements:
* Upgraded the frontend jQuery library to version 1.11
* Upgraded the frontend jQuery UI library to version 1.10.4
* Modified the loader widget to render content using handlebars
* Added the 'use strict' mode to the accordion widget
* Added the 'use strict' mode to the tab widget

2.0.0.0-dev72
=============
* Framework Improvements:
Expand Down Expand Up @@ -55,7 +132,7 @@
* Updated the whitelist filter with library code for integration tests code coverage calculation
* GitHub requests:
* [#512] (https://github.com/magento/magento2/issues/512) -- Theme Thumbnails not showing
* [#520] (https://github.com/magento/magento2/pull/502) -- Corrected Search Engine Optimization i18n
* [#520] (https://github.com/magento/magento2/pull/520) -- Corrected Search Engine Optimization i18n
* [#519] (https://github.com/magento/magento2/issues/519) -- New Theme Activation
* Customer Service usage:
* Refactored the Log module to use Customer Service
Expand Down Expand Up @@ -567,7 +644,7 @@
* Design loader moved to library
* Theme label moved to library
* Themes update:
* Reduced amount of templates and layouts in magento_plushe theme
* Reduced amount of templates and layouts in Magento/plushe theme
* Responsive design improvements
* Integrity improvements:
* Covered all Magento classes with argument sequence validator
Expand Down
9 changes: 0 additions & 9 deletions app/code/Magento/AdminNotification/Block/Inbox.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,6 @@ protected function _construct()
$this->_blockGroup = 'Magento_AdminNotification';
$this->_headerText = __('Messages Inbox');
parent::_construct();
}

/**
* @return $this
*/
protected function _prepareLayout()
{
parent::_prepareLayout();
$this->_removeButton('add');
return $this;
}
}
10 changes: 5 additions & 5 deletions app/code/Magento/AdminNotification/Helper/Data.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ class Data extends \Magento\App\Helper\AbstractHelper
protected $_unreadNoticeCounts;

/**
* @var \Magento\Core\Model\Store\Config
* @var \Magento\App\Config\ScopeConfigInterface
*/
protected $_coreStoreConfig;
protected $_scopeConfig;

/**
* @var \Magento\AdminNotification\Model\InboxFactory
Expand All @@ -76,16 +76,16 @@ class Data extends \Magento\App\Helper\AbstractHelper

/**
* @param \Magento\App\Helper\Context $context
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
*/
public function __construct(
\Magento\App\Helper\Context $context,
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\AdminNotification\Model\InboxFactory $inboxFactory
) {
parent::__construct($context);
$this->_coreStoreConfig = $coreStoreConfig;
$this->_scopeConfig = $scopeConfig;
$this->_inboxFactory = $inboxFactory;
}

Expand Down
28 changes: 14 additions & 14 deletions app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,31 +31,31 @@ class Baseurl implements \Magento\AdminNotification\Model\System\MessageInterfac
protected $_urlBuilder;

/**
* @var \Magento\App\ConfigInterface
* @var \Magento\App\Config\ScopeConfigInterface
*/
protected $_config;

/**
* @var \Magento\Core\Model\StoreManagerInterface
* @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;

/**
* @var \Magento\Core\Model\Config\ValueFactory
* @var \Magento\App\Config\ValueFactory
*/
protected $_configValueFactory;

/**
* @param \Magento\App\ConfigInterface $config
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\App\Config\ScopeConfigInterface $config
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\UrlInterface $urlBuilder
* @param \Magento\Core\Model\Config\ValueFactory $configValueFactory
* @param \Magento\App\Config\ValueFactory $configValueFactory
*/
public function __construct(
\Magento\App\ConfigInterface $config,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\App\Config\ScopeConfigInterface $config,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\UrlInterface $urlBuilder,
\Magento\Core\Model\Config\ValueFactory $configValueFactory
\Magento\App\Config\ValueFactory $configValueFactory
) {
$this->_urlBuilder = $urlBuilder;
$this->_config = $config;
Expand All @@ -71,18 +71,18 @@ public function __construct(
protected function _getConfigUrl()
{
$output = '';
$defaultUnsecure = $this->_config->getValue(\Magento\Core\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
$defaultUnsecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');

$defaultSecure = $this->_config->getValue(\Magento\Core\Model\Store::XML_PATH_SECURE_BASE_URL, 'default');
$defaultSecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, 'default');

if ($defaultSecure == \Magento\Core\Model\Store::BASE_URL_PLACEHOLDER ||
$defaultUnsecure == \Magento\Core\Model\Store::BASE_URL_PLACEHOLDER
if ($defaultSecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER ||
$defaultUnsecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER
) {
$output = $this->_urlBuilder->getUrl('adminhtml/system_config/edit', array('section' => 'web'));
} else {
/** @var $dataCollection \Magento\Core\Model\Resource\Config\Data\Collection */
$dataCollection = $this->_configValueFactory->create()->getCollection();
$dataCollection->addValueFilter(\Magento\Core\Model\Store::BASE_URL_PLACEHOLDER);
$dataCollection->addValueFilter(\Magento\Store\Model\Store::BASE_URL_PLACEHOLDER);

/** @var $data \Magento\App\Config\ValueInterface */
foreach ($dataCollection as $data) {
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/AdminNotification/Model/System/Message/Security.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class Security implements \Magento\AdminNotification\Model\System\MessageInterfa
protected $_backendConfig;

/**
* @var \Magento\App\ConfigInterface
* @var \Magento\App\Config\ScopeConfigInterface
*/
protected $_config;

Expand All @@ -66,13 +66,13 @@ class Security implements \Magento\AdminNotification\Model\System\MessageInterfa
/**
* @param \Magento\App\CacheInterface $cache
* @param \Magento\Backend\App\ConfigInterface $backendConfig
* @param \Magento\App\ConfigInterface $config
* @param \Magento\App\Config\ScopeConfigInterface $config
* @param \Magento\HTTP\Adapter\CurlFactory $curlFactory
*/
public function __construct(
\Magento\App\CacheInterface $cache,
\Magento\Backend\App\ConfigInterface $backendConfig,
\Magento\App\ConfigInterface $config,
\Magento\App\Config\ScopeConfigInterface $config,
\Magento\HTTP\Adapter\CurlFactory $curlFactory
) {
$this->_cache = $cache;
Expand Down Expand Up @@ -108,7 +108,7 @@ private function _canShowNotification()
*/
private function _isFileAccessible()
{
$unsecureBaseURL = $this->_config->getValue(\Magento\Core\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
$unsecureBaseURL = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');

/** @var $http \Magento\HTTP\Adapter\Curl */
$http = $this->_curlFactory->create();
Expand Down
7 changes: 7 additions & 0 deletions app/code/Magento/AdminNotification/etc/adminhtml/di.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,11 @@
</argument>
</arguments>
</type>
<type name="Magento\Module\Setup\Migration">
<arguments>
<argument name="compositeModules" xsi:type="array">
<item name="adminnotification" xsi:type="string">Magento_AdminNotification</item>
</argument>
</arguments>
</type>
</config>
2 changes: 2 additions & 0 deletions app/code/Magento/AdminNotification/etc/module.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@
<module name="Magento_AdminNotification" version="2.0.0.0" active="true">
<sequence>
<module name="Magento_Core"/>
<module name="Magento_Store"/>
</sequence>
<depends>
<module name="Magento_Store"/>
<module name="Magento_Core"/>
<module name="Magento_Backend"/>
<module name="Magento_Theme"/>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
$installer = $this;
/* @var $installer \Magento\Core\Model\Resource\Setup */
/* @var $installer \Magento\Module\Setup */

$installer->startSetup();
/**
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/sql/adminnotification_setup/upgrade-1.6.0.0-2.0.0.0.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
$installer = $this;
/* @var $installer \Magento\Core\Model\Resource\Setup */
/* @var $installer \Magento\Module\Setup */

$installer->startSetup();
/**
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<block class="Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup" name="unread_system_messages" as="unread_system_messages" after="system_messages" template="Magento_AdminNotification::system/messages/popup.phtml"/>
<block class="Magento\AdminNotification\Block\Window" name="notification_window" as="notification_window" acl="Magento_AdminNotification::show_toolbar" template="notification/window.phtml"/>
</referenceContainer>
<referenceBlock name="header">
<block class="Magento\AdminNotification\Block\ToolbarEntry" template="toolbar_entry.phtml" before="-"/>
</referenceBlock>
<referenceContainer name="header">
<block class="Magento\AdminNotification\Block\ToolbarEntry" template="toolbar_entry.phtml" />
</referenceContainer>
<referenceBlock name="head">
<block class="Magento\Theme\Block\Html\Head\Script" name="magento-adminnotification-toolbar-entry-js" after="jquery-jquery-js">
<arguments>
Expand Down
36 changes: 18 additions & 18 deletions app/code/Magento/AdminNotification/view/adminhtml/toolbar_entry.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
$(document).ready(function() {
// Mark notification as read via AJAX call
var markNotificationAsRead = function(notificationId) {
var requestUrl = $('.notifications .dropdown-menu').attr('data-mark-as-read-url');
var requestUrl = $('.notifications-summary .dropdown-menu').attr('data-mark-as-read-url');
$.ajax({
url: requestUrl,
type: 'POST',
Expand All @@ -39,36 +39,36 @@
showLoader: false
});
};
var notificationCount = $('.notifications').attr('data-notification-count');
var notificationCount = $('.notifications-summary').attr('data-notification-count');
// Remove notification from the list
var removeNotificationFromList = function(notificationEntry) {
notificationEntry.remove();
notificationCount--;
$('.notifications').attr('data-notification-count', notificationCount);
$('.notifications-summary').attr('data-notification-count', notificationCount);

if (notificationCount == 0) {
// Change appearance of the bubble and its behavior when the last notification is removed
$('.notifications .dropdown-menu').remove();
var notificationIcon = $('.notifications .notifications-icon');
$('.notifications-summary .dropdown-menu').remove();
var notificationIcon = $('.notifications-summary .notifications-icon');
notificationIcon.removeAttr('data-toggle');
notificationIcon.off('click.dropdown');
$('.notifications .notifications-icon .value').text('');
$('.notifications .notifications-icon .value').hide();
$('.notifications-action .counter').text('');
$('.notifications-action .counter').hide();
} else {
$('.notifications .notifications-icon .value').text(notificationCount);
$('.notifications-action .counter').text(notificationCount);
// Modify caption of the 'See All' link
var actionElement = $('.notifications .dropdown-menu .last .action-more');
var actionElement = $('.notifications-summary .dropdown-menu .last .action-more');
actionElement.text(actionElement.text().replace(/\d+/, notificationCount));
}
};

// Show popup with notification details
var showNotificationDetails = function(notificationEntry) {
var popupElement = notificationEntry.find('.notification-dialog-content').clone();
var popupElement = notificationEntry.find('.notifications-dialog-content').clone();
var notificationId = notificationEntry.attr('data-notification-id');
var dialogClassSeverity = 'notification-entry-dialog';
var dialogClassSeverity = 'notifications-entry-dialog';
if (notificationEntry.attr('data-notification-severity')) {
dialogClassSeverity = 'notification-entry-dialog notification-entry-dialog-critical';
dialogClassSeverity = 'notifications-entry-dialog notifications-entry-dialog-critical';
}
popupElement.dialog({
title: popupElement.attr('data-title'),
Expand Down Expand Up @@ -99,16 +99,16 @@
};

// Show notification description when corresponding item is clicked
$('.notifications .dropdown-menu .notification-entry').on('click.showNotification', function(event) {
$('.notifications-summary .dropdown-menu .notifications-entry').on('click.showNotification', function(event) {
// hide notification dropdown
$('.notifications .notifications-icon').trigger('click.dropdown');
$('.notifications-summary .notifications-icon').trigger('click.dropdown');
showNotificationDetails($(this));
event.stopPropagation();
});

// Remove corresponding notification from the list and mark it as read
$('.notifications .dropdown-menu .notification-entry .action-close').on('click.removeNotification', function(event) {
var notificationEntry = $(this).closest('.notification-entry')
$('.notifications-close').on('click.removeNotification', function(event) {
var notificationEntry = $(this).closest('.notifications-entry')
var notificationId = notificationEntry.attr('data-notification-id');
markNotificationAsRead(notificationId);
removeNotificationFromList(notificationEntry);
Expand All @@ -117,9 +117,9 @@

// Hide notifications bubble
if (notificationCount == 0) {
$('.notifications .notifications-icon .value').hide();
$('.notifications-action .counter').hide();
} else {
$('.notifications .notifications-icon .value').show();
$('.notifications-action .counter').show();
}
});
})(window.jQuery);
Loading

0 comments on commit 8611ea7

Please sign in to comment.