Skip to content

Commit fe74200

Browse files
author
Natalia Momotenko
committed
MAGETWO-36131: Update Content in Magento 2 by Modules - part 3
- Merge remote-tracking branch 'origin/develop' into PR - Conflicts: - app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php - app/code/Magento/GiftMessage/view/frontend/web/template/item-level-gift-message.html - app/code/Magento/GiftMessage/view/frontend/web/template/order-level-gift-message.html - app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php - dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php - dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
2 parents c4e7206 + 264c105 commit fe74200

File tree

460 files changed

+13402
-5711
lines changed

Some content is hidden

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

460 files changed

+13402
-5711
lines changed

‎CHANGELOG.md‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,42 @@
1+
0.74.0-beta14
2+
=============
3+
* Framework improvements:
4+
* Introduced an ability to uninstall modules which were installed via composer (bin/magento module:uninstall <moduleName>)
5+
* Introduced an ability to uninstall themes (bin/magento theme:uninstall <themeName>)
6+
* Introduced an ability to backup and rollback DB and Media via CLI (bin/magento setup:backup, options are --code, --db or --media)
7+
* Introduced an ability to uninstall language packages (bin/magento i18n:uninstall <languagePack>)
8+
* Introduced API notation for the following modules: Backend, Backup, Cron, Log, PageCache
9+
* Added join processors to search services, joined config for services with extension attributes
10+
* Renamed hidden_tax to discount_tax_compensation
11+
* The customer address entity table was transformed from EAV into a flat model to minimize database operations
12+
* Fixed bugs:
13+
* Fixed an issue where Setup Wizard failed on readiness check when Magento was deployed by composer create-project
14+
* Fixed the local file path disclosure when trying to browse image cache directory
15+
* Fixed an issue where development errors resulted in too many redirects
16+
* Fixed an integration test failure in Reports ViewedTest
17+
* Fixed an issue where it was impossible to save existent Grouped Product with no child items
18+
* Fixed an issue where message "We don't have as many "conf1" as you requested" appeared
19+
* Fixed an issue where second product from bundle product was ordered as separate item after checkout
20+
* Fixed an issue where configs for payments and shippings were not encrypted
21+
* Fixed an issue where Table Rates shipping method did not work
22+
* Fixed an issue where admin could not set locale properly on Account page
23+
* Fixed incomplete generated results of single tenant compiler
24+
* Fixed an issue with full page caching where one set of prices was cached for all customers
25+
* Fixed incorrect urls for private content
26+
* Fixed an issue where it was not possible to assign a product link to another product using API
27+
* Fixed an issue where zipcode was not displayed as required field on Create New Order page
28+
* Fixed the Sample Data re-installation
29+
* Fixed random fails on inventory tab for test CreateSimpleProductEntityTest
30+
* Tests:
31+
* Covered various modules with unit tests
32+
* Functional tests fixed and maintained
33+
* GitHub issues:
34+
* [#1156](https://github.com/magento/magento2/pull/1156) -- Moves common code to all auto-generated Interceptor classes into a trait
35+
* [#1206](https://github.com/magento/magento2/pull/1206) -- Allow modules to live outside of app/code directory
36+
* [#1245](https://github.com/magento/magento2/pull/1245) -- Unable to save product per website wise
37+
* [#1347](https://github.com/magento/magento2/pull/1347) -- Fixed failing Install during integration tests (MAGETWO-38482)
38+
* [#1368](https://github.com/magento/magento2/pull/1368) -- Fix typo in getCurrentCategoryKey
39+
140
0.74.0-beta13
241
=============
342
* 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-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",
6+
"magento/module-store": "0.74.0-beta14",
7+
"magento/module-backend": "0.74.0-beta14",
8+
"magento/module-media-storage": "0.74.0-beta14",
9+
"magento/framework": "0.74.0-beta14",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta13",
14+
"version": "0.74.0-beta14",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,10 @@
253253
<label>European Union Countries</label>
254254
<source_model>Magento\Directory\Model\Config\Source\Country</source_model>
255255
</field>
256+
<field id="destinations" translate="label" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
257+
<label>Top destinations</label>
258+
<source_model>Magento\Directory\Model\Config\Source\Country</source_model>
259+
</field>
256260
</group>
257261
<group id="locale" translate="label" type="text" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
258262
<label>Locale Options</label>

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

‎app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
3030
* @param \Magento\Framework\Url\Helper\Data $urlHelper
3131
* @param \Magento\Framework\Message\ManagerInterface $messageManager
3232
* @param PriceCurrencyInterface $priceCurrency
33-
* @param Configuration $bundleProductConfiguration
3433
* @param \Magento\Framework\Module\Manager $moduleManager
34+
* @param Configuration $bundleProductConfiguration
3535
* @param array $data
3636
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
3737
*/

‎app/code/Magento/Bundle/Model/Resource/Indexer/Price.php‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Price extends \Magento\Catalog\Model\Resource\Product\Indexer\Price\Defaul
2020
*/
2121
public function reindexAll()
2222
{
23-
$this->useIdxTable(true);
23+
$this->tableStrategy->setUseIdxTable(true);
2424

2525
$this->beginTransaction();
2626
try {
@@ -54,10 +54,7 @@ public function reindexEntity($entityIds)
5454
*/
5555
protected function _getBundlePriceTable()
5656
{
57-
if ($this->useIdxTable()) {
58-
return $this->getTable('catalog_product_index_price_bundle_idx');
59-
}
60-
return $this->getTable('catalog_product_index_price_bundle_tmp');
57+
return $this->tableStrategy->getTableName('catalog_product_index_price_bundle');
6158
}
6259

6360
/**
@@ -67,10 +64,7 @@ protected function _getBundlePriceTable()
6764
*/
6865
protected function _getBundleSelectionTable()
6966
{
70-
if ($this->useIdxTable()) {
71-
return $this->getTable('catalog_product_index_price_bundle_sel_idx');
72-
}
73-
return $this->getTable('catalog_product_index_price_bundle_sel_tmp');
67+
return $this->tableStrategy->getTableName('catalog_product_index_price_bundle_sel');
7468
}
7569

7670
/**
@@ -80,10 +74,7 @@ protected function _getBundleSelectionTable()
8074
*/
8175
protected function _getBundleOptionTable()
8276
{
83-
if ($this->useIdxTable()) {
84-
return $this->getTable('catalog_product_index_price_bundle_opt_idx');
85-
}
86-
return $this->getTable('catalog_product_index_price_bundle_opt_tmp');
77+
return $this->tableStrategy->getTableName('catalog_product_index_price_bundle_opt');
8778
}
8879

8980
/**

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

0 commit comments

Comments
 (0)