Merge pull request #369 from magento-nord/MAGETWO-38946 (62f58762) · Commits · KIII-12 / Magento

Commit 62f58762 authored 9 years ago by

Pelipenko, Vladimir(vpelipenko)

Merge pull request #369 from magento-nord/MAGETWO-38946

[Nord] Sprint 22

parents 0d01885e 86174e0e

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php 16 additions, 1 deletion

...e/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
app/code/Magento/CatalogInventory/Model/Resource/Stock/Item.php 1 addition, 0 deletions

...de/Magento/CatalogInventory/Model/Resource/Stock/Item.php
app/code/Magento/CatalogInventory/Model/StockRegistry.php 1 addition, 1 deletion

app/code/Magento/CatalogInventory/Model/StockRegistry.php
app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php 82 additions, 0 deletions

...talogInventory/Test/Unit/Block/Plugin/ProductViewTest.php
app/code/Magento/CatalogInventory/Test/Unit/Block/Stockqty/DefaultStockqtyTest.php 16 additions, 1 deletion

...nventory/Test/Unit/Block/Stockqty/DefaultStockqtyTest.php
app/code/Magento/CatalogInventory/Test/Unit/Model/Adminhtml/Stock/ItemTest.php 6 additions, 0 deletions

...logInventory/Test/Unit/Model/Adminhtml/Stock/ItemTest.php
app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php 10 additions, 0 deletions

...to/CatalogInventory/Test/Unit/Model/ConfigurationTest.php
app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/ItemTest.php 54 additions, 0 deletions

...gento/CatalogInventory/Test/Unit/Model/Stock/ItemTest.php
app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockItemRepositoryTest.php 196 additions, 24 deletions

...ventory/Test/Unit/Model/Stock/StockItemRepositoryTest.php
app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockRepositoryTest.php 186 additions, 0 deletions

...ogInventory/Test/Unit/Model/Stock/StockRepositoryTest.php
app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockStatusRepositoryTest.php 185 additions, 0 deletions

...ntory/Test/Unit/Model/Stock/StockStatusRepositoryTest.php
app/code/Magento/CatalogInventory/Test/Unit/Model/StockRegistryTest.php 52 additions, 0 deletions

...to/CatalogInventory/Test/Unit/Model/StockRegistryTest.php
app/code/Magento/CatalogInventory/etc/webapi.xml 1 addition, 1 deletion

app/code/Magento/CatalogInventory/etc/webapi.xml
app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-js-template.phtml 2 additions, 2 deletions

...es/catalog/product/edit/super/attribute-js-template.phtml
app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-template.phtml 2 additions, 2 deletions

...lates/catalog/product/edit/super/attribute-template.phtml
app/code/Magento/Email/Model/AbstractTemplate.php 7 additions, 3 deletions

app/code/Magento/Email/Model/AbstractTemplate.php
app/code/Magento/Email/Model/BackendTemplate.php 2 additions, 2 deletions

app/code/Magento/Email/Model/BackendTemplate.php
app/code/Magento/Email/Model/Template.php 18 additions, 5 deletions

app/code/Magento/Email/Model/Template.php
app/code/Magento/Email/Test/Unit/Model/TemplateTest.php 2 additions, 2 deletions

app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
app/code/Magento/Indexer/etc/crontab.xml 1 addition, 1 deletion

app/code/Magento/Indexer/etc/crontab.xml

with 840 additions and 45 deletions

Please register or to comment

Admin message

Merge pull request #369 from magento-nord/MAGETWO-38946