Skip to content

Commit

Permalink
0.1.0-alpha90
Browse files Browse the repository at this point in the history 
* Service layer implementation:
   * Created the Admin Shopping Cart Service
   * Created the Create Shopping Cart Items Service
   * Created the Create Shopping Cart Shipping Address Service
   * Created the Create Shopping Cart Billing Address Service
   * Created the Service Layer for Orders
   * Created CRUD service & APIs to manage options for configurable products
   * Created CRUD service & APIs to manage options for bundle products
 * Fixed bugs:
   * Fixed an issue where adding a customer address with an invalid value of the custom address attribute caused a fatal error in SOAP
   * Fixed an issue where the wrong FedEx rates were displayed
   * Fixed an issue where the Bill Me Later option did not work in Payflow payment methods
   * Fixed an issue where order comments were broken for orders placed with Authorize.net
   * Fixed the naming of the My Account -> Recurring Payment page
   * Fixed a UI elements issue in the disabled Magento_PayPalRecurringPayment and Magento_RecurringPayment modules
   * Fixed an issue where it was impossible to save configuration of a configurable product when adding it to an order in the Admin panel
   * Fixed an issue where the Select a store page was displayed during admin order creation when the Single Store mode was enabled
   * Fixed an issue when an exception was thrown when attempting to open the Customer Account page if the Recently Viewed widget was configured for the store
   * Updated the content of the Privacy Policy page
   * Fixed an issue where it was possible to update a tax rate using the POST http method
   * Fixed an issue where it was impossible to update Inventory Qty for a SKU using API
   * Fixed a JavaScript syntax error on the Create New Customer page
   * Fixed an issue where it was impossible to add new sample while creating a downloadable product
   * Fixed a JavaScript which appeared when clicking the Add New Address button in the Address Book on the storefront
   * Fixed an issue where it was possible to update Tax Rules using the PUT http method which is supposed to be used for create operation only
   * Fixed an issue where it was possible to create a Tax Rule specifying a product tax class instead of a customer tax class and vice versa
   * Fixed an issue with making websiteId a mandatory field when updating a customer using REST
   * Fixed an issue where the default value was not applied after clicking the 'Use default' link for a product price field in the catalog in the Admin panel
   * Fixed an issue where the price update mass action could not be performed
   * Fixed a JS error in the cross-sells product settings in the Admin panel
 * Added the following functional tests:
   * Mass Delete Backend Customer
   * Moderate Product Review
 * Framework improvements:
   * Added the ability to access admin functionality using admin user login for mobile
   * Refactored and unified Access Control List (ACL) to make it more consistent
   * Created a Cookie Manager (a cookie management class)
 * Changes in functional tests:
   * Enabled the CustomerMetadataService tests for SOAP
 * Themes update:
   * Fixed issues in the Blank theme
   * Implemented improvements for the Blank theme, core templates and Storefront UI Library
 * Modularity:
   * Created the Notification library component and made it possible to disable the AdminNotification module
   * Made it possible to disable the SendToFriend module
   * Created an optional ConfigurableImportExport module to remove dependency between the CatalogImportExport and ConfigurableProduct modules
   * Created an optional GroupedImportExport module to remove dependency between the CatalogImportExport and GroupedProduct modules
 * Introduce search library:
   * Created a Search request configuration
   * Created a Query object structure from the XML declaration
 * Composer Integration:
   * Added support for using 3rd-party components as Composer packages
  • Loading branch information
@magento-team
magento-team committed Aug 12, 2014
1 parent 67519d4 commit 623d88f
Show file tree
Hide file tree
Showing 1,107 changed files with 59,413 additions and 7,369 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -34,3 +34,4 @@ atlassian*

