Skip to content

Commit 14686fb

Browse files
author
Ievgen Shakhsuvarov
committed
Merge branch 'merchant_beta' of github.corp.magento.com:magento2/magento2ce into merchant_beta
2 parents 3c7480a + 38de4f1 commit 14686fb

File tree

128 files changed

+1056
-972
lines changed

Some content is hidden

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

128 files changed

+1056
-972
lines changed

‎CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
1.0.0-beta6
2+
=============
3+
* Fixed bugs:
4+
* Fixed an issue with сustomer attribute creation in admin panel
5+
* Fixed an issue with translation in html files using $t()
6+
* Fixed an issue when save customer with custom attribute of type "file"
7+
* Fixed an issue with container "page.bottom.container" in empty layout file
8+
* Fixed an issue with rendering of static blocks grid on the store view
9+
* Fixed an issue with rendering of multi-select customer attribute in admin panel
10+
* Fixed an issue with categories import in a comma-separated format
11+
* Fixed an issue with media import/export functionality
12+
* Fixed an issue with category link management interface when getting assigned products
13+
* Fixed an issue with URL rewrite bulk assignment to website in multi-store mode
14+
* Fixed an issue with website shopping cart rules applying
15+
* Fixed an issue with limiter in My Account -> My Orders
16+
* Fixed an issue with layout xml files that doesn't have translations
17+
* Various improvements:
18+
* Validation error is shown on the focus out event of the email field during Checkout
19+
* Added translations to layout xml files
20+
* Various security improvements
21+
122
1.0.0-beta5
223
=============
324
* 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": "1.0.0-beta5",
7-
"magento/module-backend": "1.0.0-beta5",
8-
"magento/module-media-storage": "1.0.0-beta5",
9-
"magento/framework": "1.0.0-beta5",
6+
"magento/module-store": "1.0.0-beta6",
7+
"magento/module-backend": "1.0.0-beta6",
8+
"magento/module-media-storage": "1.0.0-beta6",
9+
"magento/framework": "1.0.0-beta6",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "1.0.0-beta5",
14+
"version": "1.0.0-beta6",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-catalog": "1.0.0-beta5",
7-
"magento/module-catalog-inventory": "1.0.0-beta5",
8-
"magento/module-eav": "1.0.0-beta5",
9-
"magento/module-import-export": "1.0.0-beta5",
10-
"magento/module-catalog-import-export": "1.0.0-beta5",
11-
"magento/module-customer": "1.0.0-beta5",
12-
"magento/module-store": "1.0.0-beta5",
13-
"magento/framework": "1.0.0-beta5",
6+
"magento/module-catalog": "1.0.0-beta6",
7+
"magento/module-catalog-inventory": "1.0.0-beta6",
8+
"magento/module-eav": "1.0.0-beta6",
9+
"magento/module-import-export": "1.0.0-beta6",
10+
"magento/module-catalog-import-export": "1.0.0-beta6",
11+
"magento/module-customer": "1.0.0-beta6",
12+
"magento/module-store": "1.0.0-beta6",
13+
"magento/framework": "1.0.0-beta6",
1414
"magento/magento-composer-installer": "*"
1515
},
1616
"type": "magento2-module",
17-
"version": "1.0.0-beta5",
17+
"version": "1.0.0-beta6",
1818
"license": [
1919
"OSL-3.0",
2020
"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": "1.0.0-beta5",
7-
"magento/framework": "1.0.0-beta5",
6+
"magento/module-backend": "1.0.0-beta6",
7+
"magento/framework": "1.0.0-beta6",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "1.0.0-beta5",
11+
"version": "1.0.0-beta6",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-sales": "1.0.0-beta5",
7-
"magento/module-store": "1.0.0-beta5",
8-
"magento/module-quote": "1.0.0-beta5",
9-
"magento/module-checkout": "1.0.0-beta5",
10-
"magento/module-backend": "1.0.0-beta5",
11-
"magento/module-payment": "1.0.0-beta5",
12-
"magento/module-catalog": "1.0.0-beta5",
13-
"magento/framework": "1.0.0-beta5",
6+
"magento/module-sales": "1.0.0-beta6",
7+
"magento/module-store": "1.0.0-beta6",
8+
"magento/module-quote": "1.0.0-beta6",
9+
"magento/module-checkout": "1.0.0-beta6",
10+
"magento/module-backend": "1.0.0-beta6",
11+
"magento/module-payment": "1.0.0-beta6",
12+
"magento/module-catalog": "1.0.0-beta6",
13+
"magento/framework": "1.0.0-beta6",
1414
"magento/magento-composer-installer": "*"
1515
},
1616
"type": "magento2-module",
17-
"version": "1.0.0-beta5",
17+
"version": "1.0.0-beta6",
1818
"license": [
1919
"proprietary"
2020
],

