Skip to content

Commit

Permalink
0.1.0-alpha105
Browse files Browse the repository at this point in the history
* Various improvements:
    * Merged SQL and Data Upgrades for the Tax, Weee, Customer, CustomerImportExport, ProductAlert, Sendfriend and Wishlist modules
    * Added 'Interface' suffix to all interface names
    * Stabilized functional tests for the following modules:
        * CheckoutAgreements
        * Customer
        * GiftMessage
        * Integration
        * Msrp
        * Reports
* Added the following functional tests:
    * Create product attribute from product page
* Fixed bugs:
    * Fixed an issue where bundle product price doubled during backend order creation
    * Fixed an issue where an error was thrown during Tax Rate creation, deletion and update
    * Fixed an issue where FPT was doubled when creating a refund if two FPTs were applied, and as a result the refund could not be created
    * Fixed an issue where the subtotal including tax field was not refreshed after removing downloadable product from cart
    * Fixed an issue where a downloadable link tax was not added to a product price on the product page if price was displayed including tax
    * Fixed an issue with incorrect product prices for bundle products in shopping cart
    * Fixed an issue where bundle product price was calculated incorrectly on the product page
    * Fixed an issue where configurable product options were not updated after changing currency
    * Fixed an issue where a standalone simple product and the same product as part of the grouped, were not recognized as one product in the shopping cart.
    * Fixed an issue where the incorrect tier pricing information was displayed in shopping cart
    * Fixed an issue where no notice was displayed in the shopping cart for products with MAP enabled
    * Fixed an issue where it was impossible to place an order from customer page in Admin
    * Fixed an issue where it was impossible to add address for a customer in Admin
    * Fixed an issue with broken redirect URL after deleting a product from the My Wishlist widget
    * Fixed an issue where it was impossible to assign an admin user to a user role
* Service Contracts:
    * Implemented Service Contracts for the CatalogInventory Module
* Framework Improvements:
    * Added the ability to configure the list of loaded modules before installation
    * Added the ability to use the Composer autoloader instead of the Magento custom autoloaders for tests
    * Introduced a repository for storing a quote entity
* Performance improvements:
    * Split Magento\Customer\Helper\Data
