Skip to content

Commit 1485e28

Browse files
magento-teammagento-team
committed
0.1.0-alpha91
* Added the following functional tests: * Action Newsletter Template * Import Custom Options * Low Stock Products Report * Search Terms Report * Catalog: * Removed the unused old pricing .phtml templates * Removed direct dependencies on the Weee and Tax modules * Tax: * Added new price renderers for the Weee and Tax modules * Fixed the @Covers annotation in Integration tests * Fixed bugs: * Fixed an issue with FPT total line on the Shopping Cart page * Fixed the Inline translation functionality both in the backend and the storefront * Fixed an issue with the Translation dialog layout on the storefront * Fixed an issue where only the first Tier Price row was saved during simple product creation * Fixed an issue where it was impossible to save more than one group price * Fixed an issue where it was impossible to create a shipping label * Fixed an issue where Google Items synchronization resulted in a blank page * Fixed an issue where a Shopping Cart with a lot of entries did not fit the page * Fixed an issue where a JavaScript error blocked the checkout with credit cards type Other in online payment methods * Fixed JavaScript error on the Payment Methods tab in System Configuration
1 parent 623d88f commit 1485e28

File tree

292 files changed

+7788
-4087
lines changed

Some content is hidden

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

292 files changed

+7788
-4087
lines changed