/var/*
!/var/.htaccess
/vendor
55 changes: 55 additions & 0 deletions CHANGELOG.md
View file
@@ -1,3 +1,58 @@
0.1.0-alpha90
=============
* Service layer implementation:
* Created the Admin Shopping Cart Service
* Created the Create Shopping Cart Items Service
* Created the Create Shopping Cart Shipping Address Service
* Created the Create Shopping Cart Billing Address Service
* Created the Service Layer for Orders
* Created CRUD service & APIs to manage options for configurable products
* Created CRUD service & APIs to manage options for bundle products
* Fixed bugs:
* Fixed an issue where adding a customer address with an invalid value of the custom address attribute caused a fatal error in SOAP
* Fixed an issue where the wrong FedEx rates were displayed
* Fixed an issue where the Bill Me Later option did not work in Payflow payment methods
* Fixed an issue where order comments were broken for orders placed with Authorize.net
* Fixed the naming of the My Account -> Recurring Payment page
* Fixed a UI elements issue in the disabled Magento_PayPalRecurringPayment and Magento_RecurringPayment modules
* Fixed an issue where it was impossible to save configuration of a configurable product when adding it to an order in the Admin panel
* Fixed an issue where the Select a store page was displayed during admin order creation when the Single Store mode was enabled
* Fixed an issue when an exception was thrown when attempting to open the Customer Account page if the Recently Viewed widget was configured for the store
* Updated the content of the Privacy Policy page
* Fixed an issue where it was possible to update a tax rate using the POST http method
* Fixed an issue where it was impossible to update Inventory Qty for a SKU using API
* Fixed a JavaScript syntax error on the Create New Customer page
* Fixed an issue where it was impossible to add new sample while creating a downloadable product
* Fixed a JavaScript which appeared when clicking the Add New Address button in the Address Book on the storefront
* Fixed an issue where it was possible to update Tax Rules using the PUT http method which is supposed to be used for create operation only
* Fixed an issue where it was possible to create a Tax Rule specifying a product tax class instead of a customer tax class and vice versa
* Fixed an issue with making websiteId a mandatory field when updating a customer using REST
* Fixed an issue where the default value was not applied after clicking the 'Use default' link for a product price field in the catalog in the Admin panel
* Fixed an issue where the price update mass action could not be performed
* Fixed a JS error in the cross-sells product settings in the Admin panel
* Added the following functional tests:
* Mass Delete Backend Customer
* Moderate Product Review
* Framework improvements:
* Added the ability to access admin functionality using admin user login for mobile
* Refactored and unified Access Control List (ACL) to make it more consistent
* Created a Cookie Manager (a cookie management class)
* Changes in functional tests:
* Enabled the CustomerMetadataService tests for SOAP
* Themes update:
* Fixed issues in the Blank theme
* Implemented improvements for the Blank theme, core templates and Storefront UI Library
* Modularity:
* Created the Notification library component and made it possible to disable the AdminNotification module
* Made it possible to disable the SendToFriend module
* Created an optional ConfigurableImportExport module to remove dependency between the CatalogImportExport and ConfigurableProduct modules
* Created an optional GroupedImportExport module to remove dependency between the CatalogImportExport and GroupedProduct modules
* Introduce search library:
* Created a Search request configuration
* Created a Query object structure from the XML declaration
* Composer Integration:
* Added support for using 3rd-party components as Composer packages

0.1.0-alpha89
=============
* Fixed bugs:
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Expand Up @@ -6,3 +6,4 @@ All Submissions you make to Magento, an eBay Inc. company (“Magento”) throug

1. You grant Magento a perpetual, worldwide, non-exclusive, no charge, royalty free, irrevocable license under your applicable copyrights and patents to reproduce, prepare derivative works of, display, publically perform, sublicense and distribute any feedback, ideas, code, or other information (“Submission”) you submit through GitHub.
2. Your Submission is an original work of authorship and you are the owner or are legally entitled to grant the license stated above.
3. You agree to the X.commerce Agreement found here: https://www.x.com/developers/x.commerce/x.commerce-user-agreement.
5 changes: 5 additions & 0 deletions app/autoload.php
View file
Expand Up @@ -23,5 +23,10 @@
* @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)
*/
$vendorDir = require __DIR__ . '/etc/vendor_path.php';
$vendorAutoload = __DIR__ . '/../' . $vendorDir . '/autoload.php';
if (file_exists($vendorAutoload)) {
require_once $vendorAutoload;
}
require_once __DIR__ . '/../lib/internal/Magento/Framework/Autoload/IncludePath.php';
spl_autoload_register([new \Magento\Framework\Autoload\IncludePath(), 'load']);
7 changes: 3 additions & 4 deletions app/bootstrap.php
View file
Expand Up @@ -30,17 +30,17 @@
umask(0);

