Skip to content

Commit 7c5177d

Browse files
arkadiycharkadiych
committed
Merge remote-tracking branch 'mainline/develop' into develop
2 parents 4941412 + 8fd210d commit 7c5177d

File tree

208 files changed

+4848
-1971
lines changed

Some content is hidden

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

208 files changed

+4848
-1971
lines changed

‎CHANGELOG.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
0.74.0-beta11
2+
=============
3+
* Framework improvements:
4+
* Improved component Bookmarks component in scope of Enhanced Data Grids on CMS
5+
* Improved component Advanced Filtering component in scope of Enhanced Data Grids on CMS
6+
* Fixed bugs:
7+
* Fixed an issue where incorrect keys in REST request body allowed the request to go through successfully
8+
* Fixed an issue where interceptors were Generated with Invalid __wakeup()
9+
* Fixed an issue where redirect on the current page was not working in certain conditions
10+
* Fixed an issue where first store could not be selected on frontend
11+
* Fixed an issue with performance toolkit category creation
12+
* Fixed an issue when columns 'Interval', 'Price Rule' had incorrect values in Coupon Usage report
13+
* Fixed an issue where fatal error occured on Abandoned Carts report grid
14+
* Fixed an issue where it was not possible to add product to shopping cart if Use Secure URLs in Frontend = Yes
15+
* Fixed an issue where email was not required during Guest Checkout
16+
* Fixed broken ability to skip reindex in `bin/magento setup:performance:generate-fixtures` command
17+
* Fixed an issue where `bin/magento indexer:reindex` command failed after `bin/magento setup:di:compile` was run
18+
* Fixed bug with broken JS i18n
19+
* Fixed an issue with wrong value at created_at updated_at fields after quote* save
20+
* Fixed an issue where customer could not be created in backend after adding Image type attribute
21+
* Fixed Sales InvoiceItem and Order data interfaces implementation
22+
* Fixed an issue with performance toolkit medium profile
23+
* Fixed an issue where Excel Formula Injection via CSV/XML export
24+
* Fixed an issue where it was not possible to open the Customers page in backend
25+
* Fixed an issue with internal server error after clicking Continue on Billing information
26+
* Fixed an issue where it was not possible to place order with Fedex shipping method
27+
* Various changes:
28+
* Magento Centinel Removal
29+
* Removed ability to have multi-statement queries
30+
* Test coverage:
31+
* Unit tests coverage
32+
* Covered php code by unit tests after new checkout implementation
33+
* Github issues:
34+
* [#424](https://github.com/magento/magento2/issues/424) -- Combine tier pricing messages into block sentences
35+
* [#1300](https://github.com/magento/magento2/issues/1300), [#1311](https://github.com/magento/magento2/issues/1311), [#1313](https://github.com/magento/magento2/issues/1313) -- Creating product error with startdate
36+
137
0.74.0-beta10
238
=============
339
* Framework improvements:

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

‎app/code/Magento/Backend/view/adminhtml/layout/default.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
99
<head>
1010
<title>Magento Admin</title>
11+
<meta name="viewport" content="width=device-width"/>
1112
<link src="requirejs/require.js"/>
1213
<css src="extjs/resources/css/ext-all.css"/>
1314
<css src="extjs/resources/css/ytheme-magento.css"/>

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-page-cache": "0.74.0-beta10",
7-
"magento/framework": "0.74.0-beta10",
6+
"magento/module-page-cache": "0.74.0-beta11",
7+
"magento/framework": "0.74.0-beta11",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta10",
11+
"version": "0.74.0-beta11",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

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

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

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public function getAfterElementHtml()
132132
'id' => 'add_category_button',
133133
'label' => $newCategoryCaption,
134134
'title' => $newCategoryCaption,
135-
'onclick' => 'jQuery("#new-category").dialog("open")',
135+
'onclick' => 'jQuery("#new-category").trigger("openModal")',
136136
'disabled' => $this->getDisabled(),
137137
]
138138
);

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,44 @@
66
*/
77
namespace Magento\Catalog\Controller\Adminhtml\Product;
88

9+
use Magento\Catalog\Helper\Product\Composite;
10+
use Magento\Backend\Model\Session;
11+
use Magento\Backend\App\Action\Context;
12+
913
class ShowUpdateResult extends \Magento\Catalog\Controller\Adminhtml\Product
1014
{
15+
/** @var Composite */
16+
protected $productCompositeHelper;
17+
18+
/**
19+
* @param Context $context
20+
* @param Builder $productBuilder
21+
* @param Composite $productCompositeHelper
22+
*/
23+
public function __construct(
24+
Context $context,
25+
Builder $productBuilder,
26+
Composite $productCompositeHelper
27+
) {
28+
$this->productCompositeHelper = $productCompositeHelper;
29+
parent::__construct($context, $productBuilder);
30+
}
31+
1132
/**
1233
* Show item update result from updateAction
1334
* in Wishlist and Cart controllers.
1435
*
15-
* @return bool
36+
* @return \Magento\Framework\View\Result\Layout
1637
*/
1738
public function execute()
1839
{
19-
$session = $this->_objectManager->get('Magento\Backend\Model\Session');
20-
if ($session->hasCompositeProductResult()
21-
&& $session->getCompositeProductResult() instanceof \Magento\Framework\Object
40+
$layout = false;
41+
if ($this->_session->hasCompositeProductResult()
42+
&& $this->_session->getCompositeProductResult() instanceof \Magento\Framework\Object
2243
) {
23-
$this->_objectManager->get('Magento\Catalog\Helper\Product\Composite')
24-
->renderUpdateResult($session->getCompositeProductResult());
25-
$session->unsCompositeProductResult();
26-
} else {
27-
$session->unsCompositeProductResult();
28-
return false;
44+
$layout = $this->productCompositeHelper->renderUpdateResult($this->_session->getCompositeProductResult());
2945
}
46+
$this->_session->unsCompositeProductResult();
47+
return $layout;
3048
}
3149
}

0 commit comments

Comments
 (0)