‎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": "1.0.0-beta5",
7-
"magento/module-directory": "1.0.0-beta5",
8-
"magento/module-developer": "1.0.0-beta5",
9-
"magento/module-eav": "1.0.0-beta5",
10-
"magento/module-cron": "1.0.0-beta5",
11-
"magento/module-theme": "1.0.0-beta5",
12-
"magento/module-reports": "1.0.0-beta5",
13-
"magento/module-sales": "1.0.0-beta5",
14-
"magento/module-quote": "1.0.0-beta5",
15-
"magento/module-catalog": "1.0.0-beta5",
16-
"magento/module-user": "1.0.0-beta5",
17-
"magento/module-backup": "1.0.0-beta5",
18-
"magento/module-customer": "1.0.0-beta5",
19-
"magento/module-translation": "1.0.0-beta5",
20-
"magento/module-require-js": "1.0.0-beta5",
21-
"magento/module-config": "1.0.0-beta5",
22-
"magento/framework": "1.0.0-beta5",
6+
"magento/module-store": "1.0.0-beta6",
7+
"magento/module-directory": "1.0.0-beta6",
8+
"magento/module-developer": "1.0.0-beta6",
9+
"magento/module-eav": "1.0.0-beta6",
10+
"magento/module-cron": "1.0.0-beta6",
11+
"magento/module-theme": "1.0.0-beta6",
12+
"magento/module-reports": "1.0.0-beta6",
13+
"magento/module-sales": "1.0.0-beta6",
14+
"magento/module-quote": "1.0.0-beta6",
15+
"magento/module-catalog": "1.0.0-beta6",
16+
"magento/module-user": "1.0.0-beta6",
17+
"magento/module-backup": "1.0.0-beta6",
18+
"magento/module-customer": "1.0.0-beta6",
19+
"magento/module-translation": "1.0.0-beta6",
20+
"magento/module-require-js": "1.0.0-beta6",
21+
"magento/module-config": "1.0.0-beta6",
22+
"magento/framework": "1.0.0-beta6",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "1.0.0-beta5",
26+
"version": "1.0.0-beta6",
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": "1.0.0-beta5",
7-
"magento/module-backend": "1.0.0-beta5",
8-
"magento/module-cron": "1.0.0-beta5",
9-
"magento/framework": "1.0.0-beta5",
6+
"magento/module-store": "1.0.0-beta6",
7+
"magento/module-backend": "1.0.0-beta6",
8+
"magento/module-cron": "1.0.0-beta6",
9+
"magento/framework": "1.0.0-beta6",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "1.0.0-beta5",
13+
"version": "1.0.0-beta6",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 15 additions & 15 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-config": "1.0.0-beta5",
7-
"magento/module-store": "1.0.0-beta5",
8-
"magento/module-checkout": "1.0.0-beta5",
9-
"magento/module-catalog": "1.0.0-beta5",
10-
"magento/module-sales": "1.0.0-beta5",
11-
"magento/module-customer": "1.0.0-beta5",
12-
"magento/module-payment": "1.0.0-beta5",
13-
"magento/module-paypal": "1.0.0-beta5",
14-
"magento/module-quote": "1.0.0-beta5",
15-
"magento/module-backend": "1.0.0-beta5",
16-
"magento/module-directory": "1.0.0-beta5",
17-
"magento/module-theme": "1.0.0-beta5",
18-
"magento/framework": "1.0.0-beta5",
6+
"magento/module-config": "1.0.0-beta6",
7+
"magento/module-store": "1.0.0-beta6",
8+
"magento/module-checkout": "1.0.0-beta6",
9+
"magento/module-catalog": "1.0.0-beta6",
10+
"magento/module-sales": "1.0.0-beta6",
11+
"magento/module-customer": "1.0.0-beta6",
12+
"magento/module-payment": "1.0.0-beta6",
13+
"magento/module-paypal": "1.0.0-beta6",
14+
"magento/module-quote": "1.0.0-beta6",
15+
"magento/module-backend": "1.0.0-beta6",
16+
"magento/module-directory": "1.0.0-beta6",
17+
"magento/module-theme": "1.0.0-beta6",
18+
"magento/framework": "1.0.0-beta6",
1919
"braintree/braintree_php": "2.39.0",
2020
"magento/magento-composer-installer": "*"
2121
},
2222
"suggest": {
23-
"magento/module-checkout-agreements": "1.0.0-beta5"
23+
"magento/module-checkout-agreements": "1.0.0-beta6"
2424
},
2525
"type": "magento2-module",
26-
"version": "1.0.0-beta5",
26+
"version": "1.0.0-beta6",
2727
"license": [
2828
"proprietary"
2929
],

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

