Merge remote-tracking branch 'origin/MC-38398' into 2.3.7-develop-pr150

Author: zakdma

app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml

@@ -72,7 +72,7 @@
                             $methodsCount = count($methods);
                             $methodsForms = $block->hasFormTemplates() ? $block->getFormTemplates(): [];
 
-                            foreach ($methods as $_method) :
+                            foreach ($methods as $_method):
                                     $code = $_method->getCode();
                                     $checked = $block->getSelectedMethodCode() === $code;
 
@@ -82,7 +82,7 @@
                                 ?>
                                 <div data-bind="scope: 'payment_method_<?= $block->escapeHtml($code);?>'">
                                     <dt class="item-title">
-                                        <?php if ($methodsCount > 1) : ?>
+                                        <?php if ($methodsCount > 1): ?>
                                             <input type="radio"
                                                    id="p_method_<?= $block->escapeHtml($code); ?>"
                                                    value="<?= $block->escapeHtmlAttr($code); ?>"
@@ -93,11 +93,11 @@
                                                        checked: isChecked,
                                                        click: selectPaymentMethod,
                                                        visible: isRadioButtonVisible()"
-                                                <?php if ($checked) : ?>
+                                                <?php if ($checked): ?>
                                                     checked="checked"
                                                 <?php endif; ?>
                                                    class="radio"/>
-                                        <?php else : ?>
+                                        <?php else: ?>
                                             <input type="radio"
                                                    id="p_method_<?= $block->escapeHtml($code); ?>"
                                                    value="<?= $block->escapeHtmlAttr($code); ?>"
@@ -112,7 +112,7 @@
                                             <?= $block->escapeHtml($_method->getTitle()) ?>
                                         </label>
                                     </dt>
-                                    <?php if ($html = $block->getChildHtml('payment.method.' . $code)) : ?>
+                                    <?php if ($html = $block->getChildHtml('payment.method.' . $code)): ?>
                                         <dd class="item-content <?= $checked ? '' : 'no-display'; ?>">
                                             <?= /* @noEscape */ $html; ?>
                                         </dd>
@@ -171,20 +171,20 @@
             'domReady!'
         ], function(quote, $) {
             quote.billingAddress({
-                    city: '<?= /* @noEscape */ $block->getAddress()->getCity() ?>',
-                    company: '<?= /* @noEscape */ $block->getAddress()->getCompany(); ?>',
-                    countryId: '<?= /* @noEscape */ $block->getAddress()->getCountryId(); ?>',
-                    customerAddressId: '<?= /* @noEscape */ $block->getAddress()->getCustomerAddressId(); ?>',
-                    customerId: '<?= /* @noEscape */ $block->getAddress()->getCustomerId(); ?>',
-                    fax: '<?= /* @noEscape */ $block->getAddress()->getFax(); ?>',
-                    firstname: '<?= /* @noEscape */ $block->getAddress()->getFirstname(); ?>',
-                    lastname: '<?= /* @noEscape */ $block->getAddress()->getLastname(); ?>',
-                    postcode: '<?= /* @noEscape */ $block->getAddress()->getPostcode(); ?>',
-                    regionId: '<?= /* @noEscape */ $block->getAddress()->getRegionId(); ?>',
-                    regionCode: '<?= /* @noEscape */ $block->getAddress()->getRegionCode() ?>',
-                    region: '<?= /* @noEscape */ $block->getAddress()->getRegion(); ?>',
+                    city: '<?= $block->escapeJs($block->getAddress()->getCity()); ?>',
+                    company: '<?= $block->escapeJs($block->getAddress()->getCompany()); ?>',
+                    countryId: '<?= $block->escapeJs($block->getAddress()->getCountryId()); ?>',
+                    customerAddressId: '<?= $block->escapeJs($block->getAddress()->getCustomerAddressId()); ?>',
+                    customerId: '<?= $block->escapeJs($block->getAddress()->getCustomerId()); ?>',
+                    fax: '<?= $block->escapeJs($block->getAddress()->getFax()); ?>',
+                    firstname: '<?= $block->escapeJs($block->getAddress()->getFirstname()); ?>',
+                    lastname: '<?= $block->escapeJs($block->getAddress()->getLastname()); ?>',
+                    postcode: '<?= $block->escapeJs($block->getAddress()->getPostcode()); ?>',
+                    regionId: '<?= $block->escapeJs($block->getAddress()->getRegionId()); ?>',
+                    regionCode: '<?= $block->escapeJs($block->getAddress()->getRegionCode()); ?>',
+                    region: '<?= $block->escapeJs($block->getAddress()->getRegion()); ?>',
                     street: <?= /* @noEscape */ json_encode($block->getAddress()->getStreet()); ?>,
-                    telephone: '<?= /* @noEscape */ $block->getAddress()->getTelephone(); ?>'
+                    telephone: '<?= $block->escapeJs($block->getAddress()->getTelephone()); ?>'
             });
         });
     //]]>