Merge pull request #381 from magento-south/MAGETWO-36960 (264c105f) · Commits · KIII-12 / Magento

Commit 264c105f authored 9 years ago by

Nasinnyk, Andrii(anasinnyk)

Merge pull request #381 from magento-south/MAGETWO-36960

[SOUTH] Shopping cart + Bugs

parents 3ad1194c 8bd029f6

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/etc/adminhtml/system.xml 4 additions, 0 deletions

app/code/Magento/Backend/etc/adminhtml/system.xml
app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php 1 addition, 1 deletion

...code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
app/code/Magento/Bundle/view/frontend/layout/checkout_cart_item_renderers.xml 6 additions, 1 deletion

...dle/view/frontend/layout/checkout_cart_item_renderers.xml
app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php 1 addition, 1 deletion

...agento/Catalog/Block/Product/View/Options/Type/Select.php
app/code/Magento/Catalog/view/frontend/layout/checkout_cart_item_renderers.xml 6 additions, 1 deletion

...log/view/frontend/layout/checkout_cart_item_renderers.xml
app/code/Magento/Checkout/Block/Cart/Item/Renderer.php 37 additions, 30 deletions

app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions.php 62 additions, 0 deletions

...ode/Magento/Checkout/Block/Cart/Item/Renderer/Actions.php
app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Edit.php 25 additions, 0 deletions

...agento/Checkout/Block/Cart/Item/Renderer/Actions/Edit.php
app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Generic.php 59 additions, 0 deletions

...nto/Checkout/Block/Cart/Item/Renderer/Actions/Generic.php
app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Remove.php 41 additions, 0 deletions

...ento/Checkout/Block/Cart/Item/Renderer/Actions/Remove.php
app/code/Magento/Checkout/Block/Cart/Shipping.php 84 additions, 0 deletions

app/code/Magento/Checkout/Block/Cart/Shipping.php
app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/Renderer/Actions/EditTest.php 77 additions, 0 deletions

...t/Test/Unit/Block/Cart/Item/Renderer/Actions/EditTest.php
app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/Renderer/Actions/GenericTest.php 87 additions, 0 deletions

...est/Unit/Block/Cart/Item/Renderer/Actions/GenericTest.php
app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/Renderer/Actions/RemoveTest.php 57 additions, 0 deletions

...Test/Unit/Block/Cart/Item/Renderer/Actions/RemoveTest.php
app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/Renderer/ActionsTest.php 110 additions, 0 deletions

...eckout/Test/Unit/Block/Cart/Item/Renderer/ActionsTest.php
app/code/Magento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php 59 additions, 3 deletions

...gento/Checkout/Test/Unit/Block/Cart/Item/RendererTest.php
app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php 425 additions, 20 deletions

...de/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
app/code/Magento/Checkout/composer.json 0 additions, 1 deletion

app/code/Magento/Checkout/composer.json
app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml 1 addition, 0 deletions

...nto/Checkout/view/frontend/layout/checkout_cart_index.xml
app/code/Magento/Checkout/view/frontend/layout/checkout_cart_item_renderers.xml 12 additions, 2 deletions

...out/view/frontend/layout/checkout_cart_item_renderers.xml

with 1154 additions and 60 deletions

Please register or to comment

Admin message

Merge pull request #381 from magento-south/MAGETWO-36960