* Processed GitHub requests:
    * [magento#731](magento#731) -- Filter grid is absent on CMS Pages in Backend
  • Loading branch information
magento-team committed Nov 21, 2014
1 parent 02a9a0e commit fa214d8
Show file tree
Hide file tree
Showing 1,426 changed files with 30,092 additions and 14,968 deletions.
41 changes: 41 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,44 @@
0.1.0-alpha105
=============
* Various improvements:
* Merged SQL and Data Upgrades for the Tax, Weee, Customer, CustomerImportExport, ProductAlert, Sendfriend and Wishlist modules
* Added 'Interface' suffix to all interface names
* Stabilized functional tests for the following modules:
* CheckoutAgreements
* Customer
* GiftMessage
* Integration
* Msrp
* Reports
* Added the following functional tests:
* Create product attribute from product page
* Fixed bugs:
* Fixed an issue where bundle product price doubled during backend order creation
* Fixed an issue where an error was thrown during Tax Rate creation, deletion and update
* Fixed an issue where FPT was doubled when creating a refund if two FPTs were applied, and as a result the refund could not be created
* Fixed an issue where the subtotal including tax field was not refreshed after removing downloadable product from cart
* Fixed an issue where a downloadable link tax was not added to a product price on the product page if price was displayed including tax
* Fixed an issue with incorrect product prices for bundle products in shopping cart
* Fixed an issue where bundle product price was calculated incorrectly on the product page
* Fixed an issue where configurable product options were not updated after changing currency
* Fixed an issue where a standalone simple product and the same product as part of the grouped, were not recognized as one product in the shopping cart.
* Fixed an issue where the incorrect tier pricing information was displayed in shopping cart
* Fixed an issue where no notice was displayed in the shopping cart for products with MAP enabled
* Fixed an issue where it was impossible to place an order from customer page in Admin
* Fixed an issue where it was impossible to add address for a customer in Admin
* Fixed an issue with broken redirect URL after deleting a product from the My Wishlist widget
* Fixed an issue where it was impossible to assign an admin user to a user role
* Service Contracts:
* Implemented Service Contracts for the CatalogInventory Module
* Framework Improvements:
* Added the ability to configure the list of loaded modules before installation
* Added the ability to use the Composer autoloader instead of the Magento custom autoloaders for tests
* Introduced a repository for storing a quote entity
* Performance improvements:
* Split Magento\Customer\Helper\Data
* Processed GitHub requests:
* [#731](https://github.com/magento/magento2/issues/731) -- Filter grid is absent on CMS Pages in Backend

0.1.0-alpha104
=============
* Various improvements:
Expand Down
9 changes: 8 additions & 1 deletion app/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
* @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)
*/
use Magento\Framework\Autoload\AutoloaderRegistry;
use Magento\Framework\Autoload\ClassLoaderWrapper;

/**
* Shortcut constant for the root directory
Expand All @@ -32,5 +34,10 @@
$vendorDir = require BP . '/app/etc/vendor_path.php';
$vendorAutoload = BP . "/{$vendorDir}/autoload.php";
if (file_exists($vendorAutoload)) {
require_once $vendorAutoload;
$composerAutoloader = include $vendorAutoload;
}

AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));

// Sets default autoload mappings, may be overridden in Bootstrap::create
\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);
10 changes: 5 additions & 5 deletions app/code/Magento/AdminNotification/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0",
"magento/module-store": "0.1.0-alpha104",
"magento/module-core": "0.1.0-alpha104",
"magento/module-backend": "0.1.0-alpha104",
"magento/framework": "0.1.0-alpha104",
"magento/module-store": "0.1.0-alpha105",
"magento/module-core": "0.1.0-alpha105",
"magento/module-backend": "0.1.0-alpha105",
"magento/framework": "0.1.0-alpha105",
"lib-libxml": "*",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.1.0-alpha104",
"version": "0.1.0-alpha105",
"extra": {
"map": [
[
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Authorization/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"description": "Authorization module provides access to Magento ACL functionality.",
"require": {
"php": "~5.4.11|~5.5.0",
"magento/module-backend": "0.1.0-alpha104",
"magento/framework": "0.1.0-alpha104",
"magento/module-backend": "0.1.0-alpha105",
"magento/framework": "0.1.0-alpha105",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.1.0-alpha104",
"version": "0.1.0-alpha105",
"extra": {
"map": [
[
Expand Down
13 changes: 10 additions & 3 deletions app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,17 @@ protected function _returnCustomerQuote($cancelOrder = false, $errorMsg = '')
/* @var $order \Magento\Sales\Model\Order */
$order = $this->_objectManager->create('Magento\Sales\Model\Order')->loadByIncrementId($incrementId);
if ($order->getId()) {
$quote = $this->_objectManager->create('Magento\Sales\Model\Quote')->load($order->getQuoteId());
if ($quote->getId()) {
$quote->setIsActive(1)->setReservedOrderId(null)->save();
try {
/** @var \Magento\Sales\Model\QuoteRepository $quoteRepository */
$quoteRepository = $this->_objectManager->create('Magento\Sales\Model\QuoteRepository');
/** @var \Magento\Sales\Model\Quote $quote */
$quote = $quoteRepository->get($order->getQuoteId());

$quote->setIsActive(1)->setReservedOrderId(null);
$quoteRepository->save($quote);
$this->_getCheckout()->replaceQuote($quote);
} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {

}
$this->_getDirectPostSession()->removeCheckoutOrderIncrementId($incrementId);
$this->_getDirectPostSession()->unsetData('quote_id');
Expand Down
13 changes: 7 additions & 6 deletions app/code/Magento/Authorizenet/Model/Directpost.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet
protected $_storeManager;

/**
* @var \Magento\Sales\Model\QuoteFactory
* @var \Magento\Sales\Model\QuoteRepository
*/
protected $_quoteFactory;
protected $quoteRepository;

/**
* @var \Magento\Authorizenet\Model\Directpost\Response
Expand Down Expand Up @@ -113,7 +113,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet
* @param \Magento\Framework\Session\SessionManagerInterface $session
* @param \Magento\Authorizenet\Helper\Data $authorizenetData
* @param \Magento\Framework\StoreManagerInterface $storeManager
* @param \Magento\Sales\Model\QuoteFactory $quoteFactory
* @param \Magento\Sales\Model\QuoteRepository $quoteRepository
* @param \Magento\Authorizenet\Model\Directpost\RequestFactory $directRequestFactory
* @param \Magento\Authorizenet\Model\Directpost\Response $response
* @param \Magento\Authorizenet\Helper\HelperInterface $helper
Expand All @@ -138,7 +138,7 @@ public function __construct(
\Magento\Framework\Session\SessionManagerInterface $session,
\Magento\Authorizenet\Helper\Data $authorizenetData,
\Magento\Framework\StoreManagerInterface $storeManager,
\Magento\Sales\Model\QuoteFactory $quoteFactory,
\Magento\Sales\Model\QuoteRepository $quoteRepository,
\Magento\Authorizenet\Model\Directpost\RequestFactory $directRequestFactory,
\Magento\Authorizenet\Model\Directpost\Response $response,
\Magento\Authorizenet\Helper\HelperInterface $helper,
Expand All @@ -163,7 +163,7 @@ public function __construct(
$data
);
$this->_storeManager = $storeManager;
$this->_quoteFactory = $quoteFactory;
$this->quoteRepository = $quoteRepository;
$this->_requestFactory = $directRequestFactory;
$this->_response = $response;
$this->_helper = $helper;
Expand Down Expand Up @@ -718,7 +718,8 @@ protected function _authOrder(\Magento\Sales\Model\Order $order)
$this->orderSender->send($order);
}

$this->_quoteFactory->create()->load($order->getQuoteId())->setIsActive(false)->save();
$quote = $this->quoteRepository->get($order->getQuoteId())->setIsActive(false);
$this->quoteRepository->save($quote);
} catch (\Exception $e) {
// do not cancel order if we couldn't send email
}
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Authorizenet/Model/Directpost/Session.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Session extends \Magento\Framework\Session\SessionManager
* @param \Magento\Framework\Session\SaveHandlerInterface $saveHandler
* @param \Magento\Framework\Session\ValidatorInterface $validator
* @param \Magento\Framework\Session\StorageInterface $storage
* @param \Magento\Framework\Stdlib\CookieManager $cookieManager
* @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
* @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
* @internal param array $data
*/
Expand All @@ -46,7 +46,7 @@ public function __construct(
\Magento\Framework\Session\SaveHandlerInterface $saveHandler,
\Magento\Framework\Session\ValidatorInterface $validator,
\Magento\Framework\Session\StorageInterface $storage,
\Magento\Framework\Stdlib\CookieManager $cookieManager,
\Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
) {
parent::__construct(
Expand Down
18 changes: 9 additions & 9 deletions app/code/Magento/Authorizenet/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0",
"magento/module-sales": "0.1.0-alpha104",
"magento/module-checkout": "0.1.0-alpha104",
"magento/module-backend": "0.1.0-alpha104",
"magento/module-core": "0.1.0-alpha104",
"magento/module-payment": "0.1.0-alpha104",
"magento/module-centinel": "0.1.0-alpha104",
"magento/module-catalog": "0.1.0-alpha104",
"magento/framework": "0.1.0-alpha104",
"magento/module-sales": "0.1.0-alpha105",
"magento/module-checkout": "0.1.0-alpha105",
"magento/module-backend": "0.1.0-alpha105",
"magento/module-core": "0.1.0-alpha105",
"magento/module-payment": "0.1.0-alpha105",
"magento/module-centinel": "0.1.0-alpha105",
"magento/module-catalog": "0.1.0-alpha105",
"magento/framework": "0.1.0-alpha105",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
"version": "0.1.0-alpha104",
"version": "0.1.0-alpha105",
"extra": {
"map": [
[
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Backend/App/Action/Context.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class Context extends \Magento\Framework\App\Action\Context
/**
* @param \Magento\Framework\App\RequestInterface $request
* @param \Magento\Framework\App\ResponseInterface $response
* @param \Magento\Framework\ObjectManager $objectManager
* @param \Magento\Framework\ObjectManagerInterface $objectManager
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\UrlInterface $url
* @param \Magento\Framework\App\Response\RedirectInterface $redirect
Expand All @@ -96,7 +96,7 @@ class Context extends \Magento\Framework\App\Action\Context
public function __construct(
\Magento\Framework\App\RequestInterface $request,
\Magento\Framework\App\ResponseInterface $response,
\Magento\Framework\ObjectManager $objectManager,
\Magento\Framework\ObjectManagerInterface $objectManager,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\UrlInterface $url,
\Magento\Framework\App\Response\RedirectInterface $redirect,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
class Factory
{
/**
* @var \Magento\Framework\ObjectManager
* @var \Magento\Framework\ObjectManagerInterface
*/
protected $_objectManager;

/**
* @param \Magento\Framework\ObjectManager $objectManager
* @param \Magento\Framework\ObjectManagerInterface $objectManager
*/
public function __construct(\Magento\Framework\ObjectManager $objectManager)
public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
{
$this->_objectManager = $objectManager;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
class Factory
{
/**
* @var \Magento\Framework\ObjectManager
* @var \Magento\Framework\ObjectManagerInterface
*/
protected $_objectManager;

/**
* @param \Magento\Framework\ObjectManager $objectManager
* @param \Magento\Framework\ObjectManagerInterface $objectManager
*/
public function __construct(\Magento\Framework\ObjectManager $objectManager)
public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
{
$this->_objectManager = $objectManager;
}
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Backend/Model/Auth/Session.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
namespace Magento\Backend\Model\Auth;

use \Magento\Framework\Stdlib\CookieManager;
use \Magento\Framework\Stdlib\CookieManagerInterface;
use \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;

/**
Expand Down Expand Up @@ -77,7 +77,7 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
* @param \Magento\Framework\Session\SaveHandlerInterface $saveHandler
* @param \Magento\Framework\Session\ValidatorInterface $validator
* @param \Magento\Framework\Session\StorageInterface $storage
* @param CookieManager $cookieManager
* @param CookieManagerInterface $cookieManager
* @param CookieMetadataFactory $cookieMetadataFactory
* @param \Magento\Framework\Acl\Builder $aclBuilder
* @param \Magento\Backend\Model\UrlInterface $backendUrl
Expand All @@ -90,7 +90,7 @@ public function __construct(
\Magento\Framework\Session\SaveHandlerInterface $saveHandler,
\Magento\Framework\Session\ValidatorInterface $validator,
\Magento\Framework\Session\StorageInterface $storage,
CookieManager $cookieManager,
CookieManagerInterface $cookieManager,
CookieMetadataFactory $cookieMetadataFactory,
\Magento\Framework\Acl\Builder $aclBuilder,
\Magento\Backend\Model\UrlInterface $backendUrl,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
namespace Magento\Backend\Model\Authorization;

class RoleLocator implements \Magento\Framework\Authorization\RoleLocator
class RoleLocator implements \Magento\Framework\Authorization\RoleLocatorInterface
{
/**
* Authentication service
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
class Factory
{
/**
* @var \Magento\Framework\ObjectManager
* @var \Magento\Framework\ObjectManagerInterface
*/
protected $_objectManager;

/**
* @param \Magento\Framework\ObjectManager $objectManager
* @param \Magento\Framework\ObjectManagerInterface $objectManager
*/
public function __construct(\Magento\Framework\ObjectManager $objectManager)
public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
{
$this->_objectManager = $objectManager;
}
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Backend/Model/Config/BackendFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ class BackendFactory
/**
* Object manager
*
* @var \Magento\Framework\ObjectManager
* @var \Magento\Framework\ObjectManagerInterface
*/
protected $_objectManager;

/**
* @param \Magento\Framework\ObjectManager $objectmanager
* @param \Magento\Framework\ObjectManagerInterface $objectmanager
*/
public function __construct(\Magento\Framework\ObjectManager $objectmanager)
public function __construct(\Magento\Framework\ObjectManagerInterface $objectmanager)
{
$this->_objectManager = $objectmanager;
}
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Backend/Model/Config/CommentFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
class CommentFactory
{
/**
* @var \Magento\Framework\ObjectManager
* @var \Magento\Framework\ObjectManagerInterface
*/
protected $_objectManager;

/**
* @param \Magento\Framework\ObjectManager $objectManager
* @param \Magento\Framework\ObjectManagerInterface $objectManager
*/
public function __construct(\Magento\Framework\ObjectManager $objectManager)
public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
{
$this->_objectManager = $objectManager;
}
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Backend/Model/Config/Factory.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
class Factory
{
/**
* @var \Magento\Framework\ObjectManager
* @var \Magento\Framework\ObjectManagerInterface
*/
protected $_objectManager;

/**
* @param \Magento\Framework\ObjectManager $objectManager
* @param \Magento\Framework\ObjectManagerInterface $objectManager
*/
public function __construct(\Magento\Framework\ObjectManager $objectManager)
public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
{
$this->_objectManager = $objectManager;
}
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Backend/Model/Config/SourceFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ class SourceFactory
/**
* Object manager
*
* @var \Magento\Framework\ObjectManager
* @var \Magento\Framework\ObjectManagerInterface
*/
protected $_objectManager;

/**
* @param \Magento\Framework\ObjectManager $objectManager
* @param \Magento\Framework\ObjectManagerInterface $objectManager
*/
public function __construct(\Magento\Framework\ObjectManager $objectManager)
public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
{
$this->_objectManager = $objectManager;
}
Expand Down
Loading

0 comments on commit fa214d8

Please sign in to comment.