Skip to content

Commit 5059581

Browse files
author
Roman Ganin
committed
Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into troll_s30
2 parents c23ccc2 + dc51ad1 commit 5059581

File tree

604 files changed

+12516
-13159
lines changed

Some content is hidden

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

604 files changed

+12516
-13159
lines changed

‎CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
0.42.0-beta8
2+
=============
3+
* Various improvements:
4+
* Existing Builders were replaced with DataFactories in Customer and Tax modules
5+
* Refactored controller actions in the Checkout and CMS modules
6+
* Increased coverage with static tests for `.phtml` files
7+
* Moved Cookie related functionality from `Theme` and `Core` modules into a new `Cookie` module
8+
* Moved minfication configuration settings to the `View` library level
9+
* UI improvements:
10+
* Restyled installation wizard
11+
* Prepared styles for Dashboard in the Backend area
12+
* Framework improvements:
13+
* Added `setCustomAttribute` and `setCustomAttributes` methods to `ExtensibleDataInterface`
14+
* Added setter methods to data object interfaces
15+
* Replaced `Builders` with `Factories`
16+
* Added `DataObjectHelper.php` which contains the common set of methods of all builders
17+
* Refactored `__()` to return `Phrase` object
18+
* Allowed usage of `LocalizedException` on the framework's library level
19+
* Added expiration/lifetime management of frontend resources
20+
* Unified MTF configurations format for Framework, TestCase variations and TestCase scenario configurations
21+
* Fixed bugs:
22+
* Fixed an issue with product reviews list paging
23+
* Fixed an issue where sold products were not displayed in Bestsellers
24+
* Fixed an issue with image rendering on the CMS page on Frontend when `webserver rewrites = no`
25+
* GitHub requests:
26+
* [#790](https://github.com/magento/magento2/issues/790) -- Magento API fails in a CGI env (zf1 issue)
27+
* [#909](https://github.com/magento/magento2/issues/909) -- Manage Titles in popup window front-end issue
28+
* [#996](https://github.com/magento/magento2/issues/996) -- Pager block should support url "fragment".
29+
* [#985](https://github.com/magento/magento2/pull/985) -- Allow camelcase in vendorname for menus
30+
* [#1025](https://github.com/magento/magento2/pull/1025) -- Wrong parameter for getting base url for 'media' path in "Image" form element.
31+
132
0.42.0-beta7
233
=============
334
* Various 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.42.0-beta7",
7-
"magento/module-core": "0.42.0-beta7",
8-
"magento/module-backend": "0.42.0-beta7",
9-
"magento/framework": "0.42.0-beta7",
6+
"magento/module-store": "0.42.0-beta8",
7+
"magento/module-core": "0.42.0-beta8",
8+
"magento/module-backend": "0.42.0-beta8",
9+
"magento/framework": "0.42.0-beta8",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta7",
14+
"version": "0.42.0-beta8",
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.42.0-beta7",
7-
"magento/framework": "0.42.0-beta7",
6+
"magento/module-backend": "0.42.0-beta8",
7+
"magento/framework": "0.42.0-beta8",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta7",
11+
"version": "0.42.0-beta8",
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.42.0-beta7",
7-
"magento/module-directory": "0.42.0-beta7",
8-
"magento/module-core": "0.42.0-beta7",
9-
"magento/module-eav": "0.42.0-beta7",
10-
"magento/module-cron": "0.42.0-beta7",
11-
"magento/module-theme": "0.42.0-beta7",
12-
"magento/module-reports": "0.42.0-beta7",
13-
"magento/module-sales": "0.42.0-beta7",
14-
"magento/module-quote": "0.42.0-beta7",
15-
"magento/module-catalog": "0.42.0-beta7",
16-
"magento/module-user": "0.42.0-beta7",
17-
"magento/module-backup": "0.42.0-beta7",
18-
"magento/module-email": "0.42.0-beta7",
19-
"magento/module-customer": "0.42.0-beta7",
20-
"magento/module-translation": "0.42.0-beta7",
21-
"magento/module-require-js": "0.42.0-beta7",
22-
"magento/framework": "0.42.0-beta7",
6+
"magento/module-store": "0.42.0-beta8",
7+
"magento/module-directory": "0.42.0-beta8",
8+
"magento/module-core": "0.42.0-beta8",
9+
"magento/module-eav": "0.42.0-beta8",
10+
"magento/module-cron": "0.42.0-beta8",
11+
"magento/module-theme": "0.42.0-beta8",
12+
"magento/module-reports": "0.42.0-beta8",
13+
"magento/module-sales": "0.42.0-beta8",
14+
"magento/module-quote": "0.42.0-beta8",
15+
"magento/module-catalog": "0.42.0-beta8",
16+
"magento/module-user": "0.42.0-beta8",
17+
"magento/module-backup": "0.42.0-beta8",
18+
"magento/module-email": "0.42.0-beta8",
19+
"magento/module-customer": "0.42.0-beta8",
20+
"magento/module-translation": "0.42.0-beta8",
21+
"magento/module-require-js": "0.42.0-beta8",
22+
"magento/framework": "0.42.0-beta8",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.42.0-beta7",
26+
"version": "0.42.0-beta8",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
?>
77
<form action="<?php echo $block->getUrl('*/*/refreshStatistics'); ?>" method="post">
88
<input name="form_key" type="hidden" value="<?php echo $block->getFormKey(); ?>" />
9-
<button type="submit" style="float:right; margin: 15px" title="Refresh data">
10-
<?php echo __('Refresh data') ?>
9+
<button type="submit" style="float:right; margin: 15px" title="Refresh Data">
10+
<?php echo __('Refresh Data') ?>
1111
</button>
1212
</form>

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

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta7",
7-
"magento/module-catalog": "0.42.0-beta7",
8-
"magento/module-tax": "0.42.0-beta7",
9-
"magento/module-core": "0.42.0-beta7",
10-
"magento/module-backend": "0.42.0-beta7",
11-
"magento/module-sales": "0.42.0-beta7",
12-
"magento/module-checkout": "0.42.0-beta7",
13-
"magento/module-catalog-inventory": "0.42.0-beta7",
14-
"magento/module-customer": "0.42.0-beta7",
15-
"magento/module-catalog-rule": "0.42.0-beta7",
16-
"magento/module-eav": "0.42.0-beta7",
17-
"magento/module-gift-message": "0.42.0-beta7",
18-
"magento/framework": "0.42.0-beta7",
19-
"magento/module-webapi": "0.42.0-beta7",
20-
"magento/module-quote": "0.42.0-beta7",
6+
"magento/module-store": "0.42.0-beta8",
7+
"magento/module-catalog": "0.42.0-beta8",
8+
"magento/module-tax": "0.42.0-beta8",
9+
"magento/module-core": "0.42.0-beta8",
10+
"magento/module-backend": "0.42.0-beta8",
11+
"magento/module-sales": "0.42.0-beta8",
12+
"magento/module-checkout": "0.42.0-beta8",
13+
"magento/module-catalog-inventory": "0.42.0-beta8",
14+
"magento/module-customer": "0.42.0-beta8",
15+
"magento/module-catalog-rule": "0.42.0-beta8",
16+
"magento/module-eav": "0.42.0-beta8",
17+
"magento/module-gift-message": "0.42.0-beta8",
18+
"magento/framework": "0.42.0-beta8",
19+
"magento/module-webapi": "0.42.0-beta8",
20+
"magento/module-quote": "0.42.0-beta8",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"type": "magento2-module",
24-
"version": "0.42.0-beta7",
24+
"version": "0.42.0-beta8",
2525
"license": [
2626
"OSL-3.0",
2727
"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.42.0-beta7",
7-
"magento/module-customer": "0.42.0-beta7",
8-
"magento/module-checkout": "0.42.0-beta7",
9-
"magento/module-core": "0.42.0-beta7",
10-
"magento/module-backend": "0.42.0-beta7",
11-
"magento/framework": "0.42.0-beta7",
6+
"magento/module-store": "0.42.0-beta8",
7+
"magento/module-customer": "0.42.0-beta8",
8+
"magento/module-checkout": "0.42.0-beta8",
9+
"magento/module-core": "0.42.0-beta8",
10+
"magento/module-backend": "0.42.0-beta8",
11+
"magento/framework": "0.42.0-beta8",
1212
"magento/magento-composer-installer": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "0.42.0-beta7",
15+
"version": "0.42.0-beta8",
1616
"license": [
1717
"OSL-3.0",
1818
"AFL-3.0"

‎app/code/Magento/Catalog/Block/Product/AbstractProduct.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,4 +585,17 @@ public function getProductPriceHtml(
585585
}
586586
return $price;
587587
}
588+
589+
/**
590+
* Whether redirect to cart enabled
591+
*
592+
* @return bool
593+
*/
594+
public function isRedirectToCartEnabled()
595+
{
596+
return $this->_scopeConfig->getValue(
597+
'checkout/cart/redirect_to_cart',
598+
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
599+
);
600+
}
588601
}

‎app/code/Magento/Catalog/Block/Product/ListProduct.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,11 +329,14 @@ public function getIdentities()
329329
public function getAddToCartPostParams(\Magento\Catalog\Model\Product $product)
330330
{
331331
$url = $this->getAddToCartUrl($product);
332-
$data = [
333-
'product' => $product->getEntityId(),
334-
\Magento\Framework\App\Action\Action::PARAM_NAME_URL_ENCODED => $this->_postDataHelper->getEncodedUrl($url),
332+
return [
333+
'action' => $url,
334+
'data' => [
335+
'product' => $product->getEntityId(),
336+
\Magento\Framework\App\Action\Action::PARAM_NAME_URL_ENCODED =>
337+
$this->_postDataHelper->getEncodedUrl($url),
338+
]
335339
];
336-
return $this->_postDataHelper->getPostData($url, $data);
337340
}
338341

339342
/**

‎app/code/Magento/Catalog/Controller/Product/View.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,14 @@ public function execute()
9393
$notice = $product->getTypeInstance()->getSpecifyOptionMessage();
9494
$this->messageManager->addNotice($notice);
9595
}
96+
if ($this->getRequest()->isAjax()) {
97+
$this->getResponse()->representJson(
98+
$this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode([
99+
'backUrl' => $this->_redirect->getRedirectUrl()
100+
])
101+
);
102+
return;
103+
}
96104
$resultRedirect = $this->resultRedirectFactory->create();
97105
$resultRedirect->setRefererOrBaseUrl();
98106
return $resultRedirect;

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,36 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta7",
7-
"magento/module-eav": "0.42.0-beta7",
8-
"magento/module-cms": "0.42.0-beta7",
9-
"magento/module-indexer": "0.42.0-beta7",
10-
"magento/module-customer": "0.42.0-beta7",
11-
"magento/module-core": "0.42.0-beta7",
12-
"magento/module-theme": "0.42.0-beta7",
13-
"magento/module-checkout": "0.42.0-beta7",
14-
"magento/module-log": "0.42.0-beta7",
15-
"magento/module-backend": "0.42.0-beta7",
16-
"magento/module-widget": "0.42.0-beta7",
17-
"magento/module-wishlist": "0.42.0-beta7",
18-
"magento/module-tax": "0.42.0-beta7",
19-
"magento/module-msrp": "0.42.0-beta7",
20-
"magento/module-catalog-inventory": "0.42.0-beta7",
21-
"magento/module-directory": "0.42.0-beta7",
22-
"magento/module-catalog-rule": "0.42.0-beta7",
23-
"magento/module-product-alert": "0.42.0-beta7",
24-
"magento/module-url-rewrite": "0.42.0-beta7",
25-
"magento/module-catalog-url-rewrite": "0.42.0-beta7",
26-
"magento/module-page-cache": "0.42.0-beta7",
27-
"magento/module-quote": "0.42.0-beta7",
28-
"magento/framework": "0.42.0-beta7",
6+
"magento/module-store": "0.42.0-beta8",
7+
"magento/module-eav": "0.42.0-beta8",
8+
"magento/module-cms": "0.42.0-beta8",
9+
"magento/module-indexer": "0.42.0-beta8",
10+
"magento/module-customer": "0.42.0-beta8",
11+
"magento/module-core": "0.42.0-beta8",
12+
"magento/module-theme": "0.42.0-beta8",
13+
"magento/module-checkout": "0.42.0-beta8",
14+
"magento/module-log": "0.42.0-beta8",
15+
"magento/module-backend": "0.42.0-beta8",
16+
"magento/module-widget": "0.42.0-beta8",
17+
"magento/module-wishlist": "0.42.0-beta8",
18+
"magento/module-tax": "0.42.0-beta8",
19+
"magento/module-msrp": "0.42.0-beta8",
20+
"magento/module-catalog-inventory": "0.42.0-beta8",
21+
"magento/module-directory": "0.42.0-beta8",
22+
"magento/module-catalog-rule": "0.42.0-beta8",
23+
"magento/module-product-alert": "0.42.0-beta8",
24+
"magento/module-url-rewrite": "0.42.0-beta8",
25+
"magento/module-catalog-url-rewrite": "0.42.0-beta8",
26+
"magento/module-page-cache": "0.42.0-beta8",
27+
"magento/module-quote": "0.42.0-beta8",
28+
"magento/framework": "0.42.0-beta8",
2929
"magento/magento-composer-installer": "*"
3030
},
3131
"suggest": {
32-
"magento/module-cookie": "0.42.0-beta7"
32+
"magento/module-cookie": "0.42.0-beta8"
3333
},
3434
"type": "magento2-module",
35-
"version": "0.42.0-beta7",
35+
"version": "0.42.0-beta8",
3636
"license": [
3737
"OSL-3.0",
3838
"AFL-3.0"

‎app/code/Magento/Catalog/view/frontend/requirejs-config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ var config = {
1717
priceOptionDate: 'Magento_Catalog/js/price-option-date',
1818
priceOptionFile: 'Magento_Catalog/js/price-option-file',
1919
priceOptions: 'Magento_Catalog/js/price-options',
20-
priceUtils: 'Magento_Catalog/js/price-utils'
20+
priceUtils: 'Magento_Catalog/js/price-utils',
21+
catalogAddToCart: 'Magento_Catalog/js/catalog-add-to-cart'
2122
}
2223
}
2324
};

‎app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,11 @@
6464
<div class="product-item-actions">
6565
<div class="actions-primary">
6666
<?php if ($_item->isSaleable()): ?>
67-
<button type="button" class="action tocart primary"
68-
data-url="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item) ?>">
69-
<span><?php echo __('Add to Cart') ?></span>
70-
</button>
67+
<form data-role="tocart-form" action="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item); ?>" method="post">
68+
<button type="submit" class="action tocart primary">
69+
<span><?php echo __('Add to Cart'); ?></span>
70+
</button>
71+
</form>
7172
<?php else: ?>
7273
<?php if ($_item->getIsSalable()): ?>
7374
<div class="stock available"><span><?php echo __('In stock') ?></span></div>
@@ -129,6 +130,17 @@
129130
</tbody>
130131
</table>
131132
</div>
133+
<?php if (!$block->isRedirectToCartEnabled()) : ?>
134+
<script>
135+
require([
136+
'jquery',
137+
'domReady!',
138+
'Magento_Catalog/js/catalog-add-to-cart'
139+
], function($) {
140+
$('[data-role=tocart-form]').catalogAddToCart();
141+
});
142+
</script>
143+
<?php endif; ?>
132144
<?php else: ?>
133145
<div class="message info empty"><div><?php echo __('You have no items to compare.') ?></div></div>
134146
<?php endif; ?>

0 commit comments

Comments
 (0)