‎CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
0.1.0-alpha91
2+
=============
3+
* Added the following functional tests:
4+
* Action Newsletter Template
5+
* Import Custom Options
6+
* Low Stock Products Report
7+
* Search Terms Report
8+
* Catalog:
9+
* Removed the unused old pricing .phtml templates
10+
* Removed direct dependencies on the Weee and Tax modules
11+
* Tax:
12+
* Added new price renderers for the Weee and Tax modules
13+
* Fixed the @covers annotation in Integration tests
14+
* Fixed bugs:
15+
* Fixed an issue with FPT total line on the Shopping Cart page
16+
* Fixed the Inline translation functionality both in the backend and the storefront
17+
* Fixed an issue with the Translation dialog layout on the storefront
18+
* Fixed an issue where only the first Tier Price row was saved during simple product creation
19+
* Fixed an issue where it was impossible to save more than one group price
20+
* Fixed an issue where it was impossible to create a shipping label
21+
* Fixed an issue where Google Items synchronization resulted in a blank page
22+
* Fixed an issue where a Shopping Cart with a lot of entries did not fit the page
23+
* Fixed an issue where a JavaScript error blocked the checkout with credit cards type “Other” in online payment methods
24+
* Fixed JavaScript error on the Payment Methods tab in System Configuration
25+
126
0.1.0-alpha90
227
=============
328
* Service layer implementation:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.1.0-alpha90",
7-
"magento/module-core": "0.1.0-alpha90",
8-
"magento/module-backend": "0.1.0-alpha90",
9-
"magento/module-theme": "0.1.0-alpha90",
10-
"magento/framework": "0.1.0-alpha90",
6+
"magento/module-store": "0.1.0-alpha91",
7+
"magento/module-core": "0.1.0-alpha91",
8+
"magento/module-backend": "0.1.0-alpha91",
9+
"magento/module-theme": "0.1.0-alpha91",
10+
"magento/framework": "0.1.0-alpha91",
1111
"lib-libxml": "*",
1212
"magento/magento-composer-installer": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "0.1.0-alpha90",
15+
"version": "0.1.0-alpha91",
1616
"extra": {
1717
"map": [
1818
[

‎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.4.11|~5.5.0",
6-
"magento/module-backend": "0.1.0-alpha90",
7-
"magento/framework": "0.1.0-alpha90",
6+
"magento/module-backend": "0.1.0-alpha91",
7+
"magento/framework": "0.1.0-alpha91",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.1.0-alpha90",
11+
"version": "0.1.0-alpha91",
1212
"extra": {
1313
"map": [
1414
[

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.1.0-alpha90",
7-
"magento/module-sales": "0.1.0-alpha90",
8-
"magento/module-checkout": "0.1.0-alpha90",
9-
"magento/module-backend": "0.1.0-alpha90",
10-
"magento/module-core": "0.1.0-alpha90",
11-
"magento/module-payment": "0.1.0-alpha90",
12-
"magento/module-centinel": "0.1.0-alpha90",
13-
"magento/module-catalog": "0.1.0-alpha90",
14-
"magento/framework": "0.1.0-alpha90",
6+
"magento/module-store": "0.1.0-alpha91",
7+
"magento/module-sales": "0.1.0-alpha91",
8+
"magento/module-checkout": "0.1.0-alpha91",
9+
"magento/module-backend": "0.1.0-alpha91",
10+
"magento/module-core": "0.1.0-alpha91",
11+
"magento/module-payment": "0.1.0-alpha91",
12+
"magento/module-centinel": "0.1.0-alpha91",
13+
"magento/module-catalog": "0.1.0-alpha91",
14+
"magento/framework": "0.1.0-alpha91",
1515
"magento/magento-composer-installer": "*"
1616
},
1717
"type": "magento2-module",
18-
"version": "0.1.0-alpha90",
18+
"version": "0.1.0-alpha91",
1919
"extra": {
2020
"map": [
2121
[

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,32 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.1.0-alpha90",
7-
"magento/module-directory": "0.1.0-alpha90",
8-
"magento/module-core": "0.1.0-alpha90",
9-
"magento/module-eav": "0.1.0-alpha90",
10-
"magento/module-cron": "0.1.0-alpha90",
11-
"magento/module-sendfriend": "0.1.0-alpha90",
12-
"magento/module-theme": "0.1.0-alpha90",
13-
"magento/module-weee": "0.1.0-alpha90",
14-
"magento/module-reports": "0.1.0-alpha90",
15-
"magento/module-catalog-search": "0.1.0-alpha90",
16-
"magento/module-sales": "0.1.0-alpha90",
17-
"magento/module-catalog": "0.1.0-alpha90",
18-
"magento/module-user": "0.1.0-alpha90",
19-
"magento/module-cms": "0.1.0-alpha90",
20-
"magento/module-backup": "0.1.0-alpha90",
21-
"magento/module-email": "0.1.0-alpha90",
22-
"magento/module-customer": "0.1.0-alpha90",
23-
"magento/module-tax": "0.1.0-alpha90",
24-
"magento/module-checkout": "0.1.0-alpha90",
25-
"magento/module-url-rewrite": "0.1.0-alpha90",
26-
"magento/module-translation": "0.1.0-alpha90",
27-
"magento/framework": "0.1.0-alpha90",
6+
"magento/module-store": "0.1.0-alpha91",
7+
"magento/module-directory": "0.1.0-alpha91",
8+
"magento/module-core": "0.1.0-alpha91",
9+
"magento/module-eav": "0.1.0-alpha91",
10+
"magento/module-cron": "0.1.0-alpha91",
11+
"magento/module-sendfriend": "0.1.0-alpha91",
12+
"magento/module-theme": "0.1.0-alpha91",
13+
"magento/module-weee": "0.1.0-alpha91",
14+
"magento/module-reports": "0.1.0-alpha91",
15+
"magento/module-catalog-search": "0.1.0-alpha91",
16+
"magento/module-sales": "0.1.0-alpha91",
17+
"magento/module-catalog": "0.1.0-alpha91",
18+
"magento/module-user": "0.1.0-alpha91",
19+
"magento/module-cms": "0.1.0-alpha91",
20+
"magento/module-backup": "0.1.0-alpha91",
21+
"magento/module-email": "0.1.0-alpha91",
22+
"magento/module-customer": "0.1.0-alpha91",
23+
"magento/module-tax": "0.1.0-alpha91",
24+
"magento/module-checkout": "0.1.0-alpha91",
25+
"magento/module-url-rewrite": "0.1.0-alpha91",
26+
"magento/module-translation": "0.1.0-alpha91",
27+
"magento/framework": "0.1.0-alpha91",
2828
"magento/magento-composer-installer": "*"
2929
},
3030
"type": "magento2-module",
31-
"version": "0.1.0-alpha90",
31+
"version": "0.1.0-alpha91",
3232
"extra": {
3333
"map": [
3434
[

‎app/code/Magento/Backup/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.4.11|~5.5.0",
6-
"magento/module-store": "0.1.0-alpha90",
7-
"magento/module-core": "0.1.0-alpha90",
8-
"magento/module-backend": "0.1.0-alpha90",
9-
"magento/module-cron": "0.1.0-alpha90",
10-
"magento/module-index": "0.1.0-alpha90",
11-
"magento/framework": "0.1.0-alpha90",
6+
"magento/module-store": "0.1.0-alpha91",
7+
"magento/module-core": "0.1.0-alpha91",
8+
"magento/module-backend": "0.1.0-alpha91",
9+
"magento/module-cron": "0.1.0-alpha91",
10+
"magento/module-index": "0.1.0-alpha91",
11+
"magento/framework": "0.1.0-alpha91",
1212
"magento/magento-composer-installer": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "0.1.0-alpha90",
15+
"version": "0.1.0-alpha91",
1616
"extra": {
1717
"map": [
1818
[

‎app/code/Magento/Bundle/Block/Catalog/Product/Price.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,33 +29,38 @@
2929
*/
3030
class Price extends \Magento\Catalog\Block\Product\Price
3131
{
32+
/**
33+
* @var \Magento\Tax\Helper\Data
34+
*/
35+
protected $_taxHelper;
36+
3237
/**
3338
* @param \Magento\Framework\View\Element\Template\Context $context
3439
* @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
3540
* @param \Magento\Catalog\Helper\Data $catalogData
36-
* @param \Magento\Tax\Helper\Data $taxData
3741
* @param \Magento\Framework\Registry $registry
3842
* @param \Magento\Framework\Stdlib\String $string
3943
* @param \Magento\Framework\Math\Random $mathRandom
4044
* @param \Magento\Checkout\Helper\Cart $cartHelper
45+
* @param \Magento\Tax\Helper\Data $taxData
4146
* @param array $data
4247
*/
4348
public function __construct(
4449
\Magento\Framework\View\Element\Template\Context $context,
4550
\Magento\Framework\Json\EncoderInterface $jsonEncoder,
4651
\Magento\Catalog\Helper\Data $catalogData,
47-
\Magento\Tax\Helper\Data $taxData,
4852
\Magento\Framework\Registry $registry,
4953
\Magento\Framework\Stdlib\String $string,
5054
\Magento\Framework\Math\Random $mathRandom,
5155
\Magento\Checkout\Helper\Cart $cartHelper,
56+
\Magento\Tax\Helper\Data $taxData,
5257
array $data = array()
5358
) {
59+
$this->_taxHelper = $taxData;
5460
parent::__construct(
5561
$context,
5662
$jsonEncoder,
5763
$catalogData,
58-
$taxData,
5964
$registry,
6065
$string,
6166
$mathRandom,
@@ -78,7 +83,7 @@ public function displayBothPrices()
7883
) {
7984
return false;
8085
}
81-
return $this->_taxData->displayBothPrices();
86+
return $this->_taxHelper->displayBothPrices();
8287
}
8388

8489
/**

‎app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,25 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
4949
*/
5050
protected $_coreHelper;
5151

52+
/**
53+
* @var \Magento\Tax\Helper\Data
54+
*/
55+
protected $_taxHelper;
56+
57+
/**
58+
* @var \Magento\Catalog\Helper\Data
59+
*/
60+
protected $_catalogHelper;
61+
5262
/**
5363
* @param \Magento\Framework\View\Element\Template\Context $context
5464
* @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
5565
* @param \Magento\Catalog\Helper\Data $catalogData
56-
* @param \Magento\Tax\Helper\Data $taxData
5766
* @param \Magento\Framework\Registry $registry
5867
* @param \Magento\Framework\Stdlib\String $string
5968
* @param \Magento\Framework\Math\Random $mathRandom
6069
* @param \Magento\Checkout\Helper\Cart $cartHelper
70+
* @param \Magento\Tax\Helper\Data $taxData
6171
* @param \Magento\Core\Helper\Data $coreHelper
6272
* @param array $data
6373
*
@@ -67,24 +77,26 @@ public function __construct(
6777
\Magento\Framework\View\Element\Template\Context $context,
6878
\Magento\Framework\Json\EncoderInterface $jsonEncoder,
6979
\Magento\Catalog\Helper\Data $catalogData,
70-
\Magento\Tax\Helper\Data $taxData,
7180
\Magento\Framework\Registry $registry,
7281
\Magento\Framework\Stdlib\String $string,
7382
\Magento\Framework\Math\Random $mathRandom,
7483
\Magento\Checkout\Helper\Cart $cartHelper,
84+
\Magento\Tax\Helper\Data $taxData,
7585
\Magento\Core\Helper\Data $coreHelper,
7686
array $data = array()
7787
) {
7888
$this->_coreHelper = $coreHelper;
89+
$this->_catalogHelper = $catalogData;
90+
$this->_taxHelper = $taxData;
7991
parent::__construct(
8092
$context,
8193
$jsonEncoder,
8294
$catalogData,
83-
$taxData,
8495
$registry,
8596
$string,
8697
$mathRandom,
8798
$cartHelper,
99+
$taxData,
88100
$data
89101
);
90102
}
@@ -294,7 +306,8 @@ public function setValidationContainer($elementId, $containerId)
294306
*/
295307
public function formatPriceString($price, $includeContainer = true)
296308
{
297-
$taxHelper = $this->_taxData;
309+
$catalogHelper = $this->_catalogHelper;
310+
$taxHelper = $this->_taxHelper;
298311
$coreHelper = $this->_coreHelper;
299312
$currentProduct = $this->getProduct();
300313
if ($currentProduct->getPriceType() == Price::PRICE_TYPE_DYNAMIC && $this->getFormatProduct()) {
@@ -303,8 +316,8 @@ public function formatPriceString($price, $includeContainer = true)
303316
$product = $currentProduct;
304317
}
305318

306-
$priceTax = $taxHelper->getPrice($product, $price);
307-
$priceIncTax = $taxHelper->getPrice($product, $price, true);
319+
$priceTax = $catalogHelper->getTaxPrice($product, $price);
320+
$priceIncTax = $catalogHelper->getTaxPrice($product, $price, true);
308321

309322
$formatted = $coreHelper->currencyByStore($priceTax, $product->getStore(), true, $includeContainer);
310323
if ($taxHelper->displayBothPrices() && $priceTax != $priceIncTax) {

0 commit comments

Comments
 (0)