Skip to content

Commit

Permalink
2.0.0.0-dev66
Browse files Browse the repository at this point in the history 
* GitHub requests:
  * [#134] (#134) Fixed a typo in "Vorarlberg" region of Austria (was Voralberg)
* Fixed bugs:
  * Fixed an issue with the "Add to Cart" button on the MAP popup of compound products
  * Fixed an issue where the "Add Address" button for Customer in Admin was broken
  * Fixed an issue where predefined data are not loaded for a newsletter when it is added to a queue
* Indexer implementation:
  * Implemented a new optimized Catalog Category Product Indexer
  * Implemented a new optimized Catalog Category Flat Indexer
  * Implemented a new optimized Catalog Product Flat Indexer
* Modularity improvements:
  * Moved all Configurable Product functionality to a newly created ConfigurableProduct module
  * Moved the Shortcut Buttons abstraction from PayPal to Catalog
  * Moved the Recurring profile functionality to a separate module
  * Moved the Billing Agreements functionality to the PayPal module
  * Finalized the work on resolving dependencies between the Multishipping module, and all other modules. Module can be removed without any impact on the system
* Customer Service usage:
 * Updated Customer Group Grid to use Customer Service for data retrieving and filtering
 * Updated CustomerMetadataService::getAttributeMetadata to throw an exception if invalid code is provided
* Unified the format of specifying arguments for class constructors in DI and in Layout configuration:
  * A common xsd schema is being used for defining simple types. Layout and DI customize common types with their specific ones
  * Argument processing is unified, and moved to library
  • Loading branch information
@magento-team
magento-team committed Feb 21, 2014
1 parent 4ca7da2 commit d5d8091
Show file tree
Hide file tree
Showing 1,457 changed files with 37,288 additions and 21,230 deletions.
27 changes: 26 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
2.0.0.0-dev66
=============
* GitHub requests:
* [#134] (https://github.com/magento/magento2/pull/134) Fixed a typo in "Vorarlberg" region of Austria (was Voralberg)
* Fixed bugs:
* Fixed an issue with the "Add to Cart" button on the MAP popup of compound products
* Fixed an issue where the "Add Address" button for Customer in Admin was broken
* Fixed an issue where predefined data are not loaded for a newsletter when it is added to a queue
* Indexer implementation:
* Implemented a new optimized Catalog Category Product Indexer
* Implemented a new optimized Catalog Category Flat Indexer
* Implemented a new optimized Catalog Product Flat Indexer
* Modularity improvements:
* Moved all Configurable Product functionality to a newly created ConfigurableProduct module
* Moved the Shortcut Buttons abstraction from PayPal to Catalog
* Moved the Recurring profile functionality to a separate module
* Moved the Billing Agreements functionality to the PayPal module
* Finalized the work on resolving dependencies between the Multishipping module, and all other modules. Module can be removed without any impact on the system
* Customer Service usage:
* Updated Customer Group Grid to use Customer Service for data retrieving and filtering
* Updated CustomerMetadataService::getAttributeMetadata to throw an exception if invalid code is provided
* Unified the format of specifying arguments for class constructors in DI and in Layout configuration:
* A common xsd schema is being used for defining simple types. Layout and DI customize common types with their specific ones
* Argument processing is unified, and moved to library

2.0.0.0-dev65
=============
* Fixed bugs:
Expand All @@ -21,7 +46,7 @@
* Improvements in code coverage calculation:
* Added code coverage calculation in the clover xml format for unit tests
* GitHub requests:
* [#377] (https://github.com/magento/magento2/issues/377) Remove and avoid javascript eval() calls
* [#377] (https://github.com/magento/magento2/issues/377) Remove and avoid javascript eval() calls
* [#319] (https://github.com/magento/magento2/issues/319) No message was displayed when product added to shopping cart.
* [#367] (https://github.com/magento/magento2/issues/367) Improve the error message from the contact form
* [#469] (https://github.com/magento/magento2/issues/469) Can't change prices on different websites for custom options
Expand Down
6 changes: 6 additions & 0 deletions app/code/Magento/AdminNotification/Block/Inbox.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@

class Inbox extends \Magento\Backend\Block\Widget\Grid\Container
{
/**
* @return void
*/
protected function _construct()
{
$this->_controller = 'adminhtml';
Expand All @@ -37,6 +40,9 @@ protected function _construct()
parent::_construct();
}

/**
* @return $this
*/
protected function _prepareLayout()
{
parent::_prepareLayout();
Expand Down
2 changes: 2 additions & 0 deletions app/code/Magento/AdminNotification/Block/System/Messages.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ public function __construct(
}

/**
* Prepare html output
*
* @return string
*/
protected function _toHtml()
Expand Down
14 changes: 8 additions & 6 deletions app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
*/
namespace Magento\AdminNotification\Block\System\Messages;

use Magento\AdminNotification\Model\System\MessageInterface;

class UnreadMessagePopup extends \Magento\Backend\Block\Template
{
/**
Expand All @@ -31,8 +33,8 @@ class UnreadMessagePopup extends \Magento\Backend\Block\Template
* @var array
*/
protected $_itemClasses = array(
\Magento\AdminNotification\Model\System\MessageInterface::SEVERITY_CRITICAL => 'error',
\Magento\AdminNotification\Model\System\MessageInterface::SEVERITY_MAJOR => 'warning'
MessageInterface::SEVERITY_CRITICAL => 'error',
MessageInterface::SEVERITY_MAJOR => 'warning'
);

/**
Expand Down Expand Up @@ -72,7 +74,7 @@ protected function _toHtml()
/**
* Retrieve list of unread messages
*
* @return mixed
* @return MessageInterface[]
*/
public function getUnreadMessages()
{
Expand All @@ -97,10 +99,10 @@ public function getPopupTitle()
/**
* Retrieve item class by severity
*
* @param \Magento\AdminNotification\Model\System\MessageInterface $message
* @return mixed
* @param MessageInterface $message
* @return string
*/
public function getItemClass(\Magento\AdminNotification\Model\System\MessageInterface $message)
public function getItemClass(MessageInterface $message)
{
return $this->_itemClasses[$message->getSeverity()];
}
Expand Down
3 changes: 1 addition & 2 deletions app/code/Magento/AdminNotification/Block/ToolbarEntry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
namespace Magento\AdminNotification\Block;

/**
* Toolbar entry that shows latest notifications
Expand All @@ -31,8 +32,6 @@
* @package Magento_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\AdminNotification\Block;

class ToolbarEntry extends \Magento\Backend\Block\Template
{
/**
Expand Down
22 changes: 21 additions & 1 deletion app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@

class Notification extends \Magento\Backend\App\AbstractAction
{
/**
* @return void
*/
public function indexAction()
{
$this->_title->add(__('Notifications'));
Expand All @@ -42,6 +45,9 @@ public function indexAction()
$this->_view->renderLayout();
}

/**
* @return void
*/
public function markAsReadAction()
{
$notificationId = (int)$this->getRequest()->getParam('id');
Expand All @@ -67,6 +73,8 @@ public function markAsReadAction()

/**
* Mark notification as read (AJAX action)
*
* @return void
*/
public function ajaxMarkAsReadAction()
{
Expand All @@ -87,6 +95,9 @@ public function ajaxMarkAsReadAction()
);
}

/**
* @return void
*/
public function massMarkAsReadAction()
{
$ids = $this->getRequest()->getParam('notification');
Expand Down Expand Up @@ -115,6 +126,9 @@ public function massMarkAsReadAction()
$this->_redirect('adminhtml/*/');
}

/**
* @return void
*/
public function removeAction()
{
if ($id = $this->getRequest()->getParam('id')) {
Expand All @@ -123,7 +137,7 @@ public function removeAction()

if (!$model->getId()) {
$this->_redirect('adminhtml/*/');
return ;
return;
}

try {
Expand All @@ -147,6 +161,9 @@ public function removeAction()
$this->_redirect('adminhtml/*/');
}

/**
* @return void
*/
public function massRemoveAction()
{
$ids = $this->getRequest()->getParam('notification');
Expand All @@ -172,6 +189,9 @@ public function massRemoveAction()
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
}

/**
* @return bool
*/
protected function _isAllowed()
{
switch ($this->getRequest()->getActionName()) {
Expand Down
7 changes: 3 additions & 4 deletions app/code/Magento/AdminNotification/Controller/Adminhtml/Survey.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

namespace Magento\AdminNotification\Controller\Adminhtml;

/**
* Adminhtml Survey Action
Expand All @@ -32,13 +32,12 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\AdminNotification\Controller\Adminhtml;

class Survey extends \Magento\Backend\App\Action
{
/**
* Index Action
*
* @return void
*/
public function indexAction()
{
Expand All @@ -51,7 +50,7 @@ public function indexAction()
/**
* Check if user has enough privileges
*
* @return boolean
* @return bool
*/
protected function _isAllowed()
{
Expand Down
4 changes: 3 additions & 1 deletion app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

namespace Magento\AdminNotification\Controller\Adminhtml\System;

class Message extends \Magento\Backend\App\AbstractAction
{
/**
* @return void
*/
public function listAction()
{
$severity = $this->getRequest()->getParam('severity');
Expand Down
11 changes: 7 additions & 4 deletions app/code/Magento/AdminNotification/Helper/Data.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

namespace Magento\AdminNotification\Helper;

/**
* AdminNotification Data helper
Expand All @@ -32,8 +32,6 @@
* @package Magento_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\AdminNotification\Helper;

class Data extends \Magento\App\Helper\AbstractHelper
{
const XML_PATH_POPUP_URL = 'system/adminnotification/popup_url';
Expand All @@ -60,7 +58,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
protected $_latestNotice;

/**
* count of unread notes by type
* Count of unread notes by type
*
* @var array
*/
Expand All @@ -76,6 +74,11 @@ class Data extends \Magento\App\Helper\AbstractHelper
*/
protected $_inboxFactory;

/**
* @param \Magento\App\Helper\Context $context
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
*/
public function __construct(
\Magento\App\Helper\Context $context,
\Magento\Core\Model\Store\Config $coreStoreConfig,
Expand Down
7 changes: 4 additions & 3 deletions app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

namespace Magento\AdminNotification\Model\Config\Source;

/**
* AdminNotification update frequency source
Expand All @@ -32,10 +32,11 @@
* @package Magento_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\AdminNotification\Model\Config\Source;

class Frequency implements \Magento\Core\Model\Option\ArrayInterface
{
/**
* @return array
*/
public function toOptionArray()
{
return array(
Expand Down
12 changes: 7 additions & 5 deletions app/code/Magento/AdminNotification/Model/Feed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

namespace Magento\AdminNotification\Model;

/**
* AdminNotification Feed model
Expand All @@ -32,8 +32,6 @@
* @package Magento_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\AdminNotification\Model;

class Feed extends \Magento\Core\Model\AbstractModel
{
const XML_USE_HTTPS_PATH = 'system/adminnotification/use_https';
Expand Down Expand Up @@ -84,6 +82,7 @@ public function __construct(
/**
* Init model
*
* @return void
*/
protected function _construct()
{
Expand All @@ -107,7 +106,7 @@ public function getFeedUrl()
/**
* Check feed for modification
*
* @return \Magento\AdminNotification\Model\Feed
* @return $this
*/
public function checkUpdate()
{
Expand Down Expand Up @@ -174,7 +173,7 @@ public function getLastUpdate()
/**
* Set last update time (now)
*
* @return \Magento\AdminNotification\Model\Feed
* @return $this
*/
public function setLastUpdate()
{
Expand Down Expand Up @@ -212,6 +211,9 @@ public function getFeedData()
return $xml;
}

/**
* @return \SimpleXMLElement
*/
public function getFeedXml()
{
try {
Expand Down
Loading

0 comments on commit d5d8091

Please sign in to comment.