Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(storefront): BCTHEME-116 move tax field after grand total when tax inclusive #1903

Merged
merged 2 commits into from
Nov 17, 2020
Merged

feat(storefront): BCTHEME-116 move tax field after grand total when tax inclusive #1903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0242ffe
feat(storefront): BCTHEME-116 move tax field after grand total when t…
bc-alexsaiannyi Nov 13, 2020
af93d95
Merge branch 'master' into bctheme-116
BC-tymurbiedukhin Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Changelog

## Draft
- Move Tax Field under Grand Total on Cart when Tax inclusive. [#1903](https://github.com/bigcommerce/cornerstone/pull/1903)
- Added styling config for the PayPal SPB on checkout page [#1866](https://github.com/bigcommerce/cornerstone/pull/1866)

## 4.12.1 (11-10-2020)
Expand Down
1 change: 1 addition & 0 deletions lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
"coupon_code": "Coupon Code",
"discount": "Discount",
"gift_certificate": "Gift Certificate",
"included_in_total": " Included in Total",
"remove_file": "Remove this file",
"freeshipping": "Free Shipping",
"reconfigure_product": "Configure '{name}'",
Expand Down
30 changes: 22 additions & 8 deletions templates/components/cart/totals.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,16 @@
</li>
{{/if}}
{{#each cart.taxes}}
<li class="cart-total">
<div class="cart-total-label">
<strong>{{name}}:</strong>
</div>
<div class="cart-total-value">
<span>{{cost.formatted}}</span>
</div>
</li>
{{#unless included}}
<li class="cart-total">
<div class="cart-total-label">
<strong>{{name}}:</strong>
</div>
<div class="cart-total-value">
<span>{{cost.formatted}}</span>
</div>
</li>
{{/unless}}
{{/each}}
{{#if cart.discount }}
<li class="cart-total">
Expand Down Expand Up @@ -104,4 +106,16 @@
{{/or}}
</div>
</li>
{{#each cart.taxes}}
{{#if included}}
<li class="cart-total">
<div class="cart-total-label">
<strong>{{concat name (lang 'cart.included_in_total')}}:</strong>
</div>
<div class="cart-total-value">
<span>{{cost.formatted}}</span>
</div>
</li>
{{/if}}
{{/each}}
</ul>