From 278fe6b9e205c6fe184acbaead7049e3e12ee244 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@ebay.com>
Date: Sun, 28 Jun 2015 13:28:22 +0300
Subject: [PATCH] MAGETWO-39264: [Improvement]"See our shipping policy"
supports only "one string text" there is no ability to split text to multi
line
---
app/code/Magento/Checkout/Model/DefaultConfigProvider.php | 8 +++++---
.../web/template/checkout/shipping/shipping-policy.html | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
index 864d88c5ab1..21911aec850 100644
--- a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
+++ b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
@@ -295,9 +295,11 @@ class DefaultConfigProvider implements ConfigProviderInterface
'shipping/shipping_policy/enable_shipping_policy',
ScopeInterface::SCOPE_STORE
),
- 'shippingPolicyContent' => $this->scopeConfig->getValue(
- 'shipping/shipping_policy/shipping_policy_content',
- ScopeInterface::SCOPE_STORE
+ 'shippingPolicyContent' => nl2br(
+ $this->scopeConfig->getValue(
+ 'shipping/shipping_policy/shipping_policy_content',
+ ScopeInterface::SCOPE_STORE
+ )
)
],
'activeCarriers' => $this->getActiveCarriers(),
diff --git a/app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html b/app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html
index 2952978ae29..1c0cc5c80e2 100644
--- a/app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html
+++ b/app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html
@@ -9,6 +9,6 @@
<!-- ko text: $t('See our shipping policy') --><!-- /ko -->
</span>
<div class="field-tooltip-content">
- <!-- ko text: config.shippingPolicyContent --><!-- /ko -->
+ <span data-bind="html: config.shippingPolicyContent"></span>
</div>
</div>
--
GitLab