Skip to content
Snippets Groups Projects
Unverified Commit ccf2a782 authored by Magento 2 Team's avatar Magento 2 Team Committed by GitHub
Browse files

:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - magento/magento2#13141: Fix missing discount label in checkout (by @ihor-sviziev)
 - magento-engcom/magento2ce#1207: No locale for Swedish (Finland). (by @nmalevanec)
 - magento/magento2#13082: Fix Magento_Checkout address formatting (by @nfourteen)


Fixed GitHub Issues:
 - magento/magento2#11428: Cart Price Rule Label is not working (reported by @sasilinux) has been fixed in magento/magento2#13141 by @ihor-sviziev in 2.2-develop branch
   Related commits:
     1. 976182b2
     2. 3fc1f40d
     3. 0f36e0ea

 - magento/magento2#11497: Discount Rule does not show Default Rule Label (reported by @pmoreno1980) has been fixed in magento/magento2#13141 by @ihor-sviziev in 2.2-develop branch
   Related commits:
     1. 976182b2
     2. 3fc1f40d
     3. 0f36e0ea

 - magento/magento2#13095: No locale for Swedish (Finland) (reported by @rasmuswikman) has been fixed in magento-engcom/magento2ce#1207 by @nmalevanec in 2.2-develop branch
   Related commits:
     1. ecaa2c01
parents 4700a065 1fe486d1
Branches
No related merge requests found
Showing
with 40 additions and 4 deletions
......@@ -7,7 +7,7 @@
<div class="billing-address-details" data-bind="if: isAddressDetailsVisible() && currentBillingAddress()">
<!-- ko text: currentBillingAddress().prefix --><!-- /ko --> <!-- ko text: currentBillingAddress().firstname --><!-- /ko --> <!-- ko text: currentBillingAddress().middlename --><!-- /ko -->
<!-- ko text: currentBillingAddress().lastname --><!-- /ko --> <!-- ko text: currentBillingAddress().suffix --><!-- /ko --><br/>
<!-- ko text: currentBillingAddress().street --><!-- /ko --><br/>
<!-- ko text: _.values(currentBillingAddress().street).join(", ") --><!-- /ko --><br/>
<!-- ko text: currentBillingAddress().city --><!-- /ko -->, <span data-bind="html: currentBillingAddress().region"></span> <!-- ko text: currentBillingAddress().postcode --><!-- /ko --><br/>
<!-- ko text: getCountryName(currentBillingAddress().countryId) --><!-- /ko --><br/>
<!-- ko if: (currentBillingAddress().telephone) -->
......
......@@ -7,7 +7,7 @@
<!-- ko if: (visible()) -->
<!-- ko text: address().prefix --><!-- /ko --> <!-- ko text: address().firstname --><!-- /ko --> <!-- ko text: address().middlename --><!-- /ko -->
<!-- ko text: address().lastname --><!-- /ko --> <!-- ko text: address().suffix --><!-- /ko --><br/>
<!-- ko text: address().street --><!-- /ko --><br/>
<!-- ko text: _.values(address().street).join(", ") --><!-- /ko --><br/>
<!-- ko text: address().city --><!-- /ko -->, <span data-bind="html: address().region"></span> <!-- ko text: address().postcode --><!-- /ko --><br/>
<!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
<!-- ko if: (address().telephone) -->
......
......@@ -44,6 +44,25 @@ define([
return this.totals()['coupon_label'];
},
/**
* Get discount title
*
* @returns {null|String}
*/
getTitle: function () {
var discountSegments;
if (!this.totals()) {
return null;
}
discountSegments = this.totals()['total_segments'].filter(function (segment) {
return segment.code === 'discount';
});
return discountSegments.length ? discountSegments[0].title : null;
},
/**
* @return {Number}
*/
......
......@@ -7,7 +7,7 @@
<!-- ko if: isDisplayed() -->
<tr class="totals">
<th colspan="1" style="" class="mark" scope="row">
<span class="title" data-bind="text: title"></span>
<span class="title" data-bind="text: getTitle()"></span>
<span class="discount coupon" data-bind="text: getCouponLabel()"></span>
</th>
<td class="amount" data-bind="attr: {'data-th': title}">
......
......@@ -7,7 +7,7 @@
<!-- ko if: isDisplayed() -->
<tr class="totals discount">
<th class="mark" scope="row">
<span class="title" data-bind="text: title"></span>
<span class="title" data-bind="text: getTitle()"></span>
<span class="discount coupon" data-bind="text: getCouponCode()"></span>
</th>
<td class="amount">
......
......@@ -80,6 +80,10 @@
margin-bottom: 0;
overflow: inherit;
}
.discount.coupon {
display: none;
}
}
// Products table
......
......@@ -49,6 +49,10 @@
}
}
.discount.coupon {
display: none;
}
.grand.incl {
& + .grand.excl {
.mark,
......
......@@ -166,6 +166,10 @@
text-align: left;
}
}
.discount.coupon {
display: none;
}
}
// Products table
......
......@@ -49,6 +49,10 @@
}
}
.discount.coupon {
display: none;
}
.grand.incl {
& + .grand.excl {
.mark,
......
......@@ -89,6 +89,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
'sq_AL', /*Albanian (Albania)*/
'sr_Cyrl_RS', /*Serbian (Serbia)*/
'sv_SE', /*Swedish (Sweden)*/
'sv_FI', /*Swedish (Finland)*/
'sw_KE', /*Swahili (Kenya)*/
'th_TH', /*Thai (Thailand)*/
'tr_TR', /*Turkish (Turkey)*/
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment