Merge remote-tracking branch 'mainline/develop' into MAGETWO-62705-2 (50866416) · Commits · KIII-12 / Magento

Commit 50866416 authored 8 years ago by

Oleksandr Shmyheliuk

Browse files

Merge remote-tracking branch 'mainline/develop' into MAGETWO-62705-2

parents 5caedf7a 2d6bb430

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/Model/Menu.php 87 additions, 22 deletions

app/code/Magento/Backend/Model/Menu.php
app/code/Magento/Backend/Model/Menu/Item.php 46 additions, 45 deletions

app/code/Magento/Backend/Model/Menu/Item.php
app/code/Magento/Backend/Test/Unit/Model/Menu/BuilderTest.php 32 additions, 29 deletions

...code/Magento/Backend/Test/Unit/Model/Menu/BuilderTest.php
app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php 44 additions, 83 deletions

app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php
app/code/Magento/Backend/Test/Unit/Model/Menu/Filter/IteratorTest.php 54 additions, 54 deletions

...ento/Backend/Test/Unit/Model/Menu/Filter/IteratorTest.php
app/code/Magento/Backend/Test/Unit/Model/Menu/ItemTest.php 89 additions, 23 deletions

app/code/Magento/Backend/Test/Unit/Model/Menu/ItemTest.php
app/code/Magento/Backend/Test/Unit/Model/MenuTest.php 88 additions, 28 deletions

app/code/Magento/Backend/Test/Unit/Model/MenuTest.php
app/code/Magento/Backend/Test/Unit/Model/UrlTest.php 1 addition, 5 deletions

app/code/Magento/Backend/Test/Unit/Model/UrlTest.php
app/code/Magento/Backend/Test/Unit/Model/_files/menu_item_constructor_data.php 133 additions, 0 deletions

...end/Test/Unit/Model/_files/menu_item_constructor_data.php
app/code/Magento/Backend/Test/Unit/Model/_files/menu_item_data.php 118 additions, 0 deletions

...Magento/Backend/Test/Unit/Model/_files/menu_item_data.php
app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php 31 additions, 1 deletion

...nto/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php 43 additions, 1 deletion

...undle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php 29 additions, 1 deletion

app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php
app/code/Magento/Bundle/Helper/Catalog/Product/Configuration.php 17 additions, 3 deletions

...e/Magento/Bundle/Helper/Catalog/Product/Configuration.php
app/code/Magento/Bundle/Model/Product/Price.php 13 additions, 3 deletions

app/code/Magento/Bundle/Model/Product/Price.php
app/code/Magento/Bundle/Model/Product/Type.php 34 additions, 16 deletions

app/code/Magento/Bundle/Model/Product/Type.php
app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php 50 additions, 2 deletions

...ento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php 12 additions, 3 deletions

...Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php 14 additions, 6 deletions

...de/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php 12 additions, 3 deletions

...e/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php

with 947 additions and 328 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into MAGETWO-62705-2