From 976182b27212fb22bdb12c0a2da3e6a3e7231368 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Thu, 11 Jan 2018 18:32:36 +0200
Subject: [PATCH] Fix missing discount label in checkout
---
.../frontend/web/js/view/summary/discount.js | 17 +++++++++++++++++
.../web/template/cart/totals/discount.html | 2 +-
.../frontend/web/template/summary/discount.html | 2 +-
.../web/css/source/module/_cart.less | 4 ++++
.../source/module/checkout/_order-summary.less | 4 ++++
.../web/css/source/module/_cart.less | 4 ++++
.../source/module/checkout/_order-summary.less | 4 ++++
7 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/app/code/Magento/SalesRule/view/frontend/web/js/view/summary/discount.js b/app/code/Magento/SalesRule/view/frontend/web/js/view/summary/discount.js
index 5b047005962..8574d355eb3 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/js/view/summary/discount.js
+++ b/app/code/Magento/SalesRule/view/frontend/web/js/view/summary/discount.js
@@ -44,6 +44,23 @@ define([
return this.totals()['coupon_label'];
},
+ /**
+ * Get discount title
+ *
+ * @returns {null|string}
+ */
+ getTitle: function () {
+ if (!this.totals()) {
+ return null;
+ }
+
+ var discountSegments = this.totals()['total_segments'].filter(function (segment) {
+ return (segment.code === 'discount');
+ });
+
+ return discountSegments.length ? discountSegments[0].title : null;
+ },
+
/**
* @return {Number}
*/
diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html
index 4b70b4b110c..8fbb4a6ce74 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/cart/totals/discount.html
@@ -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}">
diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html
index 17a9559fa01..017e358c7e4 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/summary/discount.html
@@ -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">
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less
index 871c9e63490..bb14a3c2521 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less
@@ -80,6 +80,10 @@
margin-bottom: 0;
overflow: inherit;
}
+
+ .discount.coupon {
+ display: none;
+ }
}
// Products table
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
index 5da1faeb821..43c2ad50c7a 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
@@ -49,6 +49,10 @@
}
}
+ .discount.coupon {
+ display: none;
+ }
+
.grand.incl {
& + .grand.excl {
.mark,
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index b6193914020..4b8db9202b1 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -166,6 +166,10 @@
text-align: left;
}
}
+
+ .discount.coupon {
+ display: none;
+ }
}
// Products table
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
index ec2e95b7d82..5ecc4d4713b 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
@@ -49,6 +49,10 @@
}
}
+ .discount.coupon {
+ display: none;
+ }
+
.grand.incl {
& + .grand.excl {
.mark,
--
GitLab