ENGCOM-6152: Fixed Issue #25167:Terms and Conditions css height do nothing on frontend #25168

Author: VladimirZaets

app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php

@@ -102,7 +102,8 @@ protected function getAgreementsConfig()
                     : nl2br($this->escaper->escapeHtml($agreement->getContent())),
                 'checkboxText' => $this->escaper->escapeHtml($agreement->getCheckboxText()),
                 'mode' => $agreement->getMode(),
-                'agreementId' => $agreement->getAgreementId()
+                'agreementId' => $agreement->getAgreementId(),
+                'contentHeight' => $agreement->getContentHeight()
             ];
         }
 

app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php

@@ -77,6 +77,7 @@ public function testGetConfigIfContentIsHtml()
         $escapedCheckboxText = 'escaped_checkbox_text';
         $mode = \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO;
         $agreementId = 100;
+        $contentHeight = '100px';
         $expectedResult = [
             'checkoutAgreements' => [
                 'isEnabled' => 1,
@@ -86,6 +87,7 @@ public function testGetConfigIfContentIsHtml()
                         'checkboxText' => $escapedCheckboxText,
                         'mode' => $mode,
                         'agreementId' => $agreementId,
+                        'contentHeight' => $contentHeight
                     ],
                 ],
             ],
@@ -116,6 +118,7 @@ public function testGetConfigIfContentIsHtml()
         $agreement->expects($this->once())->method('getCheckboxText')->willReturn($checkboxText);
         $agreement->expects($this->once())->method('getMode')->willReturn($mode);
         $agreement->expects($this->once())->method('getAgreementId')->willReturn($agreementId);
+        $agreement->expects($this->once())->method('getContentHeight')->willReturn($contentHeight);
 
         $this->assertEquals($expectedResult, $this->model->getConfig());
     }
@@ -133,6 +136,7 @@ public function testGetConfigIfContentIsNotHtml()
         $escapedCheckboxText = 'escaped_checkbox_text';
         $mode = \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO;
         $agreementId = 100;
+        $contentHeight = '100px';
         $expectedResult = [
             'checkoutAgreements' => [
                 'isEnabled' => 1,
@@ -142,6 +146,7 @@ public function testGetConfigIfContentIsNotHtml()
                         'checkboxText' => $escapedCheckboxText,
                         'mode' => $mode,
                         'agreementId' => $agreementId,
+                        'contentHeight' => $contentHeight
                     ],
                 ],
             ],
@@ -172,6 +177,7 @@ public function testGetConfigIfContentIsNotHtml()
         $agreement->expects($this->once())->method('getCheckboxText')->willReturn($checkboxText);
         $agreement->expects($this->once())->method('getMode')->willReturn($mode);
         $agreement->expects($this->once())->method('getAgreementId')->willReturn($agreementId);
+        $agreement->expects($this->once())->method('getContentHeight')->willReturn($contentHeight);
 
         $this->assertEquals($expectedResult, $this->model->getConfig());
     }

app/code/Magento/CheckoutAgreements/view/frontend/web/js/view/checkout-agreements.js

@@ -23,6 +23,7 @@ define([
         agreements: agreementsConfig.agreements,
         modalTitle: ko.observable(null),
         modalContent: ko.observable(null),
+        contentHeight: ko.observable(null),
         modalWindow: null,
 
         /**
@@ -42,6 +43,7 @@ define([
         showContent: function (element) {
             this.modalTitle(element.checkboxText);
             this.modalContent(element.content);
+            this.contentHeight(element.contentHeight ? element.contentHeight : 'auto');
             agreementsModal.showModal();
         },
 

app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html

@@ -35,7 +35,7 @@
             <!-- /ko -->
         <!-- /ko -->
         <div id="checkout-agreements-modal" data-bind="afterRender: initModal" style="display: none">
-            <div class="checkout-agreements-item-content" data-bind="html: modalContent"></div>
+            <div class="checkout-agreements-item-content" data-bind="html: modalContent, style: {height: contentHeight, overflow:'auto' }"></div>
         </div>
     </div>
 </div>