Merge remote-tracking branch 'mainline/develop' into bugfix (85324c7e) · Commits · KIII-12 / Magento

Commit 85324c7e authored 8 years ago by

Stanislav Idolov

Browse files

Merge remote-tracking branch 'mainline/develop' into bugfix

parents bdb32d73 6619bdfb

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php 1 addition, 1 deletion

...o/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php 23 additions, 22 deletions

.../Unit/Model/Indexer/Product/Flat/FlatTableBuilderTest.php
app/code/Magento/CatalogInventory/etc/events.xml 0 additions, 3 deletions

app/code/Magento/CatalogInventory/etc/events.xml
app/code/Magento/Checkout/view/frontend/web/js/region-updater.js 6 additions, 3 deletions

...e/Magento/Checkout/view/frontend/web/js/region-updater.js
app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php 2 additions, 2 deletions

...nto/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
app/code/Magento/Sales/Model/Order/CreditmemoFactory.php 51 additions, 3 deletions

app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml 7 additions, 1 deletion

...view/adminhtml/templates/order/create/sidebar/items.phtml
app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php 6 additions, 39 deletions

...de/Magento/SalesInventory/Model/Order/ReturnProcessor.php
app/code/Magento/SalesInventory/Observer/RefundOrderInventoryObserver.php 37 additions, 30 deletions

.../SalesInventory/Observer/RefundOrderInventoryObserver.php
app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnProcessorTest.php 10 additions, 22 deletions

...esInventory/Test/Unit/Model/Order/ReturnProcessorTest.php
app/code/Magento/SalesInventory/Test/Unit/Observer/RefundOrderInventoryObserverTest.php 65 additions, 44 deletions

...y/Test/Unit/Observer/RefundOrderInventoryObserverTest.php
app/code/Magento/SalesInventory/etc/events.xml 12 additions, 0 deletions

app/code/Magento/SalesInventory/etc/events.xml
dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductQtyDecreasedAfterCreditmemo.php 118 additions, 0 deletions

...t/Constraint/AssertProductQtyDecreasedAfterCreditmemo.php
dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml 34 additions, 1 deletion

...nfigurableProduct/Test/Repository/ConfigurableProduct.xml
dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateCreditMemoEntityTest.xml 21 additions, 0 deletions

...rableProduct/Test/TestCase/CreateCreditMemoEntityTest.xml
dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductQtyDecreasedAfterCreditmemo.php 110 additions, 0 deletions

...t/Constraint/AssertProductQtyDecreasedAfterCreditmemo.php
dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.php 0 additions, 25 deletions

...agento/Sales/Test/TestCase/CreateCreditMemoEntityTest.php
dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml 1 addition, 1 deletion

...agento/Sales/Test/TestCase/CreateCreditMemoEntityTest.xml

with 504 additions and 197 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into bugfix