diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml index 01ed26d5e57a6..f27e417feeeca 100644 --- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml +++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml @@ -6,16 +6,17 @@ /** * @var $block \Magento\OfflinePayments\Block\Form\Banktransfer + * @var \Magento\Framework\Escaper $escaper * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ $instructions = $block->getInstructions(); ?> - escapeHtml($block->getMethodCode());?> + escapeHtml($block->getMethodCode());?> diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml index c1b07f08d4ce3..674c7f4d0e387 100644 --- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml +++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml @@ -6,16 +6,17 @@ /** * @var $block \Magento\OfflinePayments\Block\Form\Cashondelivery + * @var \Magento\Framework\Escaper $escaper * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ $instructions = $block->getInstructions(); ?> - escapeHtml($block->getMethodCode());?> + escapeHtml($block->getMethodCode());?> diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml index 789a3921b2c21..591d6918daadc 100644 --- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml +++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml @@ -6,24 +6,25 @@ /** * @var $block \Magento\OfflinePayments\Block\Form\Checkmo + * @var \Magento\Framework\Escaper $escaper * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ ?> -
+
getMethod()->getPayableTo()): ?> - - escapeHtml($block->getMethod()->getPayableTo()) ?> + + escapeHtml($block->getMethod()->getPayableTo()) ?> getMethod()->getMailingAddress()): ?>
- +
- escapeHtml($block->getMethod()->getMailingAddress())) ?> + escapeHtml($block->getMethod()->getMailingAddress())) ?>
renderStyleAsTag( "display:none", - 'fieldset#payment_form_' . $block->escapeJs($block->getMethodCode()) + 'fieldset#payment_form_' . $escaper->escapeJs($block->getMethodCode()) ) ?> diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml index a1e3da2713811..ad9d610356b04 100644 --- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml +++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml @@ -6,17 +6,18 @@ /** * @var $block \Magento\OfflinePayments\Block\Form\Purchaseorder + * @var \Magento\Framework\Escaper $escaper * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ ?> -
+
" + title="escapeHtml(__("Purchase Order Number")) ?>" class="required-entry admin__control-text" value="getInfoData('po_number') ?>"/>
@@ -24,5 +25,5 @@
renderStyleAsTag( "display:none", - 'fieldset#payment_form_' . $block->escapeJs($block->getMethodCode()) + 'fieldset#payment_form_' . $escaper->escapeJs($block->getMethodCode()) ) ?> diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml index 28395f8eeb849..dbdb3455e9a92 100644 --- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml +++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml @@ -6,18 +6,19 @@ /** * @var $block \Magento\OfflinePayments\Block\Info\Checkmo + * @var \Magento\Framework\Escaper $escaper */ $paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId()); ?> -escapeHtml($paymentTitle) ?> +escapeHtml($paymentTitle) ?> getInfo()->getAdditionalInformation()) : ?> getPayableTo()) : ?> -
escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?> +
escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?> getMailingAddress()) : ?> - +
- escapeHtml($block->getMailingAddress())) ?> + escapeHtml($block->getMailingAddress())) ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml index f85a8f8357dd9..2b97752635076 100644 --- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml +++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml @@ -6,21 +6,22 @@ /** * @var $block \Magento\OfflinePayments\Block\Info\Checkmo + * @var \Magento\Framework\Escaper $escaper */ $paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId()); ?> -escapeHtml($paymentTitle) ?> +escapeHtml($paymentTitle) ?> {{pdf_row_separator}} getInfo()->getAdditionalInformation()) : ?> {{pdf_row_separator}} getPayableTo()) : ?> - escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?> + escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?> {{pdf_row_separator}} getMailingAddress()) : ?> - escapeHtml(__('Send Check to:')) ?> + escapeHtml(__('Send Check to:')) ?> {{pdf_row_separator}} - escapeHtml($block->getMailingAddress())) ?> + escapeHtml($block->getMailingAddress())) ?> {{pdf_row_separator}} diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/purchaseorder.phtml index 4a6ea1c00b21c..0ccc8b6f24e42 100644 --- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/purchaseorder.phtml +++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/purchaseorder.phtml @@ -5,7 +5,8 @@ */ /** * @var $block \Magento\OfflinePayments\Block\Info\Purchaseorder + * @var \Magento\Framework\Escaper $escaper */ ?> -escapeHtml(__('Purchase Order Number: %1', $block->getInfo()->getPoNumber())) ?> +escapeHtml(__('Purchase Order Number: %1', $block->getInfo()->getPoNumber())) ?> {{pdf_row_separator}} diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml index ae7f654a1350b..62e2db0fb64c1 100644 --- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml +++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml @@ -5,13 +5,14 @@ */ /** * @var $block \Magento\OfflinePayments\Block\Info\Purchaseorder + * @var \Magento\Framework\Escaper $escaper */ $paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId()); ?> -
escapeHtml($paymentTitle) ?>
+
escapeHtml($paymentTitle) ?>
- - + +
escapeHtml(__('Purchase Order Number')) ?>:escapeHtml($block->getInfo()->getPoNumber()) ?>escapeHtml(__('Purchase Order Number')) ?>:escapeHtml($block->getInfo()->getPoNumber()) ?>
diff --git a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml index d8d952526e67b..1d96e3709ddb6 100644 --- a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml +++ b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml @@ -6,20 +6,21 @@ /** * @var $block \Magento\OfflinePayments\Block\Info\Checkmo + * @var \Magento\Framework\Escaper $escaper */ ?> -escapeHtml($block->getMethod()->getTitle()) ?> +escapeHtml($block->getMethod()->getTitle()) ?> {{pdf_row_separator}} getInfo()->getAdditionalInformation()) : ?> {{pdf_row_separator}} getPayableTo()) : ?> - escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?> + escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?> {{pdf_row_separator}} getMailingAddress()) : ?> - escapeHtml(__('Send Check to:')) ?> + escapeHtml(__('Send Check to:')) ?> {{pdf_row_separator}} - escapeHtml($block->getMailingAddress())) ?> + escapeHtml($block->getMailingAddress())) ?> {{pdf_row_separator}} diff --git a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml index 4a6ea1c00b21c..0ccc8b6f24e42 100644 --- a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml +++ b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml @@ -5,7 +5,8 @@ */ /** * @var $block \Magento\OfflinePayments\Block\Info\Purchaseorder + * @var \Magento\Framework\Escaper $escaper */ ?> -escapeHtml(__('Purchase Order Number: %1', $block->getInfo()->getPoNumber())) ?> +escapeHtml(__('Purchase Order Number: %1', $block->getInfo()->getPoNumber())) ?> {{pdf_row_separator}} diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml index 97288194342ba..2342d59f5143d 100644 --- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml +++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml @@ -6,15 +6,16 @@ /** * @var $block \Magento\OfflinePayments\Block\Form\Banktransfer + * @var \Magento\Framework\Escaper $escaper * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ $instructions = $block->getInstructions(); ?> - escapeHtml($block->getMethodCode());?> + escapeHtml($block->getMethodCode());?>
- escapeHtml($instructions)) ?> + escapeHtml($instructions)) ?>
renderStyleAsTag( "display:none", diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml index 160c1d27052f0..88892b96191b9 100644 --- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml +++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml @@ -6,15 +6,16 @@ /** * @var $block \Magento\OfflinePayments\Block\Form\Cashondelivery + * @var \Magento\Framework\Escaper $escaper * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ $instructions = $block->getInstructions(); ?> - escapeHtml($block->getMethodCode());?> + escapeHtml($block->getMethodCode());?>
- escapeHtml($instructions)) ?> + escapeHtml($instructions)) ?>
renderStyleAsTag( "display:none", diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml index 3b381bbf72f4f..85f23b9be1960 100644 --- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml +++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml @@ -6,26 +6,27 @@ /** * @var $block \Magento\OfflinePayments\Block\Form\Checkmo + * @var \Magento\Framework\Escaper $escaper * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ ?> getMethod()->getMailingAddress() || $block->getMethod()->getPayableTo()): ?> -
+
getMethod()->getPayableTo()): ?> -
escapeHtml(__('Make Check payable to:')) ?>
-
escapeHtml($block->getMethod()->getPayableTo()) ?>
+
escapeHtml(__('Make Check payable to:')) ?>
+
escapeHtml($block->getMethod()->getPayableTo()) ?>
getMethod()->getMailingAddress()): ?> -
escapeHtml(__('Send Check to:')) ?>
+
escapeHtml(__('Send Check to:')) ?>
- escapeHtml($block->getMethod()->getMailingAddress())) ?> + escapeHtml($block->getMethod()->getMailingAddress())) ?>
renderStyleAsTag( "display:none", - 'dl#payment_form_' . $block->escapeJs($block->getMethodCode()) + 'dl#payment_form_' . $escaper->escapeJs($block->getMethodCode()) ) ?> diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml index 35ef5d9db8616..bc9cb41cbaf0f 100644 --- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml +++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml @@ -6,19 +6,20 @@ /** * @var $block \Magento\OfflinePayments\Block\Form\Purchaseorder + * @var \Magento\Framework\Escaper $escaper * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ -$methodCode = $block->escapeHtml($block->getMethodCode()); +$methodCode = $escaper->escapeHtml($block->getMethodCode()); ?>
- +
+ value="escapeHtml($block->getInfoData('po_number')) ?>" />
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml index 2dc226db4264c..099047fbbdfe7 100644 --- a/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml +++ b/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml @@ -6,22 +6,23 @@ /** * @var $block \Magento\OfflinePayments\Block\Info\Checkmo + * @var \Magento\Framework\Escaper $escaper */ ?>
-
escapeHtml($block->getMethod()->getTitle()) ?>
+
escapeHtml($block->getMethod()->getTitle()) ?>
getInfo()->getAdditionalInformation()) : ?> getPayableTo()) : ?>
- escapeHtml(__('Make Check payable to')) ?> - escapeHtml($block->getPayableTo()) ?> + escapeHtml(__('Make Check payable to')) ?> + escapeHtml($block->getPayableTo()) ?>
getMailingAddress()) : ?>
- escapeHtml(__('Send Check to')) ?> + escapeHtml(__('Send Check to')) ?>
- escapeHtml($block->getMailingAddress())) ?> + escapeHtml($block->getMailingAddress())) ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/info/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/info/purchaseorder.phtml index 523c2f8e9c0b4..c8dad6cecd937 100644 --- a/app/code/Magento/OfflinePayments/view/frontend/templates/info/purchaseorder.phtml +++ b/app/code/Magento/OfflinePayments/view/frontend/templates/info/purchaseorder.phtml @@ -5,12 +5,13 @@ */ /** * @var $block \Magento\OfflinePayments\Block\Info\Purchaseorder + * @var \Magento\Framework\Escaper $escaper */ ?>
-
escapeHtml($block->getMethod()->getTitle()) ?>
+
escapeHtml($block->getMethod()->getTitle()) ?>
- escapeHtml(__('Purchase Order Number')) ?> - escapeHtml($block->getInfo()->getPoNumber()) ?> + escapeHtml(__('Purchase Order Number')) ?> + escapeHtml($block->getInfo()->getPoNumber()) ?>