-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7bbbb10
commit d99b2e0
Showing
7 changed files
with
121 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
<?xml version='1.0'?> | ||
<page | ||
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' | ||
xsi:noNamespaceSchemaLocation='urn:magento:framework:View/Layout/etc/page_configuration.xsd' | ||
> | ||
<referenceBlock name='checkout.root'> | ||
<arguments> | ||
<argument name='jsLayout' xsi:type='array'> | ||
<item name='components' xsi:type='array'> | ||
<item name='checkout' xsi:type='array'> | ||
<item name='children' xsi:type='array'> | ||
<item name='sidebar' xsi:type='array'> | ||
<item name='children' xsi:type='array'> | ||
<item name='summary' xsi:type='array'> | ||
<item name='children' xsi:type='array'> | ||
<item name='cart_items' xsi:type='array'> | ||
<!-- 2020-01-12 | ||
It moves cart items above the rest totals information: https://magento.stackexchange.com/a/225544 --> | ||
<item name='sortOrder' xsi:type='string'>0</item> | ||
</item> | ||
<item name='totals' xsi:type='array'> | ||
<item name='children' xsi:type='array'> | ||
<item name='subtotal' xsi:type='array'> | ||
<item name='config' xsi:type='array'> | ||
<!-- 2020-01-12 "Cart Subtotal" => "Subtotal" --> | ||
<item name='title' xsi:type='string' translate='true'>Subtotal</item> | ||
</item> | ||
</item> | ||
<item name='shipping' xsi:type='array'> | ||
<item name='config' xsi:type='array'> | ||
<!-- 2020-01-12 "Shipping" => "Shipping Options" --> | ||
<item name='title' xsi:type='string' translate='true'>Shipping Options</item> | ||
</item> | ||
</item> | ||
</item> | ||
</item> | ||
<item name='itemsAfter' xsi:type='array'> | ||
<item name='children' xsi:type='array'> | ||
<item name='discreteDelivery' xsi:type='array'> | ||
<item name='sortOrder' xsi:type='string'>1</item> | ||
<item name='displayArea' xsi:type='string'>ship-to</item> | ||
<item name='component' xsi:type='string'>uiComponent</item> | ||
<item name='config' xsi:type='array'> | ||
<item name='template' xsi:type='string'>Sheer_Checkout/discreteDelivery</item> | ||
</item> | ||
</item> | ||
</item> | ||
</item> | ||
</item> | ||
</item> | ||
</item> | ||
</item> | ||
</item> | ||
</item> | ||
</item> | ||
</argument> | ||
</arguments> | ||
</referenceBlock> | ||
</page> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
// 2020-01-12 https://www.upwork.com/ab/f/contracts/23508657 | ||
var config = {config: {mixins: { | ||
// 2020-01-12 https://www.upwork.com/ab/f/contracts/23508657 | ||
// It shows the full totals block on the shipping step of the frontend checkout: | ||
// https://magento.stackexchange.com/a/235329 | ||
'Magento_Checkout/js/view/summary/abstract-total': {'Tingle_Core/Magento_Checkout/js/view/summary/abstract-total': true} | ||
// 2020-01-12 https://www.upwork.com/ab/f/contracts/23508657 | ||
// It shows taxes in the full totals block on the shipping step of the frontend checkout: | ||
// https://magento.stackexchange.com/a/209351 | ||
,'Magento_Checkout/js/view/summary/shipping': {'Tingle_Core/Magento_Checkout/js/view/summary/shipping': true} | ||
}}}; |
13 changes: 13 additions & 0 deletions
13
view/frontend/web/Magento_Checkout/js/view/summary/abstract-total.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
// 2020-01-12 | ||
define([], function() {'use strict'; return function(sb) {return sb.extend({ | ||
/** | ||
* 2020-01-12 | ||
* @override | ||
* @see Magento_Checkout/js/view/summary/abstract-total::isFullMode() | ||
* It shows the full totals block on the shipping step of the frontend checkout: | ||
* https://magento.stackexchange.com/a/235329 | ||
* https://www.upwork.com/ab/f/contracts/23508657 | ||
* @returns {boolean} | ||
*/ | ||
isFullMode: function() {return !!this.getTotals();} | ||
});};}); |
6 changes: 6 additions & 0 deletions
6
view/frontend/web/Magento_Checkout/js/view/summary/shipping.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
// 2020-01-12 https://www.upwork.com/ab/f/contracts/23508657 | ||
// It shows taxes in the full totals block on the shipping step of the frontend checkout: | ||
// https://magento.stackexchange.com/a/209351 | ||
define(['Magento_Checkout/js/model/cart/estimate-service'], function() {'use strict'; return function(sb) {return ( | ||
sb | ||
);};}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
body.checkout-index-index .opc-block-summary { | ||
.items-in-cart { | ||
margin-bottom: 0; | ||
.product-item { | ||
padding-bottom: 0; | ||
.price-including-tax { | ||
margin: 0; | ||
> .cart-price { | ||
font-size: initial; line-height: initial; | ||
> .price {font-size: 16px; font-weight: bold;} | ||
} | ||
} | ||
} | ||
} | ||
.totals.shipping > .mark { | ||
.label { | ||
color: #000000; | ||
font-size: 16px; | ||
font-weight: bold; | ||
letter-spacing: normal; | ||
margin-bottom: 4px; | ||
margin-top: 0; | ||
padding-left: 0; | ||
text-transform: uppercase; | ||
} | ||
.value {font-size: 12px;} | ||
} | ||
} |