Merge branch 'develop' into FearlessKiwis-MAGETWO-18521-Incorrect-tax-calculation-with-discount (1a43d6e3) · Commits · KIII-12 / Magento

Commit 1a43d6e3 authored 10 years ago by

Manasa Potluri

Browse files

Merge branch 'develop' into FearlessKiwis-MAGETWO-18521-Incorrect-tax-calculation-with-discount

parents 24c6e979 670849f3

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backup/Controller/Adminhtml/Index/Grid.php 1 addition, 1 deletion

app/code/Magento/Backup/Controller/Adminhtml/Index/Grid.php
app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php 9 additions, 27 deletions

...code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php
app/code/Magento/Checkout/Model/Layout/DepersonalizePlugin.php 11 additions, 30 deletions

...ode/Magento/Checkout/Model/Layout/DepersonalizePlugin.php
app/code/Magento/Customer/Model/Layout/DepersonalizePlugin.php 13 additions, 34 deletions

...ode/Magento/Customer/Model/Layout/DepersonalizePlugin.php
app/code/Magento/PageCache/Model/DepersonalizeChecker.php 63 additions, 0 deletions

app/code/Magento/PageCache/Model/DepersonalizeChecker.php
app/code/Magento/PageCache/Model/Layout/DepersonalizePlugin.php 8 additions, 27 deletions

...de/Magento/PageCache/Model/Layout/DepersonalizePlugin.php
app/code/Magento/PageCache/Model/Observer/InvalidateCacheIfChanged.php 54 additions, 0 deletions

...nto/PageCache/Model/Observer/InvalidateCacheIfChanged.php
app/code/Magento/PageCache/etc/events.xml 1 addition, 1 deletion

app/code/Magento/PageCache/etc/events.xml
app/code/Magento/Persistent/Model/Layout/DepersonalizePlugin.php 11 additions, 29 deletions

...e/Magento/Persistent/Model/Layout/DepersonalizePlugin.php
dev/tests/unit/testsuite/Magento/Catalog/Model/Layout/DepersonalizePluginTest.php 16 additions, 80 deletions

.../Magento/Catalog/Model/Layout/DepersonalizePluginTest.php
dev/tests/unit/testsuite/Magento/Checkout/Model/Layout/DepersonalizePluginTest.php 28 additions, 30 deletions

...Magento/Checkout/Model/Layout/DepersonalizePluginTest.php
dev/tests/unit/testsuite/Magento/Customer/Model/Layout/DepersonalizePluginTest.php 39 additions, 213 deletions

...Magento/Customer/Model/Layout/DepersonalizePluginTest.php
dev/tests/unit/testsuite/Magento/Framework/Module/ModuleList/LoaderTest.php 17 additions, 9 deletions

...tsuite/Magento/Framework/Module/ModuleList/LoaderTest.php
dev/tests/unit/testsuite/Magento/Framework/Xml/ParserTest.php 11 additions, 0 deletions

...tests/unit/testsuite/Magento/Framework/Xml/ParserTest.php
dev/tests/unit/testsuite/Magento/PageCache/Model/DepersonalizeCheckerTest.php 79 additions, 0 deletions

...uite/Magento/PageCache/Model/DepersonalizeCheckerTest.php
dev/tests/unit/testsuite/Magento/PageCache/Model/Layout/DepersonalizePluginTest.php 21 additions, 50 deletions

...agento/PageCache/Model/Layout/DepersonalizePluginTest.php
dev/tests/unit/testsuite/Magento/PageCache/Model/Observer/InvalidateCacheIfChangedTest.php 86 additions, 0 deletions

...PageCache/Model/Observer/InvalidateCacheIfChangedTest.php
dev/tests/unit/testsuite/Magento/Persistent/Model/Layout/DepersonalizePluginTest.php 41 additions, 77 deletions

...gento/Persistent/Model/Layout/DepersonalizePluginTest.php
dev/tests/unit/testsuite/Magento/Setup/Controller/DatabaseCheckTest.php 6 additions, 0 deletions

.../testsuite/Magento/Setup/Controller/DatabaseCheckTest.php
lib/internal/Magento/Framework/App/ObjectManagerFactory.php 13 additions, 0 deletions

lib/internal/Magento/Framework/App/ObjectManagerFactory.php

with 528 additions and 608 deletions

Please register or to comment

Admin message

Merge branch 'develop' into FearlessKiwis-MAGETWO-18521-Incorrect-tax-calculation-with-discount