‎app/code/Magento/BundleImportExport/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-catalog": "1.0.0-beta5",
7-
"magento/module-import-export": "1.0.0-beta5",
8-
"magento/module-catalog-import-export": "1.0.0-beta5",
9-
"magento/module-bundle": "1.0.0-beta5",
10-
"magento/module-eav": "1.0.0-beta5",
11-
"magento/framework": "1.0.0-beta5",
6+
"magento/module-catalog": "1.0.0-beta6",
7+
"magento/module-import-export": "1.0.0-beta6",
8+
"magento/module-catalog-import-export": "1.0.0-beta6",
9+
"magento/module-bundle": "1.0.0-beta6",
10+
"magento/module-eav": "1.0.0-beta6",
11+
"magento/framework": "1.0.0-beta6",
1212
"magento/magento-composer-installer": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "1.0.0-beta5",
15+
"version": "1.0.0-beta6",
1616
"license": [
1717
"OSL-3.0",
1818
"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": "1.0.0-beta5",
7-
"magento/framework": "1.0.0-beta5",
6+
"magento/module-page-cache": "1.0.0-beta6",
7+
"magento/framework": "1.0.0-beta6",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "1.0.0-beta5",
11+
"version": "1.0.0-beta6",
1212
"license": [
1313
"OSL-3.0",
1414
"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": "1.0.0-beta5",
7-
"magento/module-customer": "1.0.0-beta5",
8-
"magento/module-checkout": "1.0.0-beta5",
9-
"magento/module-backend": "1.0.0-beta5",
10-
"magento/framework": "1.0.0-beta5",
6+
"magento/module-store": "1.0.0-beta6",
7+
"magento/module-customer": "1.0.0-beta6",
8+
"magento/module-checkout": "1.0.0-beta6",
9+
"magento/module-backend": "1.0.0-beta6",
10+
"magento/framework": "1.0.0-beta6",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "1.0.0-beta5",
14+
"version": "1.0.0-beta6",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Catalog/Model/CategoryLinkManagement.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ public function __construct(
3636
public function getAssignedProducts($categoryId)
3737
{
3838
$category = $this->categoryRepository->get($categoryId);
39-
$productsPosition = $category->getProductsPosition();
4039

41-
/** @var \Magento\Framework\Data\Collection\AbstractDb $products */
40+
/** @var \Magento\Catalog\Model\Resource\Product\Collection $products */
4241
$products = $category->getProductCollection();
42+
$products->addFieldToSelect('position');
4343

4444
/** @var \Magento\Catalog\Api\Data\CategoryProductLinkInterface[] $links */
4545
$links = [];
4646

4747
/** @var \Magento\Catalog\Model\Product $product */
48-
foreach ($products->getItems() as $productId => $product) {
48+
foreach ($products->getItems() as $product) {
4949
/** @var \Magento\Catalog\Api\Data\CategoryProductLinkInterface $link */
5050
$link = $this->productLinkFactory->create();
5151
$link->setSku($product->getSku())
52-
->setPosition($productsPosition[$productId])
52+
->setPosition($product->getData('cat_index_position'))
5353
->setCategoryId($category->getId());
5454
$links[] = $link;
5555
}

‎app/code/Magento/Catalog/Model/Resource/Category/Flat.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,23 @@ public function getAnchorsAbove(array $filterIds, $storeId = 0)
671671

672672
return $this->_getReadAdapter()->fetchCol($select);
673673
}
674+
675+
/**
676+
* Get positions of associated to category products
677+
*
678+
* @param \Magento\Catalog\Model\Category $category
679+
* @return array
680+
*/
681+
public function getProductsPosition($category)
682+
{
683+
$select = $this->_getReadAdapter()->select()->from(
684+
$this->getTable('catalog_category_product'),
685+
['product_id', 'position']
686+
)->where(
687+
'category_id = :category_id'
688+
);
689+
$bind = ['category_id' => (int)$category->getId()];
690+
691+
return $this->_getReadAdapter()->fetchPairs($select, $bind);
692+
}
674693
}

0 commit comments

Comments
 (0)