Skip to content

[EPC-9644] Implement secure inline-script renderer to MOTO and Pay by Link views #2929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
candemiralp merged 7 commits into from
Apr 22, 2025
Merged

[EPC-9644] Implement secure inline-script renderer to MOTO and Pay by Link views #2929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bed631f
[EPC-9644] Implement secure renderer for inline-scripts of admin orde…
candemiralp Apr 2, 2025
9f360cd
Merge branch 'main' into ECP-9644
candemiralp Apr 3, 2025
884d019
Merge branch 'main' into ECP-9644
candemiralp Apr 4, 2025
8e45471
Merge branch 'main' into ECP-9644
khushboo-singhvi Apr 16, 2025
92e834b
Merge branch 'main' into ECP-9644
khushboo-singhvi Apr 18, 2025
e7aff69
Merge branch 'main' into ECP-9644
candemiralp Apr 22, 2025
b8c492b
[EPC-9644] Remove unnecessary variable for the payment method code
candemiralp Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 29 additions & 19 deletions view/adminhtml/templates/form/moto.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
/**
* @var \Adyen\Payment\Block\Form\Moto $block
*/
$code = $block->escapeHtml($block->getMethodCode());
$ccType = $block->getInfoData('cc_type');
$ccExpMonth = $block->getInfoData('cc_exp_month');
$ccExpYear = $block->getInfoData('cc_exp_year');
Expand All @@ -22,20 +21,20 @@ $motoMerchantAccounts = $block->getMotoMerchantAccounts();
?>

<fieldset class="admin__fieldset payment-method"
id="payment_form_<?= /* @noEscape */ $code; ?>"
id="payment_form_adyen_moto"
style="display:none">

<input name="payment[stateData]" id="<?= /* @noEscape */ $code; ?>-statedata" type="hidden">
<input name="payment[motoMerchantAccount]" id="<?= /* @noEscape */ $code; ?>-merchant-account" type="hidden">
<input name="payment[stateData]" id="adyen_moto-statedata" type="hidden">
<input name="payment[motoMerchantAccount]" id="adyen_moto-merchant-account" type="hidden">

<label for="<?= /* @noEscape */ $code; ?>_merchant_accounts" class="admin__field-label">
<label for="adyen_moto_merchant_accounts" class="admin__field-label">
<span>
<?= $escaper->escapeHtml(__('MOTO Merchant Account')) ?>
</span>
</label>
<?php if ($motoMerchantAccounts): ?>
<div class="admin__field-control">
<select id="<?= /* @noEscape */ $code; ?>_merchant_accounts" class="required-entry admin__control-select">
<select id="adyen_moto_merchant_accounts" class="required-entry admin__control-select">
<option value=""><?= $escaper->escapeHtml(__('Please select...')) ?></option>
<?php foreach ($motoMerchantAccounts as $key => $value): ?>
<option value="<?= $escaper->escapeHtmlAttr($key) ?>" data-adyen-client-key="<?= $escaper->escapeHtmlAttr($value['clientkey']) ?>"><?= $escaper->escapeHtml($key) ?></option>
Expand All @@ -47,9 +46,17 @@ $motoMerchantAccounts = $block->getMotoMerchantAccounts();
<?= $escaper->escapeHtml(__('No Adyen MOTO merchant account found. Please configure MOTO merchant accounts in the plugin configuration page.')) ?>
</p>
<?php endif ?>
<div id="cardContainer-<?= /* @noEscape */ $code; ?>" style=""></div>
<div id="cardContainer-adyen_moto" style=""></div>

<script>
<?php
$availableCcTypesByAlt = json_encode($block->getCcAvailableTypesByAlt());
$countryCode = $block->getCountryId();
$environment = $block->getCheckoutEnvironment();
$locale = $block->getLocale();
$amount = $block->getAmount();
$formattedInstallments = $block->getFormattedInstallments();

