From d6e2ba6e821ff1d306f20bd10497a8adf0b8d34a Mon Sep 17 00:00:00 2001 From: Daniil Tkachev Date: Mon, 11 Nov 2024 14:11:04 +0100 Subject: [PATCH] UNZER-516 [Oxid 7] Remove auth/charge switch for ApplePay --- metadata.php | 10 +++++----- views/smarty/admin/blocks/admin_module_config_var.tpl | 2 +- .../themes/admin_twig/module_config.html.twig | 2 +- views/twig/frontend/tpl/order/unzer_applepay.html.twig | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/metadata.php b/metadata.php index 902a5d6d..98c24063 100644 --- a/metadata.php +++ b/metadata.php @@ -227,11 +227,11 @@ 'constraints' => '0|1' ], [ - 'group' => 'unzerapplepay', - 'name' => 'UnzerOption_oscunzer_applepay', - 'type' => 'select', - 'value' => '0', - 'constraints' => '0|1' + 'group' => 'unzerapplepay', + 'name' => 'UnzerOption_oscunzer_applepay', + 'type' => 'select', + 'value' => '0', + 'constraints' => '0' ], [ 'group' => 'unzerapplepay', diff --git a/views/smarty/admin/blocks/admin_module_config_var.tpl b/views/smarty/admin/blocks/admin_module_config_var.tpl index ea04f078..a8e6cecd 100644 --- a/views/smarty/admin/blocks/admin_module_config_var.tpl +++ b/views/smarty/admin/blocks/admin_module_config_var.tpl @@ -39,7 +39,7 @@ [{elseif $var_group eq "unzerapplepay"}] [{if $module_var eq "UnzerOption_oscunzer_applepay"}] - [{$smarty.block.parent}] +   [{elseif $module_var eq "applepay_merchant_capabilities" or $module_var eq "applepay_networks"}]
diff --git a/views/twig/extensions/themes/admin_twig/module_config.html.twig b/views/twig/extensions/themes/admin_twig/module_config.html.twig index 4e403033..6ca80f13 100644 --- a/views/twig/extensions/themes/admin_twig/module_config.html.twig +++ b/views/twig/extensions/themes/admin_twig/module_config.html.twig @@ -40,7 +40,7 @@
{% elseif var_group == "unzerapplepay" %} {% if module_var == "UnzerOption_oscunzer_applepay" %} - {{ parent() }} +   {% elseif module_var == "applepay_merchant_capabilities" or module_var == "applepay_networks" %}
diff --git a/views/twig/frontend/tpl/order/unzer_applepay.html.twig b/views/twig/frontend/tpl/order/unzer_applepay.html.twig index ca607a9e..605505b0 100644 --- a/views/twig/frontend/tpl/order/unzer_applepay.html.twig +++ b/views/twig/frontend/tpl/order/unzer_applepay.html.twig @@ -65,7 +65,7 @@ formData.append('merchantValidationUrl', event.validationURL); formData.append('stoken', '{{ oViewConf.getSessionChallengeToken() }}'); - fetch(decodedUrl, { + fetch(shopSelfUrl, { method: 'POST', mode: 'no-cors', headers: headers,