Skip to content

Commit 040af3a

Browse files
feat(checkout): CHECKOUT-9726 updated shipping amount display for multicoupon ui
1 parent aa4a5aa commit 040af3a

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

assets/scss/components/stencil/cart/_cart.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,14 +460,14 @@ $card-preview-zoom-bottom-offset: 6rem;
460460
.cart-total-savings {
461461
font-family: $body-font-family;
462462
font-size: fontSize("smaller");
463+
font-weight: fontWeight("bold");
463464
color: stencilColor("color-textSecondary");
464465
display: block;
465466
margin-top: spacing("eighth");
466467
}
467468

468469
.cart-savings-amount {
469470
color: stencilColor("color-success");
470-
font-weight: fontWeight("bold");
471471
}
472472
}
473473
}

lang/en.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
"coupon_code": "Coupon Code",
7575
"discount": "Discount",
7676
"discounts": "Discounts",
77-
"manual_discount": "Manual Discount",
78-
"automatic_promotion": "Automatic Promotion",
77+
"manual_discount": "Manual discount",
78+
"automatic_discount": "Automatic discount",
7979
"included_in_total": " Included in Total",
8080
"remove_file": "Remove this file",
8181
"freeshipping": "Free Shipping",

templates/components/cart/shipping-estimator.html

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,21 @@
44
{{#if shipping_cost}}
55
<div class="cart-total-value">
66
<div class="subtotal{{#unless multi_coupon_ui_enabled}} shipping-estimate-show{{/unless}}">
7-
{{#unless multi_coupon_ui_enabled}}<a href="#" class="shipping-estimate-value">{{/unless}}
8-
<span class="{{#if shipping_cost_discounted}}price--discounted{{/if}}">{{shipping_cost.formatted}}</span>
9-
{{#if shipping_cost_discounted}}
7+
{{#if multi_coupon_ui_enabled}}
8+
{{#and shipping_cost_discounted (if shipping_cost_discounted.formatted '!==' shipping_cost.formatted)}}
9+
<span class="price--discounted">{{shipping_cost.formatted}}</span>
1010
<span id="shipping-cost-discounted">{{shipping_cost_discounted.formatted}}</span>
11-
{{/if}}
12-
{{#unless multi_coupon_ui_enabled}}</a>{{/unless}}
11+
{{else}}
12+
<span id="shipping-cost-discounted">{{shipping_cost.formatted}}</span>
13+
{{/and}}
14+
{{else}}
15+
<a href="#" class="shipping-estimate-value">
16+
<span class="{{#if shipping_cost_discounted}}price--discounted{{/if}}">{{shipping_cost.formatted}}</span>
17+
{{#if shipping_cost_discounted}}
18+
<span id="shipping-cost-discounted">{{shipping_cost_discounted.formatted}}</span>
19+
{{/if}}
20+
</a>
21+
{{/if}}
1322
</div>
1423
</div>
1524
{{/if}}

templates/components/cart/totals.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<li class="cart-discount-item">
2727
<div class="cart-discount-item-label">
2828
<i class="icon" aria-hidden="true"><svg><use href="#icon-promotions" /></svg></i>
29-
<span class="cart-coupon-name">{{lang 'cart.automatic_promotion'}}</span>
29+
<span class="cart-coupon-name">{{lang 'cart.automatic_discount'}}</span>
3030
</div>
3131
<div class="cart-discount-item-value">
3232
{{cart.order_based_auto_discount_total.formatted}}
@@ -55,7 +55,7 @@
5555
{{/if}}
5656
</div>
5757
<div class="cart-discount-item-value">
58-
{{discount.formatted}}
58+
{{#if discount.value '===' 0}}-{{/if}}{{discount.formatted}}
5959
</div>
6060
</li>
6161
{{/each}}

0 commit comments

Comments
 (0)