Merge pull request #246 from magento-fearless-kiwis/develop (f7226f8d) · Commits · KIII-12 / Magento

There was an error fetching the commit references. Please try again later.

Commit f7226f8d authored 9 years ago by

Tang, Yu(ytang1)

Merge pull request #246 from magento-fearless-kiwis/develop

[FearlessKiwis] Bug Fixes

parents 3f148f9b b895ea12

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml 0 additions, 2 deletions

...o/Backend/view/adminhtml/templates/page/js/calendar.phtml
app/code/Magento/Weee/Block/Item/Price/Renderer.php 14 additions, 2 deletions

app/code/Magento/Weee/Block/Item/Price/Renderer.php
app/code/Magento/Weee/Block/Sales/Order/Totals.php 2 additions, 0 deletions

app/code/Magento/Weee/Block/Sales/Order/Totals.php
app/code/Magento/Weee/Helper/Data.php 41 additions, 6 deletions

app/code/Magento/Weee/Helper/Data.php
app/code/Magento/Weee/Observer/GetPriceConfigurationObserver.php 2 additions, 2 deletions

...e/Magento/Weee/Observer/GetPriceConfigurationObserver.php
app/code/Magento/Weee/Observer/Total/Webapi/ItemObserver.php 0 additions, 164 deletions

app/code/Magento/Weee/Observer/Total/Webapi/ItemObserver.php
app/code/Magento/Weee/Test/Unit/Block/Item/Price/RendererTest.php 11 additions, 2 deletions

.../Magento/Weee/Test/Unit/Block/Item/Price/RendererTest.php
app/code/Magento/Weee/Test/Unit/Helper/DataTest.php 129 additions, 13 deletions

app/code/Magento/Weee/Test/Unit/Helper/DataTest.php
app/code/Magento/Weee/Test/Unit/Observer/GetPriceConfigurationObserverTest.php 2 additions, 2 deletions

.../Test/Unit/Observer/GetPriceConfigurationObserverTest.php
app/code/Magento/Weee/Test/Unit/Observer/Total/Webapi/ItemTest.php 0 additions, 190 deletions

...Magento/Weee/Test/Unit/Observer/Total/Webapi/ItemTest.php
app/code/Magento/Weee/etc/webapi_rest/events.xml 0 additions, 12 deletions

app/code/Magento/Weee/etc/webapi_rest/events.xml
app/code/Magento/Weee/etc/webapi_soap/events.xml 0 additions, 12 deletions

app/code/Magento/Weee/etc/webapi_soap/events.xml
app/code/Magento/Weee/view/frontend/web/js/view/checkout/summary/item/price/row_excl_tax.js 6 additions, 3 deletions

...d/web/js/view/checkout/summary/item/price/row_excl_tax.js
app/code/Magento/Weee/view/frontend/web/js/view/checkout/summary/item/price/row_incl_tax.js 10 additions, 7 deletions

...d/web/js/view/checkout/summary/item/price/row_incl_tax.js
app/code/Magento/Weee/view/frontend/web/template/checkout/summary/item/price/row_excl_tax.html 15 additions, 13 deletions

...eb/template/checkout/summary/item/price/row_excl_tax.html
app/code/Magento/Weee/view/frontend/web/template/checkout/summary/item/price/row_incl_tax.html 6 additions, 6 deletions

...eb/template/checkout/summary/item/price/row_incl_tax.html
app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less 17 additions, 0 deletions

...o/blank/Magento_Checkout/web/css/source/module/_cart.less
app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less 15 additions, 2 deletions

...to/luma/Magento_Checkout/web/css/source/module/_cart.less
dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/AbstractReview.php 1 addition, 1 deletion

...pp/Magento/Checkout/Test/Block/Onepage/AbstractReview.php
dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/TaxCalculationTest.xml 2 additions, 2 deletions

.../ConfigurableProduct/Test/TestCase/TaxCalculationTest.xml

with 273 additions and 441 deletions

Please register or to comment

Admin message

Merge pull request #246 from magento-fearless-kiwis/develop