Skip to content

Commit 964b46c

Browse files
magento-teammagento-team
committed
2.0.0.0-dev76
* Pricing improvements: * Eliminated code duplication from templates and implemented new calculation models for the following modules: * ConfigurableProduct * Wishlist * Rss * ProductAlert * JavaScript improvements: * Removed head.js usages from frontend * Removed head.js usages from adminhtml * Themes update: * Plushe styles are removed, Plushe theme is now based on blank * Fixed bugs: * Unable to place order with product that contains custom option 'file' * OnePageCheckout is not working if PayPal method is enabled to work via Payment Bridge * Impossible to reset password for admin user (incorrect reset password link in email) * Errors when deleting customer group specified as default one in the config * A number of essential buttons do not work and block other functionality in Internet Explorer 10 * "Insert Widget" button is missing in Insert Widget popup while creating CMS page * Impossible to change status for rating in admin * System email templates are not loaded when user creates new email template * Billing Agreements tab displays during New Customer creation in admin panel * Images are not displayed in WYSIWYG when editing default pages * Error message "Asymmetric transaction rollback" when creating simple product with flat catalog product option enabled in config * Fatal error when trying to preview sample(type=link) or view link for download(type="link") for downloadable product * Customer is redirected to Home Page after adding new address during multiple address checkout if secure URLs are enabled for frontend in config * Impossible to select value in the State/Province field in the customer registration form when customer uses multiple address checkout * Manage Stock option is not editable when using mass action on several products in the admin panel * Category is not displayed in layered navigation block when Flat Catalog is enabled in config * GitHub requests: * [#489] (#489) -- PHPUnit 4.0 Compatibility * [#535] (#535) -- Image management for products * Framework improvements: * Covered Magento lib form elements with unit tests: * `lib/Magento/Framework/Data/Form/Element/AbstractElement.php` * `lib/Magento/Framework/Data/Form/Element/Button.php` * `lib/Magento/Framework/Data/Form/Element/Checkbox.php` * `lib/Magento/Framework/Data/Form/Element/CollectionFactory.php` * `lib/Magento/Framework/Data/Form/Element/Column.php` * `lib/Magento/Framework/Data/Form/Element/File.php` * `lib/Magento/Framework/Data/Form/Element/Hidden.php` * `lib/Magento/Framework/Data/Form/Element/Editablemultiselect.php` * `lib/Magento/Framework/Data/Form/Element/Factory.php` * `lib/Magento/Framework/Data/Form/Element/Image.php` * `lib/Magento/Framework/Data/Form/Element/Imagefile.php` * `lib/Magento/Framework/Data/Form/Element/Label.php` * `lib/Magento/Framework/Data/Form/Element/Link.php` * `lib/Magento/Framework/Data/Form/Element/Multiselect.php` * `lib/Magento/Framework/Data/Form/Element/Note.php` * `lib/Magento/Framework/Data/Form/Element/Obscure.php` * `lib/Magento/Framework/Data/Form/Element/Password.php` * `lib/Magento/Framework/Data/Form/Element/Radio.php` * `lib/Magento/Framework/Data/Form/Element/Reset.php` * `lib/Magento/Framework/Data/Form/Element/Submit.php` * `lib/Magento/Framework/Data/Form/Element/Text.php` * `lib/Magento/Framework/Data/Form/Element/Textarea.php`
1 parent 7444894 commit 964b46c

File tree

671 files changed

+12253
-28210
lines changed

Some content is hidden

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

671 files changed

+12253
-28210
lines changed

‎CHANGELOG.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,61 @@
1+
2.0.0.0-dev76
2+
=============
3+
* Pricing improvements:
4+
* Eliminated code duplication from templates and implemented new calculation models for the following modules:
5+
* ConfigurableProduct
6+
* Wishlist
7+
* Rss
8+
* ProductAlert
9+
* JavaScript improvements:
10+
* Removed head.js usages from frontend
11+
* Removed head.js usages from adminhtml
12+
* Themes update:
13+
* Plushe styles are removed, Plushe theme is now based on blank
14+
* Fixed bugs:
15+
* Unable to place order with product that contains custom option 'file'
16+
* OnePageCheckout is not working if PayPal method is enabled to work via Payment Bridge
17+
* Impossible to reset password for admin user (incorrect reset password link in email)
18+
* Errors when deleting customer group specified as default one in the config
19+
* A number of essential buttons do not work and block other functionality in Internet Explorer 10
20+
* "Insert Widget" button is missing in Insert Widget popup while creating CMS page
21+
* Impossible to change status for rating in admin
22+
* System email templates are not loaded when user creates new email template
23+
* Billing Agreements tab displays during New Customer creation in admin panel
24+
* Images are not displayed in WYSIWYG when editing default pages
25+
* Error message "Asymmetric transaction rollback" when creating simple product with flat catalog product option enabled in config
26+
* Fatal error when trying to preview sample(type=link) or view link for download(type="link") for downloadable product
27+
* Customer is redirected to Home Page after adding new address during multiple address checkout if secure URLs are enabled for frontend in config
28+
* Impossible to select value in the State/Province field in the customer registration form when customer uses multiple address checkout
29+
* Manage Stock option is not editable when using mass action on several products in the admin panel
30+
* Category is not displayed in layered navigation block when Flat Catalog is enabled in config
31+
* GitHub requests:
32+
* [#489] (https://github.com/magento/magento2/issues/489) -- PHPUnit 4.0 Compatibility
33+
* [#535] (https://github.com/magento/magento2/issues/535) -- Image management for products
34+
* Framework improvements:
35+
* Covered Magento lib form elements with unit tests:
36+
* `lib/Magento/Framework/Data/Form/Element/AbstractElement.php`
37+
* `lib/Magento/Framework/Data/Form/Element/Button.php`
38+
* `lib/Magento/Framework/Data/Form/Element/Checkbox.php`
39+
* `lib/Magento/Framework/Data/Form/Element/CollectionFactory.php`
40+
* `lib/Magento/Framework/Data/Form/Element/Column.php`
41+
* `lib/Magento/Framework/Data/Form/Element/File.php`
42+
* `lib/Magento/Framework/Data/Form/Element/Hidden.php`
43+
* `lib/Magento/Framework/Data/Form/Element/Editablemultiselect.php`
44+
* `lib/Magento/Framework/Data/Form/Element/Factory.php`
45+
* `lib/Magento/Framework/Data/Form/Element/Image.php`
46+
* `lib/Magento/Framework/Data/Form/Element/Imagefile.php`
47+
* `lib/Magento/Framework/Data/Form/Element/Label.php`
48+
* `lib/Magento/Framework/Data/Form/Element/Link.php`
49+
* `lib/Magento/Framework/Data/Form/Element/Multiselect.php`
50+
* `lib/Magento/Framework/Data/Form/Element/Note.php`
51+
* `lib/Magento/Framework/Data/Form/Element/Obscure.php`
52+
* `lib/Magento/Framework/Data/Form/Element/Password.php`
53+
* `lib/Magento/Framework/Data/Form/Element/Radio.php`
54+
* `lib/Magento/Framework/Data/Form/Element/Reset.php`
55+
* `lib/Magento/Framework/Data/Form/Element/Submit.php`
56+
* `lib/Magento/Framework/Data/Form/Element/Text.php`
57+
* `lib/Magento/Framework/Data/Form/Element/Textarea.php`
58+
159
2.0.0.0-dev75
260
=============
361
* Modularity improvements:

‎app/autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626
require_once __DIR__ . '/../lib/Magento/Framework/Autoload/IncludePath.php';
27-
spl_autoload_register('\Magento\Framework\Autoload\IncludePath::load');
27+
spl_autoload_register([new \Magento\Framework\Autoload\IncludePath(), 'load']);

‎app/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
require_once BP . '/app/functions.php';
6464

6565
require_once __DIR__ . '/autoload.php';
66-
\Magento\Framework\Autoload\IncludePath::addIncludePath(array(BP . '/app/code', BP . '/lib'));
66+
(new \Magento\Framework\Autoload\IncludePath())->addIncludePath(array(BP . '/app/code', BP . '/lib'));
6767
$classMapPath = BP . '/var/classmap.ser';
6868
if (file_exists($classMapPath)) {
6969
require_once BP . '/lib/Magento/Framework/Autoload/ClassMap.php';

‎app/code/Magento/Authorizenet/view/frontend/form/cc.phtml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,16 @@
3434

3535
<?php if ($this->isPartialAuthorization()): ?>
3636
<?php echo $this->getChildHtml('cards') ?>
37-
<div class="release-amounts" data-container="release-amounts">
37+
<div class="release-amounts"
38+
data-container="release-amounts"
39+
data-mage-init='{"authorizenetAuthenticate":{"partialAuthorizationConfirmationMessage": "<?php echo $this->getPartialAuthorizationConfirmationMessage()?>",
40+
"cancelConfirmationMessage": "<?php echo $this->getCancelConfirmationMessage() ?>",
41+
"cancelUrl": "<?php echo $this->getCancelUrl() ?>"}}'>
3842
<button class="button" type="button" id="payment-button-cancel" name="cancel"><span><span>Cancel</span></span></button>
3943
<span><?php echo __('To cancel pending authorizations and release amounts that have already been processed during this payment, click Cancel.') ?></span>
4044
</div>
4145
<?php echo $this->showNoticeMessage(__('Please enter a different credit card number to complete your purchase.')) ?>
4246

43-
<script type="text/javascript">
44-
(function ($) {
45-
head.js("<?php echo $this->getViewFileUrl('Magento_Authorizenet::authorizenet-authenticate.js') ?>", function () {
46-
$('[data-container="release-amounts"]').authorizenetAuthenticate({
47-
partialAuthorizationConfirmationMessage: '<?php echo $this->getPartialAuthorizationConfirmationMessage()?>',
48-
cancelConfirmationMessage: '<?php echo $this->getCancelConfirmationMessage() ?>',
49-
cancelUrl: '<?php echo $this->getCancelUrl() ?>'
50-
});
51-
});
52-
})(jQuery);
53-
</script>
5447
<span id="cancel-please-wait" class="please-wait load indicator" style="display: none" data-text="<?php echo __('Processing...') ?>">
5548
<span><?php echo __('Processing...') ?></span>
5649
</span>

‎app/code/Magento/Authorizenet/view/frontend/js/components.phtml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
/**
3+
* Magento
4+
*
5+
* NOTICE OF LICENSE
6+
*
7+
* This source file is subject to the Academic Free License (AFL 3.0)
8+
* that is bundled with this package in the file LICENSE_AFL.txt.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://opensource.org/licenses/afl-3.0.php
11+
* If you did not receive a copy of the license and are unable to
12+
* obtain it through the world-wide-web, please send an email
13+
* to license@magentocommerce.com so we can send you a copy immediately.
14+
*
15+
* DISCLAIMER
16+
*
17+
* Do not edit or add to this file if you wish to upgrade Magento to newer
18+
* versions in the future. If you wish to customize Magento for your
19+
* needs please refer to http://www.magentocommerce.com for more information.
20+
*
21+
* @category design
22+
* @package base_default
23+
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
24+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25+
*/
26+
?>
27+
<script type="text/javascript">
28+
(function($) {
29+
"use strict";
30+
/**
31+
* Declaration of resources needed for defined components
32+
*/
33+
$.mage.component({
34+
authorizenetAuthenticate: [
35+
'<?php echo $this->getViewFileUrl('Magento_Authorizenet::authorizenet-authenticate.js') ?>'
36+
]
37+
});
38+
})(jQuery);
39+
</script>
40+
<?php echo $this->getChildHtml() ?>

‎app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,7 @@
3131
</arguments>
3232
</block>
3333
</referenceBlock>
34+
<referenceBlock name="head.components">
35+
<block class="Magento\Framework\View\Element\Js\Components" name="authorizenet_page_head_components" template="Magento_Authorizenet::js/components.phtml"/>
36+
</referenceBlock>
3437
</layout>

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ protected function _convertDate($date, $locale)
8383
{
8484
if ($this->getColumn()->getFilterTime()) {
8585
try {
86-
$dateObj = $this->getLocaleDate()->date(null, null, $locale, false);
86+
$dateObj = $this->_localeDate->date(null, null, $locale, false);
8787

8888
//set default timezone for store (admin)
8989
$dateObj->setTimezone(
@@ -96,7 +96,7 @@ protected function _convertDate($date, $locale)
9696
//set date with applying timezone of store
9797
$dateObj->set(
9898
$date,
99-
$this->getLocaleDate()->getDateTimeFormat(
99+
$this->_localeDate->getDateTimeFormat(
100100
\Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT
101101
),
102102
$locale

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
<argument name="file" xsi:type="string">jquery/jquery-ui-1.9.2.js</argument>
4545
</arguments>
4646
</block>
47-
<block class="Magento\Theme\Block\Html\Head\Script" name="head-load-min-js">
47+
<block class="Magento\Theme\Block\Html\Head\Script" name="js-head-js">
4848
<arguments>
49-
<argument name="file" xsi:type="string">headjs/head.load.min.js</argument>
49+
<argument name="file" xsi:type="string">headjs/head.min.js</argument>
5050
</arguments>
5151
</block>
5252
<block class="Magento\Theme\Block\Html\Head\Script" name="underscore-js">

‎app/code/Magento/Backend/view/adminhtml/media/uploader.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
$(function () {
5252
$('#fileupload').fileupload({
5353
dataType: 'json',
54-
dropZone: '#media_gallery_content',
54+
dropZone: '[data-tab-panel=image-management]',
5555
sequentialUploads: true,
5656
acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
5757
maxFileSize: <?php echo $this->getFileSizeService()->getMaxFileSize() ?>,

‎app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727

2828
/**
2929
* Adminhtml block for fieldset of bundle product
30-
*
31-
* @category Magento
32-
* @package Magento_Adminhtml
33-
* @author Magento Core Team <core@magentocommerce.com>
3430
*/
3531
class Bundle extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle
3632
{

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

Lines changed: 8 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ public function __construct(
8181
*/
8282
public function isRatesGraterThenZero()
8383
{
84-
$_request = $this->_taxCalc->getRateRequest(false, false, false);
85-
$_request->setProductClassId($this->getProduct()->getTaxClassId());
86-
$defaultTax = $this->_taxCalc->getRate($_request);
84+
$request = $this->_taxCalc->getRateRequest(false, false, false);
85+
$request->setProductClassId($this->getProduct()->getTaxClassId());
86+
$defaultTax = $this->_taxCalc->getRate($request);
8787

88-
$_request = $this->_taxCalc->getRateRequest();
89-
$_request->setProductClassId($this->getProduct()->getTaxClassId());
90-
$currentTax = $this->_taxCalc->getRate($_request);
88+
$request = $this->_taxCalc->getRateRequest();
89+
$request->setProductClassId($this->getProduct()->getTaxClassId());
90+
$currentTax = $this->_taxCalc->getRate($request);
9191

9292
return floatval($defaultTax) > 0 || floatval($currentTax) > 0;
9393
}
@@ -101,54 +101,14 @@ public function isRatesGraterThenZero()
101101
public function displayBothPrices()
102102
{
103103
$product = $this->getProduct();
104-
if ($product->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC &&
105-
$product->getPriceModel()->getIsPricesCalculatedByIndex() !== false
104+
if ($product->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC
105+
&& $product->getPriceModel()->getIsPricesCalculatedByIndex() !== false
106106
) {
107107
return false;
108108
}
109109
return $this->_taxData->displayBothPrices();
110110
}
111111

112-
/**
113-
* Convert block to html string
114-
*
115-
* @return string
116-
*/
117-
protected function _toHtml()
118-
{
119-
$product = $this->getProduct();
120-
if ($this->getMAPTemplate() && $this->_catalogData->canApplyMsrp(
121-
$product
122-
) && $product->getPriceType() != \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC
123-
) {
124-
$hiddenPriceHtml = parent::_toHtml();
125-
if ($this->_catalogData->isShowPriceOnGesture($product)) {
126-
$this->setWithoutPrice(true);
127-
}
128-
$realPriceHtml = parent::_toHtml();
129-
$this->unsWithoutPrice();
130-
$addToCartUrl = $this->getLayout()->getBlock('product.info.bundle')->getAddToCartUrl($product);
131-
$product->setAddToCartUrl($addToCartUrl);
132-
$html = $this->getLayout()->createBlock(
133-
'Magento\Catalog\Block\Product\Price'
134-
)->setTemplate(
135-
$this->getMAPTemplate()
136-
)->setRealPriceHtml(
137-
$hiddenPriceHtml
138-
)->setPriceElementIdPrefix(
139-
'bundle-price-'
140-
)->setIdSuffix(
141-
$this->getIdSuffix()
142-
)->setProduct(
143-
$product
144-
)->toHtml();
145-
146-
return $realPriceHtml . $html;
147-
}
148-
149-
return parent::_toHtml();
150-
}
151-
152112
/**
153113
* @param null|string|bool|int|\Magento\Store\Model\Store $storeId
154114
* @return bool|\Magento\Store\Model\Website

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

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)