Skip to content

Commit 623d88f

Browse files
committed
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
1 parent 67519d4 commit 623d88f

File tree

1,107 files changed

+59413
-7369
lines changed

Some content is hidden

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

1,107 files changed

+59413
-7369
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ atlassian*
3434

3535
/var/*
3636
!/var/.htaccess
37+
/vendor

CHANGELOG.md

+55
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,58 @@
1+
0.1.0-alpha90
2+
=============
3+
* Service layer implementation:
4+
* Created the Admin Shopping Cart Service
5+
* Created the Create Shopping Cart Items Service
6+
* Created the Create Shopping Cart Shipping Address Service
7+
* Created the Create Shopping Cart Billing Address Service
8+
* Created the Service Layer for Orders
9+
* Created CRUD service & APIs to manage options for configurable products
10+
* Created CRUD service & APIs to manage options for bundle products
11+
* Fixed bugs:
12+
* Fixed an issue where adding a customer address with an invalid value of the custom address attribute caused a fatal error in SOAP
13+
* Fixed an issue where the wrong FedEx rates were displayed
14+
* Fixed an issue where the Bill Me Later option did not work in Payflow payment methods
15+
* Fixed an issue where order comments were broken for orders placed with Authorize.net
16+
* Fixed the naming of the My Account -> Recurring Payment page
17+
* Fixed a UI elements issue in the disabled Magento_PayPalRecurringPayment and Magento_RecurringPayment modules
18+
* Fixed an issue where it was impossible to save configuration of a configurable product when adding it to an order in the Admin panel
19+
* Fixed an issue where the Select a store page was displayed during admin order creation when the Single Store mode was enabled
20+
* 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
21+
* Updated the content of the Privacy Policy page
22+
* Fixed an issue where it was possible to update a tax rate using the POST http method
23+
* Fixed an issue where it was impossible to update Inventory Qty for a SKU using API
24+
* Fixed a JavaScript syntax error on the Create New Customer page
25+
* Fixed an issue where it was impossible to add new sample while creating a downloadable product
26+
* Fixed a JavaScript which appeared when clicking the Add New Address button in the Address Book on the storefront
27+
* 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
28+
* 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
29+
* Fixed an issue with making websiteId a mandatory field when updating a customer using REST
30+
* 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
31+
* Fixed an issue where the price update mass action could not be performed
32+
* Fixed a JS error in the cross-sells product settings in the Admin panel
33+
* Added the following functional tests:
34+
* Mass Delete Backend Customer
35+
* Moderate Product Review
36+
* Framework improvements:
37+
* Added the ability to access admin functionality using admin user login for mobile
38+
* Refactored and unified Access Control List (ACL) to make it more consistent
39+
* Created a Cookie Manager (a cookie management class)
40+
* Changes in functional tests:
41+
* Enabled the CustomerMetadataService tests for SOAP
42+
* Themes update:
43+
* Fixed issues in the Blank theme
44+
* Implemented improvements for the Blank theme, core templates and Storefront UI Library
45+
* Modularity:
46+
* Created the Notification library component and made it possible to disable the AdminNotification module
47+
* Made it possible to disable the SendToFriend module
48+
* Created an optional ConfigurableImportExport module to remove dependency between the CatalogImportExport and ConfigurableProduct modules
49+
* Created an optional GroupedImportExport module to remove dependency between the CatalogImportExport and GroupedProduct modules
50+
* Introduce search library:
51+
* Created a Search request configuration
52+
* Created a Query object structure from the XML declaration
53+
* Composer Integration:
54+
* Added support for using 3rd-party components as Composer packages
55+
156
0.1.0-alpha89
257
=============
358
* Fixed bugs:

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ All Submissions you make to Magento, an eBay Inc. company (“Magento”) throug
66

77
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.
88
2. Your Submission is an original work of authorship and you are the owner or are legally entitled to grant the license stated above.
9+
3. You agree to the X.commerce Agreement found here: https://www.x.com/developers/x.commerce/x.commerce-user-agreement.

app/autoload.php

+5
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,10 @@
2323
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2424
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
26+
$vendorDir = require __DIR__ . '/etc/vendor_path.php';
27+
$vendorAutoload = __DIR__ . '/../' . $vendorDir . '/autoload.php';
28+
if (file_exists($vendorAutoload)) {
29+
require_once $vendorAutoload;
30+
}
2631
require_once __DIR__ . '/../lib/internal/Magento/Framework/Autoload/IncludePath.php';
2732
spl_autoload_register([new \Magento\Framework\Autoload\IncludePath(), 'load']);

app/bootstrap.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
umask(0);
3131

3232
/* PHP version validation */
33-
if (version_compare(phpversion(), '5.4.0', '<') === true) {
33+
if (version_compare(phpversion(), '5.4.11', '<') === true) {
3434
if (PHP_SAPI == 'cli') {
35-
echo 'Magento supports PHP 5.4.0 or newer. Please read http://www.magento.com/install.';
35+
echo 'Magento supports PHP 5.4.11 or newer. Please read http://www.magento.com/install.';
3636
} else {
3737
echo <<<HTML
3838
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
3939
<div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
4040
<h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
4141
Whoops, it looks like you have an invalid PHP version.</h3>
4242
</div>
43-
<p>Magento supports PHP 5.4.0 or newer.
43+
<p>Magento supports PHP 5.4.11 or newer.
4444
<a href="http://www.magento.com/install" target="">Find out</a>
4545
how to install Magento using PHP-CGI as a work-around.
4646
</p>
@@ -60,7 +60,6 @@
6060
* Require necessary files
6161
*/
6262
require_once BP . '/app/functions.php';
63-
6463
require_once __DIR__ . '/autoload.php';
6564
(new \Magento\Framework\Autoload\IncludePath())->addIncludePath(array(BP . '/app/code', BP . '/lib/internal'));
6665
$classMapPath = BP . '/var/classmap.ser';

app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php

+10-8
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
*/
2626
namespace Magento\AdminNotification\Block\Grid\Renderer;
2727

28+
use \Magento\Framework\Notification\MessageInterface;
29+
2830
class Severity extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
2931
{
3032
/**
@@ -58,21 +60,21 @@ public function render(\Magento\Framework\Object $row)
5860
$value = '';
5961

6062
switch ($row->getData($this->getColumn()->getIndex())) {
61-
case \Magento\AdminNotification\Model\Inbox::SEVERITY_CRITICAL:
63+
case MessageInterface::SEVERITY_CRITICAL:
6264
$class = 'critical';
63-
$value = $this->_notice->getSeverities(\Magento\AdminNotification\Model\Inbox::SEVERITY_CRITICAL);
65+
$value = $this->_notice->getSeverities(MessageInterface::SEVERITY_CRITICAL);
6466
break;
65-
case \Magento\AdminNotification\Model\Inbox::SEVERITY_MAJOR:
67+
case MessageInterface::SEVERITY_MAJOR:
6668
$class = 'major';
67-
$value = $this->_notice->getSeverities(\Magento\AdminNotification\Model\Inbox::SEVERITY_MAJOR);
69+
$value = $this->_notice->getSeverities(MessageInterface::SEVERITY_MAJOR);
6870
break;
69-
case \Magento\AdminNotification\Model\Inbox::SEVERITY_MINOR:
71+
case MessageInterface::SEVERITY_MINOR:
7072
$class = 'minor';
71-
$value = $this->_notice->getSeverities(\Magento\AdminNotification\Model\Inbox::SEVERITY_MINOR);
73+
$value = $this->_notice->getSeverities(MessageInterface::SEVERITY_MINOR);
7274
break;
73-
case \Magento\AdminNotification\Model\Inbox::SEVERITY_NOTICE:
75+
case MessageInterface::SEVERITY_NOTICE:
7476
$class = 'notice';
75-
$value = $this->_notice->getSeverities(\Magento\AdminNotification\Model\Inbox::SEVERITY_NOTICE);
77+
$value = $this->_notice->getSeverities(MessageInterface::SEVERITY_NOTICE);
7678
break;
7779
}
7880
return '<span class="grid-severity-' . $class . '"><span>' . $value . '</span></span>';

app/code/Magento/AdminNotification/Block/System/Messages.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ protected function _toHtml()
7070
/**
7171
* Retrieve message list
7272
*
73-
* @return \Magento\AdminNotification\Model\System\MessageInterface[]
73+
* @return \Magento\Framework\Notification\MessageInterface[]
7474
*/
7575
public function getLastCritical()
7676
{
7777
$items = array_values($this->_messages->getItems());
7878
if (isset(
7979
$items[0]
80-
) && $items[0]->getSeverity() == \Magento\AdminNotification\Model\System\MessageInterface::SEVERITY_CRITICAL
80+
) && $items[0]->getSeverity() == \Magento\Framework\Notification\MessageInterface::SEVERITY_CRITICAL
8181
) {
8282
return $items[0];
8383
}
@@ -92,7 +92,7 @@ public function getLastCritical()
9292
public function getCriticalCount()
9393
{
9494
return $this->_messages->getCountBySeverity(
95-
\Magento\AdminNotification\Model\System\MessageInterface::SEVERITY_CRITICAL
95+
\Magento\Framework\Notification\MessageInterface::SEVERITY_CRITICAL
9696
);
9797
}
9898

@@ -104,7 +104,7 @@ public function getCriticalCount()
104104
public function getMajorCount()
105105
{
106106
return $this->_messages->getCountBySeverity(
107-
\Magento\AdminNotification\Model\System\MessageInterface::SEVERITY_MAJOR
107+
\Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR
108108
);
109109
}
110110

app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
1919
* needs please refer to http://www.magentocommerce.com for more information.
20-
*
20+
*
2121
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2222
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2323
*/
2424
namespace Magento\AdminNotification\Block\System\Messages;
2525

26-
use Magento\AdminNotification\Model\System\MessageInterface;
26+
use Magento\Framework\Notification\MessageInterface;
2727

2828
class UnreadMessagePopup extends \Magento\Backend\Block\Template
2929
{

app/code/Magento/AdminNotification/Model/Inbox.php

+14-18
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
*/
2424
namespace Magento\AdminNotification\Model;
2525

26+
use \Magento\Framework\Notification\MessageInterface;
27+
use \Magento\Framework\Notification\NotifierInterface;
28+
2629
/**
2730
* AdminNotification Inbox model
2831
*
@@ -45,16 +48,8 @@
4548
*
4649
* @author Magento Core Team <[email protected]>
4750
*/
48-
class Inbox extends \Magento\Framework\Model\AbstractModel
51+
class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface
4952
{
50-
const SEVERITY_CRITICAL = 1;
51-
52-
const SEVERITY_MAJOR = 2;
53-
54-
const SEVERITY_MINOR = 3;
55-
56-
const SEVERITY_NOTICE = 4;
57-
5853
/**
5954
* @return void
6055
*/
@@ -72,10 +67,10 @@ protected function _construct()
7267
public function getSeverities($severity = null)
7368
{
7469
$severities = array(
75-
self::SEVERITY_CRITICAL => __('critical'),
76-
self::SEVERITY_MAJOR => __('major'),
77-
self::SEVERITY_MINOR => __('minor'),
78-
self::SEVERITY_NOTICE => __('notice')
70+
MessageInterface::SEVERITY_CRITICAL => __('critical'),
71+
MessageInterface::SEVERITY_MAJOR => __('major'),
72+
MessageInterface::SEVERITY_MINOR => __('minor'),
73+
MessageInterface::SEVERITY_NOTICE => __('notice')
7974
);
8075

8176
if (!is_null($severity)) {
@@ -118,7 +113,8 @@ public function getNoticeStatus()
118113
*/
119114
public function parse(array $data)
120115
{
121-
return $this->getResource()->parse($this, $data);
116+
$this->getResource()->parse($this, $data);
117+
return $this;
122118
}
123119

124120
/**
@@ -167,7 +163,7 @@ public function add($severity, $title, $description, $url = '', $isInternal = tr
167163
*/
168164
public function addCritical($title, $description, $url = '', $isInternal = true)
169165
{
170-
$this->add(self::SEVERITY_CRITICAL, $title, $description, $url, $isInternal);
166+
$this->add(MessageInterface::SEVERITY_CRITICAL, $title, $description, $url, $isInternal);
171167
return $this;
172168
}
173169

@@ -182,7 +178,7 @@ public function addCritical($title, $description, $url = '', $isInternal = true)
182178
*/
183179
public function addMajor($title, $description, $url = '', $isInternal = true)
184180
{
185-
$this->add(self::SEVERITY_MAJOR, $title, $description, $url, $isInternal);
181+
$this->add(MessageInterface::SEVERITY_MAJOR, $title, $description, $url, $isInternal);
186182
return $this;
187183
}
188184

@@ -197,7 +193,7 @@ public function addMajor($title, $description, $url = '', $isInternal = true)
197193
*/
198194
public function addMinor($title, $description, $url = '', $isInternal = true)
199195
{
200-
$this->add(self::SEVERITY_MINOR, $title, $description, $url, $isInternal);
196+
$this->add(MessageInterface::SEVERITY_MINOR, $title, $description, $url, $isInternal);
201197
return $this;
202198
}
203199

@@ -212,7 +208,7 @@ public function addMinor($title, $description, $url = '', $isInternal = true)
212208
*/
213209
public function addNotice($title, $description, $url = '', $isInternal = true)
214210
{
215-
$this->add(self::SEVERITY_NOTICE, $title, $description, $url, $isInternal);
211+
$this->add(MessageInterface::SEVERITY_NOTICE, $title, $description, $url, $isInternal);
216212
return $this;
217213
}
218214
}

app/code/Magento/AdminNotification/Model/Resource/Inbox/Collection/Critical.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected function _initSelect()
5454
array('neq' => 1)
5555
)->addFieldToFilter(
5656
'severity',
57-
\Magento\AdminNotification\Model\Inbox::SEVERITY_CRITICAL
57+
\Magento\Framework\Notification\MessageInterface::SEVERITY_CRITICAL
5858
)->setPageSize(
5959
1
6060
);

app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
1919
* needs please refer to http://www.magentocommerce.com for more information.
20-
*
20+
*
2121
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2222
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2323
*/
@@ -28,7 +28,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
2828
/**
2929
* System message list
3030
*
31-
* @var \Magento\AdminNotification\Model\System\MessageList
31+
* @var \Magento\Framework\Notification\MessageList
3232
*/
3333
protected $_messageList;
3434

@@ -44,7 +44,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
4444
* @param \Magento\Framework\Logger $logger
4545
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
4646
* @param \Magento\Framework\Event\ManagerInterface $eventManager
47-
* @param \Magento\AdminNotification\Model\System\MessageList $messageList
47+
* @param \Magento\Framework\Notification\MessageList $messageList
4848
* @param mixed $connection
4949
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
5050
*/
@@ -53,7 +53,7 @@ public function __construct(
5353
\Magento\Framework\Logger $logger,
5454
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
5555
\Magento\Framework\Event\ManagerInterface $eventManager,
56-
\Magento\AdminNotification\Model\System\MessageList $messageList,
56+
\Magento\Framework\Notification\MessageList $messageList,
5757
$connection = null,
5858
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
5959
) {

app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection/Synchronized.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
1919
* needs please refer to http://www.magentocommerce.com for more information.
20-
*
20+
*
2121
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2222
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2323
*/
@@ -28,7 +28,7 @@ class Synchronized extends \Magento\AdminNotification\Model\Resource\System\Mess
2828
/**
2929
* Unread message list
3030
*
31-
* @var \Magento\AdminNotification\Model\System\MessageInterface[]
31+
* @var \Magento\Framework\Notification\MessageInterface[]
3232
*/
3333
protected $_unreadMessages = array();
3434

@@ -74,7 +74,7 @@ public function _afterLoad()
7474
/**
7575
* Retrieve list of unread messages
7676
*
77-
* @return \Magento\AdminNotification\Model\System\MessageInterface[]
77+
* @return \Magento\Framework\Notification\MessageInterface[]
7878
*/
7979
public function getUnread()
8080
{

app/code/Magento/AdminNotification/Model/System/Message.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
1919
* needs please refer to http://www.magentocommerce.com for more information.
20-
*
20+
*
2121
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2222
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2323
*/
2424
namespace Magento\AdminNotification\Model\System;
2525

26-
class Message extends \Magento\Framework\Model\AbstractModel implements \Magento\AdminNotification\Model\System\MessageInterface
26+
class Message extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\Notification\MessageInterface
2727
{
2828
/**
2929
* @return void

app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
namespace Magento\AdminNotification\Model\System\Message;
2525

26-
class Baseurl implements \Magento\AdminNotification\Model\System\MessageInterface
26+
class Baseurl implements \Magento\Framework\Notification\MessageInterface
2727
{
2828
/**
2929
* @var \Magento\Framework\UrlInterface

0 commit comments

Comments
 (0)