diff --git a/metadata.php b/metadata.php index b68b028..e280e0b 100644 --- a/metadata.php +++ b/metadata.php @@ -96,11 +96,6 @@ 'block' => 'select_payment', 'file' => 'views/frontend/blocks/page/checkout/select_payment.tpl' ], - [ - 'template' => 'page/checkout/payment.tpl', - 'block' => 'checkout_payment_main', - 'file' => 'views/frontend/blocks/page/checkout/checkout_payment_main.tpl' - ], [ 'template' => 'page/checkout/payment.tpl', 'block' => 'checkout_payment_nextstep', diff --git a/src/Controller/PaymentController.php b/src/Controller/PaymentController.php index 5762100..69cc931 100644 --- a/src/Controller/PaymentController.php +++ b/src/Controller/PaymentController.php @@ -77,25 +77,6 @@ public function getPaymentList() return $paymentList; } - public function isAdyenAssetsNecessary(): bool - { - if (is_null($this->assetsNecessary)) { - $this->assetsNecessary = false; - $paymentList = $this->getPaymentList(); - if (is_array($paymentList)) { - foreach ($paymentList as $paymentObj) { - /** @var AdyenPayment $paymentObj */ - if ($paymentObj->showInPaymentCtrl()) { - $this->assetsNecessary = true; - break; - } - } - } - $this->assetsNecessary = $this->assetsNecessary && !$this->isValidAdyenAuthorisation(); - } - return $this->assetsNecessary; - } - public function isActiveAdyenSession(): bool { /** @var SessionSettings $session */ diff --git a/views/frontend/blocks/page/checkout/checkout_payment_main.tpl b/views/frontend/blocks/page/checkout/checkout_payment_main.tpl deleted file mode 100644 index feba432..0000000 --- a/views/frontend/blocks/page/checkout/checkout_payment_main.tpl +++ /dev/null @@ -1,5 +0,0 @@ -[{if $oViewConf|method_exists:'checkAdyenHealth' && $oViewConf->checkAdyenHealth() && $oView->isAdyenAssetsNecessary()}] - [{* We include it as template, so that it can be modified in custom themes *}] - [{include file="modules/osc/adyen/payment/adyen_assets.tpl"}] -[{/if}] -[{$smarty.block.parent}] \ No newline at end of file