Skip to content

Commit fa01f82

Browse files
magento-teammagento-team
committed
2.0.0.0-dev61
* Introduced a new layout block attribute - cacheable * Fixed bugs: * Fixed an issue with displaying configurable product images in shopping cart * Fixed an issue with Tax Summary not being displayed properly on the Order Review page * Optimized the Plushe theme CSS * Fixed attribute types for configurable product variations * Fixed an issue with incorrect link in the Reset Password email for customers registered on the non-default website * Fixed an issue with creating orders using DHL on holiday dates * Fixed product export * Fixed 3D secure validation * Fixed an issue with session being lost when a logged in user goes from store pages using secure URL to the store pages which do not use secure URL * Fixed an issue with price ranges in the Advanced search
1 parent fcc07eb commit fa01f82

File tree

181 files changed

+5180
-1211
lines changed

Some content is hidden

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

181 files changed

+5180
-1211
lines changed

‎CHANGELOG.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
2.0.0.0-dev61
2+
=============
3+
* Introduced a new layout block attribute - cacheable
4+
* Fixed bugs:
5+
* Fixed an issue with displaying configurable product images in shopping cart
6+
* Fixed an issue with Tax Summary not being displayed properly on the Order Review page
7+
* Optimized the Plushe theme CSS
8+
* Fixed attribute types for configurable product variations
9+
* Fixed an issue with incorrect link in the Reset Password email for customers registered on the non-default website
10+
* Fixed an issue with creating orders using DHL on holiday dates
11+
* Fixed product export
12+
* Fixed 3D secure validation
13+
* Fixed an issue with session being lost when a logged in user goes from store pages using secure URL to the store pages which do not use secure URL
14+
* Fixed an issue with price ranges in the Advanced search
15+
116
2.0.0.0-dev60
217
=============
318
* Fixed bugs:
@@ -132,10 +147,6 @@
132147
* Fixed date resetting to 1 Jan 1970 after saving a design change in the admin panel in case date format is DD/MM/YY
133148
* Fixed CAPTCHA on multi-address checkout flow
134149
* Fixed view files population tool
135-
* Fixed DHL functionality of generation shipping labels
136-
* Fixed target rule if it is applied for specific customer segment
137-
* Fixed product importing that cleared price and weight
138-
* Fixed fatal error when a file reference is added to HTML head
139150
* GitHub requests:
140151
* [#122](https://github.com/magento/magento2/pull/122) -- Added support of federal units of Brazil with 27 states
141152
* [#184](https://github.com/magento/magento2/issues/184) -- Removed unused blocks and methods in Magento_Wishlist module

‎app/code/Magento/Backend/Model/Config/Source/Locale/Weekdaycodes.php

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?php
2+
/**
3+
* Magento
4+
*
5+
* NOTICE OF LICENSE
6+
*
7+
* This source file is subject to the Open Software License (OSL 3.0)
8+
* that is bundled with this package in the file LICENSE.txt.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://opensource.org/licenses/osl-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 Magento
22+
* @package Magento_Backend
23+
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25+
*/
26+
27+
/**
28+
* Locale weekdays source
29+
*/
30+
namespace Magento\Backend\Model\Config\Source\Locale;
31+
32+
class Weekdaycodes implements \Magento\Core\Model\Option\ArrayInterface
33+
{
34+
/**
35+
* @var \Magento\Core\Model\LocaleInterface
36+
*/
37+
protected $_locale;
38+
39+
/**
40+
* @param \Magento\Core\Model\LocaleInterface $locale
41+
*/
42+
public function __construct(\Magento\Core\Model\LocaleInterface $locale)
43+
{
44+
$this->_locale = $locale;
45+
}
46+
47+
/**
48+
* @return array
49+
*/
50+
public function toOptionArray()
51+
{
52+
return $this->_locale->getOptionWeekdays(true, true);
53+
}
54+
}

‎app/code/Magento/Bundle/Model/Product/Type.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -842,6 +842,7 @@ public function getSelectionsByIds($selectionIds, $product)
842842
->create()
843843
->addAttributeToSelect('*')
844844
->setFlag('require_stock_items', true)
845+
->setFlag('product_children', true)
845846
->addStoreFilter($this->getStoreFilter($product))
846847
->setStoreId($storeId)
847848
->setPositionOrder()

‎app/code/Magento/Bundle/view/frontend/layout/checkout_cart_index.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
-->
2626
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2727
<referenceBlock name="checkout.cart.form">
28-
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/item/default.phtml"/>
28+
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/item/default.phtml" cacheable="false"/>
2929
</referenceBlock>
3030
<referenceBlock name="checkout.cart.crosssell">
3131
<action method="addPriceBlockType">

‎app/code/Magento/Bundle/view/frontend/layout/checkout_multishipping_addresses.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
-->
2626
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2727
<referenceBlock name="checkout_addresses">
28-
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::multishipping/item/default.phtml"/>
28+
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::multishipping/item/default.phtml" cacheable="false"/>
2929
</referenceBlock>
3030
</layout>

‎app/code/Magento/Bundle/view/frontend/layout/checkout_multishipping_overview.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
-->
2626
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2727
<referenceBlock name="checkout_overview">
28-
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::multishipping/item/default.phtml"/>
28+
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::multishipping/item/default.phtml" cacheable="false"/>
2929
</referenceBlock>
3030
</layout>

‎app/code/Magento/Bundle/view/frontend/layout/checkout_multishipping_shipping.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
-->
2626
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2727
<referenceBlock name="checkout_shipping">
28-
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::multishipping/item/default.phtml"/>
28+
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::multishipping/item/default.phtml" cacheable="false"/>
2929
</referenceBlock>
3030
<referenceBlock name="checkout_billing_items">
31-
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::multishipping/item/default.phtml"/>
31+
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::multishipping/item/default.phtml" cacheable="false"/>
3232
</referenceBlock>
3333
</layout>

‎app/code/Magento/Bundle/view/frontend/layout/checkout_onepage_review.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
-->
2626
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2727
<referenceBlock name="order_review">
28-
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::onepage/review/item.phtml"/>
28+
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::onepage/review/item.phtml" cacheable="false"/>
2929
</referenceBlock>
3030
</layout>

‎app/code/Magento/Bundle/view/frontend/layout/default.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@
3939
</action>
4040
</referenceBlock>
4141
<referenceBlock name="minicart">
42-
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/sidebar/default.phtml"/>
42+
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/sidebar/default.phtml" cacheable="false"/>
4343
</referenceBlock>
4444
</layout>

‎app/code/Magento/Bundle/view/frontend/layout/paypal_express_review.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
-->
2626
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2727
<referenceBlock name="paypal.express.review.details">
28-
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::onepage/review/item.phtml"/>
28+
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::onepage/review/item.phtml" cacheable="false"/>
2929
</referenceBlock>
3030
</layout>

0 commit comments

Comments
 (0)