/* PHP version validation */
if (version_compare(phpversion(), '5.4.0', '<') === true) {
if (version_compare(phpversion(), '5.4.11', '<') === true) {
if (PHP_SAPI == 'cli') {
echo 'Magento supports PHP 5.4.0 or newer. Please read http://www.magento.com/install.';
echo 'Magento supports PHP 5.4.11 or newer. Please read http://www.magento.com/install.';
} else {
echo <<<HTML
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
<div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
<h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
Whoops, it looks like you have an invalid PHP version.</h3>
</div>
<p>Magento supports PHP 5.4.0 or newer.
<p>Magento supports PHP 5.4.11 or newer.
<a href="http://www.magento.com/install" target="">Find out</a>
how to install Magento using PHP-CGI as a work-around.
</p>
Expand All @@ -60,7 +60,6 @@
* Require necessary files
*/
require_once BP . '/app/functions.php';

require_once __DIR__ . '/autoload.php';
(new \Magento\Framework\Autoload\IncludePath())->addIncludePath(array(BP . '/app/code', BP . '/lib/internal'));
$classMapPath = BP . '/var/classmap.ser';
Expand Down
18 changes: 10 additions & 8 deletions app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php
View file
Expand Up @@ -25,6 +25,8 @@
*/
namespace Magento\AdminNotification\Block\Grid\Renderer;

use \Magento\Framework\Notification\MessageInterface;

class Severity extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
/**
Expand Down Expand Up @@ -58,21 +60,21 @@ public function render(\Magento\Framework\Object $row)
$value = '';

switch ($row->getData($this->getColumn()->getIndex())) {
case \Magento\AdminNotification\Model\Inbox::SEVERITY_CRITICAL:
case MessageInterface::SEVERITY_CRITICAL:
$class = 'critical';
$value = $this->_notice->getSeverities(\Magento\AdminNotification\Model\Inbox::SEVERITY_CRITICAL);
$value = $this->_notice->getSeverities(MessageInterface::SEVERITY_CRITICAL);
break;
case \Magento\AdminNotification\Model\Inbox::SEVERITY_MAJOR:
case MessageInterface::SEVERITY_MAJOR:
$class = 'major';
$value = $this->_notice->getSeverities(\Magento\AdminNotification\Model\Inbox::SEVERITY_MAJOR);
$value = $this->_notice->getSeverities(MessageInterface::SEVERITY_MAJOR);
break;
case \Magento\AdminNotification\Model\Inbox::SEVERITY_MINOR:
case MessageInterface::SEVERITY_MINOR:
$class = 'minor';
$value = $this->_notice->getSeverities(\Magento\AdminNotification\Model\Inbox::SEVERITY_MINOR);
$value = $this->_notice->getSeverities(MessageInterface::SEVERITY_MINOR);
break;
case \Magento\AdminNotification\Model\Inbox::SEVERITY_NOTICE:
case MessageInterface::SEVERITY_NOTICE:
$class = 'notice';
$value = $this->_notice->getSeverities(\Magento\AdminNotification\Model\Inbox::SEVERITY_NOTICE);
$value = $this->_notice->getSeverities(MessageInterface::SEVERITY_NOTICE);
break;
}
return '<span class="grid-severity-' . $class . '"><span>' . $value . '</span></span>';
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/AdminNotification/Block/System/Messages.php
View file
Expand Up @@ -70,14 +70,14 @@ protected function _toHtml()
/**
* Retrieve message list
*
* @return \Magento\AdminNotification\Model\System\MessageInterface[]
* @return \Magento\Framework\Notification\MessageInterface[]
*/
public function getLastCritical()
{
$items = array_values($this->_messages->getItems());
if (isset(
$items[0]
) && $items[0]->getSeverity() == \Magento\AdminNotification\Model\System\MessageInterface::SEVERITY_CRITICAL
) && $items[0]->getSeverity() == \Magento\Framework\Notification\MessageInterface::SEVERITY_CRITICAL
) {
return $items[0];
}
Expand All @@ -92,7 +92,7 @@ public function getLastCritical()
public function getCriticalCount()
{
return $this->_messages->getCountBySeverity(
\Magento\AdminNotification\Model\System\MessageInterface::SEVERITY_CRITICAL
\Magento\Framework\Notification\MessageInterface::SEVERITY_CRITICAL
);
}

Expand All @@ -104,7 +104,7 @@ public function getCriticalCount()
public function getMajorCount()
{
return $this->_messages->getCountBySeverity(
\Magento\AdminNotification\Model\System\MessageInterface::SEVERITY_MAJOR
\Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR
);
}

Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
View file
Expand Up @@ -17,13 +17,13 @@
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
*
* @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\System\Messages;

use Magento\AdminNotification\Model\System\MessageInterface;
use Magento\Framework\Notification\MessageInterface;

class UnreadMessagePopup extends \Magento\Backend\Block\Template
{
Expand Down
32 changes: 14 additions & 18 deletions app/code/Magento/AdminNotification/Model/Inbox.php
View file
Expand Up @@ -23,6 +23,9 @@
*/
namespace Magento\AdminNotification\Model;

use \Magento\Framework\Notification\MessageInterface;
use \Magento\Framework\Notification\NotifierInterface;

/**
* AdminNotification Inbox model
*
Expand All @@ -45,16 +48,8 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Inbox extends \Magento\Framework\Model\AbstractModel
class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface
{
const SEVERITY_CRITICAL = 1;

const SEVERITY_MAJOR = 2;

const SEVERITY_MINOR = 3;

const SEVERITY_NOTICE = 4;

/**
* @return void
*/
Expand All @@ -72,10 +67,10 @@ protected function _construct()
public function getSeverities($severity = null)
{
$severities = array(
self::SEVERITY_CRITICAL => __('critical'),
self::SEVERITY_MAJOR => __('major'),
self::SEVERITY_MINOR => __('minor'),
self::SEVERITY_NOTICE => __('notice')
MessageInterface::SEVERITY_CRITICAL => __('critical'),
MessageInterface::SEVERITY_MAJOR => __('major'),
MessageInterface::SEVERITY_MINOR => __('minor'),
MessageInterface::SEVERITY_NOTICE => __('notice')
);

if (!is_null($severity)) {
Expand Down Expand Up @@ -118,7 +113,8 @@ public function getNoticeStatus()
*/
public function parse(array $data)
{
return $this->getResource()->parse($this, $data);
$this->getResource()->parse($this, $data);
return $this;
}

/**
Expand Down Expand Up @@ -167,7 +163,7 @@ public function add($severity, $title, $description, $url = '', $isInternal = tr
*/
public function addCritical($title, $description, $url = '', $isInternal = true)
{
$this->add(self::SEVERITY_CRITICAL, $title, $description, $url, $isInternal);
$this->add(MessageInterface::SEVERITY_CRITICAL, $title, $description, $url, $isInternal);
return $this;
}

Expand All @@ -182,7 +178,7 @@ public function addCritical($title, $description, $url = '', $isInternal = true)
*/
public function addMajor($title, $description, $url = '', $isInternal = true)
{
$this->add(self::SEVERITY_MAJOR, $title, $description, $url, $isInternal);
$this->add(MessageInterface::SEVERITY_MAJOR, $title, $description, $url, $isInternal);
return $this;
}

Expand All @@ -197,7 +193,7 @@ public function addMajor($title, $description, $url = '', $isInternal = true)
*/
public function addMinor($title, $description, $url = '', $isInternal = true)
{
$this->add(self::SEVERITY_MINOR, $title, $description, $url, $isInternal);
$this->add(MessageInterface::SEVERITY_MINOR, $title, $description, $url, $isInternal);
return $this;
}

Expand All @@ -212,7 +208,7 @@ public function addMinor($title, $description, $url = '', $isInternal = true)
*/
public function addNotice($title, $description, $url = '', $isInternal = true)
{
$this->add(self::SEVERITY_NOTICE, $title, $description, $url, $isInternal);
$this->add(MessageInterface::SEVERITY_NOTICE, $title, $description, $url, $isInternal);
return $this;
}
}
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/Resource/Inbox/Collection/Critical.php
View file
Expand Up @@ -54,7 +54,7 @@ protected function _initSelect()
array('neq' => 1)
)->addFieldToFilter(
'severity',
\Magento\AdminNotification\Model\Inbox::SEVERITY_CRITICAL
\Magento\Framework\Notification\MessageInterface::SEVERITY_CRITICAL
)->setPageSize(
1
);
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php
View file
Expand Up @@ -17,7 +17,7 @@
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
*
* @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)
*/
Expand All @@ -28,7 +28,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* System message list
*
* @var \Magento\AdminNotification\Model\System\MessageList
* @var \Magento\Framework\Notification\MessageList
*/
protected $_messageList;

Expand All @@ -44,7 +44,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Logger $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\AdminNotification\Model\System\MessageList $messageList
* @param \Magento\Framework\Notification\MessageList $messageList
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
Expand All @@ -53,7 +53,7 @@ public function __construct(
\Magento\Framework\Logger $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\AdminNotification\Model\System\MessageList $messageList,
\Magento\Framework\Notification\MessageList $messageList,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection/Synchronized.php
View file
Expand Up @@ -17,7 +17,7 @@
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
*
* @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)
*/
Expand All @@ -28,7 +28,7 @@ class Synchronized extends \Magento\AdminNotification\Model\Resource\System\Mess
/**
* Unread message list
*
* @var \Magento\AdminNotification\Model\System\MessageInterface[]
* @var \Magento\Framework\Notification\MessageInterface[]
*/
protected $_unreadMessages = array();

Expand Down Expand Up @@ -74,7 +74,7 @@ public function _afterLoad()
/**
* Retrieve list of unread messages
*
* @return \Magento\AdminNotification\Model\System\MessageInterface[]
* @return \Magento\Framework\Notification\MessageInterface[]
*/
public function getUnread()
{
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/AdminNotification/Model/System/Message.php
View file
Expand Up @@ -17,13 +17,13 @@
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
*
* @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\System;

class Message extends \Magento\Framework\Model\AbstractModel implements \Magento\AdminNotification\Model\System\MessageInterface
class Message extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\Notification\MessageInterface
{
/**
* @return void
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
View file
Expand Up @@ -23,7 +23,7 @@
*/
namespace Magento\AdminNotification\Model\System\Message;

class Baseurl implements \Magento\AdminNotification\Model\System\MessageInterface
class Baseurl implements \Magento\Framework\Notification\MessageInterface
{
/**
* @var \Magento\Framework\UrlInterface
Expand Down

2 comments on commit 623d88f

@GrahamCampbell
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No php 5.6 support?

@alankent
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First, you are looking at build 90 - we just released build 107. Regardless, by GA I will be interested to see if PHP 7 is available and can be supported, not just PHP 5.6.

Please sign in to comment.