Merge remote-tracking branch 'mainline/develop' into UI (0636eff8) · Commits · KIII-12 / Magento

Commit 0636eff8 authored 10 years ago by

Bogdan Plieshka

Browse files

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

parents e8b41d4a 54d2d3ae

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/etc/config.xml 1 addition, 1 deletion

app/code/Magento/Backend/etc/config.xml
app/code/Magento/Catalog/Model/Category/Attribute/Source/Page.php 1 addition, 1 deletion

.../Magento/Catalog/Model/Category/Attribute/Source/Page.php
app/code/Magento/Catalog/Model/Resource/Category/Attribute/Source/Page.php 3 additions, 3 deletions

...Catalog/Model/Resource/Category/Attribute/Source/Page.php
app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Source/PageTest.php 1 addition, 1 deletion

...og/Test/Unit/Model/Category/Attribute/Source/PageTest.php
app/code/Magento/Checkout/Block/Cart/Sidebar.php 52 additions, 5 deletions

app/code/Magento/Checkout/Block/Cart/Sidebar.php
app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php 98 additions, 0 deletions

app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php 83 additions, 0 deletions

...ode/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php
app/code/Magento/Checkout/Model/Cart.php 3 additions, 1 deletion

app/code/Magento/Checkout/Model/Cart.php
app/code/Magento/Checkout/Model/Sidebar.php 178 additions, 0 deletions

app/code/Magento/Checkout/Model/Sidebar.php
app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php 234 additions, 0 deletions

.../Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php
app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/UpdateItemQtyTest.php 210 additions, 0 deletions

...eckout/Test/Unit/Controller/Sidebar/UpdateItemQtyTest.php
app/code/Magento/Checkout/Test/Unit/Model/SidebarTest.php 233 additions, 0 deletions

app/code/Magento/Checkout/Test/Unit/Model/SidebarTest.php
app/code/Magento/Checkout/etc/config.xml 1 addition, 1 deletion

app/code/Magento/Checkout/etc/config.xml
app/code/Magento/Checkout/view/frontend/layout/default.xml 11 additions, 8 deletions

app/code/Magento/Checkout/view/frontend/layout/default.xml
app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml 47 additions, 80 deletions

...ento/Checkout/view/frontend/templates/cart/minicart.phtml
app/code/Magento/Checkout/view/frontend/templates/cart/minicart/content.phtml 87 additions, 0 deletions

...ckout/view/frontend/templates/cart/minicart/content.phtml
app/code/Magento/Checkout/view/frontend/templates/cart/sidebar/default.phtml 24 additions, 5 deletions

...eckout/view/frontend/templates/cart/sidebar/default.phtml
app/code/Magento/Checkout/view/frontend/templates/cart/subtotal.phtml 1 addition, 1 deletion

...ento/Checkout/view/frontend/templates/cart/subtotal.phtml
app/code/Magento/Checkout/view/frontend/web/js/sidebar.js 231 additions, 7 deletions

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
app/code/Magento/Cms/Api/BlockRepositoryInterface.php 60 additions, 0 deletions

app/code/Magento/Cms/Api/BlockRepositoryInterface.php

with 1559 additions and 114 deletions

Please register or to comment

Admin message

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