Skip to content

Commit 03fe58f

Browse files
committed
ACP2E-1162: Poor user experience on checkout - update shipping price message/add some notice
1 parent a047c76 commit 03fe58f

File tree

5 files changed

+9
-28
lines changed

5 files changed

+9
-28
lines changed

app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontNotCalculatedValueInShippingTotalInOrderSummaryActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</annotations>
1515

1616
<arguments>
17-
<argument name="value" defaultValue="Not yet calculated" type="string"/>
17+
<argument name="value" defaultValue="Selected shipping method is not available. Please select another shipping method for this order." type="string"/>
1818
</arguments>
1919
<waitForElementVisible selector="{{CheckoutOrderSummarySection.shippingTotalNotYetCalculated}}" time="30" stepKey="waitForShippingTotalToBeVisible"/>
2020
<see selector="{{CheckoutOrderSummarySection.shippingTotalNotYetCalculated}}" userInput="{{value}}" stepKey="assertShippingTotalIsNotYetCalculated"/>

app/code/Magento/Checkout/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ Summary,Summary
176176
"We'll send your order confirmation here.","We'll send your order confirmation here."
177177
Payment,Payment
178178
"Not yet calculated","Not yet calculated"
179+
"Selected shipping method is not available. Please select another shipping method for this order.","Selected shipping method is not available. Please select another shipping method for this order."
179180
"The order was not successful!","The order was not successful!"
180181
"Thank you for your purchase!","Thank you for your purchase!"
181182
"Password", "Password"

app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@
373373
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/shipping</item>
374374
<item name="config" xsi:type="array">
375375
<item name="title" xsi:type="string" translate="true">Shipping</item>
376-
<item name="notCalculatedMessage" xsi:type="string" translate="true">Not yet calculated</item>
376+
<item name="notCalculatedMessage" xsi:type="string" translate="true">Selected shipping method is not available. Please select another shipping method for this order.</item>
377377
</item>
378378
</item>
379379
<item name="grand-total" xsi:type="array">

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070

7171
.not-calculated {
7272
font-style: italic;
73+
white-space: normal;
7374
}
7475

7576
//
@@ -82,15 +83,7 @@
8283
border-bottom: @border-width__base solid @border-color__base;
8384
.lib-css(padding, @indent__s @indent__xl @indent__s 0);
8485
cursor: pointer;
85-
.lib-icon-font(
86-
@icon-down,
87-
@_icon-font-size: 30px,
88-
@_icon-font-line-height: 12px,
89-
@_icon-font-text-hide: true,
90-
@_icon-font-margin: 3px 0 0,
91-
@_icon-font-position: after,
92-
@_icon-font-display: block
93-
);
86+
.lib-icon-font(@icon-down, @_icon-font-size: 30px, @_icon-font-line-height: 12px, @_icon-font-text-hide: true, @_icon-font-margin: 3px 0 0, @_icon-font-position: after, @_icon-font-display: block);
9487
margin-bottom: 0;
9588
position: relative;
9689

@@ -109,10 +102,7 @@
109102

110103
&.active {
111104
> .title {
112-
.lib-icon-font-symbol(
113-
@_icon-font-content: @icon-up,
114-
@_icon-font-position: after
115-
);
105+
.lib-icon-font-symbol(@_icon-font-content: @icon-up, @_icon-font-position: after);
116106
}
117107
}
118108

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070

7171
.not-calculated {
7272
font-style: italic;
73+
white-space: normal;
7374
}
7475

7576
//
@@ -82,15 +83,7 @@
8283
border-bottom: @border-width__base solid @border-color__base;
8384
.lib-css(padding, @indent__s @indent__xl @indent__s 0);
8485
cursor: pointer;
85-
.lib-icon-font(
86-
@icon-down,
87-
@_icon-font-size: 12px,
88-
@_icon-font-line-height: 12px,
89-
@_icon-font-text-hide: true,
90-
@_icon-font-margin: 3px 0 0,
91-
@_icon-font-position: after,
92-
@_icon-font-display: block
93-
);
86+
.lib-icon-font(@icon-down, @_icon-font-size: 12px, @_icon-font-line-height: 12px, @_icon-font-text-hide: true, @_icon-font-margin: 3px 0 0, @_icon-font-position: after, @_icon-font-display: block);
9487
margin-bottom: 0;
9588
position: relative;
9689

@@ -109,10 +102,7 @@
109102

110103
&.active {
111104
> .title {
112-
.lib-icon-font-symbol(
113-
@_icon-font-content: @icon-up,
114-
@_icon-font-position: after
115-
);
105+
.lib-icon-font-symbol(@_icon-font-content: @icon-up, @_icon-font-position: after);
116106
}
117107
}
118108

0 commit comments

Comments
 (0)