-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Added support for MTF Reporting Tool
* Framework improvements:
* Covered the following Magento application components with unit tests:
* `ConfigurableProduct/Helper/Data.php`
* `ConfigurableProduct/Model/Export/RowCustomizer.php`
* `ConfigurableProduct/Model/Product/Type/Configurable.php`
* `ConfigurableProduct/Model/Product/Type/Plugin.php`
* `ConfigurableProduct/Model/Quote/Item/QuantityValidator/Initializer/Option/Plugin/ConfigurableProduct.php`
* `CatalogSearch/Helper/Data.php`
* Covered Magento lib with unit tests:
* `lib/internal/Magento/Framework/DB/Helper/AbstractHelper.php`
* `lib/internal/Magento/Framework/DB/Tree/Node.php`
* Created Service API for Magento_Catalog Module:
* Implemented the Product API
* Implemented the ProductAttributeRead API
* Fixed bugs:
* Fixed issues with form elements visibility on the backend
* Fixed an issue where backend forms contained an excessive container
* Fixed an issue where a wrong category structure was displayed on the Category page
* Fixed an issue where the pub/index.php entry point was broken because of the obsolete constants
* Fixed an issue where it was impossible to pass an empty array as an argument in DI configuration and layout updates
* Fixed an issue with status and visibility settings of a related product on the backend
* Fixed an issue with unused DB indexes, which used resources, but did not contribute to higher performance
* Fixed an issue where it was possible to create a downloadable product without specifying a link or a file
* Fixed an issue where a fatal error occured when opening a fixed bundle product with custom options page on the frontend
* Fixed an issue where the was a wrong config key for backend cataloginventory
* Processed GitHub requests:
* [#548] (#548) -- Console installer doesn't checks filesystem permissions
* [#552] (#552) -- backend notifications sitebuild bug
* [#562] (#562) -- Bugfix Magento\Framework\DB\Adapter\Pdo\Mysql::getCreateTable()
* [#565] (#565) -- Magento\CatalogSearch\Model\Query::getResultCollection() not working
* [#557] (#557) -- translation anomalies backend login page
* Added the following functional tests:
* Advanced Search
* Existing Customer Creation
* Product Attribute Creation
* Product Rating Creation
* Sales Rule Creation
* System Product Attribute Deletion
* Tax Rate Creation
* Tax Rule Deletion
* Update Category
* Update Category Url Rewrite
* Update Product Url Rewrite- Loading branch information
1 parent
d895f13
commit 658b76f
Showing
413 changed files
with
19,087 additions
and
8,256 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <?php | ||
| /** | ||
| * Magento | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * This source file is subject to the Open Software License (OSL 3.0) | ||
| * that is bundled with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://opensource.org/licenses/osl-3.0.php | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * 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\Bundle\Model\Plugin; | ||
|
|
||
| /** | ||
| * Class PriceBackend | ||
| * | ||
| * Make price validation optional for bundle dynamic | ||
| */ | ||
| class PriceBackend | ||
| { | ||
| /** | ||
| * @param \Magento\Catalog\Model\Product\Attribute\Backend\Price $subject | ||
| * @param Closure $proceed | ||
| * @param \Magento\Catalog\Model\Product $product | ||
| * @return bool | ||
| * @SuppressWarnings(PHPMD.UnusedFormalParameter) | ||
| */ | ||
| public function aroundValidate( | ||
| \Magento\Catalog\Model\Product\Attribute\Backend\Price $subject, | ||
| \Closure $proceed, | ||
| \Magento\Catalog\Model\Product $product | ||
| ) { | ||
| if ($product->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC) { | ||
| return true; | ||
| } else { | ||
| return $proceed($product); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,15 +22,13 @@ | |
| * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) | ||
| */ | ||
|
|
||
| /** | ||
| * Products mass update inventory tab | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab; | ||
|
|
||
| use Magento\CatalogInventory\Model\Stock\Item; | ||
|
|
||
| /** | ||
| * Products mass update inventory tab | ||
| */ | ||
| class Inventory extends \Magento\Backend\Block\Widget implements \Magento\Backend\Block\Widget\Tab\TabInterface | ||
| { | ||
| /** | ||
|
|
@@ -91,7 +89,11 @@ public function getStoreId() | |
| */ | ||
| public function getDefaultConfigValue($field) | ||
| { | ||
| return $this->_scopeConfig->getValue(Item::XML_PATH_ITEM . $field, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->getStoreId()); | ||
| return $this->_scopeConfig->getValue( | ||
| Item::XML_PATH_ITEM . $field, | ||
| \Magento\Store\Model\ScopeInterface::SCOPE_STORE, | ||
| $this->getStoreId() | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,8 +25,6 @@ | |
|
|
||
| /** | ||
| * Product inventory data | ||
| * | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| class Inventory extends \Magento\Backend\Block\Widget | ||
| { | ||
|
|
@@ -40,14 +38,14 @@ class Inventory extends \Magento\Backend\Block\Widget | |
| * | ||
| * @var \Magento\Catalog\Helper\Data | ||
| */ | ||
| protected $_catalogData = null; | ||
| protected $_catalogData; | ||
|
|
||
| /** | ||
| * Core registry | ||
| * | ||
| * @var \Magento\Framework\Registry | ||
| */ | ||
| protected $_coreRegistry = null; | ||
| protected $_coreRegistry; | ||
|
|
||
| /** | ||
| * @var \Magento\CatalogInventory\Model\Source\Stock | ||
|
|
@@ -138,7 +136,10 @@ public function getFieldValue($field) | |
| return $this->getStockItem()->getDataUsingMethod($field); | ||
| } | ||
|
|
||
| return $this->_scopeConfig->getValue(\Magento\CatalogInventory\Model\Stock\Item::XML_PATH_ITEM . $field, \Magento\Store\Model\ScopeInterface::SCOPE_STORE); | ||
| return $this->_scopeConfig->getValue( | ||
| \Magento\CatalogInventory\Model\Stock\Item::XML_PATH_ITEM . $field, | ||
| \Magento\Store\Model\ScopeInterface::SCOPE_STORE | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -153,7 +154,10 @@ public function getConfigFieldValue($field) | |
| } | ||
| } | ||
|
|
||
| return $this->_scopeConfig->getValue(\Magento\CatalogInventory\Model\Stock\Item::XML_PATH_ITEM . $field, \Magento\Store\Model\ScopeInterface::SCOPE_STORE); | ||
| return $this->_scopeConfig->getValue( | ||
| \Magento\CatalogInventory\Model\Stock\Item::XML_PATH_ITEM . $field, | ||
| \Magento\Store\Model\ScopeInterface::SCOPE_STORE | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -162,7 +166,10 @@ public function getConfigFieldValue($field) | |
| */ | ||
| public function getDefaultConfigValue($field) | ||
| { | ||
| return $this->_scopeConfig->getValue(\Magento\CatalogInventory\Model\Stock\Item::XML_PATH_ITEM . $field, \Magento\Store\Model\ScopeInterface::SCOPE_STORE); | ||
| return $this->_scopeConfig->getValue( | ||
| \Magento\CatalogInventory\Model\Stock\Item::XML_PATH_ITEM . $field, | ||
| \Magento\Store\Model\ScopeInterface::SCOPE_STORE | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
|
|
||
Oops, something went wrong.