diff --git a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php index 864d88c5ab14f40b8dcf3547b3d5459fbbde53bf..21911aec850fcdc82c6163d2684fc10869fa8421 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 2952978ae29cc18eb0e96012ea92ab2105a1b3c8..1c0cc5c80e2efc4a25ad4c7f9e52266b569bbb82 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>