Merge branch 'checkout_stabilization' into checkout (8e16f36d) · Commits · KIII-12 / Magento

Commit 8e16f36d authored 9 years ago by

Olexii Korshenko

Browse files

Merge branch 'checkout_stabilization' into checkout

parents be391d61 4c78f615

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml 0 additions, 0 deletions

...nto/Captcha/view/frontend/layout/checkout_index_index.xml
app/code/Magento/Checkout/Block/Cart.php 1 addition, 1 deletion

app/code/Magento/Checkout/Block/Cart.php
app/code/Magento/Checkout/Block/Cart/Sidebar.php 1 addition, 1 deletion

app/code/Magento/Checkout/Block/Cart/Sidebar.php
app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php 8 additions, 1 deletion

app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
app/code/Magento/Checkout/Block/Onepage/Link.php 1 addition, 1 deletion

app/code/Magento/Checkout/Block/Onepage/Link.php
app/code/Magento/Checkout/Controller/Index/Index.php 1 addition, 1 deletion

app/code/Magento/Checkout/Controller/Index/Index.php
app/code/Magento/Checkout/Controller/Onepage.php 2 additions, 2 deletions

app/code/Magento/Checkout/Controller/Onepage.php
app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php 4 additions, 4 deletions

...Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php
app/code/Magento/Checkout/etc/frontend/di.xml 1 addition, 1 deletion

app/code/Magento/Checkout/etc/frontend/di.xml
app/code/Magento/Checkout/etc/frontend/page_types.xml 1 addition, 1 deletion

app/code/Magento/Checkout/etc/frontend/page_types.xml
app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml 23 additions, 1 deletion

...to/Checkout/view/frontend/layout/checkout_index_index.xml
app/code/Magento/Checkout/view/frontend/web/js/action/select-shipping-address.js 4 additions, 0 deletions

...ut/view/frontend/web/js/action/select-shipping-address.js
app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js 13 additions, 1 deletion

...nto/Checkout/view/frontend/web/js/view/billing-address.js
app/code/Magento/Checkout/view/frontend/web/js/view/cart/authentication.js 1 addition, 1 deletion

...Checkout/view/frontend/web/js/view/cart/authentication.js
app/code/Magento/Checkout/view/frontend/web/js/view/estimation.js 32 additions, 0 deletions

.../Magento/Checkout/view/frontend/web/js/view/estimation.js
app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js 6 additions, 0 deletions

...nto/Checkout/view/frontend/web/js/view/payment/default.js
app/code/Magento/Checkout/view/frontend/web/js/view/summary/cart-items.js 1 addition, 1 deletion

.../Checkout/view/frontend/web/js/view/summary/cart-items.js
app/code/Magento/Checkout/view/frontend/web/js/view/summary/item/details.js 2 additions, 4 deletions

...heckout/view/frontend/web/js/view/summary/item/details.js
app/code/Magento/Checkout/view/frontend/web/template/estimation.html 19 additions, 0 deletions

...gento/Checkout/view/frontend/web/template/estimation.html
app/code/Magento/Checkout/view/frontend/web/template/onepage.html 3 additions, 23 deletions

.../Magento/Checkout/view/frontend/web/template/onepage.html

with 124 additions and 44 deletions

Please register or to comment

Admin message

Merge branch 'checkout_stabilization' into checkout