Skip to content

Commit 54afd6d

Browse files
author
Mike Weis
committed
Merge branch 'develop' into FearlessKiwis-MAGETWO-31458-fpt-display-on-partial-invoice
2 parents 35128a2 + 30de8cb commit 54afd6d

File tree

301 files changed

+9630
-3387
lines changed

Some content is hidden

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

301 files changed

+9630
-3387
lines changed

‎CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
0.74.0-beta3
2+
=============
3+
* API
4+
* The orders were extended with the gift messages
5+
* The page and block data and repository interfaces
6+
* Updated the public API list
7+
* Framework improvements
8+
* Improved the profile generator
9+
* Introduced the new environment for Jasmine tests
10+
* Design
11+
* Inverted the new admin area styles scope, clean up the old styles
12+
* New Side Panels on Admin Area
13+
* Various
14+
* Asynchronous indexing for sales grids
15+
* Advanced Mini Cart
16+
* The HTML minification management on Admin Area
17+
* Minor UI improvements
18+
* The GitHub contribution process was updated in the README.md file
19+
* Fixed bugs
20+
* Fixed the assets deployment tool with the minification
21+
* Fixed the JMeter scenario for the performance toolkit
22+
* Fixed the static files caching on Varnish
23+
* Fixed Admin user creation with the duplicated email or name (incorrect URL)
24+
* Fixed the link on Reset password email for secure URL case
25+
* Fixed the configured product adding from the wish-list to shopping cart
26+
* Fixed the long labels display on Admin Area
27+
* Fixed the Navigation Menu items on Admin Area
28+
* Various unit and integration tests bugs
29+
* GitHub issues and requests
30+
[#675] (https://github.com/magento/magento2/issues/675) -- Fix for Textarea element cols and rows #675
31+
132
0.74.0-beta2
233
=============
334
* Fixed bugs

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta2",
7-
"magento/module-backend": "0.74.0-beta2",
8-
"magento/module-media-storage": "0.74.0-beta2",
9-
"magento/framework": "0.74.0-beta2",
6+
"magento/module-store": "0.74.0-beta3",
7+
"magento/module-backend": "0.74.0-beta3",
8+
"magento/module-media-storage": "0.74.0-beta3",
9+
"magento/framework": "0.74.0-beta3",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta2",
14+
"version": "0.74.0-beta3",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.74.0-beta2",
7-
"magento/framework": "0.74.0-beta2",
6+
"magento/module-backend": "0.74.0-beta3",
7+
"magento/framework": "0.74.0-beta3",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta2",
11+
"version": "0.74.0-beta3",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/composer.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta2",
7-
"magento/module-directory": "0.74.0-beta2",
8-
"magento/module-developer": "0.74.0-beta2",
9-
"magento/module-eav": "0.74.0-beta2",
10-
"magento/module-cron": "0.74.0-beta2",
11-
"magento/module-theme": "0.74.0-beta2",
12-
"magento/module-reports": "0.74.0-beta2",
13-
"magento/module-sales": "0.74.0-beta2",
14-
"magento/module-quote": "0.74.0-beta2",
15-
"magento/module-catalog": "0.74.0-beta2",
16-
"magento/module-user": "0.74.0-beta2",
17-
"magento/module-backup": "0.74.0-beta2",
18-
"magento/module-customer": "0.74.0-beta2",
19-
"magento/module-translation": "0.74.0-beta2",
20-
"magento/module-require-js": "0.74.0-beta2",
21-
"magento/module-config": "0.74.0-beta2",
22-
"magento/framework": "0.74.0-beta2",
6+
"magento/module-store": "0.74.0-beta3",
7+
"magento/module-directory": "0.74.0-beta3",
8+
"magento/module-developer": "0.74.0-beta3",
9+
"magento/module-eav": "0.74.0-beta3",
10+
"magento/module-cron": "0.74.0-beta3",
11+
"magento/module-theme": "0.74.0-beta3",
12+
"magento/module-reports": "0.74.0-beta3",
13+
"magento/module-sales": "0.74.0-beta3",
14+
"magento/module-quote": "0.74.0-beta3",
15+
"magento/module-catalog": "0.74.0-beta3",
16+
"magento/module-user": "0.74.0-beta3",
17+
"magento/module-backup": "0.74.0-beta3",
18+
"magento/module-customer": "0.74.0-beta3",
19+
"magento/module-translation": "0.74.0-beta3",
20+
"magento/module-require-js": "0.74.0-beta3",
21+
"magento/module-config": "0.74.0-beta3",
22+
"magento/framework": "0.74.0-beta3",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.74.0-beta2",
26+
"version": "0.74.0-beta3",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,6 @@
154154
<label>Developer</label>
155155
<tab>advanced</tab>
156156
<resource>Magento_Backend::dev</resource>
157-
<group id="restrict" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
158-
<label>Developer Client Restrictions</label>
159-
<field id="allow_ips" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
160-
<label>Allowed IPs (comma separated)</label>
161-
<comment>Leave empty for access from any location.</comment>
162-
</field>
163-
</group>
164157
<group id="debug" translate="label" type="text" sortOrder="20" showInDefault="0" showInWebsite="1" showInStore="1">
165158
<label>Debug</label>
166159
<field id="template_hints" translate="label" type="select" sortOrder="20" showInDefault="0" showInWebsite="1" showInStore="1">

‎app/code/Magento/Backup/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta2",
7-
"magento/module-backend": "0.74.0-beta2",
8-
"magento/module-cron": "0.74.0-beta2",
9-
"magento/framework": "0.74.0-beta2",
6+
"magento/module-store": "0.74.0-beta3",
7+
"magento/module-backend": "0.74.0-beta3",
8+
"magento/module-cron": "0.74.0-beta3",
9+
"magento/framework": "0.74.0-beta3",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.74.0-beta2",
13+
"version": "0.74.0-beta3",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

‎app/code/Magento/Bundle/Model/Product/Price.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,12 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
4747
* @param \Magento\Framework\Event\ManagerInterface $eventManager
4848
* @param PriceCurrencyInterface $priceCurrency
4949
* @param GroupManagementInterface $groupManagement
50+
* @param \Magento\Catalog\Api\Data\ProductGroupPriceInterfaceFactory $groupPriceFactory
51+
* @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory
52+
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
5053
* @param \Magento\Catalog\Helper\Data $catalogData
54+
*
55+
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
5156
*/
5257
public function __construct(
5358
\Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory,
@@ -57,6 +62,9 @@ public function __construct(
5762
\Magento\Framework\Event\ManagerInterface $eventManager,
5863
PriceCurrencyInterface $priceCurrency,
5964
GroupManagementInterface $groupManagement,
65+
\Magento\Catalog\Api\Data\ProductGroupPriceInterfaceFactory $groupPriceFactory,
66+
\Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory,
67+
\Magento\Framework\App\Config\ScopeConfigInterface $config,
6068
\Magento\Catalog\Helper\Data $catalogData
6169
) {
6270
$this->_catalogData = $catalogData;
@@ -67,7 +75,10 @@ public function __construct(
6775
$customerSession,
6876
$eventManager,
6977
$priceCurrency,
70-
$groupManagement
78+
$groupManagement,
79+
$groupPriceFactory,
80+
$tierPriceFactory,
81+
$config
7182
);
7283
}
7384

‎app/code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
namespace Magento\Bundle\Test\Unit\Model\Product;
77

8+
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
9+
810
class PriceTest extends \PHPUnit_Framework_TestCase
911
{
1012
/**
@@ -75,16 +77,26 @@ protected function setUp()
7577
$this->priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')->getMock();
7678
$this->groupManagement = $this->getMockBuilder('Magento\Customer\Api\GroupManagementInterface')
7779
->getMockForAbstractClass();
78-
79-
$this->model = new \Magento\Bundle\Model\Product\Price(
80-
$this->ruleFactoryMock,
81-
$this->storeManagerMock,
82-
$this->localeDateMock,
83-
$this->customerSessionMock,
84-
$this->eventManagerMock,
85-
$this->priceCurrency,
86-
$this->groupManagement,
87-
$this->catalogHelperMock
80+
$gpFactory = $this->getMock('Magento\Catalog\Api\Data\ProductGroupPriceInterfaceFactory', [], [], '', false);
81+
$tpFactory = $this->getMock('Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory', [], [], '', false);
82+
$scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
83+
84+
$objectManagerHelper = new ObjectManagerHelper($this);
85+
$this->model = $objectManagerHelper->getObject(
86+
'Magento\Bundle\Model\Product\Price',
87+
[
88+
'ruleFactory' => $this->ruleFactoryMock,
89+
'storeManager' => $this->storeManagerMock,
90+
'localeDate' => $this->localeDateMock,
91+
'customerSession' => $this->customerSessionMock,
92+
'eventManager' => $this->eventManagerMock,
93+
'priceCurrency' => $this->priceCurrency,
94+
'groupManagement' => $this->groupManagement,
95+
'groupPriceFactory' => $gpFactory,
96+
'tierPriceFactory' => $tpFactory,
97+
'config' => $scopeConfig,
98+
'catalogData' => $this->catalogHelperMock
99+
]
88100
);
89101
}
90102

‎app/code/Magento/Bundle/composer.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta2",
7-
"magento/module-catalog": "0.74.0-beta2",
8-
"magento/module-tax": "0.74.0-beta2",
9-
"magento/module-backend": "0.74.0-beta2",
10-
"magento/module-sales": "0.74.0-beta2",
11-
"magento/module-checkout": "0.74.0-beta2",
12-
"magento/module-catalog-inventory": "0.74.0-beta2",
13-
"magento/module-customer": "0.74.0-beta2",
14-
"magento/module-catalog-rule": "0.74.0-beta2",
15-
"magento/module-eav": "0.74.0-beta2",
16-
"magento/module-config": "0.74.0-beta2",
17-
"magento/module-gift-message": "0.74.0-beta2",
18-
"magento/framework": "0.74.0-beta2",
19-
"magento/module-quote": "0.74.0-beta2",
20-
"magento/module-media-storage": "0.74.0-beta2",
6+
"magento/module-store": "0.74.0-beta3",
7+
"magento/module-catalog": "0.74.0-beta3",
8+
"magento/module-tax": "0.74.0-beta3",
9+
"magento/module-backend": "0.74.0-beta3",
10+
"magento/module-sales": "0.74.0-beta3",
11+
"magento/module-checkout": "0.74.0-beta3",
12+
"magento/module-catalog-inventory": "0.74.0-beta3",
13+
"magento/module-customer": "0.74.0-beta3",
14+
"magento/module-catalog-rule": "0.74.0-beta3",
15+
"magento/module-eav": "0.74.0-beta3",
16+
"magento/module-config": "0.74.0-beta3",
17+
"magento/module-gift-message": "0.74.0-beta3",
18+
"magento/framework": "0.74.0-beta3",
19+
"magento/module-quote": "0.74.0-beta3",
20+
"magento/module-media-storage": "0.74.0-beta3",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"suggest": {
24-
"magento/module-webapi": "0.74.0-beta2"
24+
"magento/module-webapi": "0.74.0-beta3"
2525
},
2626
"type": "magento2-module",
27-
"version": "0.74.0-beta2",
27+
"version": "0.74.0-beta3",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

‎app/code/Magento/Captcha/composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta2",
7-
"magento/module-customer": "0.74.0-beta2",
8-
"magento/module-checkout": "0.74.0-beta2",
9-
"magento/module-backend": "0.74.0-beta2",
10-
"magento/framework": "0.74.0-beta2",
6+
"magento/module-store": "0.74.0-beta3",
7+
"magento/module-customer": "0.74.0-beta3",
8+
"magento/module-checkout": "0.74.0-beta3",
9+
"magento/module-backend": "0.74.0-beta3",
10+
"magento/framework": "0.74.0-beta3",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta2",
14+
"version": "0.74.0-beta3",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

0 commit comments

Comments
 (0)