Skip to content

Commit a5ec470

Browse files
author
Fred Sung
committed
Merge remote-tracking branch 'mainlineCE/develop' into MAGETWO-38833-fix-error-messages-theme-uninstall
# Conflicts: # composer.lock
2 parents 36ef30c + 86646fc commit a5ec470

File tree

456 files changed

+14539
-4487
lines changed

Some content is hidden

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

456 files changed

+14539
-4487
lines changed

CHANGELOG.md

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,66 @@
1+
0.74.0-beta13
2+
=============
3+
* Framework improvements:
4+
* Created Join Directive, Join Process for Tables, XML Config support to define a performance join for search services
5+
* Added support of field weighting for MySQL Search Engine
6+
* Modified indexer declaration to support field declaration
7+
* Model related methods and properties are removed from Magento Object
8+
* Various improvements:
9+
* Added supporting of lost product types for Product Import/Export
10+
* Improved performance of Product Import/Export
11+
* Implemented Payment\Gateway infrastructure as a new design for payment methods
12+
* Fixed messages in Setup CLI
13+
* JS Smart fixed scroll
14+
* Improved sub-menu animation and sub-menu links mouse event effects
15+
* Automated UI Documentation build process with Grunt.js
16+
* Updated composer dependency to newer version
17+
* Implemented direct web link on Magento order transactions records
18+
* Tests:
19+
* Reduced Travis CI integration test time
20+
* Increased test coverage for the Integration module
21+
* Re-structured unit tests for the updater app to follow the convention used by the rest of Magento code
22+
* Fixed Bugs:
23+
* Fixed Help links in Install Wizard
24+
* Fixed an issue where composer install failed since ext-xsl was not available
25+
* Fixed web installer on HHVM
26+
* Fixed broken links to static assets when error occurs
27+
* Fixed failed integration tests on Travis CI builds
28+
* Fixed an issue where menu with one sub-menu item not being displayed
29+
* Fixed an issue where IPN messages did not show relevant info about transaction
30+
* Fixed an issue where Magento\Framework\Data\Form did not accept data-mage-init parameter
31+
* Fixed an issue where not all specified "Multiple Select" Bundle options were added to Shopping Cart
32+
* Fixed ConfigureProductInCustomerWishlistOnBackendTest functional test
33+
* Fixed an issue with all mandatory fields in the Sales data interfaces
34+
* Fixed an issue where billing and shipping sections did not contain address information on order print from Guest
35+
* Fixed an issue where orders placed in different store views had duplicated IDs
36+
* Fixed an issue where Shopping Cart Price Rules were not applying properly for Bundled products
37+
* Fixed an issue where column coupon_rule_name was not filled in the sales_order table when you create the order
38+
* Fixed an issue where customer registration or login on frontend created an empty cart
39+
* Fixed an issue where Product Model sometimes values change in getters methods
40+
* Fixed an issue where deleting option through API service for configurable product did not unlink variations
41+
* Fixed an issue where there was no ability to place order using multishipping if cart contained virtual product
42+
* Fixed an issue where "Terms and Conditions" was absent on order review step
43+
* Fixed an issue where grid actions for "Shopping Cart Items" grid was absent in Customer Account (Backend)
44+
* Fixed XSS vulnerability in Magento "Add to cart" link
45+
* Fixed UI issues on view order info frontend pages for guest customer
46+
* Fixed an issue where "Currency Rates" backend form was displayed broken
47+
* Fixed an issue where padding was missed for Custom Price Checkbox on "Create Order" Backend page
48+
* Fixed an issue where "Choose Variation" buttons lost alignment on "Create Configurable Product" Backend page
49+
* Fixed an issue where "Date & Time" Custom option was displayed broken on "Create Order" Backend page
50+
* Fixed an issue where colon was displayed before every Product Attribute label on Frontend
51+
* Fixed an issue where record from url_rewrite table was not removed when CMS page deleted
52+
* Fixed an issue where widget option "Number of Products to Display" did not work
53+
* Fixed validation message issues for CMS pages
54+
* Fixed an issue where "Click for Price" link was displayed in widgets for product with "Display Actual Price" != "On Gesture" MAP setting
55+
* Fixed an issue where Form_key cookie was not listed in privacy page
56+
* Fixed an issue where merchant wasn’t redirected to correspondent option when trying to enable Dashboard charts
57+
* Fixed an issue where wrong message was displayed after exceeding maximum failed login attempts
58+
* GitHub issues:
59+
* [#1292](https://github.com/magento/magento2/pull/1292) Admin menu with 1 submenu item does not show the subitem
60+
* [#1133](https://github.com/magento/magento2/pull/1133) Getter methods shouldn't change values
61+
* [#1263](https://github.com/magento/magento2/issues/1263) "We don't have as many "product name" as you requested" not showing in mini cart
62+
* [#1284](https://github.com/magento/magento2/issues/1284) Order tracking link redirected to dashboard in admin
63+
164
0.74.0-beta12
265
=============
366
* MTF Improvements:
@@ -2589,7 +2652,7 @@
25892652
* Canadian provincial sales taxes
25902653
* Fixed issues with bundle product price inconsistency across the system
25912654
* Added warnings if invalid tax configuration is created in the Admin panel
2592-
* Fixed issues with regards to hidden tax
2655+
* Fixed issues with regards to discount tax compensation
25932656
* Fixed bugs:
25942657
* Fixed an issue where grouped price was not applied for grouped products
25952658
* Fixed an issue where a fatal error occurred when opening a grouped product page without assigned products on the frontend

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-beta12",
7-
"magento/module-backend": "0.74.0-beta12",
8-
"magento/module-media-storage": "0.74.0-beta12",
9-
"magento/framework": "0.74.0-beta12",
6+
"magento/module-store": "0.74.0-beta13",
7+
"magento/module-backend": "0.74.0-beta13",
8+
"magento/module-media-storage": "0.74.0-beta13",
9+
"magento/framework": "0.74.0-beta13",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta12",
14+
"version": "0.74.0-beta13",
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-beta12",
7-
"magento/framework": "0.74.0-beta12",
6+
"magento/module-backend": "0.74.0-beta13",
7+
"magento/framework": "0.74.0-beta13",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta12",
11+
"version": "0.74.0-beta13",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

app/code/Magento/Backend/Block/Widget/Form.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,13 @@ public function setForm(\Magento\Framework\Data\Form $form)
111111
$this->_form = $form;
112112
$this->_form->setParent($this);
113113
$this->_form->setBaseUrl($this->_urlBuilder->getBaseUrl());
114+
115+
$customAttributes = $this->getData('custom_attributes');
116+
if (is_array($customAttributes)) {
117+
foreach ($customAttributes as $key => $value) {
118+
$this->_form->addCustomAttribute($key, $value);
119+
}
120+
}
114121
return $this;
115122
}
116123

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Backend\Test\Unit\Block\Widget;
7+
8+
use Magento\Backend\Block\Template\Context;
9+
use Magento\Backend\Block\Widget\Form;
10+
use Magento\Framework\Data\Form as DataForm;
11+
use Magento\Framework\UrlInterface;
12+
13+
class FormTest extends \PHPUnit_Framework_TestCase
14+
{
15+
/** @var Form */
16+
protected $model;
17+
18+
/** @var Context |\PHPUnit_Framework_MockObject_MockObject */
19+
protected $context;
20+
21+
/** @var DataForm |\PHPUnit_Framework_MockObject_MockObject */
22+
protected $dataForm;
23+
24+
/** @var UrlInterface |\PHPUnit_Framework_MockObject_MockObject */
25+
protected $urlBuilder;
26+
27+
protected function setUp()
28+
{
29+
$this->prepareContext();
30+
31+
$this->dataForm = $this->getMockBuilder('Magento\Framework\Data\Form')
32+
->disableOriginalConstructor()
33+
->setMethods([
34+
'setParent',
35+
'setBaseUrl',
36+
'addCustomAttribute',
37+
])
38+
->getMock();
39+
40+
$this->model = new Form(
41+
$this->context
42+
);
43+
}
44+
45+
protected function prepareContext()
46+
{
47+
$this->urlBuilder = $this->getMockBuilder('Magento\Framework\UrlInterface')
48+
->getMock();
49+
50+
$this->context = $this->getMockBuilder('Magento\Backend\Block\Template\Context')
51+
->disableOriginalConstructor()
52+
->getMock();
53+
$this->context->expects($this->any())
54+
->method('getUrlBuilder')
55+
->willReturn($this->urlBuilder);
56+
}
57+
58+
public function testSetForm()
59+
{
60+
$baseUrl = 'base_url';
61+
$attributeKey = 'attribute_key';
62+
$attributeValue = 'attribute_value';
63+
64+
$this->dataForm->expects($this->once())
65+
->method('setParent')
66+
->with($this->model)
67+
->willReturnSelf();
68+
$this->dataForm->expects($this->once())
69+
->method('setBaseUrl')
70+
->with($baseUrl)
71+
->willReturnSelf();
72+
$this->dataForm->expects($this->once())
73+
->method('addCustomAttribute')
74+
->with($attributeKey, $attributeValue)
75+
->willReturnSelf();
76+
77+
$this->urlBuilder->expects($this->once())
78+
->method('getBaseUrl')
79+
->willReturn($baseUrl);
80+
81+
$this->model->setData('custom_attributes', [$attributeKey => $attributeValue]);
82+
$this->assertEquals($this->model, $this->model->setForm($this->dataForm));
83+
}
84+
85+
public function testSetFormNoCustomAttributes()
86+
{
87+
$baseUrl = 'base_url';
88+
89+
$this->dataForm->expects($this->once())
90+
->method('setParent')
91+
->with($this->model)
92+
->willReturnSelf();
93+
$this->dataForm->expects($this->once())
94+
->method('setBaseUrl')
95+
->with($baseUrl)
96+
->willReturnSelf();
97+
98+
$this->urlBuilder->expects($this->once())
99+
->method('getBaseUrl')
100+
->willReturn($baseUrl);
101+
102+
$this->assertEquals($this->model, $this->model->setForm($this->dataForm));
103+
}
104+
}

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-beta12",
7-
"magento/module-directory": "0.74.0-beta12",
8-
"magento/module-developer": "0.74.0-beta12",
9-
"magento/module-eav": "0.74.0-beta12",
10-
"magento/module-cron": "0.74.0-beta12",
11-
"magento/module-theme": "0.74.0-beta12",
12-
"magento/module-reports": "0.74.0-beta12",
13-
"magento/module-sales": "0.74.0-beta12",
14-
"magento/module-quote": "0.74.0-beta12",
15-
"magento/module-catalog": "0.74.0-beta12",
16-
"magento/module-user": "0.74.0-beta12",
17-
"magento/module-backup": "0.74.0-beta12",
18-
"magento/module-customer": "0.74.0-beta12",
19-
"magento/module-translation": "0.74.0-beta12",
20-
"magento/module-require-js": "0.74.0-beta12",
21-
"magento/module-config": "0.74.0-beta12",
22-
"magento/framework": "0.74.0-beta12",
6+
"magento/module-store": "0.74.0-beta13",
7+
"magento/module-directory": "0.74.0-beta13",
8+
"magento/module-developer": "0.74.0-beta13",
9+
"magento/module-eav": "0.74.0-beta13",
10+
"magento/module-cron": "0.74.0-beta13",
11+
"magento/module-theme": "0.74.0-beta13",
12+
"magento/module-reports": "0.74.0-beta13",
13+
"magento/module-sales": "0.74.0-beta13",
14+
"magento/module-quote": "0.74.0-beta13",
15+
"magento/module-catalog": "0.74.0-beta13",
16+
"magento/module-user": "0.74.0-beta13",
17+
"magento/module-backup": "0.74.0-beta13",
18+
"magento/module-customer": "0.74.0-beta13",
19+
"magento/module-translation": "0.74.0-beta13",
20+
"magento/module-require-js": "0.74.0-beta13",
21+
"magento/module-config": "0.74.0-beta13",
22+
"magento/framework": "0.74.0-beta13",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.74.0-beta12",
26+
"version": "0.74.0-beta13",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

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-beta12",
7-
"magento/module-backend": "0.74.0-beta12",
8-
"magento/module-cron": "0.74.0-beta12",
9-
"magento/framework": "0.74.0-beta12",
6+
"magento/module-store": "0.74.0-beta13",
7+
"magento/module-backend": "0.74.0-beta13",
8+
"magento/module-cron": "0.74.0-beta13",
9+
"magento/framework": "0.74.0-beta13",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.74.0-beta12",
13+
"version": "0.74.0-beta13",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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-beta12",
7-
"magento/module-catalog": "0.74.0-beta12",
8-
"magento/module-tax": "0.74.0-beta12",
9-
"magento/module-backend": "0.74.0-beta12",
10-
"magento/module-sales": "0.74.0-beta12",
11-
"magento/module-checkout": "0.74.0-beta12",
12-
"magento/module-catalog-inventory": "0.74.0-beta12",
13-
"magento/module-customer": "0.74.0-beta12",
14-
"magento/module-catalog-rule": "0.74.0-beta12",
15-
"magento/module-eav": "0.74.0-beta12",
16-
"magento/module-config": "0.74.0-beta12",
17-
"magento/module-gift-message": "0.74.0-beta12",
18-
"magento/framework": "0.74.0-beta12",
19-
"magento/module-quote": "0.74.0-beta12",
20-
"magento/module-media-storage": "0.74.0-beta12",
6+
"magento/module-store": "0.74.0-beta13",
7+
"magento/module-catalog": "0.74.0-beta13",
8+
"magento/module-tax": "0.74.0-beta13",
9+
"magento/module-backend": "0.74.0-beta13",
10+
"magento/module-sales": "0.74.0-beta13",
11+
"magento/module-checkout": "0.74.0-beta13",
12+
"magento/module-catalog-inventory": "0.74.0-beta13",
13+
"magento/module-customer": "0.74.0-beta13",
14+
"magento/module-catalog-rule": "0.74.0-beta13",
15+
"magento/module-eav": "0.74.0-beta13",
16+
"magento/module-config": "0.74.0-beta13",
17+
"magento/module-gift-message": "0.74.0-beta13",
18+
"magento/framework": "0.74.0-beta13",
19+
"magento/module-quote": "0.74.0-beta13",
20+
"magento/module-media-storage": "0.74.0-beta13",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"suggest": {
24-
"magento/module-webapi": "0.74.0-beta12"
24+
"magento/module-webapi": "0.74.0-beta13"
2525
},
2626
"type": "magento2-module",
27-
"version": "0.74.0-beta12",
27+
"version": "0.74.0-beta13",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
class="change-container-classname admin__control-checkbox checkbox bundle-option-<?php echo $_option->getId() ?> <?php if ($_option->getRequired()) echo 'validate-one-required-by-name' ?>"
3535
id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
3636
type="checkbox"
37-
name="bundle_option[<?php echo $_option->getId() ?>]"
37+
name="bundle_option[<?php echo $_option->getId() ?>][<?php echo $_selection->getId() ?>]"
3838
<?php if ($block->isSelected($_selection)):?>
3939
<?php echo ' checked="checked"'; ?>
4040
<?php endif;?>

app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
price="<?php echo $block->getSelectionPrice($_selections[0]) ?>" />
2222
<?php else: ?>
2323
<select multiple="multiple" size="5" id="bundle-option-<?php echo $_option->getId() ?>"
24-
name="bundle_option[<?php echo $_option->getId() ?>]"
24+
name="bundle_option[<?php echo $_option->getId() ?>][]"
2525
class="admin__control-multiselect bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> multiselect change-container-classname"
2626
onchange="ProductConfigure.bundleControl.changeSelection(this)">
2727
<?php if(!$_option->getRequired()): ?>

0 commit comments

Comments
 (0)