From f73f3ef53932fc823e017905610e8021519bf4a5 Mon Sep 17 00:00:00 2001 From: Allan Aievoli Date: Mon, 30 Oct 2017 16:29:38 -0200 Subject: [PATCH 1/2] Fix missing discount label in checkout --- .../frontend/web/js/view/summary/discount.js | 16 ++++++++++++++++ .../web/template/cart/totals/discount.html | 2 +- .../frontend/web/template/summary/discount.html | 2 +- 3 files changed, 18 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 5b04700596272..e31266c744678 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,22 @@ define([ return this.totals()['coupon_label']; }, + getTitle: function () { + if (!this.totals()) { + return null; + } + + var total = this.totals(); + + for(var i = 0, len = total.total_segments.length; i < len; i++) { + if(total.total_segments[i].code == "discount") { + return total.total_segments[i].title; + } + } + + return 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 4b70b4b110c97..8fbb4a6ce74ae 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 @@ - + 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 17a9559fa01f2..017e358c7e419 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 @@ - + From 8bafcac3156b693a46ad0865e268f2e50d9ab97a Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Fri, 3 Nov 2017 17:46:09 -0500 Subject: [PATCH 2/2] Fix missing discount label in checkout #11883 - fixed code style --- .../frontend/web/js/view/summary/discount.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 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 e31266c744678..dba988a502115 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,20 +44,21 @@ define([ return this.totals()['coupon_label']; }, + /** + * Get discount title + * + * @returns {null|string} + */ getTitle: function () { + var discountSegments = null; if (!this.totals()) { return null; } - var total = this.totals(); - - for(var i = 0, len = total.total_segments.length; i < len; i++) { - if(total.total_segments[i].code == "discount") { - return total.total_segments[i].title; - } - } - - return null; + discountSegments = this.totals()['total_segments'].filter(function (segment) { + return (segment.code === 'discount'); + }); + return discountSegments.length ? discountSegments[0].title : null; }, /**