$scriptString = <<<script
define(
'renderCheckoutComponent',
[
Expand All @@ -65,8 +72,8 @@ $motoMerchantAccounts = $block->getMotoMerchantAccounts();
return card;
},
init: function (clientKey, amount, installmentAmounts) {
(async function () { // RequireJS does not support async callback
var ccTypes = <?= /* @noEscape */ json_encode($block->getCcAvailableTypesByAlt()); ?>;
(async function () {
var ccTypes = $availableCcTypesByAlt;

// Get cc type by adyen cc type
var getCcCodeByAltCode = function (altCode) {
Expand All @@ -77,12 +84,12 @@ $motoMerchantAccounts = $block->getMotoMerchantAccounts();
return "";
}

var cardNode = document.getElementById("cardContainer-<?= /* @noEscape */ $code; ?>");
var cardNode = document.getElementById("cardContainer-adyen_moto");

var checkout = await AdyenCheckout({
clientKey: clientKey,
environment: "<?= /* @noEscape */ $block->getCheckoutEnvironment(); ?>",
locale: "<?= /* @noEscape */ $block->getLocale(); ?>",
environment: "$environment",
locale: "$locale",
risk: {
enabled: false
},
Expand All @@ -99,7 +106,7 @@ $motoMerchantAccounts = $block->getMotoMerchantAccounts();
amount: amount,
onChange: function (state) {
if (state.isValid) {
$('#<?= /* @noEscape */ $code; ?>-statedata').val(JSON.stringify(state.data));
$('#adyen_moto-statedata').val(JSON.stringify(state.data));
}
}
});
Expand All @@ -123,13 +130,13 @@ $motoMerchantAccounts = $block->getMotoMerchantAccounts();
'renderCheckoutComponent',
],
function ($, renderCheckoutComponent) {
$("#<?= /* @noEscape */ $code; ?>_merchant_accounts").on("change", function () {
$("#adyen_moto_merchant_accounts").on("change", function () {
if (renderCheckoutComponent.status() !== null) {
renderCheckoutComponent.unmount();
}

let amount = <?= /* @noEscape */ $block->getAmount(); ?>;
let installmentAmounts = <?= /* @noEscape */ $block->getFormattedInstallments(); ?>;
let amount = $amount;
let installmentAmounts = $formattedInstallments;

let clientKey = $(this).find("option:selected").attr('data-adyen-client-key');
let merchantAccount = $(this).find("option:selected").val();
Expand All @@ -138,10 +145,13 @@ $motoMerchantAccounts = $block->getMotoMerchantAccounts();
return;
}

$("#<?= /* @noEscape */ $code; ?>-merchant-account").val(merchantAccount);
$("#adyen_moto-merchant-account").val(merchantAccount);
renderCheckoutComponent.init(clientKey, amount, installmentAmounts);
});
}
);
</script>
script;
?>

<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
</fieldset>
18 changes: 13 additions & 5 deletions view/adminhtml/templates/form/pay_by_link.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,28 @@ if (!isset($escaper)) {
}
?>

<script>
<?php
$minData = $escaper->escapeHtml($block->getMinExpiryTimestamp());
$maxData = $escaper->escapeHtml($block->getMaxExpiryTimestamp());
$defaultExpiry = $block->escapeJs($block->getDefaultExpiryDate());

$scriptString = <<<script
require(["jquery", "mage/calendar"],
function ($) {
$("#adyen_pbl_expires_at").calendar({
changeYear: true,
changeMonth: true,
buttonText: 'Select Expiry Date',
dateFormat: 'dd-mm-yy',
minDate: new Date(<?=$escaper->escapeHtml($block->getMinExpiryTimestamp())?>),
maxDate: new Date(<?=$escaper->escapeHtml($block->getMaxExpiryTimestamp())?>)
}).val('<?= $block->escapeJs($block->getDefaultExpiryDate()) ?>');
minDate: new Date($minData),
maxDate: new Date($maxData)
}).val('$defaultExpiry');

});
</script>
script;
?>

<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

<fieldset
class="admin__fieldset payment-method"
Expand Down
Loading