diff --git a/Api/NNRepositoryInterface.php b/Api/NNRepositoryInterface.php
new file mode 100755
index 0000000..609970b
--- /dev/null
+++ b/Api/NNRepositoryInterface.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Api;
+
+interface NNRepositoryInterface
+{
+    /**
+     * Novalnet product activation key auto config
+     *
+     * @api
+     * @param string $signature
+     * @param string $payment_access_key
+     * @return string
+     */
+    public function activateProductKey($signature, $payment_access_key);
+
+    /**
+     * Novalnet Webhook URL configuration
+     *
+     * @api
+     * @param string $signature
+     * @param string $payment_access_key
+     * @return string
+     */
+    public function configWebhookUrl($signature, $payment_access_key);
+
+    /**
+     * Get redirect URL
+     *
+     * @api
+     * @param string[] $data
+     * @return string
+     */
+    public function getRedirectURL($data);
+
+    /**
+     * Remove Novalnet payment token
+     *
+     * @api
+     * @param int $transactionRowId
+     * @return bool
+     */
+    public function removeToken($transactionRowId);
+
+    /**
+     * Get Instalment payment options
+     *
+     * @api
+     * @param string $code
+     * @param float $total
+     * @return string
+     */
+    public function getInstalmentOptions($code, $total);
+
+    /**
+     * Get Instalment payment cycle details
+     *
+     * @api
+     * @param float $amount
+     * @param int $period
+     * @return string
+     */
+    public function getInstalmentCycleAmount($amount, $period);
+
+    /**
+     * Novalnet payment callback
+     *
+     * @api
+     * @return string
+     */
+    public function callback();
+
+    /**
+     * Add to Cart
+     *
+     * @api
+     * @param string $data
+     * @return string
+     */
+    public function addToCart($data);
+
+    /**
+     * Place Order
+     *
+     * @api
+     * @param string[] $paymentData
+     * @param string[] $billingAddress
+     * @param string[] $shippingAddress
+     * @param string[] $shippingMethod
+     * @param bool $isPaymentPage
+     * @return string
+     */
+    public function placeOrder($paymentData, $billingAddress, $shippingAddress = [], $shippingMethod = [], $isPaymentPage = false);
+
+    /**
+     * Get Cart Contents
+     *
+     * @api
+     * @return string
+     */
+    public function getCart();
+
+    /**
+     * Estimate Shipping by Address
+     *
+     * @api
+     * @param string[] $address
+     * @return string
+     */
+    public function estimateShippingMethod($address);
+
+    /**
+     * Get express checkout request params for Product page
+     *
+     * @api
+     * @param string[] $data
+     * @return string
+     */
+    public function getProductPageParams($data);
+
+    /**
+     * Apply shipping method and calculate totals
+     *
+     * @api
+     * @param string[] $shippingMethod
+     * @return string
+     */
+    public function applyShippingMethod($shippingMethod);
+}
diff --git a/Block/Adminhtml/Button/Control.php b/Block/Adminhtml/Button/Control.php
new file mode 100755
index 0000000..3990dbc
--- /dev/null
+++ b/Block/Adminhtml/Button/Control.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Adminhtml\Button;
+
+use Magento\Backend\Block\Widget\Button\Toolbar as ToolbarContext;
+use Magento\Framework\View\Element\AbstractBlock;
+use Magento\Backend\Block\Widget\Button\ButtonList;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class Control extends \Magento\Sales\Block\Adminhtml\Order\View
+{
+    /**
+     * @var \Magento\Framework\Registry
+     */
+    protected $coreRegistry = null;
+
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Magento\Framework\Registry $registry
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     */
+    public function __construct(
+        \Magento\Framework\Registry $registry,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer
+    ) {
+        $this->coreRegistry = $registry;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Before push buttons
+     *
+     * @param ToolbarContext $toolbar
+     * @param AbstractBlock $context
+     * @param ButtonList $buttonList
+     * @return mixed
+     */
+    public function beforePushButtons(
+        ToolbarContext $toolbar,
+        \Magento\Framework\View\Element\AbstractBlock $context,
+        \Magento\Backend\Block\Widget\Button\ButtonList $buttonList
+    ) {
+        if ($context instanceof \Magento\Sales\Block\Adminhtml\Order\Invoice\View) {
+            $orderPayment = $context->getInvoice()->getOrder()->getPayment();
+            if ($orderPayment->getMethodInstance()->getCode() == ConfigProvider::NOVALNET_INVOICE) {
+                $buttonList->remove('capture');
+            }
+            return [$context, $buttonList];
+        }
+
+        if (!$context instanceof \Magento\Sales\Block\Adminhtml\Order\View) {
+            return [$context, $buttonList];
+        }
+
+        $order = $this->getOrder();
+        $payment = $order->getPayment();
+        $paymentMethodCode = $payment->getMethodInstance()->getCode();
+        if (!empty($paymentMethodCode) && preg_match('/novalnet/i', $paymentMethodCode)) {
+
+            $additionalData = [];
+            if (!empty($payment->getAdditionalData())) {
+                $additionalData = $this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+                    ? $this->serializer->unserialize($payment->getAdditionalData())
+                    : json_decode($payment->getAdditionalData(), true);
+            }
+
+            $transactionStatus = !empty($additionalData['NnStatus'])
+                ? $this->novalnetRequestHelper->getStatus($additionalData['NnStatus'], $order) : '';
+
+            if ($transactionStatus) {
+                // remove Capture button
+                $buttonList->update('order_invoice', 'label', __('Capture'));
+
+                if (in_array($transactionStatus, ['PENDING', 'DEACTIVATED']) || !empty($additionalData['NnZeroAmountBooking'])) {
+                    $buttonList->remove('order_invoice');
+                }
+
+                if ($order->canInvoice() && $transactionStatus == 'ON_HOLD' &&
+                    $paymentMethodCode == ConfigProvider::NOVALNET_INVOICE
+                ) {
+                    $buttonList->remove('order_invoice');
+                    $message = __('Are you sure you want to capture the payment?');
+                    $capturePaymentUrl = $context->getUrl(
+                        'novalnetpayment/sales/ordercapture',
+                        ['order_id' => $order->getId()]
+                    );
+
+                    $buttonList->add(
+                        'novalnet_confirm',
+                        [
+                            'label' => __('Novalnet Capture'),
+                            'onclick' => "confirmSetLocation('{$message}', '{$capturePaymentUrl}')"
+                        ]
+                    );
+                }
+
+                if ($transactionStatus == 'ON_HOLD') {
+                    $buttonList->remove('void_payment');
+                    $message = __('Are you sure you want to cancel the payment?');
+                    $voidPaymentUrl = $context->getUrl(
+                        'sales/*/voidPayment',
+                        ['order_id' => $order->getId()]
+                    );
+                    $buttonList->add(
+                        'void_payment',
+                        [
+                            'label' => __('Void'),
+                            'onclick' => "confirmSetLocation('{$message}', '{$voidPaymentUrl}')"
+                        ]
+                    );
+                }
+
+                if ($transactionStatus == 'PENDING' && $this->novalnetConfig->isRedirectPayment($paymentMethodCode) ||
+                    in_array(
+                        $paymentMethodCode,
+                        [
+                            ConfigProvider::NOVALNET_PREPAYMENT,
+                            ConfigProvider::NOVALNET_CASHPAYMENT,
+                            ConfigProvider::NOVALNET_MULTIBANCO
+                        ]
+                    )
+                ) {
+                    $buttonList->remove('order_cancel'); // remove Cancel button
+                    $buttonList->remove('void_payment'); // remove Void button
+                }
+            }
+        }
+
+        return [$context, $buttonList];
+    }
+
+    /**
+     * Retrieve order model object
+     *
+     * @return \Magento\Sales\Model\Order
+     */
+    public function getOrder()
+    {
+        return $this->coreRegistry->registry('sales_order');
+    }
+}
diff --git a/Block/Adminhtml/Sales/Order/View/Tab/Instalment.php b/Block/Adminhtml/Sales/Order/View/Tab/Instalment.php
new file mode 100755
index 0000000..7ee028d
--- /dev/null
+++ b/Block/Adminhtml/Sales/Order/View/Tab/Instalment.php
@@ -0,0 +1,263 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Adminhtml\Sales\Order\View\Tab;
+
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class Instalment extends \Magento\Backend\Block\Template implements \Magento\Backend\Block\Widget\Tab\TabInterface
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::sales/order/view/tab/instalment.phtml';
+
+    /**
+     * @var \Magento\Framework\Registry
+     */
+    protected $coreRegistry = null;
+
+    /**
+     * @var \Magento\Framework\Pricing\Helper\Data
+     */
+    protected $pricingHelper;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     */
+    protected $datetime;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $datetime
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\Registry $registry,
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $datetime,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        array $data = []
+    ) {
+        $this->coreRegistry = $registry;
+        $this->pricingHelper = $pricingHelper;
+        $this->datetime = $datetime;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Retrieve order model instance
+     *
+     * @return \Magento\Sales\Model\Order
+     */
+    public function getOrder()
+    {
+        return $this->coreRegistry->registry('current_order');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTabLabel()
+    {
+        return __('Instalment');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTabTitle()
+    {
+        return __('Instalment');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function canShowTab()
+    {
+        $payment = $this->getOrder()->getPayment();
+        if (in_array(
+            $payment->getMethodInstance()->getCode(),
+            [
+                ConfigProvider::NOVALNET_SEPA_INSTALMENT,
+                ConfigProvider::NOVALNET_INVOICE_INSTALMENT
+            ]
+        )) {
+            $additionalData = [];
+            if (!empty($payment->getAdditionalData())) {
+                $additionalData = $this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+                    ? $this->serializer->unserialize($payment->getAdditionalData())
+                    : json_decode($payment->getAdditionalData(), true);
+            }
+
+            $paymentStatus = !empty($additionalData['NnStatus'])
+                ? $this->novalnetRequestHelper->getStatus($additionalData['NnStatus'], $this->getOrder()) : '';
+            return (bool) ($paymentStatus == 'CONFIRMED');
+        }
+
+        return false;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isHidden()
+    {
+        return false;
+    }
+
+    /**
+     * Get Tab Class
+     *
+     * @return string
+     */
+    public function getTabClass()
+    {
+        return 'ajax only';
+    }
+
+    /**
+     * Get Class
+     *
+     * @return string
+     */
+    public function getClass()
+    {
+        return $this->getTabClass();
+    }
+
+    /**
+     * Get Tab Url
+     *
+     * @return string
+     */
+    public function getTabUrl()
+    {
+        return $this->getUrl('novalnetpayment/sales/instalment', ['_current' => true]);
+    }
+
+    /**
+     * Get URL to edit the customer.
+     *
+     * @return string
+     */
+    public function getCustomerViewUrl()
+    {
+        if ($this->getOrder()->getCustomerIsGuest() || !$this->getOrder()->getCustomerId()) {
+            return '';
+        }
+
+        return $this->getUrl('customer/index/edit', ['id' => $this->getOrder()->getCustomerId()]);
+    }
+
+    /**
+     * Check if is single store mode
+     *
+     * @return bool
+     */
+    public function isSingleStoreMode()
+    {
+        return $this->_storeManager->isSingleStoreMode();
+    }
+
+    /**
+     * Get order store name
+     *
+     * @return null|string
+     */
+    public function getOrderStoreName()
+    {
+        if ($this->getOrder()) {
+            $storeId = $this->getOrder()->getStoreId();
+            if ($storeId === null) {
+                $deleted = __(' [deleted]');
+                return nl2br($this->getOrder()->getStoreName()) . $deleted;
+            }
+            $store = $this->_storeManager->getStore($storeId);
+            $name = [$store->getWebsite()->getName(), $store->getGroup()->getName(), $store->getName()];
+            return (!empty($name)) ? implode('<br>', $name) : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get payment additional data
+     *
+     * @param string $key
+     * @return null|string
+     */
+    public function getAdditionalData($key)
+    {
+        $payment = $this->getOrder()->getPayment();
+        $details = [];
+        if (!empty($payment->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+                    ? $this->serializer->unserialize($payment->getAdditionalData())
+                    : json_decode($payment->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && !empty($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get Formated Date
+     *
+     * @param string $date
+     * @return string
+     */
+    public function getFormatedDate($date)
+    {
+        return $this->datetime->formatDate($date, \IntlDateFormatter::LONG);
+    }
+
+    /**
+     * Update Currency
+     *
+     * @param string $amount
+     * @return float|string
+     */
+    public function updateCurrency($amount)
+    {
+        return $this->pricingHelper->currency($amount);
+    }
+}
diff --git a/Block/Adminhtml/Sales/Order/View/Tab/ZeroAmountBooking.php b/Block/Adminhtml/Sales/Order/View/Tab/ZeroAmountBooking.php
new file mode 100755
index 0000000..80c4c29
--- /dev/null
+++ b/Block/Adminhtml/Sales/Order/View/Tab/ZeroAmountBooking.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Adminhtml\Sales\Order\View\Tab;
+
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class ZeroAmountBooking extends \Magento\Backend\Block\Template implements \Magento\Backend\Block\Widget\Tab\TabInterface
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::sales/order/view/tab/zeroamountbooking.phtml';
+
+    /**
+     * @var \Magento\Framework\Registry
+     */
+    protected $coreRegistry = null;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\Registry $registry,
+        \Magento\Backend\Block\Template\Context $context,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        array $data = []
+    ) {
+        $this->coreRegistry = $registry;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Retrieve order model instance
+     *
+     * @return \Magento\Sales\Model\Order
+     */
+    public function getOrder()
+    {
+        return $this->coreRegistry->registry('current_order');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTabLabel()
+    {
+        return __('Zero amount booking');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTabTitle()
+    {
+        return __('Zero amount booking');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function canShowTab()
+    {
+        $payment = $this->getOrder()->getPayment();
+
+        if ($this->getOrder()->getStatus() == \Magento\Sales\Model\Order::STATE_CANCELED) {
+            return false;
+        }
+
+        if (in_array(
+            $payment->getMethodInstance()->getCode(),
+            [
+                ConfigProvider::NOVALNET_SEPA,
+                ConfigProvider::NOVALNET_CC
+            ]
+        )) {
+            $additionalData = [];
+            if (!empty($payment->getAdditionalData())) {
+                $additionalData = $this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+                    ? $this->serializer->unserialize($payment->getAdditionalData())
+                    : json_decode($payment->getAdditionalData(), true);
+            }
+
+            $paymentStatus = !empty($additionalData['NnStatus'])
+                ? $this->novalnetRequestHelper->getStatus($additionalData['NnStatus'], $this->getOrder()) : '';
+            return (bool) ($paymentStatus == 'CONFIRMED' && !empty($additionalData['NnZeroAmountBooking']) && empty($additionalData['NnZeroAmountDone']));
+        }
+
+        return false;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isHidden()
+    {
+        return false;
+    }
+
+    /**
+     * Get Tab Class
+     *
+     * @return string
+     */
+    public function getTabClass()
+    {
+        return 'ajax only';
+    }
+
+    /**
+     * Get Class
+     *
+     * @return string
+     */
+    public function getClass()
+    {
+        return $this->getTabClass();
+    }
+
+    /**
+     * Get Tab Url
+     *
+     * @return string
+     */
+    public function getTabUrl()
+    {
+        return $this->getUrl('novalnetpayment/sales/zeroamountbookingTab', ['_current' => true]);
+    }
+
+    /**
+     * Get payment additional data
+     *
+     * @param string $key
+     *
+     * @return null|string
+     */
+    public function getAdditionalData($key)
+    {
+        $payment = $this->getOrder()->getPayment();
+        $details = [];
+        if (!empty($payment->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+                    ? $this->serializer->unserialize($payment->getAdditionalData())
+                    : json_decode($payment->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the formated amount in cents/euro
+     *
+     * @param  float  $amount
+     * @param  string $type
+     * @return int
+     */
+    public function getFormattedAmount($amount, $type = 'CENT')
+    {
+        return $this->novalnetRequestHelper->getFormattedAmount($amount, $type);
+    }
+}
diff --git a/Block/Checkout/Cart/Shortcut.php b/Block/Checkout/Cart/Shortcut.php
new file mode 100755
index 0000000..6ad6297
--- /dev/null
+++ b/Block/Checkout/Cart/Shortcut.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Novalnet\Payment\Block\Checkout\Cart;
+
+use Novalnet\Payment\Block\Checkout\Cart\ShortcutButtonsConfig;
+use Magento\Catalog\Block\ShortcutInterface;
+
+class Shortcut extends ShortcutButtonsConfig implements ShortcutInterface
+{
+    public const ALIAS_ELEMENT_INDEX = 'alias';
+
+    /**
+     * Template file for the block
+     *
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::checkout/MinicartShortcut.phtml';
+
+    /**
+     * @var bool
+     */
+    private $isMiniCart = false;
+
+    /**
+     * @var bool
+     */
+    private $isShoppingCart = false;
+
+    /**
+     * Get shortcut alias
+     *
+     * @return string
+     */
+    public function getAlias()
+    {
+        return $this->getData(self::ALIAS_ELEMENT_INDEX);
+    }
+
+    /**
+     * Set is in catalog product
+     *
+     * @param bool $isCatalog
+     *
+     * @return $this
+     */
+    public function setIsInCatalogProduct($isCatalog)
+    {
+        $this->isMiniCart = !$isCatalog;
+        return $this;
+    }
+
+    /**
+     * Set is in shopping cart
+     *
+     * @param bool $isShoppingCart
+     * @return void
+     */
+    public function setIsShoppingCart($isShoppingCart)
+    {
+        $this->isShoppingCart = $isShoppingCart;
+
+        if ($isShoppingCart) {
+            $this->_template = 'Novalnet_Payment::checkout/CartPageShortcut.phtml';
+        } else {
+            $this->_template = 'Novalnet_Payment::checkout/MinicartShortcut.phtml';
+        }
+    }
+
+    /**
+     * Is Should Rendered
+     *
+     * @return bool
+     */
+    protected function shouldRender()
+    {
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $session = $objectManager->create(\Magento\Checkout\Model\Session::class);
+
+        if ($this->isShoppingCart) {
+            return true;
+        }
+
+        return $this->isMiniCart;
+    }
+
+    /**
+     * Render the block if needed
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        if (!$this->shouldRender()) {
+            return '';
+        }
+
+        return parent::_toHtml();
+    }
+}
diff --git a/Block/Checkout/Cart/ShortcutButtonsConfig.php b/Block/Checkout/Cart/ShortcutButtonsConfig.php
new file mode 100755
index 0000000..856357e
--- /dev/null
+++ b/Block/Checkout/Cart/ShortcutButtonsConfig.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Checkout\Cart;
+
+use Magento\Catalog\Model\Product\Type as ProductType;
+use Magento\Downloadable\Model\Product\Type as DownloadableProduct;
+
+class ShortcutButtonsConfig extends \Magento\Framework\View\Element\Template
+{
+    /**
+     * @var \Magento\Catalog\Model\ProductFactory
+     */
+    protected $productFactory;
+
+    /**
+     * @var \Magento\Framework\Registry
+     */
+    protected $registry;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @param \Magento\Catalog\Model\ProductFactory $productFactory
+     * @param \Magento\Framework\Registry $registry
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Catalog\Model\ProductFactory $productFactory,
+        \Magento\Framework\Registry $registry,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->productFactory = $productFactory;
+        $this->registry = $registry;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Get Payment method active status
+     *
+     * @param string $page
+     * @return array
+     */
+    public function isPageEnabledForExpressCheckout($page)
+    {
+        return $this->novalnetRequestHelper->isPageEnabledForExpressCheckout($page);
+    }
+
+    /**
+     * Get Product Id
+     *
+     * @return int
+     */
+    public function getProductId()
+    {
+        $product = $this->registry->registry('product');
+        return $product->getId();
+    }
+
+    /**
+     * Get Product Type
+     *
+     * @return array
+     */
+    public function loadProductById()
+    {
+        $productId = $this->getProductId();
+        $model = $this->productFactory->create();
+        $product = $model->load($productId);
+        return [
+            'productId' => $product->getId(),
+            'isVirtual' => (in_array($product->getTypeId(), [ProductType::TYPE_VIRTUAL, DownloadableProduct::TYPE_DOWNLOADABLE])) ? true : false
+        ];
+    }
+}
diff --git a/Block/Form/Cashpayment.php b/Block/Form/Cashpayment.php
new file mode 100755
index 0000000..f91f66e
--- /dev/null
+++ b/Block/Form/Cashpayment.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Form;
+
+class Cashpayment extends \Magento\Payment\Block\Form
+{
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Model\Ui\ConfigProvider
+     */
+    protected $novalnetConfigProvider;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->setTemplate('Novalnet_Payment::form/Cashpayment.phtml');
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetConfigProvider = $novalnetConfigProvider;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+    }
+
+    /**
+     * Get payment logo enabled status
+     *
+     * @param  string $paymentMethodcode
+     * @return string
+     */
+    public function getPaymentLogo($paymentMethodcode)
+    {
+        return $this->novalnetConfigProvider->getPaymentLogo($paymentMethodcode);
+    }
+
+    /**
+     * Verify whether the payment is in Test mode
+     *
+     * @param string $paymentMethodcode
+     * @return int
+     */
+    public function getTestMode($paymentMethodcode)
+    {
+        return $this->novalnetConfig->getTestMode($paymentMethodcode);
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Form/Cc.php b/Block/Form/Cc.php
new file mode 100755
index 0000000..a119094
--- /dev/null
+++ b/Block/Form/Cc.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Form;
+
+class Cc extends \Magento\Payment\Block\Form
+{
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Model\Ui\ConfigProvider
+     */
+    protected $novalnetConfigProvider;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    protected $jsonHelperRequest;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelperRequest
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelperRequest,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->setTemplate('Novalnet_Payment::form/Cc.phtml'); // Sets form template
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetConfigProvider = $novalnetConfigProvider;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelperRequest = $jsonHelperRequest;
+    }
+
+    /**
+     * Get payment logo enabled status
+     *
+     * @param  string $paymentMethodcode
+     * @return string
+     */
+    public function getPaymentLogo($paymentMethodcode)
+    {
+        return $this->novalnetConfigProvider->getPaymentLogo($paymentMethodcode);
+    }
+
+    /**
+     * Get Credit Card logos
+     *
+     * @param  string $paymentMethodcode
+     * @return array|bool
+     */
+    public function getCreditCardLogos($paymentMethodcode)
+    {
+        return $this->novalnetConfigProvider->getCcAvailableTypes($paymentMethodcode);
+    }
+
+    /**
+     * Verify whether the payment is in Test mode
+     *
+     * @param  string $paymentMethodcode
+     * @return int
+     */
+    public function getTestMode($paymentMethodcode)
+    {
+        return $this->novalnetConfig->getTestMode($paymentMethodcode);
+    }
+
+    /**
+     * Get instructions text from config
+     *
+     * @return string|null
+     */
+    public function isInlineForm()
+    {
+        return $this->getMethod()->getConfigData('inline_form');
+    }
+
+    /**
+     * Retrieve Credit Card iframe params
+     *
+     * @return array
+     */
+    public function getCcIframeParams()
+    {
+        return $this->novalnetConfigProvider->getCcIframeParams();
+    }
+
+    /**
+     * Get form style configuration
+     *
+     * @param string $param
+     * @return string|null
+     */
+    public function getStyleConfig($param)
+    {
+        $creditCardStyle = $this->novalnetConfigProvider->getCcStyleConfig();
+        if (isset($creditCardStyle[$param])) {
+            return $creditCardStyle[$param];
+        }
+
+        return '';
+    }
+
+    /**
+     * Retrieve Credit Card configs
+     *
+     * @param  string $paymentMethodcode
+     * @return array
+     */
+    public function getConfig($paymentMethodcode)
+    {
+        $config = $this->novalnetConfigProvider->getConfig();
+        return $config['payment'][$paymentMethodcode];
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+
+    /**
+     * Get json helper request
+     *
+     * @return mixed
+     */
+    public function jsonHelper()
+    {
+        return $this->jsonHelperRequest;
+    }
+
+    /**
+     * To get is zero amount booking
+     *
+     * @return bool
+     */
+    public function isZeroAmountBooking()
+    {
+        return ($this->novalnetConfig->getPaymentConfig(\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_CC, 'payment_action') == \Novalnet\Payment\Model\NNConfig::ACTION_ZERO_AMOUNT_BOOKING);
+    }
+}
diff --git a/Block/Form/Invoice.php b/Block/Form/Invoice.php
new file mode 100755
index 0000000..c86792f
--- /dev/null
+++ b/Block/Form/Invoice.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Form;
+
+class Invoice extends \Magento\Payment\Block\Form
+{
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Model\Ui\ConfigProvider
+     */
+    protected $novalnetConfigProvider;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->setTemplate('Novalnet_Payment::form/Invoice.phtml');
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetConfigProvider = $novalnetConfigProvider;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+    }
+
+    /**
+     * Get payment logo enabled status
+     *
+     * @param  string $paymentMethodcode
+     * @return string
+     */
+    public function getPaymentLogo($paymentMethodcode)
+    {
+        return $this->novalnetConfigProvider->getPaymentLogo($paymentMethodcode);
+    }
+
+    /**
+     * Verify whether the payment is in Test mode
+     *
+     * @param  string $paymentMethodcode
+     * @return int
+     */
+    public function getTestMode($paymentMethodcode)
+    {
+        return $this->novalnetConfig->getTestMode($paymentMethodcode);
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Form/InvoiceGuarantee.php b/Block/Form/InvoiceGuarantee.php
new file mode 100755
index 0000000..8867839
--- /dev/null
+++ b/Block/Form/InvoiceGuarantee.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Form;
+
+class InvoiceGuarantee extends \Magento\Payment\Block\Form
+{
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Model\Ui\ConfigProvider
+     */
+    protected $novalnetConfigProvider;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    protected $jsonHelperRequest;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelperRequest
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelperRequest,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->setTemplate('Novalnet_Payment::form/InvoiceGuarantee.phtml');
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetConfigProvider = $novalnetConfigProvider;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelperRequest = $jsonHelperRequest;
+    }
+
+    /**
+     * Get payment logo enabled status
+     *
+     * @param  string $paymentMethodcode
+     * @return string
+     */
+    public function getPaymentLogo($paymentMethodcode)
+    {
+        return $this->novalnetConfigProvider->getPaymentLogo($paymentMethodcode);
+    }
+
+    /**
+     * Verify whether the payment is in Test mode
+     *
+     * @param  string $paymentMethodcode
+     * @return int
+     */
+    public function getTestMode($paymentMethodcode)
+    {
+        return $this->novalnetConfig->getTestMode($paymentMethodcode);
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+
+    /**
+     * Get json helper request
+     *
+     * @return mixed
+     */
+    public function jsonHelper()
+    {
+        return $this->jsonHelperRequest;
+    }
+}
diff --git a/Block/Form/InvoiceInstalment.php b/Block/Form/InvoiceInstalment.php
new file mode 100755
index 0000000..8b1ca6c
--- /dev/null
+++ b/Block/Form/InvoiceInstalment.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Form;
+
+class InvoiceInstalment extends \Magento\Payment\Block\Form
+{
+    /**
+     * @var \Magento\Framework\Pricing\Helper\Data
+     */
+    protected $priceHelper;
+
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Model\Ui\ConfigProvider
+     */
+    protected $novalnetConfigProvider;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    protected $jsonHelperRequest;
+
+    /**
+     * @var \Magento\Directory\Model\Currency
+     */
+    protected $currency;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $storeManager;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Magento\Framework\Pricing\Helper\Data $priceHelper
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelperRequest
+     * @param \Magento\Directory\Model\Currency $currency
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Magento\Framework\Pricing\Helper\Data $priceHelper,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelperRequest,
+        \Magento\Directory\Model\Currency $currency,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->setTemplate('Novalnet_Payment::form/InvoiceInstalment.phtml');
+        $this->priceHelper = $priceHelper;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetConfigProvider = $novalnetConfigProvider;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelperRequest = $jsonHelperRequest;
+        $this->currency = $currency;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Get payment logo enabled status
+     *
+     * @param  string $paymentMethodcode
+     * @return string
+     */
+    public function getPaymentLogo($paymentMethodcode)
+    {
+        return $this->novalnetConfigProvider->getPaymentLogo($paymentMethodcode);
+    }
+
+    /**
+     * Verify whether the payment is in Test mode
+     *
+     * @param  string $paymentMethodcode
+     * @return int
+     */
+    public function getTestMode($paymentMethodcode)
+    {
+        return $this->novalnetConfig->getTestMode($paymentMethodcode);
+    }
+
+    /**
+     * Get Novalnet Guarantee instalment cycles
+     *
+     * @return null|string
+     */
+    public function getInstalmentCycles()
+    {
+        return $this->novalnetConfig->getPaymentConfig($this->getMethodCode(), 'instalment_cycles');
+    }
+
+    /**
+     * Get amount with currency
+     *
+     * @param  int $amount
+     * @return null|string
+     */
+    public function updateCurrency($amount)
+    {
+        return $this->priceHelper->currency($amount, true, false);
+    }
+
+    /**
+     * Returns Instalment cycle details api URL for the Novalnet module
+     *
+     * @return string
+     */
+    public function getInstalmentCycleDetailUrl()
+    {
+        $baseUrl = $this->_storeManager->getStore()->getBaseUrl();
+        return str_replace('index.php/', '', $baseUrl) . 'rest/V1/novalnet/payment/instalment_cycle/';
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+
+    /**
+     * Get json helper request
+     *
+     * @return mixed
+     */
+    public function jsonHelper()
+    {
+        return $this->jsonHelperRequest;
+    }
+
+    /**
+     * Get currency symbol for current locale and currency code
+     *
+     * @return string|null
+     */
+    public function getCurrentCurrencySymbol()
+    {
+        $store = $this->storeManager->getStore();
+        $currencyCode = $store->getCurrentCurrencyCode();
+        $currentCurrency = trim($currencyCode);
+        $currency = $this->currency->load($currentCurrency);
+        return $currency->getCurrencySymbol();
+    }
+}
diff --git a/Block/Form/Multibanco.php b/Block/Form/Multibanco.php
new file mode 100755
index 0000000..148327e
--- /dev/null
+++ b/Block/Form/Multibanco.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Form;
+
+class Multibanco extends \Magento\Payment\Block\Form
+{
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Model\Ui\ConfigProvider
+     */
+    protected $novalnetConfigProvider;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->setTemplate('Novalnet_Payment::form/Multibanco.phtml');
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetConfigProvider = $novalnetConfigProvider;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+    }
+
+    /**
+     * Get payment logo enabled status
+     *
+     * @param  string $paymentMethodcode
+     * @return string
+     */
+    public function getPaymentLogo($paymentMethodcode)
+    {
+        return $this->novalnetConfigProvider->getPaymentLogo($paymentMethodcode);
+    }
+
+    /**
+     * Verify whether the payment is in Test mode
+     *
+     * @param  string $paymentMethodcode
+     * @return int
+     */
+    public function getTestMode($paymentMethodcode)
+    {
+        return $this->novalnetConfig->getTestMode($paymentMethodcode);
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Form/Prepayment.php b/Block/Form/Prepayment.php
new file mode 100755
index 0000000..4782576
--- /dev/null
+++ b/Block/Form/Prepayment.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Form;
+
+class Prepayment extends \Magento\Payment\Block\Form
+{
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Model\Ui\ConfigProvider
+     */
+    protected $novalnetConfigProvider;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->setTemplate('Novalnet_Payment::form/Prepayment.phtml');
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetConfigProvider = $novalnetConfigProvider;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+    }
+
+    /**
+     * Get payment logo enabled status
+     *
+     * @param  string $paymentMethodcode
+     * @return string
+     */
+    public function getPaymentLogo($paymentMethodcode)
+    {
+        return $this->novalnetConfigProvider->getPaymentLogo($paymentMethodcode);
+    }
+
+    /**
+     * Verify whether the payment is in Test mode
+     *
+     * @param  string $paymentMethodcode
+     * @return int
+     */
+    public function getTestMode($paymentMethodcode)
+    {
+        return $this->novalnetConfig->getTestMode($paymentMethodcode);
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Form/Sepa.php b/Block/Form/Sepa.php
new file mode 100755
index 0000000..324326f
--- /dev/null
+++ b/Block/Form/Sepa.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Form;
+
+class Sepa extends \Magento\Payment\Block\Form
+{
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Model\Ui\ConfigProvider
+     */
+    protected $novalnetConfigProvider;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    protected $jsonHelperRequest;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelperRequest
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelperRequest,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->setTemplate('Novalnet_Payment::form/Sepa.phtml');
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetConfigProvider = $novalnetConfigProvider;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelperRequest = $jsonHelperRequest;
+    }
+
+    /**
+     * Get payment logo enabled status
+     *
+     * @param  string $paymentMethodcode
+     * @return string
+     */
+    public function getPaymentLogo($paymentMethodcode)
+    {
+        return $this->novalnetConfigProvider->getPaymentLogo($paymentMethodcode);
+    }
+
+    /**
+     * Verify whether the payment is in Test mode
+     *
+     * @param  string $paymentMethodcode
+     * @return int
+     */
+    public function getTestMode($paymentMethodcode)
+    {
+        return $this->novalnetConfig->getTestMode($paymentMethodcode);
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+
+    /**
+     * Get json helper request
+     *
+     * @return mixed
+     */
+    public function jsonHelper()
+    {
+        return $this->jsonHelperRequest;
+    }
+
+    /**
+     * To get is zero amount booking
+     *
+     * @return bool
+     */
+    public function isZeroAmountBooking()
+    {
+        return ($this->novalnetConfig->getPaymentConfig(\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_CC, 'payment_action') == \Novalnet\Payment\Model\NNConfig::ACTION_ZERO_AMOUNT_BOOKING);
+    }
+}
diff --git a/Block/Form/SepaGuarantee.php b/Block/Form/SepaGuarantee.php
new file mode 100755
index 0000000..43d0c57
--- /dev/null
+++ b/Block/Form/SepaGuarantee.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Form;
+
+class SepaGuarantee extends \Magento\Payment\Block\Form
+{
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Model\Ui\ConfigProvider
+     */
+    protected $novalnetConfigProvider;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    protected $jsonHelperRequest;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelperRequest
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelperRequest,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->setTemplate('Novalnet_Payment::form/SepaGuarantee.phtml');
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetConfigProvider = $novalnetConfigProvider;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelperRequest = $jsonHelperRequest;
+    }
+
+    /**
+     * Get payment logo enabled status
+     *
+     * @param  string $paymentMethodcode
+     * @return string
+     */
+    public function getPaymentLogo($paymentMethodcode)
+    {
+        return $this->novalnetConfigProvider->getPaymentLogo($paymentMethodcode);
+    }
+
+    /**
+     * Verify whether the payment is in Test mode
+     *
+     * @param  string $paymentMethodcode
+     * @return int
+     */
+    public function getTestMode($paymentMethodcode)
+    {
+        return $this->novalnetConfig->getTestMode($paymentMethodcode);
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+
+    /**
+     * Get json helper request
+     *
+     * @return mixed
+     */
+    public function jsonHelper()
+    {
+        return $this->jsonHelperRequest;
+    }
+}
diff --git a/Block/Form/SepaInstalment.php b/Block/Form/SepaInstalment.php
new file mode 100755
index 0000000..b856200
--- /dev/null
+++ b/Block/Form/SepaInstalment.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Form;
+
+class SepaInstalment extends \Magento\Payment\Block\Form
+{
+    /**
+     * @var \Magento\Framework\Pricing\Helper\Data
+     */
+    protected $priceHelper;
+
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Model\Ui\ConfigProvider
+     */
+    protected $novalnetConfigProvider;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    protected $jsonHelperRequest;
+
+    /**
+     * @var \Magento\Directory\Model\Currency
+     */
+    protected $currency;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $storeManager;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Magento\Framework\Pricing\Helper\Data $priceHelper
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelperRequest
+     * @param \Magento\Directory\Model\Currency $currency
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Magento\Framework\Pricing\Helper\Data $priceHelper,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Model\Ui\ConfigProvider $novalnetConfigProvider,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelperRequest,
+        \Magento\Directory\Model\Currency $currency,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->setTemplate('Novalnet_Payment::form/SepaInstalment.phtml');
+        $this->priceHelper = $priceHelper;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetConfigProvider = $novalnetConfigProvider;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelperRequest = $jsonHelperRequest;
+        $this->currency = $currency;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Get payment logo enabled status
+     *
+     * @param  string $paymentMethodcode
+     * @return string
+     */
+    public function getPaymentLogo($paymentMethodcode)
+    {
+        return $this->novalnetConfigProvider->getPaymentLogo($paymentMethodcode);
+    }
+
+    /**
+     * Verify whether the payment is in Test mode
+     *
+     * @param  string $paymentMethodcode
+     * @return int
+     */
+    public function getTestMode($paymentMethodcode)
+    {
+        return $this->novalnetConfig->getTestMode($paymentMethodcode);
+    }
+
+    /**
+     * Get Novalnet Guarantee instalment cycles
+     *
+     * @return null|string
+     */
+    public function getInstalmentCycles()
+    {
+        return $this->novalnetConfig->getPaymentConfig($this->getMethodCode(), 'instalment_cycles');
+    }
+
+    /**
+     * Get amount with currency
+     *
+     * @param int $amount
+     * @return null|string
+     */
+    public function updateCurrency($amount)
+    {
+        return $this->priceHelper->currency($amount, true, false);
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+
+    /**
+     * Returns Instalment cycle details api URL for the Novalnet module
+     *
+     * @return string
+     */
+    public function getInstalmentCycleDetailUrl()
+    {
+        $baseUrl = $this->_storeManager->getStore()->getBaseUrl();
+        return str_replace('index.php/', '', $baseUrl) . 'rest/V1/novalnet/payment/instalment_cycle/';
+    }
+
+    /**
+     * Get json helper request
+     *
+     * @return mixed
+     */
+    public function jsonHelper()
+    {
+        return $this->jsonHelperRequest;
+    }
+
+    /**
+     * Get currency symbol for current locale and currency code
+     *
+     * @return string|null
+     */
+    public function getCurrentCurrencySymbol()
+    {
+        $store = $this->storeManager->getStore();
+        $currencyCode = $store->getCurrentCurrencyCode();
+        $currentCurrency = trim($currencyCode);
+        $currency = $this->currency->load($currentCurrency);
+        return $currency->getCurrencySymbol();
+    }
+}
diff --git a/Block/Info/Alipay.php b/Block/Info/Alipay.php
new file mode 100755
index 0000000..9e1c006
--- /dev/null
+++ b/Block/Info/Alipay.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Alipay extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Alipay.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template for Pdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Alipay.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Applepay.php b/Block/Info/Applepay.php
new file mode 100755
index 0000000..10b5328
--- /dev/null
+++ b/Block/Info/Applepay.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Applepay extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Applepay.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Applepay.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Bancontact.php b/Block/Info/Bancontact.php
new file mode 100755
index 0000000..36dd5a9
--- /dev/null
+++ b/Block/Info/Bancontact.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Bancontact extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Bancontact.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template for Pdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Bancontact.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Banktransfer.php b/Block/Info/Banktransfer.php
new file mode 100755
index 0000000..50d82c9
--- /dev/null
+++ b/Block/Info/Banktransfer.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Banktransfer extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Banktransfer.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template for Pdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Banktransfer.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Blik.php b/Block/Info/Blik.php
new file mode 100755
index 0000000..29a1094
--- /dev/null
+++ b/Block/Info/Blik.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Blik extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Blik.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Blik.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Cashpayment.php b/Block/Info/Cashpayment.php
new file mode 100755
index 0000000..89a0f8a
--- /dev/null
+++ b/Block/Info/Cashpayment.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Cashpayment extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Cashpayment.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template for Pdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Cashpayment.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+
+    /**
+     * Get GrandTotal
+     *
+     * @return mixed
+     */
+    public function getGrandTotal()
+    {
+        return $this->novalnetRequestHelper->getAmountWithSymbol($this->getInfo()->getOrder()->getGrandTotal(), $this->getInfo()->getOrder()->getStoreId());
+    }
+}
diff --git a/Block/Info/Cc.php b/Block/Info/Cc.php
new file mode 100755
index 0000000..ae8cef2
--- /dev/null
+++ b/Block/Info/Cc.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Cc extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Cc.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template for Pdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Cc.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Eps.php b/Block/Info/Eps.php
new file mode 100755
index 0000000..072e689
--- /dev/null
+++ b/Block/Info/Eps.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Eps extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Eps.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Eps.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Giropay.php b/Block/Info/Giropay.php
new file mode 100755
index 0000000..73a65cc
--- /dev/null
+++ b/Block/Info/Giropay.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Giropay extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Giropay.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Giropay.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Googlepay.php b/Block/Info/Googlepay.php
new file mode 100755
index 0000000..4b84bd3
--- /dev/null
+++ b/Block/Info/Googlepay.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Googlepay extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Googlepay.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Googlepay.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Ideal.php b/Block/Info/Ideal.php
new file mode 100755
index 0000000..b9d8ed3
--- /dev/null
+++ b/Block/Info/Ideal.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Ideal extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Ideal.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Ideal.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Invoice.php b/Block/Info/Invoice.php
new file mode 100755
index 0000000..32fb049
--- /dev/null
+++ b/Block/Info/Invoice.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Invoice extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Invoice.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template for Pdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Invoice.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+
+    /**
+     * Get GrandTotal
+     *
+     * @return mixed
+     */
+    public function getGrandTotal()
+    {
+        return $this->novalnetRequestHelper->getAmountWithSymbol($this->getInfo()->getOrder()->getGrandTotal(), $this->getInfo()->getOrder()->getStoreId());
+    }
+}
diff --git a/Block/Info/InvoiceGuarantee.php b/Block/Info/InvoiceGuarantee.php
new file mode 100755
index 0000000..f09f200
--- /dev/null
+++ b/Block/Info/InvoiceGuarantee.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class InvoiceGuarantee extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/InvoiceGuarantee.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/InvoiceGuarantee.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+
+    /**
+     * Get GrandTotal
+     *
+     * @return mixed
+     */
+    public function getGrandTotal()
+    {
+        return $this->novalnetRequestHelper->getAmountWithSymbol($this->getInfo()->getOrder()->getGrandTotal(), $this->getInfo()->getOrder()->getStoreId());
+    }
+}
diff --git a/Block/Info/InvoiceInstalment.php b/Block/Info/InvoiceInstalment.php
new file mode 100755
index 0000000..7ae8067
--- /dev/null
+++ b/Block/Info/InvoiceInstalment.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class InvoiceInstalment extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/InvoiceInstalment.phtml';
+
+    /**
+     * @var \Magento\Framework\Pricing\Helper\Data
+     */
+    protected $priceHelper;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Magento\Framework\Pricing\Helper\Data $priceHelper
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Magento\Framework\Pricing\Helper\Data $priceHelper,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->priceHelper = $priceHelper;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/InvoiceInstalment.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get amount with currency
+     *
+     * @param int $amount
+     * @return null|string
+     */
+    public function updateCurrency($amount)
+    {
+        return $this->priceHelper->currency($amount, true, false);
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+
+    /**
+     * Get GrandTotal
+     *
+     * @return mixed
+     */
+    public function getGrandTotal()
+    {
+        return $this->novalnetRequestHelper->getAmountWithSymbol($this->getInfo()->getOrder()->getGrandTotal(), $this->getInfo()->getOrder()->getStoreId());
+    }
+}
diff --git a/Block/Info/Multibanco.php b/Block/Info/Multibanco.php
new file mode 100755
index 0000000..9b17177
--- /dev/null
+++ b/Block/Info/Multibanco.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Multibanco extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Multibanco.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Multibanco.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+
+    /**
+     * Get GrandTotal
+     *
+     * @return mixed
+     */
+    public function getGrandTotal()
+    {
+        return $this->novalnetRequestHelper->getAmountWithSymbol($this->getInfo()->getOrder()->getGrandTotal(), $this->getInfo()->getOrder()->getStoreId());
+    }
+}
diff --git a/Block/Info/OnlineBanktransfer.php b/Block/Info/OnlineBanktransfer.php
new file mode 100755
index 0000000..bca9f1a
--- /dev/null
+++ b/Block/Info/OnlineBanktransfer.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class OnlineBanktransfer extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/OnlineBanktransfer.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template for Pdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/OnlineBanktransfer.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Paypal.php b/Block/Info/Paypal.php
new file mode 100755
index 0000000..6438b57
--- /dev/null
+++ b/Block/Info/Paypal.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Paypal extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Paypal.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Paypal.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/PostFinance.php b/Block/Info/PostFinance.php
new file mode 100755
index 0000000..3553c19
--- /dev/null
+++ b/Block/Info/PostFinance.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class PostFinance extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/PostFinance.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/PostFinance.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/PostFinanceCard.php b/Block/Info/PostFinanceCard.php
new file mode 100755
index 0000000..036be3e
--- /dev/null
+++ b/Block/Info/PostFinanceCard.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class PostFinanceCard extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/PostFinanceCard.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/PostFinanceCard.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = (!empty($this->getInfo()->getAdditionalData())) ? ($this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                : json_decode($this->getInfo()->getAdditionalData(), true)) : [];
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Prepayment.php b/Block/Info/Prepayment.php
new file mode 100755
index 0000000..b6fc4eb
--- /dev/null
+++ b/Block/Info/Prepayment.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Prepayment extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Prepayment.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Prepayment.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+
+    /**
+     * Get GrandTotal
+     *
+     * @return mixed
+     */
+    public function getGrandTotal()
+    {
+        return $this->novalnetRequestHelper->getAmountWithSymbol($this->getInfo()->getOrder()->getGrandTotal(), $this->getInfo()->getOrder()->getStoreId());
+    }
+}
diff --git a/Block/Info/Przelewy.php b/Block/Info/Przelewy.php
new file mode 100755
index 0000000..1154fcc
--- /dev/null
+++ b/Block/Info/Przelewy.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Przelewy extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Przelewy.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Przelewy.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Sepa.php b/Block/Info/Sepa.php
new file mode 100755
index 0000000..3248eef
--- /dev/null
+++ b/Block/Info/Sepa.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Sepa extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Sepa.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template for Pdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Sepa.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/SepaGuarantee.php b/Block/Info/SepaGuarantee.php
new file mode 100755
index 0000000..4ad298f
--- /dev/null
+++ b/Block/Info/SepaGuarantee.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class SepaGuarantee extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/SepaGuarantee.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/SepaGuarantee.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/SepaInstalment.php b/Block/Info/SepaInstalment.php
new file mode 100755
index 0000000..3eaedf6
--- /dev/null
+++ b/Block/Info/SepaInstalment.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class SepaInstalment extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/SepaInstalment.phtml';
+
+    /**
+     * @var \Magento\Framework\Pricing\Helper\Data
+     */
+    protected $priceHelper;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Magento\Framework\Pricing\Helper\Data $priceHelper
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Magento\Framework\Pricing\Helper\Data $priceHelper,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->priceHelper = $priceHelper;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Set template forPdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/SepaInstalment.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get amount with currency
+     *
+     * @param int $amount
+     * @return float|string
+     */
+    public function updateCurrency($amount)
+    {
+        return $this->priceHelper->currency($amount, true, false);
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Trustly.php b/Block/Info/Trustly.php
new file mode 100755
index 0000000..a05b0bf
--- /dev/null
+++ b/Block/Info/Trustly.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Trustly extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Trustly.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template for Pdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Trustly.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Info/Wechatpay.php b/Block/Info/Wechatpay.php
new file mode 100755
index 0000000..7be5bf9
--- /dev/null
+++ b/Block/Info/Wechatpay.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Info;
+
+class Wechatpay extends \Magento\Payment\Block\Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::info/Wechatpay.phtml';
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Set template for Pdf
+     *
+     * @return string
+     */
+    public function toPdf()
+    {
+        $this->setTemplate('Novalnet_Payment::pdf/Wechatpay.phtml');
+        return $this->toHtml();
+    }
+
+    /**
+     * Get additional information for the payment
+     *
+     * @param  string $key
+     * @return string|null
+     */
+    public function getAdditionalData($key)
+    {
+        $details = [];
+        if (!empty($this->getInfo()->getAdditionalData())) {
+            $details = $this->novalnetRequestHelper->isSerialized($this->getInfo()->getAdditionalData())
+                    ? $this->serializer->unserialize($this->getInfo()->getAdditionalData())
+                    : json_decode($this->getInfo()->getAdditionalData(), true);
+        }
+
+        if (is_array($details)) {
+            return (!empty($key) && isset($details[$key])) ? $details[$key] : '';
+        }
+
+        return null;
+    }
+
+    /**
+     * Get novalnet helper
+     *
+     * @return mixed
+     */
+    public function novalnetHelper()
+    {
+        return $this->novalnetRequestHelper;
+    }
+}
diff --git a/Block/Onepage/Success/Message.php b/Block/Onepage/Success/Message.php
new file mode 100755
index 0000000..4c66d5c
--- /dev/null
+++ b/Block/Onepage/Success/Message.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\Onepage\Success;
+
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class Message extends \Magento\Framework\View\Element\Template
+{
+    /**
+     * @var \Magento\Checkout\Model\Session
+     */
+    protected $checkoutSession;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer
+    ) {
+        $this->checkoutSession = $checkoutSession;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        parent::__construct($context);
+    }
+
+    /**
+     * Return Novalnet Cashpayment additional data
+     *
+     * @return mixed
+     */
+    public function getCpAdditionalData()
+    {
+        $additionalData = false;
+        $order = $this->checkoutSession->getLastRealOrder();
+        if ($order->getId()) {
+            $payment = $order->getPayment();
+            if ($payment->getMethodInstance()->getCode() == ConfigProvider::NOVALNET_CASHPAYMENT) {
+                $additionalData = (!empty($payment->getAdditionalData())) ? json_decode($payment->getAdditionalData(), true) : [];
+            }
+        }
+
+        return $additionalData;
+    }
+
+    /**
+     * Return Novalnet Googlepay additional data
+     *
+     * @return mixed
+     */
+    public function getGpayAdditionalData()
+    {
+        $additionalData = false;
+        $order = $this->checkoutSession->getLastRealOrder();
+        if ($order->getId()) {
+            $payment = $order->getPayment();
+            if ($payment->getMethodInstance()->getCode() == ConfigProvider::NOVALNET_GOOGLEPAY) {
+                $additionalData = (!empty($payment->getAdditionalData())) ? json_decode($payment->getAdditionalData(), true) : [];
+            }
+        }
+
+        return $additionalData;
+    }
+
+    /**
+     * Return Novalnet Applepay additional data
+     *
+     * @return mixed
+     */
+    public function getApplepayAdditionalData()
+    {
+        $additionalData = false;
+        $order = $this->checkoutSession->getLastRealOrder();
+        if ($order->getId()) {
+            $payment = $order->getPayment();
+            if ($payment->getMethodInstance()->getCode() == ConfigProvider::NOVALNET_APPLEPAY) {
+                $additionalData = (!empty($payment->getAdditionalData())) ? json_decode($payment->getAdditionalData(), true) : [];
+            }
+        }
+
+        return $additionalData;
+    }
+}
diff --git a/Block/System/Config/Form/Field/CreditcardStyle.php b/Block/System/Config/Form/Field/CreditcardStyle.php
new file mode 100755
index 0000000..01888a2
--- /dev/null
+++ b/Block/System/Config/Form/Field/CreditcardStyle.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\System\Config\Form\Field;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+/**
+ * Novalnet Creditcard style block
+ */
+class CreditcardStyle extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * Novalnet Credit Card form default styles
+     *
+     * @var array
+     */
+    public $ccLocalFormConfig = [
+        'standard_style_label' => 'font-family: Raleway,Helvetica Neue,Verdana,Arial,sans-serif;font-size: 13px;font-weight: 600;color: #636363;line-height: 1.5;',
+        'standard_style_input' => 'color: #636363;font-family: Helvetica Neue,Verdana,Arial,sans-serif;font-size: 14px;',
+        'standard_style_css' => ''
+    ];
+
+    /**
+     * Set template to itself
+     *
+     * @return $this
+     */
+    protected function _prepareLayout()
+    {
+        parent::_prepareLayout();
+        if (!$this->getTemplate()) {
+            $this->setTemplate('Novalnet_Payment::system/config/form/field/creditcardStyle.phtml');
+        }
+        return $this;
+    }
+
+    /**
+     * Remove scope label
+     *
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    public function render(AbstractElement $element)
+    {
+        $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
+        return parent::render($element);
+    }
+
+    /**
+     * Return element html
+     *
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    protected function _getElementHtml(AbstractElement $element)
+    {
+        $this->setElements($element);
+        return $this->_toHtml();
+    }
+
+    /**
+     * Return element value
+     *
+     * @return mixed
+     */
+    public function getElement()
+    {
+        return $this->getElements();
+    }
+
+    /**
+     * Retrieve Novalnet Credit Card form style
+     *
+     * @param string $param
+     * @return string|null
+     */
+    public function getElementValue($param)
+    {
+        $values = $this->getElements()->getValue($param);
+        if (!empty($values)) {
+            return $values;
+        } elseif (isset($this->ccLocalFormConfig[$param])) {
+            return $this->ccLocalFormConfig[$param];
+        }
+
+        return '';
+    }
+}
diff --git a/Block/System/Config/Form/Field/Disabled.php b/Block/System/Config/Form/Field/Disabled.php
new file mode 100755
index 0000000..e5fadb9
--- /dev/null
+++ b/Block/System/Config/Form/Field/Disabled.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\System\Config\Form\Field;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+/**
+ * Novalnet Disable System Config Field block
+ */
+class Disabled extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * Remove scope label
+     *
+     * @param  AbstractElement $element
+     * @return string
+     */
+    public function render(AbstractElement $element)
+    {
+        $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
+        return parent::render($element);
+    }
+
+    /**
+     * Return element html
+     *
+     * @param  AbstractElement $element
+     * @return string
+     */
+    protected function _getElementHtml(AbstractElement $element)
+    {
+        $element->setReadonly(true);
+        return parent::_getElementHtml($element);
+    }
+}
diff --git a/Block/System/Config/Form/Field/Guaranteeforce.php b/Block/System/Config/Form/Field/Guaranteeforce.php
new file mode 100755
index 0000000..f5274b7
--- /dev/null
+++ b/Block/System/Config/Form/Field/Guaranteeforce.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\System\Config\Form\Field;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+/**
+ * Novalnet Disable System Config Field block
+ */
+class Guaranteeforce extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * Set template to itself
+     *
+     * @return $this
+     */
+    protected function _prepareLayout()
+    {
+        parent::_prepareLayout();
+        $this->setTemplate('Novalnet_Payment::system/config/form/field/Guaranteeforce.phtml');
+        return $this;
+    }
+
+    /**
+     * Return element html
+     *
+     * @param  AbstractElement $element
+     * @return string
+     */
+    protected function _getElementHtml(AbstractElement $element)
+    {
+        return $this->_toHtml();
+    }
+}
diff --git a/Block/System/Config/Form/Field/ModuleVersion.php b/Block/System/Config/Form/Field/ModuleVersion.php
new file mode 100755
index 0000000..6cc9fd9
--- /dev/null
+++ b/Block/System/Config/Form/Field/ModuleVersion.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\System\Config\Form\Field;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+/**
+ * Novalnet Payment module version renderer
+ */
+class ModuleVersion extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+    }
+
+    /**
+     * Returns element
+     *
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
+        return parent::render($element);
+    }
+
+    /**
+     * Returns element html
+     *
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return mixed
+     */
+    protected function _getElementHtml(AbstractElement $element)
+    {
+        return $this->novalnetRequestHelper->getNovalnetVersion();
+    }
+}
diff --git a/Block/System/Config/Form/Field/Notification.php b/Block/System/Config/Form/Field/Notification.php
new file mode 100755
index 0000000..7880e40
--- /dev/null
+++ b/Block/System/Config/Form/Field/Notification.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\System\Config\Form\Field;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+/**
+ * Novalnet Payment module activate notification renderer
+ */
+class Notification extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * @var \Magento\Backend\Model\UrlInterface
+     */
+    protected $backendUrl;
+
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Backend\Model\UrlInterface $backendUrl
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Backend\Model\UrlInterface $backendUrl,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->backendUrl = $backendUrl;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+    }
+
+    /**
+     * Set template to itself
+     *
+     * @return $this
+     */
+    protected function _prepareLayout()
+    {
+        parent::_prepareLayout();
+        if (!$this->getTemplate()) {
+            $this->setTemplate('Novalnet_Payment::system/config/form/field/AvailablePayments.phtml');
+        }
+        return $this;
+    }
+
+    /**
+     * Returns element html
+     *
+     * @param AbstractElement $element
+     * @return string
+     */
+    protected function _getElementHtml(AbstractElement $element)
+    {
+        return $this->_toHtml();
+    }
+
+    /**
+     * Activate Global configuration
+     *
+     * @return bool
+     */
+    public function activateGlobalConfiguration()
+    {
+        return !($this->novalnetConfig->getGlobalConfig('signature') &&
+            $this->novalnetConfig->getGlobalConfig('payment_access_key') &&
+            $this->novalnetRequestHelper->checkIsNumeric($this->novalnetConfig->getGlobalConfig('tariff_id')));
+    }
+
+    /**
+     * Get Global configuration URL
+     *
+     * @return string
+     */
+    public function getGlobalConfigUrl()
+    {
+        return $this->backendUrl->getUrl('*/*/*', ['_current' => true, 'section' => 'payment']);
+    }
+}
diff --git a/Block/System/Config/Form/Field/VendorAutoConfig.php b/Block/System/Config/Form/Field/VendorAutoConfig.php
new file mode 100755
index 0000000..5b29b86
--- /dev/null
+++ b/Block/System/Config/Form/Field/VendorAutoConfig.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\System\Config\Form\Field;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+/**
+ * Novalnet VendorAutoConfig block
+ */
+class VendorAutoConfig extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * Set template to itself
+     *
+     * @return $this
+     */
+    protected function _prepareLayout()
+    {
+        parent::_prepareLayout();
+        if (!$this->getTemplate()) {
+            $this->setTemplate('Novalnet_Payment::system/config/form/field/VendorAutoConfig.phtml');
+        }
+        return $this;
+    }
+
+    /**
+     * Remove scope label
+     *
+     * @param  AbstractElement $element
+     * @return string
+     */
+    public function render(AbstractElement $element)
+    {
+        $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
+        return parent::render($element);
+    }
+
+    /**
+     * Return element html
+     *
+     * @param  AbstractElement $element
+     * @return string
+     */
+    protected function _getElementHtml(AbstractElement $element)
+    {
+        $this->addData(
+            [
+                'button_label' => __($element->getOriginalData('button_label')),
+                'html_id' => $element->getHtmlId(),
+            ]
+        );
+
+        return $this->_toHtml();
+    }
+}
diff --git a/Block/System/Config/Form/Field/WebhookURL.php b/Block/System/Config/Form/Field/WebhookURL.php
new file mode 100755
index 0000000..4a95ff7
--- /dev/null
+++ b/Block/System/Config/Form/Field/WebhookURL.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block\System\Config\Form\Field;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+/**
+ * Novalnet Payment webhook URL renderer
+ */
+class WebhookURL extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $storeManager;
+
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $config;
+
+    /**
+     * @var \Magento\Framework\App\Request\Http
+     */
+    protected $request;
+
+    /**
+     * @var string
+     */
+    protected $_template = 'Novalnet_Payment::config/webhooks_configuration.phtml';
+
+    /**
+     * @var mixed
+     */
+    protected $storeId;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Novalnet\Payment\Model\NNConfig $config
+     * @param \Magento\Framework\App\Request\Http $request
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Novalnet\Payment\Model\NNConfig $config,
+        \Magento\Framework\App\Request\Http $request,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->storeManager = $storeManager;
+        $this->config = $config;
+        $this->storeManager = $context->getStoreManager();
+        $this->request = $request;
+        $this->storeId = $this->getAdminConfigStoreId();
+    }
+
+    /**
+     * Render element html
+     *
+     * @param AbstractElement $element
+     * @return string
+     */
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
+        return parent::render($element);
+    }
+
+    /**
+     * Returns storeId
+     *
+     * @return int
+     */
+    public function getAdminConfigStoreId()
+    {
+        $storeId = (int)$this->request->getParam('store', 0);
+        $websiteId = (int)$this->request->getParam('website', 0);
+
+        if ($storeId) {
+            return $storeId;
+        } elseif ($websiteId) {
+            return $this->storeManager->getWebsite($websiteId)->getDefaultStore()->getId();
+        }
+
+        return 0; // Default store
+    }
+
+    /**
+     * Returns Button html
+     *
+     * @return string
+     */
+    public function getButtonHtml()
+    {
+        $button = $this->getLayout()->createBlock(
+            \Magento\Backend\Block\Widget\Button::class
+        )->setData(
+            [
+                'id' => 'novalnet_configure_webhooks',
+                'label' => __('Configure'),
+            ]
+        );
+
+        return $button->toHtml();
+    }
+
+    /**
+     * Returns Ajax URL
+     *
+     * @return string
+     */
+    public function getAjaxUrl()
+    {
+        $storeBaseUrl = $this->storeManager->getStore()->getBaseUrl();
+        return str_replace('index.php/', '', $storeBaseUrl) . 'rest/V1/novalnet/config_webhook_url/';
+    }
+
+    /**
+     * Returns Webhook URL
+     *
+     * @return string
+     */
+    public function getWebHookUrl()
+    {
+        $webhookUrl = $this->config->getMerchantScriptConfig('vendor_script_url');
+        $storeBaseUrl = $this->storeManager->getStore()->getBaseUrl();
+        return !empty($webhookUrl) ? $webhookUrl : str_replace('index.php/', '', $storeBaseUrl) . 'rest/V1/novalnet/callback';
+    }
+
+    /**
+     * Returns element html
+     *
+     * @param AbstractElement $element
+     * @return string
+     */
+    protected function _getElementHtml(AbstractElement $element)
+    {
+        $this->setElements($element);
+        return $this->_toHtml();
+    }
+
+    /**
+     * Return element value
+     *
+     * @return object
+     */
+    public function getElement()
+    {
+        return $this->getElements();
+    }
+}
diff --git a/Block/VendorAutoConfig.php b/Block/VendorAutoConfig.php
new file mode 100755
index 0000000..b839f06
--- /dev/null
+++ b/Block/VendorAutoConfig.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Block;
+
+use Magento\Framework\View\Element\Template;
+
+class VendorAutoConfig extends Template
+{
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $storeManager;
+
+    /**
+     * @var \Laminas\Uri\Uri
+     */
+    protected $uriParser;
+
+    /**
+     * @param Template\Context $context
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Laminas\Uri\Uri $uriParser
+     * @param array $data
+     */
+    public function __construct(
+        Template\Context $context,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Laminas\Uri\Uri $uriParser,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->scopeConfig = $context->getScopeConfig();
+        $this->_storeManager = $storeManager;
+        $this->uriParser = $uriParser;
+    }
+
+    /**
+     * Returns vendor auto config url for the Novalnet module
+     *
+     * @return string
+     */
+    public function getVendorAutoConfigUrl()
+    {
+        $baseUrl = $this->_storeManager->getStore()->getBaseUrl();
+        return str_replace('index.php/', '', $baseUrl) . 'rest/V1/novalnet/activate_product_key/';
+    }
+
+    /**
+     * Gets request section value
+     *
+     * @return string|null
+     */
+    public function getSectionParam()
+    {
+        return ($this->getRequest()->getParam('section') ? $this->getRequest()->getParam('section') : '');
+    }
+
+    /**
+     * Retrieves Store configuration values
+     *
+     * @param  string $path
+     * @return string
+     */
+    public function getConfigValue($path)
+    {
+        $scope = '';
+        $id = '';
+        if ($this->getRequest()->getParam('website', 0)) {
+            $scope = \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE;
+            $id = $this->getRequest()->getParam('website', 0);
+        } elseif ($this->getRequest()->getParam('store', 0)) {
+            $scope = \Magento\Store\Model\ScopeInterface::SCOPE_STORE;
+            $id = $this->getRequest()->getParam('store', 0);
+        }
+
+        if ($scope && $id) {
+            return $this->scopeConfig->getValue($path, $scope, $id);
+        } else {
+            return $this->scopeConfig->getValue($path);
+        }
+    }
+
+    /**
+     * Returns shop host URL
+     *
+     * @return string
+     */
+    public function getShopHostName()
+    {
+        $storeBaseUrl = $this->_storeManager->getStore()->getBaseUrl();
+        $url = $this->uriParser->parse($storeBaseUrl);
+
+        return !empty($url->getHost()) ? $url->getHost() : '';
+    }
+}
diff --git a/Controller/Adminhtml/Sales/Instalment.php b/Controller/Adminhtml/Sales/Instalment.php
new file mode 100755
index 0000000..d0b9d07
--- /dev/null
+++ b/Controller/Adminhtml/Sales/Instalment.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Controller\Adminhtml\Sales;
+
+use Magento\Backend\App\Action;
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Psr\Log\LoggerInterface;
+
+class Instalment extends \Magento\Sales\Controller\Adminhtml\Order
+{
+    /**
+     * @var \Magento\Framework\View\LayoutFactory
+     */
+    protected $layoutFactory;
+
+    /**
+     * @param Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+     * @param \Magento\Framework\Translate\InlineInterface $translateInline
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param OrderManagementInterface $orderManagement
+     * @param OrderRepositoryInterface $orderRepository
+     * @param LoggerInterface $logger
+     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+     */
+    public function __construct(
+        Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
+        \Magento\Framework\Translate\InlineInterface $translateInline,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        OrderManagementInterface $orderManagement,
+        OrderRepositoryInterface $orderRepository,
+        LoggerInterface $logger,
+        \Magento\Framework\View\LayoutFactory $layoutFactory
+    ) {
+        $this->layoutFactory = $layoutFactory;
+        parent::__construct(
+            $context,
+            $coreRegistry,
+            $fileFactory,
+            $translateInline,
+            $resultPageFactory,
+            $resultJsonFactory,
+            $resultLayoutFactory,
+            $resultRawFactory,
+            $orderManagement,
+            $orderRepository,
+            $logger
+        );
+    }
+
+    /**
+     * Instalment tab for Novalnet payments
+     *
+     * @return mixed
+     */
+    public function execute()
+    {
+        $this->_initOrder();
+        $layout = $this->layoutFactory->create();
+        $html = $layout->createBlock(\Novalnet\Payment\Block\Adminhtml\Sales\Order\View\Tab\Instalment::class)
+            ->toHtml();
+        $this->_translateInline->processResponseBody($html);
+        $resultRaw = $this->resultRawFactory->create();
+        $resultRaw->setContents($html);
+        return $resultRaw;
+    }
+}
diff --git a/Controller/Adminhtml/Sales/OrderCapture.php b/Controller/Adminhtml/Sales/OrderCapture.php
new file mode 100755
index 0000000..385f1cf
--- /dev/null
+++ b/Controller/Adminhtml/Sales/OrderCapture.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Controller\Adminhtml\Sales;
+
+use Novalnet\Payment\Model\NNConfig;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class OrderCapture extends \Magento\Sales\Controller\Adminhtml\Order
+{
+    /**
+     * @var \Novalnet\Payment\Model\TransactionStatus
+     */
+    private $transactionStatusModel;
+
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    private $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    private $serializer;
+
+    /**
+     * @var \Novalnet\Payment\Logger\NovalnetLogger
+     */
+    private $novalnetLogger;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+     * @param \Magento\Framework\Translate\InlineInterface $translateInline
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param \Magento\Sales\Api\OrderManagementInterface $orderManagement
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
+        \Magento\Framework\Translate\InlineInterface $translateInline,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        \Magento\Sales\Api\OrderManagementInterface $orderManagement,
+        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        \Psr\Log\LoggerInterface $logger,
+        \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+    ) {
+        $this->transactionStatusModel = $transactionStatusModel;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        $this->novalnetLogger = $novalnetLogger;
+        parent::__construct(
+            $context,
+            $coreRegistry,
+            $fileFactory,
+            $translateInline,
+            $resultPageFactory,
+            $resultJsonFactory,
+            $resultLayoutFactory,
+            $resultRawFactory,
+            $orderManagement,
+            $orderRepository,
+            $logger
+        );
+    }
+
+    /**
+     * Order confirmation process for Novalnet payments (Invoice)
+     *
+     * @return mixed
+     */
+    public function execute()
+    {
+        $order = $this->_initOrder();
+        $resultRedirect = $this->resultRedirectFactory->create();
+        try {
+            if ($order) {
+                $payment = $order->getPayment();
+                $storeId = $order->getStoreId();
+                $paymentMethodCode = $payment->getMethodInstance()->getCode();
+                $transactionId = preg_replace('/[^0-9]+/', '', $payment->getLastTransId());
+
+                if ($order->canInvoice() && $paymentMethodCode == ConfigProvider::NOVALNET_INVOICE) {
+                    $invoice = $order->prepareInvoice();
+                    $invoice->setRequestedCaptureCase(\Magento\Sales\Model\Order\Invoice::CAPTURE_ONLINE)
+                        ->register();
+                    $additionalData = [];
+                    if (!empty($payment->getAdditionalData())) {
+                        $additionalData = $this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+                            ? $this->serializer->unserialize($payment->getAdditionalData())
+                            : json_decode($payment->getAdditionalData(), true);
+                    }
+
+                    if (!empty($additionalData['NnGuarantee'])) {
+                        $state = \Magento\Sales\Model\Order\Invoice::STATE_PAID;
+                    } else {
+                        $state = \Magento\Sales\Model\Order\Invoice::STATE_OPEN;
+                    }
+
+                    $invoice->setState($state)
+                        ->setTransactionId($transactionId)
+                        ->save();
+
+                    $transactionStatus = !empty($additionalData['NnStatus'])
+                        ? $this->novalnetRequestHelper->getStatus($additionalData['NnStatus'], $order) : '';
+                    $this->transactionStatusModel->loadByAttribute($order->getIncrementId(), 'order_id')
+                        ->setStatus($transactionStatus)->save();
+
+                    $orderStatus = $this->novalnetConfig->getPaymentConfig(
+                        $paymentMethodCode,
+                        'order_status',
+                        $storeId
+                    );
+
+                    $orderStatus = $orderStatus ? $orderStatus : \Magento\Sales\Model\Order::STATE_PROCESSING;
+                    // Verifies and sets order status
+                    $order->setState(\Magento\Sales\Model\Order::STATE_PROCESSING)
+                        ->setStatus($orderStatus);
+                    $order->save();
+
+                    $this->messageManager->addSuccess(__('The invoice has been created.'));
+                    $this->novalnetLogger->notice('The invoice has been created for order no: ' . $order->getIncrementId());
+                } else {
+                    $this->messageManager->addError(__('The order does not allow an invoice to be created.'));
+                    $this->novalnetLogger->notice('The order does not allow an invoice to be created for order no: ' . $order->getIncrementId());
+                }
+
+                $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]);
+                return $resultRedirect;
+            }
+        } catch (\Exception $e) {
+            $error = __('The order does not allow an invoice to be created.') . ' ' . $e->getMessage();
+            $this->messageManager->addError($error);
+            $this->novalnetLogger->error($error);
+        }
+
+        $resultRedirect->setPath('sales/order/');
+        return $resultRedirect;
+    }
+}
diff --git a/Controller/Adminhtml/Sales/Refund.php b/Controller/Adminhtml/Sales/Refund.php
new file mode 100755
index 0000000..0730e04
--- /dev/null
+++ b/Controller/Adminhtml/Sales/Refund.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Controller\Adminhtml\Sales;
+
+use Novalnet\Payment\Model\NNConfig;
+
+class Refund extends \Magento\Sales\Controller\Adminhtml\Order
+{
+    /**
+     * @var \Magento\Framework\HTTP\Client\Curl
+     */
+    private $clientFactory;
+
+    /**
+     * @var \Magento\Framework\Pricing\Helper\Data
+     */
+    private $pricingHelper;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    private $serializer;
+
+    /**
+     * @var \Novalnet\Payment\Logger\NovalnetLogger
+     */
+    private $novalnetLogger;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+     * @param \Magento\Framework\Translate\InlineInterface $translateInline
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param \Magento\Sales\Api\OrderManagementInterface $orderManagement
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Framework\HTTP\Client\Curl $clientFactory
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
+        \Magento\Framework\Translate\InlineInterface $translateInline,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        \Magento\Sales\Api\OrderManagementInterface $orderManagement,
+        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\HTTP\Client\Curl $clientFactory,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+    ) {
+        $this->pricingHelper = $pricingHelper;
+        $this->clientFactory = $clientFactory;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelper = $jsonHelper;
+        $this->serializer = $serializer;
+        $this->novalnetLogger = $novalnetLogger;
+        parent::__construct(
+            $context,
+            $coreRegistry,
+            $fileFactory,
+            $translateInline,
+            $resultPageFactory,
+            $resultJsonFactory,
+            $resultLayoutFactory,
+            $resultRawFactory,
+            $orderManagement,
+            $orderRepository,
+            $logger
+        );
+    }
+
+    /**
+     * Order refund process for Novalnet payments
+     *
+     * @return mixed
+     */
+    public function execute()
+    {
+        $refundAmount = $this->getRequest()->getParam('nn-refund-amount');
+        $refundTid = $this->getRequest()->getParam('nn-refund-tid');
+        $refundTid = $this->novalnetRequestHelper->makeValidNumber($refundTid);
+        $instalmentCancel = $this->getRequest()->getParam('nn-instalment-cancel');
+        $order = $this->_initOrder();
+        $payment = $order->getPayment();
+        $storeId = $order->getStoreId();
+        $resultRedirect = $this->resultRedirectFactory->create();
+
+        $additionalData = [];
+        if (!empty($payment->getAdditionalData())) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+                ? $this->serializer->unserialize($payment->getAdditionalData())
+                : json_decode($payment->getAdditionalData(), true);
+        }
+
+        if (!empty($additionalData['NnZeroAmountBooking']) && !empty($additionalData['NnZeroAmountDone'])) {
+            $refundTid = $additionalData['NnZeroAmountRefTid'];
+        }
+
+        if ((!$refundAmount && !$instalmentCancel) || !$refundTid) {
+            $this->messageManager->addError(__('The Amount should be in future'));
+            $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]);
+            return $resultRedirect;
+        }
+
+        if ($order) {
+            if (!empty($instalmentCancel)) {
+                $this->novalnetLogger->notice('Intiated instalment cancel for Novalnet ID: ' . $refundTid);
+                $url = NNConfig::NOVALNET_INSTALMENT_CANCEL;
+                $requestData = [
+                    'instalment' => [
+                        'tid'    => $refundTid,
+                    ]
+                ];
+            } else {
+                $this->novalnetLogger->notice('Intiated instalment refund for Novalnet ID: ' . $refundTid);
+                $url = NNConfig::NOVALNET_REFUND_URL;
+                $requestData = [
+                    'transaction' => [
+                        'tid' => $refundTid,
+                        'amount' => $refundAmount
+                    ],
+                    'custom' => ['lang' => $this->novalnetRequestHelper->getDefaultLanguage()]
+                ];
+            }
+
+            $this->clientFactory->setHeaders($this->novalnetRequestHelper->getRequestHeaders(false, $storeId));
+            $this->clientFactory->post($url, $this->jsonHelper->jsonEncode($requestData));
+            $response = new \Magento\Framework\DataObject();
+            $responseBody = ($this->clientFactory->getBody()) ? json_decode($this->clientFactory->getBody(), true) : [];
+            $response->setData($responseBody);
+
+            if ($response->getData('result/status') == 'SUCCESS') {
+                $refundKey = $this->getRequest()->getParam('nn-refund-key');
+                $newRefundTid = $response->getData('transaction/refund/tid')
+                    ? $response->getData('transaction/refund/tid') : $refundTid;
+
+                if (empty($refundAmount)) {
+                    $refundAmount = $response->getData('transaction/refund/amount');
+                    $additionalData['InstalmentCancel'] = 1;
+                }
+                $additionalData['InstalmentDetails'][$refundKey]['Refund'][] = [
+                    'tid' => $newRefundTid,
+                    'amount' => $refundAmount / 100
+                ];
+
+                $refundAmountwithCurrency = $this->pricingHelper->currency(($refundAmount / 100), true, false);
+                $additionalData['NnRefunded'][$newRefundTid]['reftid'] = $newRefundTid;
+                $additionalData['NnRefunded'][$newRefundTid]['refamount'] = $refundAmountwithCurrency;
+                $additionalData['NnRefunded'][$newRefundTid]['reqtid'] = $refundTid;
+
+                $payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+                $this->messageManager->addSuccess(__('The Refund executed properly'));
+                $this->novalnetLogger->notice('The Refund executed properly for order id ' . $order->getId());
+            } elseif ($response->getData('result/status_text')) {
+                $this->messageManager->addError($response->getData('result/status_text'));
+                $this->novalnetLogger->notice('The Refund not working for order id: ' . $order->getId());
+            }
+
+            $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]);
+            return $resultRedirect;
+        }
+
+        $resultRedirect->setPath('sales/order/');
+        return $resultRedirect;
+    }
+}
diff --git a/Controller/Adminhtml/Sales/ZeroAmountBookingTab.php b/Controller/Adminhtml/Sales/ZeroAmountBookingTab.php
new file mode 100755
index 0000000..e98045e
--- /dev/null
+++ b/Controller/Adminhtml/Sales/ZeroAmountBookingTab.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Controller\Adminhtml\Sales;
+
+use Magento\Backend\App\Action;
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Psr\Log\LoggerInterface;
+
+class ZeroAmountBookingTab extends \Magento\Sales\Controller\Adminhtml\Order
+{
+    /**
+     * @var \Magento\Framework\View\LayoutFactory
+     */
+    protected $layoutFactory;
+
+    /**
+     * @param Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+     * @param \Magento\Framework\Translate\InlineInterface $translateInline
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param OrderManagementInterface $orderManagement
+     * @param OrderRepositoryInterface $orderRepository
+     * @param LoggerInterface $logger
+     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+     */
+    public function __construct(
+        Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
+        \Magento\Framework\Translate\InlineInterface $translateInline,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        OrderManagementInterface $orderManagement,
+        OrderRepositoryInterface $orderRepository,
+        LoggerInterface $logger,
+        \Magento\Framework\View\LayoutFactory $layoutFactory
+    ) {
+        $this->layoutFactory = $layoutFactory;
+        parent::__construct(
+            $context,
+            $coreRegistry,
+            $fileFactory,
+            $translateInline,
+            $resultPageFactory,
+            $resultJsonFactory,
+            $resultLayoutFactory,
+            $resultRawFactory,
+            $orderManagement,
+            $orderRepository,
+            $logger
+        );
+    }
+
+    /**
+     * Zero Amount Booking tab for Novalnet payments
+     *
+     * @return mixed
+     */
+    public function execute()
+    {
+        $this->_initOrder();
+        $layout = $this->layoutFactory->create();
+        $html = $layout->createBlock(\Novalnet\Payment\Block\Adminhtml\Sales\Order\View\Tab\ZeroAmountBooking::class)
+            ->toHtml();
+        $this->_translateInline->processResponseBody($html);
+        $resultRaw = $this->resultRawFactory->create();
+        $resultRaw->setContents($html);
+        return $resultRaw;
+    }
+}
diff --git a/Controller/Adminhtml/Sales/ZeroAmountUpdate.php b/Controller/Adminhtml/Sales/ZeroAmountUpdate.php
new file mode 100755
index 0000000..576c8e0
--- /dev/null
+++ b/Controller/Adminhtml/Sales/ZeroAmountUpdate.php
@@ -0,0 +1,352 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Controller\Adminhtml\Sales;
+
+use Novalnet\Payment\Model\NNConfig;
+use Magento\Store\Model\StoreManagerInterface;
+
+class ZeroAmountUpdate extends \Magento\Sales\Controller\Adminhtml\Order
+{
+    /**
+     * @var \Magento\Framework\HTTP\Client\Curl
+     */
+    private $clientFactory;
+
+    /**
+     * @var \Magento\Framework\Pricing\Helper\Data
+     */
+    private $pricingHelper;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    private $serializer;
+
+    /**
+     * @var \Novalnet\Payment\Logger\NovalnetLogger
+     */
+    private $novalnetLogger;
+
+    /**
+     * @var NNConfig
+     */
+    private $novalnetConfig;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var \Novalnet\Payment\Model\TransactionStatus
+     */
+    private $transactionStatusModel;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Email\Sender\InvoiceSender
+     */
+    private $invoiceSender;
+
+    /**
+     * @var \Magento\Framework\DB\TransactionFactory
+     */
+    private $dbTransaction;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+     * @param \Magento\Framework\Translate\InlineInterface $translateInline
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param \Magento\Sales\Api\OrderManagementInterface $orderManagement
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Framework\HTTP\Client\Curl $clientFactory
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+     * @param NNConfig $novalnetConfig
+     * @param StoreManagerInterface $storeManager
+     * @param \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel
+     * @param \Magento\Sales\Model\Order\Email\Sender\InvoiceSender $invoiceSender
+     * @param \Magento\Framework\DB\TransactionFactory $dbTransaction
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
+        \Magento\Framework\Translate\InlineInterface $translateInline,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        \Magento\Sales\Api\OrderManagementInterface $orderManagement,
+        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\HTTP\Client\Curl $clientFactory,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger,
+        NNConfig $novalnetConfig,
+        StoreManagerInterface $storeManager,
+        \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel,
+        \Magento\Sales\Model\Order\Email\Sender\InvoiceSender $invoiceSender,
+        \Magento\Framework\DB\TransactionFactory $dbTransaction
+    ) {
+        parent::__construct(
+            $context,
+            $coreRegistry,
+            $fileFactory,
+            $translateInline,
+            $resultPageFactory,
+            $resultJsonFactory,
+            $resultLayoutFactory,
+            $resultRawFactory,
+            $orderManagement,
+            $orderRepository,
+            $logger
+        );
+        $this->pricingHelper = $pricingHelper;
+        $this->clientFactory = $clientFactory;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelper = $jsonHelper;
+        $this->serializer = $serializer;
+        $this->novalnetLogger = $novalnetLogger;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->storeManager = $storeManager;
+        $this->transactionStatusModel = $transactionStatusModel;
+        $this->invoiceSender = $invoiceSender;
+        $this->dbTransaction = $dbTransaction;
+    }
+
+    /**
+     * Zero amount booking process
+     *
+     * @return mixed
+     */
+    public function execute()
+    {
+        $order = $this->_initOrder();
+        $resultRedirect = $this->resultRedirectFactory->create();
+        ($order->getId()) ? $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]) : $resultRedirect->setPath('sales/order/');
+
+        try {
+            $amountToUpdate = $this->getRequest()->getParam('nn-amount-to-update');
+            $storeId = $order->getStoreId();
+            $payment = $order->getPayment();
+            $paymentMethodCode = $payment->getMethodInstance()->getCode();
+            $billingAddress = $order->getBillingAddress();
+            $billingStreet = $this->getStreet($billingAddress);
+            $shippingAddress = $order->getShippingAddress();
+            $paymentToken = $this->getPaymentToken($order->getIncrementId());
+
+            $data = [];
+
+            $data['merchant'] = [
+                'signature' => $this->novalnetConfig->getGlobalConfig('signature', $storeId),
+                'tariff' => $this->novalnetConfig->getGlobalConfig('tariff_id', $storeId),
+            ];
+
+            $data['customer'] = [
+                'first_name' => $billingAddress->getFirstname(),
+                'last_name' => $billingAddress->getLastname(),
+                'email' => $billingAddress->getEmail(),
+                'tel' => $billingAddress->getTelephone(),
+                'customer_ip' => $this->novalnetRequestHelper->getRequestIp(),
+                'customer_no' => $order->getCustomerId(),
+            ];
+
+            $data['customer']['billing'] = [
+                'street' => $billingStreet,
+                'city' => $billingAddress->getCity(),
+                'zip' => $billingAddress->getPostcode(),
+                'country_code' => $billingAddress->getCountryId(),
+                'state' => $this->novalnetRequestHelper->getRegionNameByCode($billingAddress->getRegionCode(), $billingAddress->getCountryId())
+            ];
+
+            if (!empty($shippingAddress)) {
+                if ($billingAddress->getFirstname() == $shippingAddress->getFirstname() &&
+                    $billingAddress->getLastname() == $shippingAddress->getLastname() &&
+                    $billingStreet == $this->getStreet($shippingAddress) &&
+                    $billingAddress->getCity() == $shippingAddress->getCity() &&
+                    $billingAddress->getCountryId() ==$shippingAddress->getCountryId() &&
+                    $billingAddress->getPostcode() == $shippingAddress->getPostcode()
+                ) {
+                    $data['customer']['shipping']['same_as_billing'] = 1;
+                } else {
+                    $data['customer']['shipping'] = [
+                        'first_name' => $shippingAddress->getFirstname(),
+                        'last_name' => $shippingAddress->getLastname(),
+                        'email' => $shippingAddress->getEmail(),
+                        'tel' => $shippingAddress->getTelephone(),
+                        'street' => $this->getStreet($shippingAddress),
+                        'city' => $shippingAddress->getCity(),
+                        'zip' => $shippingAddress->getPostcode(),
+                        'country_code' => $shippingAddress->getCountryId(),
+                        'state' => $this->novalnetRequestHelper->getRegionNameByCode($shippingAddress->getRegionCode(), $shippingAddress->getCountryId())
+                    ];
+
+                    if (!empty($shippingAddress->getCompany())) {
+                        $data['customer']['shipping']['company'] = $shippingAddress->getCompany();
+                    }
+                }
+            }
+
+            $data['transaction'] = [
+                'payment_type' => $this->novalnetConfig->getPaymentType($paymentMethodCode),
+                'amount' => $amountToUpdate,
+                'currency' => $order->getBaseCurrencyCode(),
+                'test_mode' => $this->novalnetConfig->getTestMode($paymentMethodCode),
+                'order_no' => $order->getIncrementId(),
+                'system_ip' => $this->novalnetRequestHelper->getServerAddr(),
+                'system_name' => 'Magento',
+                'system_version' => $this->novalnetRequestHelper->getMagentoVersion() . '-' . $this->novalnetRequestHelper->getNovalnetVersion(),
+                'system_url' => $this->storeManager->getStore()->getBaseUrl(),
+                'payment_data' => [
+                    'token' => $paymentToken
+                ]
+            ];
+
+            $data['custom'] = [
+                'lang' => $this->novalnetRequestHelper->getDefaultLanguage(),
+            ];
+
+            $endPointURL = NNConfig::NOVALNET_PAYMENT_URL;
+            $this->clientFactory->setHeaders($this->novalnetRequestHelper->getRequestHeaders(false, $storeId));
+            $this->clientFactory->post($endPointURL, $this->jsonHelper->jsonEncode($data));
+            $response = new \Magento\Framework\DataObject();
+            $responseBody = ($this->clientFactory->getBody()) ? json_decode($this->clientFactory->getBody(), true) : [];
+            $response->setData($responseBody);
+
+            if ($response->getData('result/status') == 'SUCCESS') {
+                $zeroAmountRefTid = $response->getData('transaction/tid');
+                $updatedAmount = $this->novalnetRequestHelper->getFormattedAmount($response->getData('transaction/amount'), 'RAW');
+
+                $additionalData = [];
+                if (!empty($payment->getAdditionalData())) {
+                    $additionalData = $this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+                        ? $this->serializer->unserialize($payment->getAdditionalData())
+                        : json_decode($payment->getAdditionalData(), true);
+                }
+
+                $updatedAmountwithCurrency = $this->pricingHelper->currency($updatedAmount, true, false);
+                $additionalData['NnZeroAmountDone'] = 1;
+                $additionalData['NnUpdatedZeroAmount'] = $updatedAmountwithCurrency;
+                $additionalData['NnZeroAmountRefTid'] = $zeroAmountRefTid;
+                $additionalData['NnZeroAmountCapture'] = 1;
+                $payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData));
+
+                $payment->setTransactionId($zeroAmountRefTid . '-zeroamount')
+                    ->setLastTransId($zeroAmountRefTid)
+                    ->capture();
+
+                $orderStatus = $this->novalnetConfig->getPaymentConfig(
+                    $paymentMethodCode,
+                    'order_status',
+                    $storeId
+                );
+
+                if ($response->getData('transaction/status') == 'CONFIRMED') {
+                    $order->setStatus($orderStatus)->save();
+                }
+
+                $invoice = current($order->getInvoiceCollection()->getItems());
+                $this->dbTransaction->create()->addObject($payment)->addObject($invoice)->addObject($order)->save();
+                $this->invoiceSender->send($invoice);
+
+                $order->addStatusHistoryComment(__('Zero Amount has been updated successfully'), false)->save();
+                $this->messageManager->addSuccess(__('Amount has been booked successfully'));
+                $this->novalnetLogger->notice('Zero Amount has been updated successfully for order id: ' . $order->getId());
+            } elseif ($response->getData('result/status_text')) {
+                $this->messageManager->addError($response->getData('result/status_text'));
+                $order->addStatusHistoryComment(__('Zero Amount update has been failed'), false)->save();
+                $this->novalnetLogger->notice('Zero Amount update has been failed for order id: ' . $order->getId());
+            }
+
+            return $resultRedirect;
+        } catch (\Exception $e) {
+            $this->messageManager->addError($e->getMessage());
+            return $resultRedirect;
+        }
+    }
+
+    /**
+     * Get Street from address
+     *
+     * @param object $address
+     * @return string
+     */
+    public function getStreet($address)
+    {
+        try {
+            if (method_exists($address, 'getStreetFull')) {
+                $street = $address->getStreetFull();
+            } else {
+                if ($address->getStreetLine1()) {
+                    $street = implode(' ', [$address->getStreetLine1(), $address->getStreetLine2()]);
+                } else {
+                    $street = (!empty($address->getStreet())) ? implode(' ', $address->getStreet()) : '';
+                }
+            }
+
+            return $street;
+        } catch (\Exception $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Get payment token for the order
+     *
+     * @param mixed $orderIncrementId
+     * @return string|null
+     */
+    protected function getPaymentToken($orderIncrementId)
+    {
+        try {
+            $tokenInfo = $this->transactionStatusModel->getCollection()->addFieldToFilter('order_id', ['eq' => $orderIncrementId])->getFirstItem();
+
+            if (!empty($tokenInfo['token'])) {
+                return $tokenInfo['token'];
+            }
+
+            return null;
+        } catch (\Exception $e) {
+            throw $e;
+        }
+    }
+}
diff --git a/Controller/Redirect/Failure.php b/Controller/Redirect/Failure.php
new file mode 100755
index 0000000..beed954
--- /dev/null
+++ b/Controller/Redirect/Failure.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Controller\Redirect;
+
+use Novalnet\Payment\Model\NNConfig;
+
+class Failure extends \Magento\Framework\App\Action\Action
+{
+    /**
+     * @var \Magento\Sales\Model\Order
+     */
+    protected $salesModel;
+
+    /**
+     * @var \Magento\Checkout\Model\Session
+     */
+    protected $checkoutSession;
+
+    /**
+     * @var \Magento\Framework\HTTP\Client\Curl
+     */
+    protected $clientFactory;
+
+    /**
+     * @var \Magento\Framework\Message\ManagerInterface
+     */
+    protected $messageManager;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    protected $jsonHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @var NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Logger\NovalnetLogger
+     */
+    private $novalnetLogger;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Sales\Model\Order $salesModel
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Framework\HTTP\Client\Curl $clientFactory
+     * @param \Magento\Framework\Message\ManagerInterface $messageManager
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Sales\Model\Order $salesModel,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        \Magento\Framework\HTTP\Client\Curl $clientFactory,
+        \Magento\Framework\Message\ManagerInterface $messageManager,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        NNConfig $novalnetConfig,
+        \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+    ) {
+        parent::__construct($context);
+        $this->salesModel = $salesModel;
+        $this->checkoutSession = $checkoutSession;
+        $this->clientFactory = $clientFactory;
+        $this->messageManager = $messageManager;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelper = $jsonHelper;
+        $this->serializer = $serializer;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetLogger = $novalnetLogger;
+    }
+
+    /**
+     * Handles Novalnet redirect failure process
+     *
+     * @return mixed
+     */
+    public function execute()
+    {
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $checkSumResponse = $this->getRequest()->getParams();
+
+        // Loads order model by loading the Increment Id
+        $order = $this->salesModel->loadByIncrementId($checkSumResponse['order_no']);
+        $storeId = '';
+        if ($order) {
+            $storeId = $order->getStoreId();
+        }
+        $payment = $order->getPayment();
+        $lastTransId = $payment->getLastTransId();
+        if (!empty($lastTransId)) {
+            $this->novalnetLogger->notice('Callback already executed for ' . $order->getIncrementId());
+            $resultRedirect->setPath('checkout/onepage/failure');
+            return $resultRedirect;
+        }
+
+        if (isset($checkSumResponse['tid'])) {
+            $this->novalnetLogger->notice('Customer return from Novalnet to shop (Novalnet redirect failure controller). Novalnet transaction ID: ' . $checkSumResponse['tid']);
+            $this->clientFactory->setHeaders($this->novalnetRequestHelper->getRequestHeaders(false, $storeId));
+            $this->clientFactory->post(
+                NNConfig::NOVALNET_TRANSACTION_DETAIL_URL,
+                $this->jsonHelper->jsonEncode(
+                    [
+                        'transaction' => ['tid'  => $checkSumResponse['tid']],
+                        'custom'      => ['lang' => $this->novalnetRequestHelper->getDefaultLanguage()]
+                    ]
+                )
+            );
+        }
+
+        $response = new \Magento\Framework\DataObject();
+        $responseBody = ($this->clientFactory->getBody()) ? json_decode($this->clientFactory->getBody(), true) : [];
+        $response->setData($responseBody);
+
+        // Loads order model by loading the Increment Id
+        $orderId = !empty($checkSumResponse['order_no']) ? $checkSumResponse['order_no'] : $response->getData('transaction/order_no');
+        $this->novalnetLogger->notice('Get order no' . $orderId);
+        $order = $this->salesModel->loadByIncrementId($orderId);
+
+        $this->novalnetLogger->notice('Order loaded successfully ' . $order->getIncrementId());
+        $this->novalnetRequestHelper->saveCanceledOrder($response, $order);
+        $errorMessage = !empty($checkSumResponse['status_text']) ? $checkSumResponse['status_text'] : $response->getData('result/status_text');
+        $this->messageManager->addErrorMessage(__($errorMessage));
+
+        // Restore the cart items
+        if ($this->novalnetConfig->getGlobalConfig('restore_cart')) {
+            $this->novalnetRequestHelper->restoreQuote($orderId);
+            $this->novalnetLogger->notice('Successfully restored the cart items' . $order->getIncrementId());
+            $resultRedirect->setPath('checkout/cart');
+        } else {
+            $resultRedirect->setPath('checkout/onepage/failure');
+        }
+
+        return $resultRedirect;
+    }
+}
diff --git a/Controller/Redirect/Success.php b/Controller/Redirect/Success.php
new file mode 100755
index 0000000..d196ea7
--- /dev/null
+++ b/Controller/Redirect/Success.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Controller\Redirect;
+
+use Novalnet\Payment\Model\NNConfig;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class Success extends \Magento\Framework\App\Action\Action
+{
+    /**
+     * @var \Magento\Sales\Model\Order
+     */
+    protected $salesModel;
+
+    /**
+     * @var \Magento\Checkout\Model\Session
+     */
+    protected $checkoutSession;
+
+    /**
+     * @var \Magento\Framework\HTTP\Client\Curl
+     */
+    protected $clientFactory;
+
+    /**
+     * @var \Magento\Framework\Message\ManagerInterface
+     */
+    protected $messageManager;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+
+    /**
+     * @var NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Logger\NovalnetLogger
+     */
+    private $novalnetLogger;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Sales\Model\Order $salesModel
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Framework\HTTP\Client\Curl $clientFactory
+     * @param \Magento\Framework\Message\ManagerInterface $messageManager
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Sales\Model\Order $salesModel,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        \Magento\Framework\HTTP\Client\Curl $clientFactory,
+        \Magento\Framework\Message\ManagerInterface $messageManager,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        NNConfig $novalnetConfig,
+        \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+    ) {
+        parent::__construct($context);
+        $this->salesModel = $salesModel;
+        $this->clientFactory = $clientFactory;
+        $this->checkoutSession = $checkoutSession;
+        $this->messageManager = $messageManager;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelper = $jsonHelper;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetLogger = $novalnetLogger;
+    }
+
+    /**
+     * Handles Novalnet redirect success process
+     *
+     * @return mixed
+     */
+    public function execute()
+    {
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $checkSumResponse = $this->getRequest()->getParams();
+        // Loads order model by loading the Increment Id
+        $order = $this->salesModel->loadByIncrementId($checkSumResponse['order_no']);
+        $storeId = '';
+        if ($order) {
+            $storeId = $order->getStoreId();
+        }
+        $this->novalnetLogger->notice('Customer return from Novalnet to shop (Novalnet redirect success controller). Novalnet transaction ID: ' . $checkSumResponse['tid']);
+        $payment = $order->getPayment();
+        $lastTransId = $payment->getLastTransId();
+        if (!empty($lastTransId)) {
+            $this->novalnetLogger->notice('Callback already executed for ' . $order->getIncrementId());
+            $resultRedirect->setPath('checkout/onepage/success');
+            return $resultRedirect;
+        }
+
+        $this->clientFactory->setHeaders($this->novalnetRequestHelper->getRequestHeaders(false, $storeId));
+        $this->clientFactory->post(
+            NNConfig::NOVALNET_TRANSACTION_DETAIL_URL,
+            $this->jsonHelper->jsonEncode(
+                [
+                    'transaction' => ['tid'  => $checkSumResponse['tid']],
+                    'custom'      => ['lang' => $this->novalnetRequestHelper->getDefaultLanguage()]
+                ]
+            )
+        );
+
+        $response = new \Magento\Framework\DataObject();
+        $responseBody = ($this->clientFactory->getBody()) ? json_decode($this->clientFactory->getBody(), true) : [];
+        $response->setData($responseBody);
+
+        // Loads order model by loading the Increment Id
+        $order = $this->salesModel->loadByIncrementId($response->getData('transaction/order_no'));
+
+        $this->novalnetLogger->notice('Order loaded successfully ' . $order->getIncrementId());
+
+        $payment = $order->getPayment();
+        $paymentMethodCode = $payment->getMethodInstance()->getCode();
+        $additionalData = (!empty($payment->getAdditionalData())) ? json_decode($payment->getAdditionalData(), true) : [];
+
+        // Checks payment hash on return
+        if (!$this->novalnetRequestHelper->checkPaymentHash($checkSumResponse, $additionalData)) {
+            if ($this->novalnetConfig->getGlobalConfig('restore_cart')) {
+                $this->novalnetRequestHelper->restoreQuote($order->getIncrementId());
+                $this->novalnetLogger->notice('Successfully restored the cart items' . $order->getIncrementId());
+                $resultRedirect->setPath('checkout/cart');
+            } else {
+                $resultRedirect->setPath('checkout/onepage/failure');
+            }
+            $errorMessage = 'While redirecting some data has been changed. The hash check failed.';
+            $this->messageManager->addErrorMessage(__($errorMessage));
+            $this->novalnetLogger->notice($errorMessage);
+
+            return $resultRedirect;
+        }
+
+        // Process in handling on redirect payment return success
+        if (!$this->novalnetRequestHelper->checkReturnedData($response, $order, $payment)) {
+            if ($this->novalnetConfig->getGlobalConfig('restore_cart')) {
+                $this->novalnetRequestHelper->restoreQuote($order->getIncrementId());
+                $this->novalnetLogger->notice('Successfully restored the cart items' . $order->getIncrementId());
+                $resultRedirect->setPath('checkout/cart');
+            } else {
+                $resultRedirect->setPath('checkout/onepage/failure');
+            }
+            $this->messageManager->addErrorMessage(__($response->getData('result/status_text')));
+            $this->novalnetLogger->notice('Failure for check returned data. The status text is: ' . $response->getData('result/status_text'));
+
+            return $resultRedirect;
+        }
+
+        // Store payment data if token exist
+        if ($response->getData('transaction/payment_data/token')) {
+            $this->novalnetRequestHelper->savePaymentToken($order, $paymentMethodCode, $response);
+            $this->novalnetLogger->notice('Stored payment data');
+        }
+
+        $resultRedirect->setPath('checkout/onepage/success');
+
+        return $resultRedirect;
+    }
+}
diff --git a/Gateway/Config/CanInitializeHandler.php b/Gateway/Config/CanInitializeHandler.php
new file mode 100755
index 0000000..3c5a8f1
--- /dev/null
+++ b/Gateway/Config/CanInitializeHandler.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Config;
+
+use Magento\Payment\Gateway\Config\ValueHandlerInterface;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class CanInitializeHandler implements ValueHandlerInterface
+{
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+    }
+
+    /**
+     * Initialize Novalnet Credit Card payment only if do_redirect is 1
+     *
+     * @param array $subject
+     * @param int|null $storeId
+     * @return bool
+     */
+    public function handle(array $subject, $storeId = null)
+    {
+        $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($subject);
+        $paymentMethodCode = $paymentDataObject->getPayment()->getMethodInstance()->getCode();
+        if ($paymentMethodCode == ConfigProvider::NOVALNET_CC || $paymentMethodCode == ConfigProvider::NOVALNET_GOOGLEPAY) {
+            $methodSession = $this->novalnetRequestHelper->getMethodSession($paymentMethodCode);
+            if ($methodSession->getData($paymentMethodCode . '_do_redirect')) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/Gateway/Config/OrderPlaceRedirectUrlHandler.php b/Gateway/Config/OrderPlaceRedirectUrlHandler.php
new file mode 100755
index 0000000..a7853bc
--- /dev/null
+++ b/Gateway/Config/OrderPlaceRedirectUrlHandler.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Config;
+
+use Magento\Payment\Gateway\Config\ValueHandlerInterface;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class OrderPlaceRedirectUrlHandler implements ValueHandlerInterface
+{
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+    }
+
+    /**
+     * Initialize Mail for Credit Card payment only if do_rediret is 1
+     *
+     * @param array $subject
+     * @param int|null $storeId
+     * @return bool
+     */
+    public function handle(array $subject, $storeId = null)
+    {
+        $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($subject);
+        $paymentMethodCode = $paymentDataObject->getPayment()->getMethodInstance()->getCode();
+        if ($paymentMethodCode == ConfigProvider::NOVALNET_CC || $paymentMethodCode == ConfigProvider::NOVALNET_GOOGLEPAY) {
+            $methodSession = $this->novalnetRequestHelper->getMethodSession($paymentMethodCode);
+            if ($methodSession->getData($paymentMethodCode . '_do_redirect') != 0) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/Gateway/Config/PaymentActionHandler.php b/Gateway/Config/PaymentActionHandler.php
new file mode 100755
index 0000000..78f3aeb
--- /dev/null
+++ b/Gateway/Config/PaymentActionHandler.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Config;
+
+use Magento\Payment\Gateway\Config\ValueHandlerInterface;
+use Magento\Payment\Model\Method\AbstractMethod;
+use \Novalnet\Payment\Model\NNConfig;
+
+class PaymentActionHandler implements ValueHandlerInterface
+{
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    private $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     */
+    public function __construct(
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+    ) {
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+    }
+
+    /**
+     * Validate minimum limit for authorization
+     *
+     * @param array $subject
+     * @param int|null $storeId
+     * @return bool
+     */
+    public function handle(array $subject, $storeId = null)
+    {
+        $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($subject);
+        $orderTotalAmount = $paymentDataObject->getOrder()->getGrandTotalAmount();
+        $paymentMethodCode = $paymentDataObject->getPayment()->getMethodInstance()->getCode();
+        $paymentAction = $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'payment_action');
+        $minAuthAmount = $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'manual_checking_amount');
+
+        if ($paymentAction == AbstractMethod::ACTION_AUTHORIZE &&
+            (string) $this->novalnetRequestHelper->getFormattedAmount($orderTotalAmount) >= (string) $minAuthAmount
+        ) {
+            return AbstractMethod::ACTION_AUTHORIZE;
+        } elseif ($this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'payment_action') == NNConfig::ACTION_ZERO_AMOUNT_BOOKING) {
+            return AbstractMethod::ACTION_AUTHORIZE;
+        } else {
+            return AbstractMethod::ACTION_AUTHORIZE_CAPTURE;
+        }
+    }
+}
diff --git a/Gateway/Http/Client/TransactionAuthorize.php b/Gateway/Http/Client/TransactionAuthorize.php
new file mode 100755
index 0000000..8c58c6a
--- /dev/null
+++ b/Gateway/Http/Client/TransactionAuthorize.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Http\Client;
+
+use Magento\Payment\Gateway\Http\ClientInterface;
+use Magento\Payment\Gateway\Http\TransferInterface;
+use Magento\Framework\HTTP\Client\Curl;
+use Novalnet\Payment\Helper\Request;
+use Novalnet\Payment\Model\NNConfig;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Serialize\Serializer\Serialize;
+
+class TransactionAuthorize implements ClientInterface
+{
+    /**
+     * @var \Magento\Framework\HTTP\Client\Curl
+     */
+    private $clientFactory;
+
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    private $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+
+    /**
+     * @var \Magento\Framework\Session\SessionManagerInterface
+     */
+    protected $coreSession;
+
+    /**
+     * @param Curl $clientFactory
+     * @param NNConfig $novalnetConfig
+     * @param Request $novalnetRequestHelper
+     * @param Data $jsonHelper
+     * @param \Magento\Framework\Session\SessionManagerInterface $coreSession
+     */
+    public function __construct(
+        Curl $clientFactory,
+        NNConfig $novalnetConfig,
+        Request $novalnetRequestHelper,
+        Data $jsonHelper,
+        \Magento\Framework\Session\SessionManagerInterface $coreSession
+    ) {
+        $this->clientFactory = $clientFactory;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelper = $jsonHelper;
+        $this->coreSession = $coreSession;
+    }
+
+    /**
+     * Send request to gateway. Returns result as ENV array
+     *
+     * @param TransferInterface $transferObject
+     * @return array
+     */
+    public function placeRequest(TransferInterface $transferObject)
+    {
+        $requestData = $transferObject->getBody();
+        if (!empty($requestData['action'])) {
+            return $requestData;
+        }
+
+        $storeId = $requestData['storeId'];
+        unset($requestData['storeId']);
+        $this->clientFactory->setHeaders($this->novalnetRequestHelper->getRequestHeaders(false, $storeId));
+        $paymentMethodCode = $this->novalnetConfig->getPaymentCodeByType($requestData['transaction']['payment_type']);
+
+        if (in_array(
+            $paymentMethodCode,
+            [
+                ConfigProvider::NOVALNET_PREPAYMENT,
+                ConfigProvider::NOVALNET_CASHPAYMENT,
+                ConfigProvider::NOVALNET_MULTIBANCO
+            ]
+        ) || $this->coreSession->getRecurringProcess()) {
+            $this->clientFactory->post(NNConfig::NOVALNET_PAYMENT_URL, $this->jsonHelper->jsonEncode($requestData));
+        } else {
+            $this->clientFactory->post(NNConfig::NOVALNET_AUTHORIZE_URL, $this->jsonHelper->jsonEncode($requestData));
+        }
+
+        $response = (!empty($this->clientFactory->getBody())) ? json_decode($this->clientFactory->getBody(), true) : [];
+
+        if (!empty($response['result']['status']) && $response['result']['status'] == 'SUCCESS') {
+            return $response;
+        } elseif (!empty($response['result']['status_text'])) {
+            throw new \Magento\Framework\Exception\LocalizedException(__($response['result']['status_text']));
+        }
+    }
+}
diff --git a/Gateway/Http/Client/TransactionCapture.php b/Gateway/Http/Client/TransactionCapture.php
new file mode 100755
index 0000000..ec0a2b4
--- /dev/null
+++ b/Gateway/Http/Client/TransactionCapture.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Http\Client;
+
+use Magento\Payment\Gateway\Http\ClientInterface;
+use Magento\Payment\Gateway\Http\TransferInterface;
+use Magento\Framework\HTTP\Client\Curl;
+use Novalnet\Payment\Helper\Request;
+use Novalnet\Payment\Model\NNConfig;
+use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Serialize\Serializer\Serialize;
+use Novalnet\Payment\Logger\NovalnetLogger;
+
+class TransactionCapture implements ClientInterface
+{
+    /**
+     * @var \Magento\Framework\HTTP\Client\Curl
+     */
+    private $clientFactory;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @var Data
+     */
+    private $jsonHelper;
+
+    /**
+     * @var NovalnetLogger
+     */
+    private $novalnetLogger;
+
+    /**
+     * @param Curl $clientFactory
+     * @param Request $novalnetRequestHelper
+     * @param Data $jsonHelper
+     * @param NovalnetLogger $novalnetLogger
+     */
+    public function __construct(
+        Curl $clientFactory,
+        Request $novalnetRequestHelper,
+        Data $jsonHelper,
+        NovalnetLogger $novalnetLogger
+    ) {
+        $this->clientFactory = $clientFactory;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelper = $jsonHelper;
+        $this->novalnetLogger = $novalnetLogger;
+    }
+
+    /**
+     * Send request to gateway. Returns result as ENV array
+     *
+     * @param TransferInterface $transferObject
+     * @return array
+     */
+    public function placeRequest(TransferInterface $transferObject)
+    {
+        $requestData = $transferObject->getBody();
+        if (isset($requestData['action'])) {
+            return $requestData;
+        }
+
+        $storeId = $requestData['storeId'];
+        unset($requestData['storeId']);
+        $this->clientFactory->setHeaders($this->novalnetRequestHelper->getRequestHeaders(false, $storeId));
+        if (empty($requestData['transaction']['tid'])) {
+            $this->clientFactory->post(NNConfig::NOVALNET_PAYMENT_URL, $this->jsonHelper->jsonEncode($requestData));
+        } else {
+            $this->novalnetLogger->notice('Capture has been initiated for the TID: ' . $requestData['transaction']['tid']);
+            $this->clientFactory->post(NNConfig::NOVALNET_CAPTURE_URL, $this->jsonHelper->jsonEncode($requestData));
+        }
+
+        $response = (!empty($this->clientFactory->getBody())) ? json_decode($this->clientFactory->getBody(), true) : [];
+
+        if (!empty($response['result']['status']) && $response['result']['status'] == 'SUCCESS') {
+            $this->novalnetLogger->notice('The transaction has been confirmed successfully');
+            return $response;
+        } elseif (!empty($response['result']['status_text'])) {
+            $this->novalnetLogger->notice('The transaction capture not working. The status text: ' . $response['result']['status_text']);
+            throw new \Magento\Framework\Exception\LocalizedException(__($response['result']['status_text']));
+        }
+    }
+}
diff --git a/Gateway/Http/Client/TransactionInitialize.php b/Gateway/Http/Client/TransactionInitialize.php
new file mode 100755
index 0000000..7a0ff98
--- /dev/null
+++ b/Gateway/Http/Client/TransactionInitialize.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Http\Client;
+
+use Magento\Payment\Gateway\Http\ClientInterface;
+use Magento\Payment\Gateway\Http\TransferInterface;
+use Magento\Framework\HTTP\Client\Curl;
+use Novalnet\Payment\Helper\Request;
+use Novalnet\Payment\Model\NNConfig;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Serialize\Serializer\Serialize;
+
+class TransactionInitialize implements ClientInterface
+{
+    /**
+     * @var \Magento\Framework\HTTP\Client\Curl
+     */
+    private $clientFactory;
+
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    private $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @var Data
+     */
+    private $jsonHelper;
+
+    /**
+     * @var \Magento\Framework\Session\SessionManagerInterface
+     */
+    protected $coreSession;
+
+    /**
+     * @param Curl $clientFactory
+     * @param NNConfig $novalnetConfig
+     * @param Request $novalnetRequestHelper
+     * @param Data $jsonHelper
+     * @param \Magento\Framework\Session\SessionManagerInterface $coreSession
+     */
+    public function __construct(
+        Curl $clientFactory,
+        NNConfig $novalnetConfig,
+        Request $novalnetRequestHelper,
+        Data $jsonHelper,
+        \Magento\Framework\Session\SessionManagerInterface $coreSession
+    ) {
+        $this->clientFactory = $clientFactory;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelper = $jsonHelper;
+        $this->coreSession = $coreSession;
+    }
+
+    /**
+     * Send request to gateway. Returns result as ENV array
+     *
+     * @param TransferInterface $transferObject
+     * @return array
+     */
+    public function placeRequest(TransferInterface $transferObject)
+    {
+        $requestData = $transferObject->getBody();
+        $storeId = $requestData['storeId'];
+        unset($requestData['storeId']);
+        $this->clientFactory->setHeaders($this->novalnetRequestHelper->getRequestHeaders(false, $storeId));
+        $paymentMethodCode = $this->novalnetConfig->getPaymentCodeByType($requestData['transaction']['payment_type']);
+        $minAuthAmount = $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'manual_checking_amount');
+
+        if ($this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'payment_action') == 'authorize' && ($requestData['transaction']['amount'] >= $minAuthAmount) && !$this->coreSession->getRecurringProcess()) {
+            $this->clientFactory->post(NNConfig::NOVALNET_AUTHORIZE_URL, $this->jsonHelper->jsonEncode($requestData));
+        } else {
+            $this->clientFactory->post(NNConfig::NOVALNET_PAYMENT_URL, $this->jsonHelper->jsonEncode($requestData));
+        }
+
+        $response = (!empty($this->clientFactory->getBody())) ? json_decode($this->clientFactory->getBody(), true) : [];
+
+        if (!empty($response['result']['status']) && $response['result']['status'] == 'SUCCESS') {
+            return $response;
+        } elseif (!empty($response['result']['status_text'])) {
+            throw new \Magento\Framework\Exception\LocalizedException(__($response['result']['status_text']));
+        }
+    }
+}
diff --git a/Gateway/Http/Client/TransactionRedirect.php b/Gateway/Http/Client/TransactionRedirect.php
new file mode 100755
index 0000000..d723b88
--- /dev/null
+++ b/Gateway/Http/Client/TransactionRedirect.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Http\Client;
+
+use Magento\Payment\Gateway\Http\ClientInterface;
+use Magento\Payment\Gateway\Http\TransferInterface;
+
+class TransactionRedirect implements ClientInterface
+{
+    /**
+     * Send request to gateway. Returns result as ENV array
+     *
+     * @param TransferInterface $transferObject
+     * @return array
+     */
+    public function placeRequest(TransferInterface $transferObject)
+    {
+        return [];
+    }
+}
diff --git a/Gateway/Http/Client/TransactionRefund.php b/Gateway/Http/Client/TransactionRefund.php
new file mode 100755
index 0000000..4c7dcb3
--- /dev/null
+++ b/Gateway/Http/Client/TransactionRefund.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Http\Client;
+
+use Magento\Payment\Gateway\Http\ClientInterface;
+use Magento\Payment\Gateway\Http\TransferInterface;
+use Magento\Framework\HTTP\Client\Curl;
+use Novalnet\Payment\Helper\Request;
+use Novalnet\Payment\Model\NNConfig;
+use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Serialize\Serializer\Serialize;
+use Novalnet\Payment\Logger\NovalnetLogger;
+
+class TransactionRefund implements ClientInterface
+{
+    /**
+     * @var \Magento\Framework\HTTP\Client\Curl
+     */
+    private $clientFactory;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @var Data
+     */
+    private $jsonHelper;
+
+    /**
+     * @var NovalnetLogger
+     */
+    private $novalnetLogger;
+
+    /**
+     * @param \Magento\Framework\HTTP\Client\Curl $clientFactory
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param Data $jsonHelper
+     * @param NovalnetLogger $novalnetLogger
+     */
+    public function __construct(
+        Curl $clientFactory,
+        Request $novalnetRequestHelper,
+        Data $jsonHelper,
+        NovalnetLogger $novalnetLogger
+    ) {
+        $this->clientFactory = $clientFactory;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelper = $jsonHelper;
+        $this->novalnetLogger = $novalnetLogger;
+    }
+
+    /**
+     * Send request to gateway. Returns result as ENV array
+     *
+     * @param TransferInterface $transferObject
+     * @return array
+     */
+    public function placeRequest(TransferInterface $transferObject)
+    {
+        $requestData = $transferObject->getBody();
+        $storeId = $requestData['storeId'];
+        unset($requestData['storeId']);
+        $this->novalnetLogger->notice('Refund has been initiated for the TID: ' . $requestData['transaction']['tid']);
+        $this->clientFactory->setHeaders($this->novalnetRequestHelper->getRequestHeaders(false, $storeId));
+        $this->clientFactory->post(
+            NNConfig::NOVALNET_REFUND_URL,
+            $this->jsonHelper->jsonEncode($requestData)
+        );
+        $response = (!empty($this->clientFactory->getBody())) ? json_decode($this->clientFactory->getBody(), true) : [];
+
+        if (!empty($response['result']['status']) && $response['result']['status'] == 'SUCCESS') {
+            $this->novalnetLogger->notice('The refund has been successfully');
+            return $response;
+        } elseif (!empty($response['result']['status_text'])) {
+            $this->novalnetLogger->notice('The refund not working. The status text: ' . $response['result']['status_text']);
+            throw new \Magento\Framework\Exception\LocalizedException(__($response['result']['status_text']));
+        }
+    }
+}
diff --git a/Gateway/Http/Client/TransactionVoid.php b/Gateway/Http/Client/TransactionVoid.php
new file mode 100755
index 0000000..e83858d
--- /dev/null
+++ b/Gateway/Http/Client/TransactionVoid.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Http\Client;
+
+use Magento\Payment\Gateway\Http\ClientInterface;
+use Magento\Payment\Gateway\Http\TransferInterface;
+use Magento\Framework\HTTP\Client\Curl;
+use Novalnet\Payment\Helper\Request;
+use Novalnet\Payment\Model\NNConfig;
+use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Serialize\Serializer\Serialize;
+use Novalnet\Payment\Logger\NovalnetLogger;
+
+class TransactionVoid implements ClientInterface
+{
+    /**
+     * @var \Magento\Framework\HTTP\Client\Curl
+     */
+    private $clientFactory;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @var Data
+     */
+    private $jsonHelper;
+
+    /**
+     * @var NovalnetLogger
+     */
+    private $novalnetLogger;
+
+    /**
+     * @param \Magento\Framework\HTTP\Client\Curl $clientFactory
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param Data $jsonHelper
+     * @param NovalnetLogger $novalnetLogger
+     */
+    public function __construct(
+        Curl $clientFactory,
+        Request $novalnetRequestHelper,
+        Data $jsonHelper,
+        NovalnetLogger $novalnetLogger
+    ) {
+        $this->clientFactory = $clientFactory;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelper = $jsonHelper;
+        $this->novalnetLogger = $novalnetLogger;
+    }
+
+    /**
+     * Send request to gateway. Returns result as ENV array
+     *
+     * @param TransferInterface $transferObject
+     * @return array
+     */
+    public function placeRequest(TransferInterface $transferObject)
+    {
+        $requestData = $transferObject->getBody();
+        if (isset($requestData['action'])) {
+            return $requestData;
+        }
+        $storeId = $requestData['storeId'];
+        unset($requestData['storeId']);
+        $this->novalnetLogger->notice('Cancellation/void has been initiated for the TID: ' . $requestData['transaction']['tid']);
+        $this->clientFactory->setHeaders($this->novalnetRequestHelper->getRequestHeaders(false, $storeId));
+        $this->clientFactory->post(
+            NNConfig::NOVALNET_CANCEL_URL,
+            $this->jsonHelper->jsonEncode($requestData)
+        );
+        $response = ($this->clientFactory->getBody()) ? json_decode($this->clientFactory->getBody(), true) : [];
+
+        if (!empty($response['result']['status']) && $response['result']['status'] == 'SUCCESS') {
+            $this->novalnetLogger->notice('The transaction has been canceled successfully');
+            return $response;
+        } elseif (!empty($response['result']['status_text'])) {
+            $this->novalnetLogger->notice('The transaction cancellation not working. The status text: ' . $response['result']['status_text']);
+            throw new \Magento\Framework\Exception\LocalizedException(__($response['result']['status_text']));
+        }
+    }
+}
diff --git a/Gateway/Http/TransferFactory.php b/Gateway/Http/TransferFactory.php
new file mode 100755
index 0000000..4302342
--- /dev/null
+++ b/Gateway/Http/TransferFactory.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Http;
+
+use Magento\Payment\Gateway\Http\TransferBuilder;
+use Magento\Payment\Gateway\Http\TransferFactoryInterface;
+use Magento\Payment\Gateway\Http\TransferInterface;
+
+class TransferFactory implements TransferFactoryInterface
+{
+    /**
+     * @var TransferBuilder
+     */
+    private $transferBuilder;
+
+    /**
+     * @param TransferBuilder $transferBuilder
+     */
+    public function __construct(
+        TransferBuilder $transferBuilder
+    ) {
+        $this->transferBuilder = $transferBuilder;
+    }
+
+    /**
+     * Builds gateway transfer object
+     *
+     * @param array $request
+     * @return TransferInterface
+     */
+    public function create(array $request)
+    {
+        return $this->transferBuilder
+            ->setBody($request)
+            ->setMethod('POST')
+            ->build();
+    }
+}
diff --git a/Gateway/Request/AbstractDataBuilder.php b/Gateway/Request/AbstractDataBuilder.php
new file mode 100755
index 0000000..718dfc7
--- /dev/null
+++ b/Gateway/Request/AbstractDataBuilder.php
@@ -0,0 +1,504 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Request;
+
+use Magento\Payment\Gateway\ConfigInterface;
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+use Magento\Payment\Gateway\Request\BuilderInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\UrlInterface;
+use Novalnet\Payment\Helper\Request;
+use Novalnet\Payment\Model\NNConfig;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+use Magento\Framework\Json\Helper\Data as jsonHelper;
+use Magento\Framework\Serialize\Serializer\Serialize as serializer;
+use Magento\Catalog\Model\Product\Type as ProductType;
+use Magento\Downloadable\Model\Product\Type as DownloadableProduct;
+
+class AbstractDataBuilder implements BuilderInterface
+{
+    /**
+     * @var UrlInterface
+     */
+    protected $urlInterface;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    protected $storeManager;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    protected $datetime;
+
+    /**
+     * @var \Magento\Backend\Model\Auth\Session
+     */
+    protected $authSession;
+
+    /**
+     * @var \Magento\Checkout\Model\Cart
+     */
+    protected $cart;
+
+    /**
+     * @var NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var ConfigInterface
+     */
+    protected $config;
+
+    /**
+     * @var jsonHelper
+     */
+    protected $jsonHelper;
+
+    /**
+     * @var serializer
+     */
+    protected $serializer;
+
+    /**
+     * @param UrlInterface $urlInterface
+     * @param StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $datetime
+     * @param \Magento\Backend\Model\Auth\Session $authSession
+     * @param \Magento\Checkout\Model\Cart $cart
+     * @param Request $novalnetRequestHelper
+     * @param NNConfig $novalnetConfig
+     * @param ConfigInterface $config
+     * @param jsonHelper $jsonHelper
+     * @param serializer $serializer
+     */
+    public function __construct(
+        UrlInterface $urlInterface,
+        StoreManagerInterface $storeManager,
+        \Magento\Framework\Stdlib\DateTime\DateTime $datetime,
+        \Magento\Backend\Model\Auth\Session $authSession,
+        \Magento\Checkout\Model\Cart $cart,
+        Request $novalnetRequestHelper,
+        NNConfig $novalnetConfig,
+        ConfigInterface $config,
+        jsonHelper $jsonHelper,
+        serializer $serializer
+    ) {
+        $this->urlInterface = $urlInterface;
+        $this->storeManager = $storeManager;
+        $this->datetime = $datetime;
+        $this->authSession = $authSession;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->config = $config;
+        $this->jsonHelper = $jsonHelper;
+        $this->serializer = $serializer;
+        $this->cart = $cart;
+    }
+
+    /**
+     * Build request for Payment action
+     *
+     * @param array $buildSubject
+     * @return array
+     */
+    public function build(array $buildSubject)
+    {
+        $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($buildSubject);
+        $order = $paymentDataObject->getOrder();
+        $paymentMethodCode = $paymentDataObject->getPayment()->getMethodInstance()->getCode();
+
+        $merchantParams = $this->buildMerchantParams($order);
+        $customerParams = $this->buildCustomerParams($order, $paymentMethodCode);
+        $transactionParams = $this->buildTransactionParams($order, $paymentMethodCode);
+        $customParams = $this->buildCustomParams($paymentMethodCode);
+        $cartInfoParams = $this->buildCartInfoParams($paymentMethodCode);
+        $data = array_merge($merchantParams, $customerParams, $transactionParams, $customParams);
+        $data['storeId'] = $paymentDataObject->getPayment()->getOrder()->getStoreId();
+        $data = $this->filterStandardParameter($data);
+        $data = array_merge($data, $cartInfoParams);
+        return $data;
+    }
+
+    /**
+     * Build Merchant params
+     *
+     * @param mixed $order
+     * @return array
+     */
+    public function buildMerchantParams($order)
+    {
+        $storeId = $order->getStoreId();
+        // Build Merchant Data
+        $data['merchant'] = [
+            'signature' => $this->novalnetConfig->getGlobalConfig('signature', $storeId),
+            'tariff'    => $this->novalnetConfig->getGlobalConfig('tariff_id', $storeId),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * Build Customer params
+     *
+     * @param mixed $order
+     * @param string $paymentMethodCode
+     * @return array
+     */
+    public function buildCustomerParams($order, $paymentMethodCode)
+    {
+        $billingAddress = $order->getBillingAddress();
+        $shippingAddress = $order->getShippingAddress();
+        $billingStreet = $this->getStreet($billingAddress);
+
+        $methodSession = $this->novalnetRequestHelper->getMethodSession($paymentMethodCode);
+
+        $shopperIp = $order->getRemoteIp();
+
+        if (!$this->novalnetRequestHelper->isAdmin() && empty($shopperIp)) {
+            $shopperIp = $order->getXForwardedFor();
+        }
+        $requestIp = $this->novalnetRequestHelper->getRequestIp();
+        $data = [];
+
+        // Forming billing data
+        if ($billingAddress) {
+            $data['customer'] = [
+                'first_name'  => $billingAddress->getFirstname(),
+                'last_name'   => $billingAddress->getLastname(),
+                'email'       => $billingAddress->getEmail(),
+                'tel'         => $billingAddress->getTelephone(),
+                'customer_ip' => ($shopperIp != $requestIp) ? $this->novalnetRequestHelper->getRequestIp() : $shopperIp,
+                'customer_no' => $this->novalnetRequestHelper->getCustomerId(),
+            ];
+
+            $data['customer']['billing'] = [
+                'street'       => $billingStreet,
+                'city'         => $billingAddress->getCity(),
+                'zip'          => $billingAddress->getPostcode(),
+                'country_code' => $billingAddress->getCountryId(),
+                'state'        => $this->novalnetRequestHelper->getRegionNameByCode($billingAddress->getRegionCode(), $billingAddress->getCountryId())
+            ];
+
+            if ($methodSession->getData($paymentMethodCode . '_dob')) {
+                $data['customer']['birth_date'] = $this->datetime->date(
+                    'Y-m-d',
+                    $methodSession->getData($paymentMethodCode . '_dob')
+                );
+            }
+
+            if (empty($data['customer']['birth_date']) && !empty($billingAddress->getCompany())) {
+                $data['customer']['billing']['company'] = $billingAddress->getCompany();
+            }
+        }
+
+        // Forming shipping data
+        if (!empty($shippingAddress)) {
+            if ($billingAddress->getFirstname() == $shippingAddress->getFirstname() &&
+                $billingAddress->getLastname() == $shippingAddress->getLastname() &&
+                $billingStreet == $this->getStreet($shippingAddress) &&
+                $billingAddress->getCity() == $shippingAddress->getCity() &&
+                $billingAddress->getCountryId() ==$shippingAddress->getCountryId() &&
+                $billingAddress->getPostcode() == $shippingAddress->getPostcode()
+            ) {
+                $data['customer']['shipping']['same_as_billing'] = 1;
+            } else {
+                $data['customer']['shipping'] = [
+                    'first_name'   => $shippingAddress->getFirstname(),
+                    'last_name'    => $shippingAddress->getLastname(),
+                    'email'        => $shippingAddress->getEmail(),
+                    'tel'          => $shippingAddress->getTelephone(),
+                    'street'       => $this->getStreet($shippingAddress),
+                    'city'         => $shippingAddress->getCity(),
+                    'zip'          => $shippingAddress->getPostcode(),
+                    'country_code' => $shippingAddress->getCountryId(),
+                    'state'        => $this->novalnetRequestHelper->getRegionNameByCode($shippingAddress->getRegionCode(), $shippingAddress->getCountryId())
+                ];
+                if (!empty($shippingAddress->getCompany())) {
+                    $data['customer']['shipping']['company'] = $shippingAddress->getCompany();
+                }
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Build Transaction params
+     *
+     * @param mixed $order
+     * @param string $paymentMethodCode
+     * @return array
+     */
+    public function buildTransactionParams($order, $paymentMethodCode)
+    {
+        $billingAddress = $order->getBillingAddress();
+        $methodSession = $this->novalnetRequestHelper->getMethodSession($paymentMethodCode);
+
+        $data['transaction'] = [
+            'payment_type'     => $this->novalnetConfig->getPaymentType($paymentMethodCode),
+            'amount'           => $this->novalnetRequestHelper->getFormattedAmount($order->getGrandTotalAmount()),
+            'currency'         => $order->getCurrencyCode(),
+            'test_mode'        => $this->novalnetConfig->getTestMode($paymentMethodCode),
+            'order_no'         => $order->getOrderIncrementId(),
+            'system_ip'        => $this->novalnetRequestHelper->getServerAddr(),
+            'system_name'      => 'Magento',
+            'system_version'   => $this->novalnetRequestHelper->getMagentoVersion() . '-' .
+                                    $this->novalnetRequestHelper->getNovalnetVersion(),
+            'system_url'       => $this->storeManager->getStore()->getBaseUrl()
+        ];
+
+        $paymentDatas = ['token', 'pan_hash', 'unique_id', 'iban', 'wallet_token', 'bic'];
+
+        foreach ($paymentDatas as $paymentData) {
+            if ($methodSession->getData($paymentMethodCode . '_' . $paymentData)) {
+                $data['transaction']['payment_data'][$paymentData] = preg_replace('/\s+/', '', $methodSession->getData($paymentMethodCode . '_' . $paymentData));
+            }
+        }
+
+        if ($this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'shop_type') && $methodSession->getData($paymentMethodCode . '_create_token') && empty($methodSession->getData($paymentMethodCode . '_token'))) {
+            $data['transaction']['create_token'] = $methodSession->getData($paymentMethodCode . '_create_token');
+        }
+
+        if ($this->novalnetConfig->isZeroAmountBookingSupported($paymentMethodCode) &&
+            $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'payment_action') == NNConfig::ACTION_ZERO_AMOUNT_BOOKING
+        ) {
+            $data['transaction']['create_token'] = 1;
+            $data['transaction']['amount'] = 0;
+        }
+
+        $paymentDueDate = $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'due_date');
+        $paymentDueDate = (!empty($paymentDueDate)) ? ltrim($paymentDueDate, '0') : '';
+        if ($paymentDueDate) {
+            $data['transaction']['due_date'] = date('Y-m-d', strtotime('+' . $paymentDueDate . ' days'));
+        }
+
+        if ($methodSession->getData($paymentMethodCode . '_cycle')) {
+            $data['instalment']['cycles'] = $methodSession->getData($paymentMethodCode . '_cycle');
+            $data['instalment']['interval'] = '1m';
+        }
+
+        if ($this->novalnetConfig->isRedirectPayment($paymentMethodCode) || $methodSession->getData($paymentMethodCode . '_do_redirect')) {
+            $data['transaction']['return_url'] = $this->urlInterface->getUrl('novalnet/redirect/success', ['order_no' => $order->getOrderIncrementId()]);
+            $data['transaction']['error_return_url'] = $this->urlInterface->getUrl('novalnet/redirect/failure', ['order_no' => $order->getOrderIncrementId()]);
+        }
+
+        if ($this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'enforce_3d')) {
+            $data['transaction']['enforce_3d'] = 1;
+        }
+
+        // check if Order has subscription item
+        $subscription = false;
+        foreach ($order->getItems() as $item) {
+            $additionalData = [];
+            if (!empty($item->getAdditionalData())) {
+                $additionalData = json_decode($item->getAdditionalData(), true);
+            }
+
+            if (!empty($additionalData['period_unit']) && !empty($additionalData['billing_frequency'])) {
+                $subscription = true;
+                break;
+            }
+        }
+
+        //If subscription order then set create_token default
+        if ($subscription) {
+            if (!isset($data['transaction']['create_token']) && !isset($data['transaction']['payment_data']['token'])) {
+                $data['transaction']['create_token'] = 1;
+            }
+        }
+
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $coreSession = $objectManager->create(\Magento\Framework\Session\SessionManagerInterface::class);
+
+        if ($coreSession->getRecurringProcess()) {
+            if (in_array($paymentMethodCode, [ConfigProvider::NOVALNET_CC, ConfigProvider::NOVALNET_PAYPAL])) {
+                unset($data['transaction']['return_url']);
+                unset($data['transaction']['error_return_url']);
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Build Custom params
+     *
+     * @param string $paymentMethodCode
+     * @return array
+     */
+    public function buildCustomParams($paymentMethodCode)
+    {
+        $data['custom'] = [
+            'lang'      => $this->novalnetRequestHelper->getDefaultLanguage(),
+        ];
+
+        if ($this->novalnetRequestHelper->isAdmin()) {
+            $data['custom']['input1'] = 'admin_user';
+            $data['custom']['inputval1'] = $this->authSession->getUser()->getID();
+        }
+
+        if ($this->novalnetRequestHelper->getMethodSession($paymentMethodCode)->getData($paymentMethodCode . '_create_token') == '1') {
+            $data['custom']['input2'] = 'create_token';
+            $data['custom']['inputval2'] = 1;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Build cart info params
+     *
+     * @param string $paymentMethodCode
+     * @return array
+     */
+    public function buildCartInfoParams($paymentMethodCode)
+    {
+        $data['cart_info'] = [];
+        if ($paymentMethodCode == ConfigProvider::NOVALNET_PAYPAL) {
+            $quote = $this->cart->getQuote();
+            $discount = $quote->getBaseSubtotal() - $quote->getBaseSubtotalWithDiscount();
+            $discount = ($discount > 0) ? $this->novalnetRequestHelper->getFormattedAmount($discount) : 0;
+            $taxAmount = !empty($quote->getTotals()['tax']->getValue()) ? $quote->getTotals()['tax']->getValue() : 0;
+            $data['cart_info'] = [
+                'items_shipping_price' => ($quote->getShippingAddress()->getBaseShippingAmount() > 0) ? $this->novalnetRequestHelper->getFormattedAmount($quote->getShippingAddress()->getBaseShippingAmount()) : 0,
+                'items_tax_price' => ($taxAmount > 0) ? $this->novalnetRequestHelper->getFormattedAmount($taxAmount) : 0
+            ];
+
+            $lineItems = [];
+            foreach ($quote->getAllVisibleItems() as $item) {
+                array_push($lineItems, [
+                    'category' => ($item->getTypeId() == DownloadableProduct::TYPE_DOWNLOADABLE || $item->getTypeId() == ProductType::TYPE_VIRTUAL) ? 'virtual' : 'physical',
+                    'description' => '',
+                    'name' => $item->getName(),
+                    'price' => $this->novalnetRequestHelper->getFormattedAmount($item->getPrice()),
+                    'quantity' => $item->getQty()
+                ]);
+            }
+
+            if ($discount) {
+                array_push($lineItems, [
+                    'category' => '',
+                    'description' => '',
+                    'name' => 'Discount',
+                    'price' => '-' . $discount,
+                    'quantity' => 1
+                ]);
+            }
+
+            $data['cart_info']['line_items'] = $lineItems;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Build Extension params
+     *
+     * @param array $buildSubject
+     * @param string|bool $refundAction
+     * @return array
+     */
+    public function buildExtensionParams($buildSubject, $refundAction = false)
+    {
+        $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($buildSubject);
+        $additionalData = $paymentDataObject->getPayment()->getAdditionalData();
+        $storeId = $paymentDataObject->getPayment()->getOrder()->getStoreId();
+
+        if ($additionalData) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($additionalData)
+                ? $this->serializer->unserialize($additionalData)
+                : json_decode($additionalData, true);
+
+            $data['transaction'] = [
+                'tid' => $additionalData['NnTid']
+            ];
+
+            if ($refundAction) {
+                $refundAmount = \Magento\Payment\Gateway\Helper\SubjectReader::readAmount($buildSubject);
+
+                $data['transaction']['amount'] = $this->novalnetRequestHelper->getFormattedAmount($refundAmount);
+
+                if (!empty($additionalData['NnZeroAmountBooking']) && !empty($additionalData['NnZeroAmountDone'])) {
+                    $data['transaction']['tid'] = $additionalData['NnZeroAmountRefTid'];
+                }
+            }
+
+            $data['custom'] = [
+                'lang'         => $this->novalnetRequestHelper->getDefaultLanguage(),
+                'shop_invoked' => 1
+            ];
+            $data['storeId'] = $storeId;
+            return $data;
+        }
+    }
+
+    /**
+     * Get Street from address
+     *
+     * @param object $address
+     * @return string
+     */
+    public function getStreet($address)
+    {
+        if (method_exists($address, 'getStreetFull')) {
+            $street = $address->getStreetFull();
+        } else {
+            if ($address->getStreetLine1()) {
+                $street = implode(' ', [$address->getStreetLine1(), $address->getStreetLine2()]);
+            } else {
+                $street = (!empty($address->getStreet())) ? implode(' ', $address->getStreet()) : '';
+            }
+        }
+
+        return $street;
+    }
+
+    /**
+     * Get filter standard param
+     *
+     * @param array $requestData
+     *
+     * @return array
+     */
+    protected function filterStandardParameter($requestData)
+    {
+        $excludedParams = ['test_mode', 'enforce_3d', 'amount', 'storeId'];
+
+        foreach ($requestData as $key => $value) {
+            if (is_array($value)) {
+                $requestData[$key] = $this->filterStandardParameter($requestData[$key]);
+            }
+
+            if (!in_array($key, $excludedParams) && empty($requestData[$key])) {
+                unset($requestData[$key]);
+            }
+        }
+
+        return $requestData;
+    }
+}
diff --git a/Gateway/Request/AuthorizationDataBuilder.php b/Gateway/Request/AuthorizationDataBuilder.php
new file mode 100755
index 0000000..60cebec
--- /dev/null
+++ b/Gateway/Request/AuthorizationDataBuilder.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Request;
+
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class AuthorizationDataBuilder extends AbstractDataBuilder
+{
+    /**
+     * Builds ENV request for Authorize action
+     *
+     * @param array $buildSubject
+     * @return array
+     */
+    public function build(array $buildSubject)
+    {
+        $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($buildSubject);
+        $payment = $paymentDataObject->getPayment();
+        $paymentMethodCode = $payment->getMethodInstance()->getCode();
+        $additionalData = [];
+        if (!empty($payment->getAdditionalData())) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+                ? $this->serializer->unserialize($payment->getAdditionalData())
+                : json_decode($payment->getAdditionalData(), true);
+        }
+
+        if (!empty($additionalData['NnTxnSecret']) ||
+            in_array(
+                $paymentMethodCode,
+                [
+                    ConfigProvider::NOVALNET_SEPA_GUARANTEE,
+                    ConfigProvider::NOVALNET_INVOICE_GUARANTEE,
+                    ConfigProvider::NOVALNET_SEPA_INSTALMENT,
+                    ConfigProvider::NOVALNET_INVOICE_INSTALMENT
+                ]
+            )
+        ) {
+            return ['action' => 'NN_Authorize'];
+        }
+
+        return parent::build($buildSubject);
+    }
+}
diff --git a/Gateway/Request/CaptureDataBuilder.php b/Gateway/Request/CaptureDataBuilder.php
new file mode 100755
index 0000000..565973b
--- /dev/null
+++ b/Gateway/Request/CaptureDataBuilder.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Request;
+
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class CaptureDataBuilder extends AbstractDataBuilder
+{
+    /**
+     * Builds ENV request for Capture action
+     *
+     * @param array $buildSubject
+     * @return array
+     */
+    public function build(array $buildSubject)
+    {
+        $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($buildSubject);
+        $payment = $paymentDataObject->getPayment();
+        $paymentMethodCode = $payment->getMethodInstance()->getCode();
+        $additionalData = [];
+        if (!empty($payment->getAdditionalData())) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+                ? $this->serializer->unserialize($payment->getAdditionalData())
+                : json_decode($payment->getAdditionalData(), true);
+        }
+        $order = $payment->getOrder();
+        $transactionStatus = !empty($additionalData['NnStatus'])
+            ? $this->novalnetRequestHelper->getStatus($additionalData['NnStatus'], $order) : '';
+
+        if ($transactionStatus == 'ON_HOLD' && !empty($this->urlInterface->getCurrentUrl()) &&
+            !preg_match('/callback/i', $this->urlInterface->getCurrentUrl())
+        ) {
+            return parent::buildExtensionParams($buildSubject);
+        } elseif (!empty($this->urlInterface->getCurrentUrl()) && preg_match('/callback/i', $this->urlInterface->getCurrentUrl())) {
+            return ['action' => 'NN_Capture', 'Async' => 'callback'];
+        } elseif (!empty($additionalData['NnZeroAmountCapture']) || !empty($additionalData['NnZeroAmountBooking'])) {
+            return ['action' => 'NN_ZeroCapture'];
+        } elseif (!empty($additionalData['NnTxnSecret']) ||
+            (!empty($this->urlInterface->getCurrentUrl()) && preg_match('/callback/i', $this->urlInterface->getCurrentUrl())) ||
+            (in_array(
+                $paymentMethodCode,
+                [
+                    ConfigProvider::NOVALNET_SEPA_GUARANTEE,
+                    ConfigProvider::NOVALNET_INVOICE_GUARANTEE,
+                    ConfigProvider::NOVALNET_SEPA_INSTALMENT,
+                    ConfigProvider::NOVALNET_INVOICE_INSTALMENT
+                ]
+            ) && $transactionStatus == 'CONFIRMED')
+        ) {
+            return ['action' => 'NN_Capture'];
+        }
+
+        return parent::build($buildSubject);
+    }
+}
diff --git a/Gateway/Request/InitializeDataBuilder.php b/Gateway/Request/InitializeDataBuilder.php
new file mode 100755
index 0000000..ee8cd23
--- /dev/null
+++ b/Gateway/Request/InitializeDataBuilder.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Request;
+
+class InitializeDataBuilder extends AbstractDataBuilder
+{
+    /**
+     * Builds ENV request for Redirect Payment initialize action
+     *
+     * @param array $buildSubject
+     * @return array
+     */
+    public function build(array $buildSubject)
+    {
+        return parent::build($buildSubject);
+    }
+}
diff --git a/Gateway/Request/RedirectAuthorizeDataBuilder.php b/Gateway/Request/RedirectAuthorizeDataBuilder.php
new file mode 100755
index 0000000..a9e2d8d
--- /dev/null
+++ b/Gateway/Request/RedirectAuthorizeDataBuilder.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Request;
+
+class RedirectAuthorizeDataBuilder extends AbstractDataBuilder
+{
+    /**
+     * Builds ENV request for Rediect Payment authorize action
+     *
+     * @param array $buildSubject
+     * @return array
+     */
+    public function build(array $buildSubject)
+    {
+        return [];
+    }
+}
diff --git a/Gateway/Request/RefundDataBuilder.php b/Gateway/Request/RefundDataBuilder.php
new file mode 100755
index 0000000..eb93c97
--- /dev/null
+++ b/Gateway/Request/RefundDataBuilder.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Request;
+
+class RefundDataBuilder extends AbstractDataBuilder
+{
+    /**
+     * Builds ENV request for Refund action
+     *
+     * @param array $buildSubject
+     * @return array
+     */
+    public function build(array $buildSubject)
+    {
+        return parent::buildExtensionParams($buildSubject, true);
+    }
+}
diff --git a/Gateway/Request/VoidDataBuilder.php b/Gateway/Request/VoidDataBuilder.php
new file mode 100755
index 0000000..0a554fe
--- /dev/null
+++ b/Gateway/Request/VoidDataBuilder.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Request;
+
+class VoidDataBuilder extends AbstractDataBuilder
+{
+    /**
+     * Builds ENV request for Void action
+     *
+     * @param array $buildSubject
+     * @return array
+     */
+    public function build(array $buildSubject)
+    {
+        $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($buildSubject);
+        $payment = $paymentDataObject->getPayment();
+        $additionalData = [];
+        if (!empty($payment->getAdditionalData())) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+                ? $this->serializer->unserialize($payment->getAdditionalData())
+                : json_decode($payment->getAdditionalData(), true);
+        }
+
+        if (!empty($additionalData['NnZeroAmountBooking'])) {
+            return ['action' => 'NN_ZeroVoid'];
+        }
+
+        return parent::buildExtensionParams($buildSubject);
+    }
+}
diff --git a/Gateway/Response/CcPaymentHandler.php b/Gateway/Response/CcPaymentHandler.php
new file mode 100755
index 0000000..d30f102
--- /dev/null
+++ b/Gateway/Response/CcPaymentHandler.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Response;
+
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+
+class CcPaymentHandler implements \Magento\Payment\Gateway\Response\HandlerInterface
+{
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    private $serializer;
+
+    /**
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     */
+    public function __construct(
+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer
+    ) {
+        $this->dateTime = $dateTime;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelper = $jsonHelper;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Handles transaction authorize and capture for Credit Card payment
+     *
+     * @param array $handlingSubject
+     * @param array $paymentResponse
+     * @return void
+     */
+    public function handle(array $handlingSubject, array $paymentResponse)
+    {
+        $response = new \Magento\Framework\DataObject();
+        $response->setData($paymentResponse);
+        $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($handlingSubject);
+        $order = $paymentDataObject->getOrder();
+        $payment = $paymentDataObject->getPayment();
+        $paymentMethodCode = $payment->getMethodInstance()->getCode();
+        $additionalData = $payment->getAdditionalData()
+            ? ($this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+            ? $this->serializer->unserialize($payment->getAdditionalData())
+            : json_decode($payment->getAdditionalData(), true)) : [];
+        $transactionStatus = !empty($additionalData['NnStatus'])
+            ? $this->novalnetRequestHelper->getStatus($additionalData['NnStatus'], $order) : '';
+
+        if ($response->getData('action') == 'NN_ZeroCapture') {
+            $payment->setIsTransactionClosed(false)
+                ->setShouldCloseParentTransaction(false);
+        } elseif (in_array($response->getData('action'), ['NN_Authorize', 'NN_Capture']) &&
+            isset($additionalData['NnTid'])
+        ) {
+            // Authorize or Capture CC3d initial transaction
+            $payment->setTransactionId($additionalData['NnTid'])
+                ->setAmount($order->getGrandTotalAmount())
+                ->setIsTransactionClosed(false)
+                ->setShouldCloseParentTransaction(false);
+
+            if ($transactionStatus == 'ON_HOLD') {
+                $payment->setTransactionId($additionalData['NnTid']);
+            }
+
+            if ($response->getData('Async') == 'callback') {
+                $payment->setTransactionId($additionalData['NnTid'] . '-capture');
+            }
+        } elseif (!empty($response->getData())) {
+            if ($response->getData('result/redirect_url')) {
+                $payment->setAdditionalData(
+                    $this->jsonHelper->jsonEncode($this->novalnetRequestHelper->buildRedirectAdditionalData($response))
+                );
+            } else {
+                if ($transactionStatus == 'ON_HOLD') {
+                    $additionalData['ApiProcess'] = 'capture';
+                    $additionalData['ApiProcessedAt'] = $this->dateTime->date('d-m-Y H:i:s');
+                    $additionalData['NnStatus'] = $response->getData('transaction/status');
+                    // Capture the Authorized transaction
+                    $payment->setTransactionId($response->getData('transaction/tid') . '-capture')
+                        ->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))
+                        ->setIsTransactionClosed(false)
+                        ->setShouldCloseParentTransaction(false);
+                } else {
+                    // Authorize or Capture the CC transaction
+                    $payment->setTransactionId($response->getData('transaction/tid'))
+                        ->setAmount($order->getGrandTotalAmount())
+                        ->setAdditionalData(
+                            $this->jsonHelper->jsonEncode(
+                                $this->novalnetRequestHelper->buildAdditionalData($response, $payment)
+                            )
+                        )
+                        ->setIsTransactionClosed(false)
+                        ->setShouldCloseParentTransaction(false);
+
+                    // Store payment data if token exist
+                    if ($response->getData('result/status') == 'SUCCESS' && $response->getData('transaction/payment_data/token')) {
+                        $this->novalnetRequestHelper->savePaymentToken($order, $paymentMethodCode, $response);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Gateway/Response/PaymentHandler.php b/Gateway/Response/PaymentHandler.php
new file mode 100755
index 0000000..8a7c6d4
--- /dev/null
+++ b/Gateway/Response/PaymentHandler.php
@@ -0,0 +1,286 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Response;
+
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class PaymentHandler implements \Magento\Payment\Gateway\Response\HandlerInterface
+{
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     */
+    private $timeZone;
+
+    /**
+     * @var \Novalnet\Payment\Model\TransactionStatus
+     */
+    private $transactionStatusModel;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    private $serializer;
+
+    /**
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timeZone
+     * @param \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     */
+    public function __construct(
+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timeZone,
+        \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer
+    ) {
+        $this->dateTime = $dateTime;
+        $this->timeZone = $timeZone;
+        $this->transactionStatusModel = $transactionStatusModel;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelper = $jsonHelper;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Handles transaction authorize and capture
+     *
+     * @param array $handlingSubject
+     * @param array $paymentResponse
+     * @return void
+     */
+    public function handle(array $handlingSubject, array $paymentResponse)
+    {
+        $response = new \Magento\Framework\DataObject();
+        $response->setData($paymentResponse);
+        $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($handlingSubject);
+        $order = $paymentDataObject->getOrder();
+        $payment = $paymentDataObject->getPayment();
+        $paymentMethodCode = $payment->getMethodInstance()->getCode();
+        $additionalData = [];
+        if (!empty($payment->getAdditionalData())) {
+            if ($this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())) {
+                $additionalData = $this->serializer->unserialize($payment->getAdditionalData());
+            } else {
+                $additionalData = json_decode($payment->getAdditionalData(), true);
+            }
+        }
+
+        $transactionStatus = '';
+        if (!empty($additionalData['NnStatus'])) {
+            $transactionStatus = $this->novalnetRequestHelper->getStatus($additionalData['NnStatus'], $order);
+        }
+
+        if ($response->getData('action') == 'NN_ZeroCapture') {
+            $payment->setIsTransactionClosed(false)
+                ->setShouldCloseParentTransaction(false);
+        } elseif (in_array($response->getData('action'), ['NN_Authorize', 'NN_Capture']) &&
+            isset($additionalData['NnTid'])
+        ) {
+            // Authorize or Capture the initial redirect transaction
+            $payment->setTransactionId($additionalData['NnTid'])
+                ->setAmount($order->getGrandTotalAmount())
+                ->setIsTransactionClosed(false)
+                ->setShouldCloseParentTransaction(false);
+
+            if ($transactionStatus == 'ON_HOLD') {
+                $payment->setTransactionId($additionalData['NnTid']);
+            }
+
+            if ($response->getData('Async') == 'callback') { // Capture from Novalnet admin portal through callback
+                $payment->setTransactionId($additionalData['NnTid'] . '-capture');
+            }
+        } elseif (!empty($response->getData())) {
+            if (!empty($response->getData('result/redirect_url'))) {
+                $payment->setAdditionalData(
+                    $this->jsonHelper->jsonEncode($this->novalnetRequestHelper->buildRedirectAdditionalData($response))
+                );
+            } else {
+                if ($transactionStatus == 'ON_HOLD') {
+                    $additionalData = $this->handleOnHold($additionalData, $response, $paymentMethodCode);
+                    // Capture the Authorized transaction
+                    $payment->setTransactionId($response->getData('transaction/tid') . '-capture')
+                        ->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))
+                        ->setIsTransactionClosed(false)
+                        ->setShouldCloseParentTransaction(false);
+                    // update Paypal Token information if null available
+                    if ($paymentMethodCode == ConfigProvider::NOVALNET_PAYPAL) {
+                        $this->savePaymentToken($response, $order);
+                    }
+                } else {
+                    // Authorize or Capture the transaction
+                    $payment->setTransactionId($response->getData('transaction/tid'))
+                        ->setAmount($order->getGrandTotalAmount())
+                        ->setAdditionalData(
+                            $this->jsonHelper->jsonEncode($this->novalnetRequestHelper->buildAdditionalData($response, $payment))
+                        )->setIsTransactionClosed(false)
+                        ->setShouldCloseParentTransaction(false);
+
+                    if (in_array(
+                        $paymentMethodCode,
+                        [
+                            ConfigProvider::NOVALNET_SEPA_GUARANTEE,
+                            ConfigProvider::NOVALNET_INVOICE_GUARANTEE,
+                            ConfigProvider::NOVALNET_SEPA_INSTALMENT,
+                            ConfigProvider::NOVALNET_INVOICE_INSTALMENT
+                        ]
+                    )) {
+                        $amount = $this->novalnetRequestHelper->getFormattedAmount($response->getData('transaction/amount'), 'RAW');
+                        if (in_array($response->getData('transaction/status'), ['PENDING', 'ON_HOLD'])) {
+                            $payment->authorize(true, $amount);
+                        } elseif ($response->getData('transaction/status') == 'CONFIRMED') {
+                            $payment->setTransactionId($response->getData('transaction/tid'))
+                                ->setLastTransId($response->getData('transaction/tid'))
+                                ->capture(null)
+                                ->setAmount($amount)
+                                ->setIsTransactionClosed(false)
+                                ->setShouldCloseParentTransaction(false);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Store payment data if token exist
+        if ($response->getData('result/status') == 'SUCCESS' && $response->getData('transaction/payment_data/token')) {
+            $this->novalnetRequestHelper->savePaymentToken($order, $paymentMethodCode, $response);
+        }
+    }
+
+    /**
+     * Handles save paypal payment token
+     *
+     * @param object $response
+     * @param object $order
+     * @return void
+     */
+    private function savePaymentToken($response, $order)
+    {
+        $transactionStatus = $this->transactionStatusModel->getCollection()->setPageSize(1)
+            ->addFieldToFilter('order_id', $order->getOrderIncrementId())
+            ->getFirstItem();
+        if ($transactionStatus->getId()) {
+            $tokenInfo = $transactionStatus->getTokenInfo();
+            if (!empty($tokenInfo)) {
+                $tokenInfo = json_decode($tokenInfo, true);
+            }
+            if ($response->getData('transaction/payment_data/paypal_account')) {
+                $tokenInfo['NnPaypalAccount'] = $response->getData('transaction/payment_data/paypal_account');
+            }
+            if ($response->getData('transaction/payment_data/paypal_transaction_id')) {
+                $tokenInfo['NnPaypalTransactionId'] = $response->getData('transaction/payment_data/paypal_transaction_id');
+            }
+            if (!empty($tokenInfo)) {
+                $transactionStatus->setTokenInfo($this->jsonHelper->jsonEncode($tokenInfo))->save();
+            }
+        }
+    }
+
+    /**
+     * Handles On Hold actions
+     *
+     * @param array $additionalData
+     * @param object $response
+     * @param string $paymentMethodCode
+     * @return array
+     */
+    private function handleOnHold($additionalData, $response, $paymentMethodCode)
+    {
+        $additionalData['ApiProcess'] = 'capture';
+        $additionalData['ApiProcessedAt'] = $this->dateTime->date('d-m-Y H:i:s');
+        $additionalData['NnStatus'] = $response->getData('transaction/status');
+
+        $this->transactionStatusModel->loadByAttribute($response->getData('transaction/order_no'), 'order_id')
+            ->setStatus($response->getData('transaction/status'))->save();
+
+        // Due date update for Invoice payment
+        if (in_array(
+            $paymentMethodCode,
+            [ConfigProvider::NOVALNET_INVOICE, ConfigProvider::NOVALNET_INVOICE_GUARANTEE, ConfigProvider::NOVALNET_INVOICE_INSTALMENT]
+        )) {
+            $formatDate = $this->timeZone->formatDate(
+                $response->getData('transaction/due_date'),
+                \IntlDateFormatter::LONG
+            );
+            $note = (!empty($additionalData['NnInvoiceComments'])) ? explode('|', $additionalData['NnInvoiceComments']) : [];
+            $additionalData['NnInvoiceComments'] = (!empty($note)) ? implode('|', $note) : '';
+            $additionalData['NnDueDate'] = $formatDate;
+        }
+
+        if (in_array(
+            $paymentMethodCode,
+            [
+                ConfigProvider::NOVALNET_SEPA_INSTALMENT,
+                ConfigProvider::NOVALNET_INVOICE_INSTALMENT
+            ]
+        )) {
+            $instalmentCycleAmount = $this->novalnetRequestHelper->getFormattedAmount(
+                $response->getData('instalment/cycle_amount'),
+                'RAW'
+            );
+            $additionalData['InstallPaidAmount'] = $instalmentCycleAmount;
+            $additionalData['PaidInstall'] = $response->getData('instalment/cycles_executed');
+            $additionalData['DueInstall'] = $response->getData('instalment/pending_cycles');
+            $additionalData['NextCycle'] = $response->getData('instalment/next_cycle_date');
+            $additionalData['InstallCycleAmount'] = $instalmentCycleAmount;
+
+            if ($futureInstalmentDates = $response->getData('instalment/cycle_dates')) {
+                foreach ($futureInstalmentDates as $cycle => $futureInstalmentDate) {
+                    $additionalData['InstalmentDetails'][$cycle] = [
+                        'amount' => $instalmentCycleAmount,
+                        'nextCycle' => $futureInstalmentDate ? date('Y-m-d', strtotime($futureInstalmentDate)) : '',
+                        'paidDate' => ($cycle == 1) ? date('Y-m-d') : '',
+                        'status' => ($cycle == 1) ? 'Paid' : 'Pending',
+                        'reference' => ($cycle == 1) ? $response->getData('transaction/tid') : ''
+                    ];
+                }
+            }
+
+            $additionalData['InstalmentDetails'][1] = [
+                'amount' => $instalmentCycleAmount,
+                'nextCycle' => $response->getData('instalment/next_cycle_date'),
+                'paidDate' => date('Y-m-d'),
+                'status' => 'Paid',
+                'reference' => $response->getData('transaction/tid')
+            ];
+        }
+
+        return $additionalData;
+    }
+}
diff --git a/Gateway/Response/RedirectAuthorizeHandler.php b/Gateway/Response/RedirectAuthorizeHandler.php
new file mode 100755
index 0000000..0c4775f
--- /dev/null
+++ b/Gateway/Response/RedirectAuthorizeHandler.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Response;
+
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+
+class RedirectAuthorizeHandler implements \Magento\Payment\Gateway\Response\HandlerInterface
+{
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    private $serializer;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Handles transaction authorize for Redirect payments
+     *
+     * @param array $handlingSubject
+     * @param array $response
+     * @return void
+     */
+    public function handle(array $handlingSubject, array $response)
+    {
+        $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($handlingSubject);
+        $order = $paymentDataObject->getOrder();
+        $payment = $paymentDataObject->getPayment();
+        $additionalData = [];
+        if (!empty($payment->getAdditionalData())) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+                    ? $this->serializer->unserialize($payment->getAdditionalData())
+                    : json_decode($payment->getAdditionalData(), true);
+        }
+
+        // Authorize initial transaction
+        $payment->setTransactionId($additionalData['NnTid'])
+                ->setAmount($order->getGrandTotalAmount())
+                ->setIsTransactionClosed(false)
+                ->setShouldCloseParentTransaction(false);
+    }
+}
diff --git a/Gateway/Response/RefundHandler.php b/Gateway/Response/RefundHandler.php
new file mode 100755
index 0000000..eb76199
--- /dev/null
+++ b/Gateway/Response/RefundHandler.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Response;
+
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+
+class RefundHandler implements \Magento\Payment\Gateway\Response\HandlerInterface
+{
+    /**
+     * @var \Magento\Framework\Pricing\Helper\Data
+     */
+    private $pricingHelper;
+
+    /**
+     * @var \Novalnet\Payment\Model\TransactionStatus
+     */
+    private $transactionStatusModel;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    private $serializer;
+
+    /**
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
+     * @param \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     */
+    public function __construct(
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
+        \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer
+    ) {
+        $this->pricingHelper = $pricingHelper;
+        $this->transactionStatusModel = $transactionStatusModel;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelper = $jsonHelper;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Handles transaction refund
+     *
+     * @param array $handlingSubject
+     * @param array $paymentResponse
+     * @return void
+     */
+    public function handle(array $handlingSubject, array $paymentResponse)
+    {
+        $response = new \Magento\Framework\DataObject();
+        $response->setData($paymentResponse);
+        $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($handlingSubject);
+        $refundAmount = \Magento\Payment\Gateway\Helper\SubjectReader::readAmount($handlingSubject);
+
+        $payment = $paymentDataObject->getPayment();
+        $additionalData = [];
+        if (!empty($payment->getAdditionalData())) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+                    ? $this->serializer->unserialize($payment->getAdditionalData())
+                    : json_decode($payment->getAdditionalData(), true);
+        }
+        $parentTid = $additionalData['NnTid'];
+        $lastTransid = !empty($payment->getLastTransId()) ? $payment->getLastTransId() : $additionalData['NnTid'];
+        if (!empty($additionalData['NnZeroAmountBooking']) && !empty($additionalData['NnZeroAmountDone'])) {
+            $parentTid = $additionalData['NnZeroAmountRefTid'];
+            $lastTransid = !empty($payment->getLastTransId()) ? $payment->getLastTransId() : $additionalData['NnZeroAmountRefTid'];
+            $lastTransid = (strpos($lastTransid, '-zeroamount') !== false) ? $this->novalnetRequestHelper->makeValidNumber($lastTransid) : $lastTransid;
+        }
+
+        $additionalData['NnStatus'] = $response->getData('transaction/status');
+        $noOfRefunds = empty($additionalData['NnRefundsOccured']) ? 1 : $additionalData['NnRefundsOccured'] + 1;
+        $additionalData['NnRefundsOccured'] = $noOfRefunds;
+
+        $refundTid = $response->getData('transaction/refund/tid') ? $response->getData('transaction/refund/tid') : (
+            (strpos($lastTransid, '-refund') !== false) ?
+            $this->novalnetRequestHelper->makeValidNumber($lastTransid) . '-refund' . $noOfRefunds
+            : $lastTransid . '-refund');
+
+        $refundAmount = $this->pricingHelper->currency($refundAmount, true, false);
+        $additionalData['NnRefunded'][$refundTid]['reftid'] = $refundTid;
+        $additionalData['NnRefunded'][$refundTid]['refamount'] = $refundAmount;
+        $additionalData['NnRefunded'][$refundTid]['reqtid'] = $parentTid;
+
+        $this->transactionStatusModel->loadByAttribute($response->getData('transaction/order_no'), 'order_id')
+            ->setStatus($response->getData('transaction/status'))->save();
+        $payment->setTransactionId($refundTid)
+                ->setLastTransId($refundTid)
+                ->setParentTransactionId($parentTid)
+                ->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))
+                ->setIsTransactionClosed(true)
+                ->setShouldCloseParentTransaction(!$payment->getCreditmemo()->getInvoice()->canRefund());
+    }
+}
diff --git a/Gateway/Response/VoidHandler.php b/Gateway/Response/VoidHandler.php
new file mode 100755
index 0000000..c0042e4
--- /dev/null
+++ b/Gateway/Response/VoidHandler.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Response;
+
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+
+class VoidHandler implements \Magento\Payment\Gateway\Response\HandlerInterface
+{
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @var \Novalnet\Payment\Model\TransactionStatus
+     */
+    private $transactionStatusModel;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    private $serializer;
+
+    /**
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+     * @param \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     */
+    public function __construct(
+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
+        \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer
+    ) {
+        $this->dateTime = $dateTime;
+        $this->transactionStatusModel = $transactionStatusModel;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelper = $jsonHelper;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Handles transaction void
+     *
+     * @param array $handlingSubject
+     * @param array $paymentResponse
+     * @return void
+     */
+    public function handle(array $handlingSubject, array $paymentResponse)
+    {
+        $response = new \Magento\Framework\DataObject();
+        $response->setData($paymentResponse);
+        $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($handlingSubject);
+        $payment = $paymentDataObject->getPayment();
+        $additionalData = [];
+
+        if ($response->getData('action') !== 'NN_ZeroVoid') {
+            if (!empty($payment->getAdditionalData())) {
+                $additionalData = $this->novalnetRequestHelper->isSerialized($payment->getAdditionalData())
+                        ? $this->serializer->unserialize($payment->getAdditionalData())
+                        : json_decode($payment->getAdditionalData(), true);
+            }
+            $additionalData['ApiProcess'] = 'void';
+            $additionalData['ApiProcessedAt'] = $this->dateTime->date('d-m-Y H:i:s');
+            $additionalData['NnStatus'] = $response->getData('transaction/status');
+            $additionalData['NnComments'] = '<br><b><font color="red">' . __('Payment Failed') . '</font> - '
+                . $response->getData('transaction/status') . '</b>';
+            $this->transactionStatusModel->loadByAttribute($response->getData('transaction/order_no'), 'order_id')
+                ->setStatus($response->getData('transaction/status'))->save();
+
+            $payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))
+                ->setIsTransactionClosed(true)
+                ->setShouldCloseParentTransaction(true);
+        }
+    }
+}
diff --git a/Gateway/Validator/ResponseCodeValidator.php b/Gateway/Validator/ResponseCodeValidator.php
new file mode 100755
index 0000000..9bec07e
--- /dev/null
+++ b/Gateway/Validator/ResponseCodeValidator.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Gateway\Validator;
+
+use Magento\Payment\Gateway\Validator\AbstractValidator;
+use Magento\Payment\Gateway\Validator\ResultInterface;
+use Magento\Payment\Gateway\Helper\SubjectReader;
+
+class ResponseCodeValidator extends AbstractValidator
+{
+    /**
+     * Performs validation of result/response code
+     *
+     * @param array $validationSubject
+     * @return ResultInterface
+     */
+    public function validate(array $validationSubject)
+    {
+        $response = new \Magento\Framework\DataObject();
+        $response->setData(SubjectReader::readResponse($validationSubject));
+        $isValid = true;
+        $msg = [];
+
+        if (empty($response->getData('action')) && $response->getData('result/status') != 'SUCCESS') {
+            $isValid = false;
+            $msg = [__($response->getData('result/status_text'))];
+        }
+
+        return $this->createResult($isValid, $msg);
+    }
+}
diff --git a/Helper/Request.php b/Helper/Request.php
new file mode 100755
index 0000000..38945c8
--- /dev/null
+++ b/Helper/Request.php
@@ -0,0 +1,1265 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Helper;
+
+use Magento\Sales\Model\Order;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+use Novalnet\Payment\Model\NNConfig;
+
+/**
+ * Novalnet payment request helper
+ *
+ */
+class Request extends \Magento\Framework\App\Helper\AbstractHelper
+{
+    /**
+     * @var \Magento\Framework\App\State
+     */
+    protected $appState;
+
+    /**
+     * @var \Magento\Framework\Pricing\Helper\Data
+     */
+    protected $pricingHelper;
+
+    /**
+     * @var \Magento\Framework\App\ProductMetadata
+     */
+    protected $productMetadata;
+
+    /**
+     * @var \Magento\Framework\Module\ModuleListInterface
+     */
+    protected $moduleList;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    protected $requestInterface;
+
+    /**
+     * @var \Magento\Framework\Locale\ResolverInterface
+     */
+    protected $resolverInterface;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    protected $jsonHelper;
+
+    /**
+     * @var \Magento\Directory\Model\CountryFactory
+     */
+    protected $countryFactory;
+
+    /**
+     * @var \Magento\Customer\Model\Session
+     */
+    protected $customerSession;
+
+    /**
+     * @var \Magento\Checkout\Model\Session
+     */
+    protected $checkoutSession;
+
+    /**
+     * @var \Magento\Backend\Model\Session\Quote
+     */
+    protected $adminCheckoutSession;
+
+    /**
+     * @var \Magento\Checkout\Model\SessionFactory
+     */
+    protected $checkoutSessionFactory;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     */
+    protected $dateTime;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Email\Sender\InvoiceSender
+     */
+    protected $invoiceSender;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Email\Sender\OrderSender
+     */
+    protected $orderEmailSender;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface
+     */
+    protected $transactionBuilder;
+
+    /**
+     * @var \Novalnet\Payment\Model\TransactionStatus
+     */
+    protected $transactionStatusModel;
+
+    /**
+     * @var NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Magento\Framework\HTTP\PhpEnvironment\ServerAddress
+     */
+    protected $serverAddress;
+
+    /**
+     * @var \Novalnet\Payment\Logger\NovalnetLogger
+     */
+    protected $novalnetLogger;
+
+    /**
+     * @var array
+     */
+    protected $onholdStatus = [ '91', '98', '99', '85'];
+
+    /**
+     * @var array
+     */
+    protected $pendingStatus = [ '75', '86', '90'];
+
+    /**
+     * @var \Magento\Directory\Helper\Data
+     */
+    protected $directoryHelper;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $storeManager;
+
+    /**
+     * @var \Magento\Tax\Helper\Data
+     */
+    private $taxHelper;
+
+    /**
+     * @var \Magento\Framework\Session\SessionManagerInterface
+     */
+    protected $coreSession;
+
+    /**
+     * @var \Magento\Directory\Model\Region $regionModel
+     */
+    protected $regionModel;
+
+    /**
+     * @param \Magento\Framework\App\Helper\Context $context
+     * @param \Magento\Framework\App\State $appState
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
+     * @param \Magento\Framework\App\ProductMetadata $productMetadata
+     * @param \Magento\Framework\Module\ModuleListInterface $moduleList
+     * @param \Magento\Framework\App\RequestInterface $requestInterface
+     * @param \Magento\Framework\Locale\ResolverInterface $resolverInterface
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param \Magento\Directory\Model\CountryFactory $countryFactory
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Backend\Model\Session\Quote $adminCheckoutSession
+     * @param \Magento\Checkout\Model\SessionFactory $checkoutSessionFactory
+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $dateTime
+     * @param \Magento\Sales\Model\Order\Email\Sender\InvoiceSender $invoiceSender
+     * @param \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderEmailSender
+     * @param \Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface $transactionBuilder
+     * @param \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel
+     * @param NNConfig $novalnetConfig
+     * @param \Magento\Framework\HTTP\PhpEnvironment\ServerAddress $serverAddress
+     * @param \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+     * @param \Magento\Directory\Helper\Data $directoryHelper
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Tax\Helper\Data $taxHelper
+     * @param \Magento\Framework\Session\SessionManagerInterface $coreSession
+     * @param \Magento\Directory\Model\Region $regionModel
+     */
+    public function __construct(
+        \Magento\Framework\App\Helper\Context $context,
+        \Magento\Framework\App\State $appState,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
+        \Magento\Framework\App\ProductMetadata $productMetadata,
+        \Magento\Framework\Module\ModuleListInterface $moduleList,
+        \Magento\Framework\App\RequestInterface $requestInterface,
+        \Magento\Framework\Locale\ResolverInterface $resolverInterface,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        \Magento\Directory\Model\CountryFactory $countryFactory,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        \Magento\Backend\Model\Session\Quote $adminCheckoutSession,
+        \Magento\Checkout\Model\SessionFactory $checkoutSessionFactory,
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $dateTime,
+        \Magento\Sales\Model\Order\Email\Sender\InvoiceSender $invoiceSender,
+        \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderEmailSender,
+        \Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface $transactionBuilder,
+        \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel,
+        NNConfig $novalnetConfig,
+        \Magento\Framework\HTTP\PhpEnvironment\ServerAddress $serverAddress,
+        \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger,
+        \Magento\Directory\Helper\Data $directoryHelper,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Tax\Helper\Data $taxHelper,
+        \Magento\Framework\Session\SessionManagerInterface $coreSession,
+        \Magento\Directory\Model\Region $regionModel
+    ) {
+        parent::__construct($context);
+        $this->appState = $appState;
+        $this->pricingHelper = $pricingHelper;
+        $this->productMetadata = $productMetadata;
+        $this->moduleList = $moduleList;
+        $this->requestInterface = $requestInterface;
+        $this->resolverInterface = $resolverInterface;
+        $this->serializer = $serializer;
+        $this->jsonHelper = $jsonHelper;
+        $this->countryFactory = $countryFactory;
+        $this->customerSession = $customerSession;
+        $this->checkoutSession = $checkoutSession;
+        $this->adminCheckoutSession = $adminCheckoutSession;
+        $this->checkoutSessionFactory = $checkoutSessionFactory;
+        $this->dateTime = $dateTime;
+        $this->invoiceSender = $invoiceSender;
+        $this->orderEmailSender = $orderEmailSender;
+        $this->transactionBuilder = $transactionBuilder;
+        $this->transactionStatusModel = $transactionStatusModel;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->serverAddress = $serverAddress;
+        $this->novalnetLogger = $novalnetLogger;
+        $this->directoryHelper = $directoryHelper;
+        $this->scopeConfig = $scopeConfig;
+        $this->storeManager = $storeManager;
+        $this->taxHelper = $taxHelper;
+        $this->coreSession = $coreSession;
+        $this->regionModel = $regionModel;
+    }
+
+    /**
+     * Get request headers
+     *
+     * @param string|bool $payment_access_key
+     * @param int|null $storeId
+     * @return array
+     */
+    public function getRequestHeaders($payment_access_key = false, $storeId = null)
+    {
+        if (!$payment_access_key) {
+            $payment_access_key = $this->novalnetConfig->getGlobalConfig('payment_access_key', $storeId);
+        }
+
+        $encoded_data = base64_encode($payment_access_key);
+        return [
+            'Content-Type' => 'application/json',
+            'Charset' => 'utf-8',
+            'Accept' => 'application/json',
+            'X-NN-Access-Key' => $encoded_data,
+        ];
+    }
+
+    /**
+     * Build addtional data for redirect payment
+     *
+     * @param mixed $response
+     * @return array
+     */
+    public function buildRedirectAdditionalData($response)
+    {
+        if ($response->getData('transaction/txn_secret')) {
+            $additionalData['NnRedirectURL'] = $response->getData('result/redirect_url');
+            $additionalData['NnTxnSecret'] = $response->getData('transaction/txn_secret');
+            return $additionalData;
+        }
+
+        return [];
+    }
+
+    /**
+     * Build addtional data for payment
+     *
+     * @param mixed $response
+     * @param mixed $payment
+     * @return array
+     */
+    public function buildAdditionalData($response, $payment)
+    {
+        $additionalData = [];
+        if (!empty($payment->getAdditionalData())) {
+            $additionalData = $this->isSerialized($payment->getAdditionalData())
+                ? $this->serializer->unserialize($payment->getAdditionalData())
+                : json_decode($payment->getAdditionalData(), true);
+
+            if (isset($additionalData['NnRedirectURL'])) {
+                unset($additionalData['NnRedirectURL']);
+            }
+        }
+
+        $paymentMethodCode = $this->novalnetConfig->getPaymentCodeByType($response->getData('transaction/payment_type'));
+
+        $dataToStore = ['transaction/test_mode', 'transaction/status', 'transaction/tid', 'custom/lang', 'transaction/due_date', 'transaction/partner_payment_reference', 'transaction/payment_data/cc_3d', 'transaction/checkout_js', 'transaction/checkout_token'];
+
+        foreach ($dataToStore as $responseData) {
+            if ($response->getData($responseData)) {
+                $responseDataFormatted = preg_replace('/(?:.*)\/(.*)/', ucwords('$1'), $responseData);
+                $responseDataFormatted = str_replace('_', '', ucwords($responseDataFormatted, '_'));
+                $additionalData['Nn' . $responseDataFormatted] = $response->getData($responseData);
+            }
+        }
+
+        $invoiceAmount = $this->pricingHelper->currency(
+            $this->getFormattedAmount(($response->getData('instalment/cycle_amount') ? $response->getData('instalment/cycle_amount')
+            : $response->getData('transaction/amount')), 'RAW'),
+            true,
+            false
+        );
+        $additionalData['NnAmount'] = $invoiceAmount;
+
+        if (!empty($additionalData['NnDueDate'])) {
+            $additionalData['NnDueDate'] = $this->dateTime->formatDate(
+                $additionalData['NnDueDate'],
+                \IntlDateFormatter::LONG
+            );
+        }
+
+        if ($response->getData('transaction/bank_details')) {
+            $additionalData['NnInvoiceComments'] = $this->getInvoiceComments($response);
+        }
+
+        if ($paymentMethodCode == ConfigProvider::NOVALNET_CASHPAYMENT) {
+            $additionalData['CpDueDate'] = $this->dateTime->formatDate(
+                $response->getData('transaction/due_date'),
+                \IntlDateFormatter::LONG
+            );
+
+            $cashPaymentStores = [];
+            foreach ($response->getData('transaction/nearest_stores') as $key => $cashPaymentStore) {
+                $cashPaymentStores[] = [
+                    'title' => $cashPaymentStore['store_name'],
+                    'street' => $cashPaymentStore['street'],
+                    'city' => $cashPaymentStore['city'],
+                    'zipcode' => $cashPaymentStore['zip'],
+                    'country' => $this->countryFactory->create()->loadByCode($cashPaymentStore['country_code'])
+                        ->getName()
+                ];
+            }
+
+            $additionalData['CashpaymentStores'] = $cashPaymentStores;
+        }
+
+        if ($response->getData('instalment')) {
+            $instalmentCycleAmount = $this->getFormattedAmount(
+                $response->getData('instalment/cycle_amount'),
+                'RAW'
+            );
+            $additionalData['InstallPaidAmount'] = $instalmentCycleAmount;
+            $additionalData['PaidInstall'] = $response->getData('instalment/cycles_executed');
+            $additionalData['DueInstall'] = $response->getData('instalment/pending_cycles');
+            $additionalData['NextCycle'] = $response->getData('instalment/next_cycle_date');
+            $additionalData['InstallCycleAmount'] = $instalmentCycleAmount;
+
+            if ($futureInstalmentDates = $response->getData('instalment/cycle_dates')) {
+                foreach (array_keys($futureInstalmentDates) as $cycle) {
+                    $additionalData['InstalmentDetails'][$cycle] = [
+                        'amount' => $instalmentCycleAmount,
+                        'nextCycle' => !empty($futureInstalmentDates[$cycle + 1]) ? date('Y-m-d', strtotime($futureInstalmentDates[$cycle + 1])) : '',
+                        'paidDate' => ($cycle == 1) ? date('Y-m-d') : '',
+                        'status' => ($cycle == 1) ? 'Paid' : 'Pending',
+                        'reference' => ($cycle == 1) ? $response->getData('transaction/tid') : ''
+                    ];
+                }
+            }
+
+        }
+
+        if ($this->novalnetConfig->isZeroAmountBookingSupported($paymentMethodCode) &&
+            $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'payment_action') == NNConfig::ACTION_ZERO_AMOUNT_BOOKING
+        ) {
+            $additionalData['NnZeroAmountBooking'] = 1;
+        }
+
+        $order = $payment->getOrder();
+        $this->saveTransactionDetails($response, $paymentMethodCode);
+
+        return $additionalData;
+    }
+
+    /**
+     * Retrieves Novalnet Invoice Comments
+     *
+     * @param mixed $response
+     * @return string
+     */
+    public function getInvoiceComments($response)
+    {
+        $invoicePaymentsNote = 'Account holder: ' . $response->getData('transaction/bank_details/account_holder');
+        $invoicePaymentsNote .= '|IBAN: ' . $response->getData('transaction/bank_details/iban');
+        $invoicePaymentsNote .= '|BIC: ' . $response->getData('transaction/bank_details/bic');
+        $invoicePaymentsNote .= '|Bank: ' . $response->getData('transaction/bank_details/bank_name')
+        . ' ' . $response->getData('transaction/bank_details/bank_place');
+
+        $invoicePaymentsNote .= '|Payment References description:';
+        if ($response->getData('instalment/cycle_amount')) {
+            $invoicePaymentsNote .= '|Payment Reference:' . $response->getData('transaction/tid');
+        } else {
+            $invoicePaymentsNote .= '|Payment reference 1:' . $response->getData('transaction/tid');
+            $invoicePaymentsNote .= '|Payment reference 2:' . $response->getData('transaction/invoice_ref');
+        }
+
+        return $invoicePaymentsNote;
+    }
+
+    /**
+     * Saves transaction details into Novalnet table
+     *
+     * @param mixed $response
+     * @param string $paymentMethodCode
+     * @return void
+     */
+    public function saveTransactionDetails($response, $paymentMethodCode)
+    {
+        $this->transactionStatusModel->setOrderId($response->getData('transaction/order_no'))
+           ->setTid($response->getData('transaction/tid'))
+           ->setStatus($response->getData('transaction/status'))
+           ->setCustomerId($this->getCustomerId())
+           ->setPaymentMethod($paymentMethodCode)
+           ->save();
+    }
+
+    /**
+     * Check payment hash for redirect payments
+     *
+     * @param array $response
+     * @param array $additionalData
+     * @return bool
+     */
+    public function checkPaymentHash($response, $additionalData)
+    {
+        $accessKey = (!empty($this->novalnetConfig->getGlobalConfig('payment_access_key'))) ? trim($this->novalnetConfig->getGlobalConfig('payment_access_key')) : '';
+        $checksumString = $response['tid'] . $additionalData['NnTxnSecret'] . $response['status']
+            . strrev($accessKey);
+        $generatedChecksum = (!empty($checksumString)) ? hash('sha256', $checksumString) : '';
+
+        if ($generatedChecksum !== $response['checksum']) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check return data for redirect payments and update order accordingly
+     *
+     * @param mixed $response
+     * @param mixed $order
+     * @param mixed $payment
+     * @return bool
+     */
+    public function checkReturnedData($response, $order, $payment)
+    {
+        if ($response->getData('transaction/status') == 'FAILURE') {
+            $this->saveCanceledOrder($response, $order);
+            return false;
+        }
+        $storeId = $order->getStoreId();
+        $paymentMethodCode = $payment->getMethodInstance()->getCode();
+        // Retrieves additional payment data for the order
+        $additionalData = $this->buildAdditionalData($response, $payment);
+        $amount = $this->getFormattedAmount($response->getData('transaction/amount'), 'RAW');
+        $payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+        $setOrderStatus = $this->novalnetConfig->getGlobalOnholdStatus($storeId);
+
+        if ($response->getData('transaction/status') == 'CONFIRMED' && empty($additionalData['NnZeroAmountBooking'])) {
+            // capture transaction
+            $payment->setTransactionId($additionalData['NnTid'])
+                ->setLastTransId($additionalData['NnTid'])
+                ->capture(null)
+                ->setAmount($amount)
+                ->setIsTransactionClosed(false)
+                ->setShouldCloseParentTransaction(false)
+                ->save();
+
+            $setOrderStatus = $this->novalnetConfig->getPaymentConfig(
+                $paymentMethodCode,
+                'order_status',
+                $storeId
+            );
+        } else {
+            // authorize transaction
+            if (!empty($additionalData['NnZeroAmountBooking'])) {
+                $payment->authorize(true, $order->getBaseGrandTotal())->save();
+            } else {
+                $payment->authorize(true, $amount)->save();
+            }
+
+            if ($response->getData('transaction/status') == 'PENDING') {
+                    $setOrderStatus = 'pending';
+            }
+        }
+
+        $order->setState(Order::STATE_PROCESSING)
+            ->setStatus($setOrderStatus)
+            ->save();
+        $order->addStatusHistoryComment(__('Customer successfully returned from Novalnet'), false)
+            ->save();
+
+        // Order Confirmation and Invoice email
+        if ($order->getCanSendNewEmailFlag()) {
+            try {
+                $this->orderEmailSender->send($order);
+                $invoice = current($order->getInvoiceCollection()->getItems());
+                if ($invoice) {
+                    $this->invoiceSender->send($invoice);
+                }
+            } catch (\Exception $e) {
+                $this->_logger->critical($e);
+                $this->novalnetLogger->error($e);
+            }
+        }
+
+        //update payment token
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+
+        $subscription = false;
+        if (!empty($order->getItems())) {
+            foreach ($order->getItems() as $item) {
+                $additionalData = [];
+                if (!empty($item->getAdditionalData())) {
+                    $additionalData = json_decode($item->getAdditionalData(), true);
+                }
+
+                if (!empty($additionalData['period_unit']) && !empty($additionalData['billing_frequency'])) {
+                    $subscription = true;
+                    break;
+                }
+            }
+            if ($subscription) {
+                if (in_array($paymentMethodCode, [ConfigProvider::NOVALNET_CC, ConfigProvider::NOVALNET_PAYPAL])) {
+                    $token = !empty($response->getData('transaction/payment_data/token')) ? $response->getData('transaction/payment_data/token') : '';
+                    if (!empty($token)) {
+                        $subscriptionModel = $objectManager->create(\Novalnet\Subscription\Model\SubscriptionDetails::class);
+                        $subscriptionModel = $subscriptionModel->getCollection()->addFieldToFilter('order_id', $order->getIncrementId())->getFirstItem();
+                        $subscriptionModel->setToken($token)->save();
+                    }
+
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Save canceled payment transaction
+     *
+     * @param mixed $response
+     * @param mixed $order
+     * @param string|bool $statusText
+     * @return void
+     */
+    public function saveCanceledOrder($response, $order, $statusText = false)
+    {
+        $payment = $order->getPayment();
+        // Get payment transaction status message
+        $statusMessage = ($statusText)
+            ? $statusText : $response->getData('result/status_text');
+
+        $additionalData = $payment->getAdditionalData() ? ($this->isSerialized($payment->getAdditionalData())
+                ? $this->serializer->unserialize($payment->getAdditionalData())
+                : json_decode($payment->getAdditionalData(), true)) : [];
+
+        $nnAmount = $this->pricingHelper->currency(
+            $this->getFormattedAmount(($response->getData('instalment/cycle_amount') ? $response->getData('instalment/cycle_amount')
+            : $response->getData('transaction/amount')), 'RAW'),
+            true,
+            false
+        );
+
+        $additionalData['NnTid'] = $response->getData('transaction/tid');
+        $additionalData['NnStatus'] = $response->getData('transaction/status');
+        $additionalData['NnTestMode'] = $response->getData('transaction/test_mode');
+        $additionalData['NnAmount'] = $nnAmount;
+        $additionalData['NnComments'] = '<b><font color="red">' . __('Payment Failed') . '</font> - '
+            . $statusMessage . '</b>';
+        $payment->setLastTransId($additionalData['NnTid'])
+            ->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))
+            ->save();
+
+        // UnHold and Cancel the order with the cancel text
+        if ($order->canUnhold()) {
+            $order->unhold();
+        }
+
+        //Cancel subscription if exist
+        $paymentMethodCode = $payment->getMethodInstance()->getCode();
+        $subscription = false;
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        if (!empty($order->getItems())) {
+            foreach ($order->getItems() as $item) {
+                $additionalData = (!empty($item->getAdditionalData())) ? json_decode($item->getAdditionalData(), true) : [];
+                if (!empty($additionalData['period_unit']) && !empty($additionalData['billing_frequency'])) {
+                    $subscription = true;
+                    break;
+                }
+            }
+        }
+        if ($subscription) {
+            if (in_array($paymentMethodCode, [ConfigProvider::NOVALNET_CC, ConfigProvider::NOVALNET_PAYPAL])) {
+                $subscriptionModel = $objectManager->create(\Novalnet\Subscription\Model\SubscriptionItems::class);
+                $subscriptionitems = $subscriptionModel->getCollection()->addFieldToFilter('order_id', $order->getIncrementId());
+                if (!empty($subscriptionitems)) {
+                    foreach ($subscriptionitems as $subscriptionitem) {
+                        $subscriptionitem->setState('CANCELED')->save();
+                    }
+                }
+            }
+        }
+
+        $order->registerCancellation($statusMessage)->save();
+    }
+
+    /**
+     * Save payment token
+     *
+     * @param mixed $order
+     * @param string $paymentMethodCode
+     * @param mixed $response
+     * @return void
+     */
+    public function savePaymentToken($order, $paymentMethodCode, $response)
+    {
+        if ($this->novalnetConfig->isOneClickPayment($paymentMethodCode)) {
+            if (strpos($paymentMethodCode, ConfigProvider::NOVALNET_SEPA) !== false) {
+                $paymentMethodCode = ConfigProvider::NOVALNET_SEPA;
+            }
+            $transactionStatusCollection = $this->transactionStatusModel->getCollection()
+                ->setPageSize(2)
+                ->setOrder('id', 'DESC')
+                ->addFieldToFilter('token', ['null' => false])
+                ->addFieldToFilter('customer_id', $order->getCustomerId())
+                ->addFieldToFilter('payment_method', ['like' => $paymentMethodCode . '%']);
+            // Override the old token if two tokens already exist
+            if ($transactionStatusCollection->count() >= 2) {
+                $this->transactionStatusModel->setEntityId($transactionStatusCollection->getFirstItem()->getId());
+            }
+
+            $responseTokens = ['transaction/payment_data/card_brand', 'transaction/payment_data/card_holder', 'transaction/payment_data/card_expiry_month', 'transaction/payment_data/card_expiry_year', 'transaction/payment_data/card_number', 'transaction/payment_data/iban', 'transaction/payment_data/account_holder', 'transaction/payment_data/paypal_account', 'transaction/payment_data/paypal_transaction_id'];
+
+            foreach ($responseTokens as $responseToken) {
+                if ($response->getData($responseToken)) {
+                    $responseTokenFormatted = preg_replace('/(?:transaction\/payment_data)\/(.*)/', ucwords('$1'), $responseToken);
+                    $responseTokenFormatted = str_replace('_', '', ucwords($responseTokenFormatted, '_'));
+                    $tokenInfo['Nn' . $responseTokenFormatted] = $response->getData($responseToken);
+                }
+            }
+
+            $this->transactionStatusModel->setToken($response->getData('transaction/payment_data/token'));
+            if (!empty($tokenInfo) && $response->getData('custom/create_token') == '1') {
+                $this->transactionStatusModel->setTokenInfo($this->jsonHelper->jsonEncode($tokenInfo));
+            }
+            $this->transactionStatusModel->save();
+        }
+    }
+
+    /**
+     * Restore cart items
+     *
+     * @param  string $orderId
+     * @return void
+     */
+    public function restoreQuote($orderId)
+    {
+        $this->checkoutSession->restoreQuote();
+        $this->checkoutSession->setLastRealOrderId($orderId);
+    }
+
+    /**
+     * Retrieve Magento version
+     *
+     * @return string
+     */
+    public function getMagentoVersion()
+    {
+        return $this->productMetadata->getVersion();
+    }
+
+    /**
+     * Retrieve Novalnet version
+     *
+     * @return int
+     */
+    public function getNovalnetVersion()
+    {
+        return $this->moduleList->getOne('Novalnet_Payment')['setup_version'];
+    }
+
+    /**
+     * Get shop default language
+     *
+     * @return string
+     */
+    public function getDefaultLanguage()
+    {
+        $defaultLocale = (!empty($this->resolverInterface->getDefaultLocale())) ? explode('_', $this->resolverInterface->getDefaultLocale()) : [];
+        return (is_array($defaultLocale) && !empty($defaultLocale)) ? $defaultLocale[0] : 'en';
+    }
+
+    /**
+     * Retrieves customer session model
+     *
+     * @return mixed
+     */
+    public function getCustomerSession()
+    {
+        return $this->customerSession;
+    }
+
+    /**
+     * Retrieve customer id from current session
+     *
+     * @return int|string
+     */
+    public function getCustomerId()
+    {
+        if ($this->coreSession->getRecurringProcess()) {
+            return $this->coreSession->getCustomerId();
+        }
+
+        if ($this->customerSession->isLoggedIn()) {
+            return $this->customerSession->getCustomer()->getId();
+        } elseif ($this->isAdmin()) {
+            $adminSession = $this->getAdminCheckoutSession();
+            return $adminSession->getCustomerId() ? $adminSession->getCustomerId() : 'guest';
+        } else {
+            return 'guest';
+        }
+    }
+
+    /**
+     * Check if the payment area is admin
+     *
+     * @return boolean
+     */
+    public function isAdmin()
+    {
+        return (bool)($this->appState->getAreaCode() == \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
+    }
+
+    /**
+     * Retrieves admin checkout session model
+     *
+     * @return mixed
+     */
+    public function getAdminCheckoutSession()
+    {
+        return $this->adminCheckoutSession;
+    }
+
+    /**
+     * Retrieves Order Amount
+     *
+     * @return int
+     */
+    public function getAmount()
+    {
+        $quote = (!$this->isAdmin())
+            ? $this->checkoutSession->getQuote()
+            : $this->adminCheckoutSession->getQuote();
+        return $this->getFormattedAmount($quote->getGrandTotal());
+    }
+
+    /**
+     * Retrieves Retrieves Billing Address from checkout session model
+     *
+     * @return array
+     */
+    public function getBillingAddress()
+    {
+        $quote = (!$this->isAdmin())
+            ? $this->checkoutSession->getQuote()
+            : $this->adminCheckoutSession->getQuote();
+        $billingAddress = $quote->getBillingAddress();
+        $firstName = ($billingAddress->getFirstname())
+            ? $billingAddress->getFirstname()
+            : (($quote->getCustomerFirstname())
+            ?  $quote->getCustomerFirstname()
+            : "");
+        $lastName = ($billingAddress->getLastname())
+            ? $billingAddress->getLastname()
+            : (($quote->getCustomerLastname())
+            ?  $quote->getCustomerLastname()
+            : "");
+        $billing = ['firstname' => $firstName,
+            'lastname' => $lastName,
+            'street' => $billingAddress->getStreet(),
+            'city' => $billingAddress->getCity(),
+            'country_id' => $billingAddress->getCountryId(),
+            'email' => $billingAddress->getEmail(),
+            'postcode' => $billingAddress->getPostcode(),
+        ];
+        return $billing;
+    }
+
+    /**
+     * Retrieves Shipping Address from checkout session model
+     *
+     * @return array
+     */
+    public function getShippingAddress()
+    {
+        $quote = (!$this->isAdmin())
+            ? $this->checkoutSession->getQuote()
+            : $this->adminCheckoutSession->getQuote();
+        $shippingAddress = $quote->getShippingAddress();
+        $firstName = ($shippingAddress->getFirstname())
+            ? $shippingAddress->getFirstname()
+            : (($quote->getCustomerFirstname())
+            ?  $quote->getCustomerFirstname()
+            : "");
+        $lastName = ($shippingAddress->getLastname())
+            ? $shippingAddress->getLastname()
+            : (($quote->getCustomerLastname())
+            ?  $quote->getCustomerLastname()
+            : "");
+        $shipping = ['firstname' => $firstName,
+            'lastname' => $lastName,
+            'street' => $shippingAddress->getStreet(),
+            'city' => $shippingAddress->getCity(),
+            'country_id' => $shippingAddress->getCountryId(),
+            'email' => $shippingAddress->getEmail(),
+            'postcode' => $shippingAddress->getPostcode(),
+            'same_as_billing' => $shippingAddress->getSameAsBilling(),
+        ];
+        return $shipping;
+    }
+
+    /**
+     * Retrieves account holder name from the billing address
+     *
+     * @return string
+     */
+    public function getAccountHolder()
+    {
+        $quote = (!$this->isAdmin())
+            ? $this->checkoutSession->getQuote()
+            : $this->adminCheckoutSession->getQuote();
+        $billingAddress = $quote->getBillingAddress();
+
+        if ($billingAddress->getFirstname() && $billingAddress->getLastname()) {
+            return $billingAddress->getFirstname() .' '. $billingAddress->getLastname();
+        } elseif ($quote->getCustomerFirstname() && $quote->getCustomerLastname()) {
+            return $quote->getCustomerFirstname() .' '. $quote->getCustomerLastname();
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Retrieves Company from the billing address
+     *
+     * @return string
+     */
+    public function getCustomerCompany()
+    {
+        $billingaddress = (!$this->isAdmin())
+            ? $this->checkoutSession->getQuote()->getBillingAddress()
+            : $this->adminCheckoutSession->getQuote()->getBillingAddress();
+
+        return $billingaddress->getCompany();
+    }
+
+    /**
+     * Get IP address from request
+     *
+     * @return mixed
+     */
+    public function getRequestIp()
+    {
+        $serverVariables = $this->requestInterface->getServer();
+        $remoteAddrHeaders = ['HTTP_X_FORWARDED_HOST', 'HTTP_CLIENT_IP', 'HTTP_X_REAL_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED',
+        'HTTP_X_CLUSTER_CLIENT_IP', 'HTTP_FORWARDED_FOR', 'HTTP_FORWARDED', 'REMOTE_ADDR'];
+
+        foreach ($remoteAddrHeaders as $header) {
+            if (property_exists($serverVariables, $header) === true) {
+                if (in_array($header, ['HTTP_X_FORWARDED_HOST', 'HTTP_X_FORWARDED_FOR'])) {
+                    $forwardedIps = (!empty($serverVariables[$header])) ? explode(",", $serverVariables[$header]) : [];
+                    $serverVariables[$header] = trim(end($forwardedIps));
+                }
+
+                return $serverVariables[$header];
+            }
+        }
+    }
+
+    /**
+     * Get Server IP address
+     *
+     * @return mixed
+     */
+    public function getServerAddr()
+    {
+        return $this->serverAddress->getServerAddress();
+    }
+
+    /**
+     * Get the formated amount in cents/euro
+     *
+     * @param mixed $amount
+     * @param string $type
+     * @return mixed
+     */
+    public function getFormattedAmount($amount, $type = 'CENT')
+    {
+        if (!empty($amount)) {
+            return ($type == 'RAW') ? number_format($amount / 100, 2, '.', '') : round($amount, 2) * 100;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the Amount with symbol
+     *
+     * @param mixed $amount
+     * @param int $storeId
+     * @return float|string
+     */
+    public function getAmountWithSymbol($amount, $storeId)
+    {
+        return $this->pricingHelper->currencyByStore($amount, $storeId);
+    }
+
+    /**
+     * Get payment method session
+     *
+     * @param  string $paymentMethodCode
+     * @param  bool $unset
+     * @return mixed
+     */
+    public function getMethodSession($paymentMethodCode, $unset = false)
+    {
+        $checkoutSession = $this->checkoutSessionFactory->create();
+        if (!$checkoutSession->hasData($paymentMethodCode) || $unset) {
+            $checkoutSession->setData($paymentMethodCode, new \Magento\Framework\DataObject([]));
+        }
+
+        return $checkoutSession->getData($paymentMethodCode);
+    }
+
+    /**
+     * Replace strings from the tid passed
+     *
+     * @param mixed $tid
+     * @return mixed
+     */
+    public function makeValidNumber($tid)
+    {
+        return preg_replace('/[^0-9]+/', '', $tid);
+    }
+
+    /**
+     * Check the value is numeric
+     *
+     * @param  mixed $value
+     * @return bool
+     */
+    public function checkIsNumeric($value)
+    {
+        if (!empty($value)) {
+            return (bool) preg_match('/^\d+$/', $value);
+        }
+
+        return false;
+    }
+
+    /**
+     * Check whether string is serialized
+     *
+     * @param  mixed $data
+     * @return boolean
+     */
+    public function isSerialized($data)
+    {
+        if (!empty($data)) {
+            $data = trim($data);
+            if ($data == 'N;') {
+                return true;
+            }
+
+            $lastChar = substr($data, -1);
+            if (!is_string($data) || strlen($data) < 4 || $data[1] !== ':'
+                || ($lastChar !== ';' && $lastChar !== '}')) {
+                return false;
+            }
+
+            $token = $data[0];
+            switch ($token) {
+                case 's':
+                    if (substr($data, -2, 1) !== '"') {
+                        return false;
+                    }
+
+                    // no break
+                case 'a':
+                case 'O':
+                    return (bool) preg_match("/^{$token}:[0-9]+:/s", $data);
+                case 'b':
+                case 'i':
+                case 'd':
+                    return (bool) preg_match("/^{$token}:[0-9.E-]+;$/", $data);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get proper Status Text
+     *
+     * @param mixed $status
+     * @param mixed $order
+     * @return string
+     */
+    public function getStatus($status, $order)
+    {
+        if ($this->checkIsNumeric($status) == true) {
+            if (in_array($status, $this->onholdStatus)) {
+                $status = 'ON_HOLD';
+            } elseif (in_array($status, $this->pendingStatus)) {
+                 $status = 'PENDING';
+            } elseif ($status == '100') {
+                $payment = $order->getPayment();
+                $paymentCode = $payment->getMethodInstance()->getCode();
+                if (in_array(
+                    $paymentCode,
+                    [
+                        ConfigProvider::NOVALNET_INVOICE,
+                        ConfigProvider::NOVALNET_PREPAYMENT,
+                        ConfigProvider::NOVALNET_CASHPAYMENT
+                    ]
+                )) {
+                    $invoice_id = '';
+                    $invoice = [];
+                    foreach ($order->getInvoiceCollection() as $invoice) {
+                        $invoice_id = $invoice->getIncrementId();
+                        $invoice = $invoice->getData();
+                    }
+                    if (!empty($invoice_id) && (in_array($paymentCode, [ConfigProvider::NOVALNET_PREPAYMENT, ConfigProvider::NOVALNET_CASHPAYMENT])
+                        || ($paymentCode == ConfigProvider::NOVALNET_INVOICE && $invoice['state'] == 2))) {
+                        $status = 'CONFIRMED';
+                    } else {
+                        $status = 'PENDING';
+                    }
+                } else {
+                    $status = 'CONFIRMED';
+                }
+            } elseif ($status == '103') {
+                $status = 'DEACTIVATED';
+            } else {
+                $status = 'FAILURE';
+            }
+        }
+
+        return $status;
+    }
+
+    /**
+     * Validate Customer Company param
+     *
+     * @param  string $paymentMethod
+     * @return boolean
+     */
+    public function validateCompany($paymentMethod)
+    {
+        $company = $this->getCustomerCompany();
+        if (!empty($company) && $this->novalnetConfig->getPaymentConfig($paymentMethod, 'allow_b2b_customer')) {
+            if (preg_match('/^(?:\d+|(?:)\.?|[^a-zA-Z0-9]+|[a-zA-Z]{1})$|^(herr|frau|jahr|mr|miss|mrs|others|andere|anrede|salutation|null|none|keine|company|firma|no|na|n\/a|test|private|privat)$/i', $company)) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Get Country Code
+     *
+     * @param int $store
+     * @return string
+     */
+    public function getCountryCode($store = null)
+    {
+        return $this->directoryHelper->getDefaultCountry($store);
+    }
+
+    /**
+     * Get express checkout Enabled pages
+     *
+     * @param string $page
+     * @return array
+     */
+    public function isPageEnabledForExpressCheckout($page)
+    {
+        $isApplePayEnabled = $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_APPLEPAY, 'active');
+        $applePayEnabledPages = $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_APPLEPAY, 'enabled_pages');
+        $applePayEnabledPages =  (!empty($applePayEnabledPages)) ? explode(',', $applePayEnabledPages) : [];
+
+        $isGooglePayEnabled = $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_GOOGLEPAY, 'active');
+        $googlePayEnabledPages = $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_GOOGLEPAY, 'enabled_pages');
+        $googlePayEnabledPages =  (!empty($googlePayEnabledPages)) ? explode(',', $googlePayEnabledPages) : [];
+
+        return [
+            ConfigProvider::NOVALNET_APPLEPAY => (bool) ($isApplePayEnabled && $this->validateBasicParams() && in_array($page, $applePayEnabledPages) && $this->canUseForGuestCheckout()),
+            ConfigProvider::NOVALNET_GOOGLEPAY => (bool) ($isGooglePayEnabled && $this->validateBasicParams() && in_array($page, $googlePayEnabledPages) && $this->canUseForGuestCheckout())
+        ];
+    }
+
+    /**
+     * Validate Novalnet basic params
+     *
+     * @return bool
+     */
+    public function validateBasicParams()
+    {
+        return ($this->novalnetConfig->getGlobalConfig('signature') &&
+            $this->novalnetConfig->getGlobalConfig('payment_access_key') &&
+            $this->checkIsNumeric($this->novalnetConfig->getGlobalConfig('tariff_id')));
+    }
+
+    /**
+     * Can payment used for guest checkout
+     *
+     * @return bool
+     */
+    public function canUseForGuestCheckout()
+    {
+        if ($this->getCustomerSession()->isLoggedIn()) {
+            return true;
+        };
+
+        return $this->scopeConfig->getValue(
+            'checkout/options/guest_checkout',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $this->storeManager->getStore()->getId()
+        );
+    }
+
+    /**
+     * Get Configuration
+     *
+     * @param string $field
+     * @return mixed
+     */
+    public function getSystemConfig($field)
+    {
+        return $this->scopeConfig->getValue(
+            $field,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $this->storeManager->getStore()->getId()
+        );
+    }
+
+    /**
+     * Get Payment sheet Configuration values
+     *
+     * @return array
+     */
+    public function paymentSheetConfigurations()
+    {
+        return [
+            ConfigProvider::NOVALNET_APPLEPAY => [
+                'btnType' => $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_APPLEPAY, 'button_style'),
+                'btnTheme' => $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_APPLEPAY, 'button_theme'),
+                'btnHeight' => $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_APPLEPAY, 'button_height'),
+                'btnRadius' => $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_APPLEPAY, 'button_corner_radius'),
+                'sellerName' => $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_APPLEPAY, 'seller_name'),
+                'environment' => ($this->novalnetConfig->getTestMode(ConfigProvider::NOVALNET_APPLEPAY, $this->storeManager->getStore()->getId())) ? 'SANDBOX' : 'PRODUCTION'
+            ],
+            ConfigProvider::NOVALNET_GOOGLEPAY => [
+                'btnType' => $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_GOOGLEPAY, 'button_type'),
+                'btnTheme' => $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_GOOGLEPAY, 'button_theme'),
+                'btnHeight' => $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_GOOGLEPAY, 'button_height'),
+                'sellerName' => $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_GOOGLEPAY, 'seller_name'),
+                'environment' => ($this->novalnetConfig->getTestMode(ConfigProvider::NOVALNET_GOOGLEPAY, $this->storeManager->getStore()->getId())) ? 'SANDBOX' : 'PRODUCTION',
+                'partnerId' => $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_GOOGLEPAY, 'merchant_id'),
+                'enforce3d' => ($this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_GOOGLEPAY, 'enforce_3d')) ? $this->novalnetConfig->getPaymentConfig(ConfigProvider::NOVALNET_GOOGLEPAY, 'enforce_3d') : 0
+            ],
+            'countryCode' => $this->getCountryCode(),
+            'currencyCode' => $this->storeManager->getStore()->getBaseCurrencyCode(),
+            'langCode' => $this->getLanguageCodeForPaymentSheet(),
+            'clientKey' => $this->novalnetConfig->getGlobalConfig('client_key')
+        ];
+    }
+
+    /**
+     * To get formatted language code for payment sheet
+     *
+     * @return string
+     */
+    public function getLanguageCodeForPaymentSheet()
+    {
+        $defaultLocale = (!empty($this->resolverInterface->getDefaultLocale())) ? explode('_', $this->resolverInterface->getDefaultLocale()) : [];
+        return (is_array($defaultLocale) && !empty($defaultLocale[0]) && !empty($defaultLocale[1])) ? $defaultLocale[0] . '-' . $defaultLocale[1] : 'en-US';
+    }
+
+    /**
+     * Get tax calculation settings and set apple pay amount type
+     *
+     * @return bool
+     */
+    public function isAmountPendingForExpressCheckout()
+    {
+        return ($this->taxHelper->getTaxBasedOn() == 'billing') ? true : false;
+    }
+
+    /**
+     * Get region name by code
+     *
+     * @param string $regionCode
+     * @param string $countryCode
+     * @return string
+     */
+    public function getRegionNameByCode($regionCode, $countryCode)
+    {
+        try {
+            $regionName = $this->regionModel->loadByCode($regionCode, $countryCode)->getName();
+
+            if (!empty($regionName)) {
+                return $regionName;
+            }
+
+            return $regionCode;
+        } catch (\Exception $e) {
+            return $regionCode;
+        }
+    }
+}
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100755
index 0000000..2731214
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,52 @@
+Freeware-Lizenzvereinbarung
+
+Deutsch:
+
+Präambel:
+Die nachfolgende Vereinbarung regelt die Rechte und die Haftung zwischen Ihnen (im Folgenden „Partner“) und der Novalnet AG (im Folgenden „Novalnet“) in Bezug auf die von Novalnet kostenlos bereitgestellten Softwarelösungen zur Anbindung von eCommerce-Systemen an die Payment Plattform von Novalnet. Von dieser Regelung ausdrücklich nicht betroffen sind die Leistungen, die Novalnet gemäß dem zwischen den Parteien geschlossenen Dienstleistungsvertrag gegenüber dem Partner erbringt. Mit der Installation und der Benutzung der Software bestätigen Sie automatisch, dass Sie diese Freeware-Lizenzvereinbarung gelesen haben und mit ihr einverstanden sind. Wenn Sie als Partner mit diesen Bedingungen nicht einverstanden sind, installieren und nutzen Sie die Software nicht.
+
+Lizenz:
+Für die von Novalnet unentgeltlich bereitgestellten Payment Module sowie alle weiteren Module, die Novalnet anderweitig veröffentlicht, räumt Novalnet ein zeitlich auf die Dauer des zwischen den Parteien geschlossenen Dienstleistungsvertrages begrenztes, nicht ausschließliches, unentgeltliches Nutzungsrecht ein. Die Lizenzvereinbarung berechtigt Sie, die Software auf einem oder mehreren Rechnern zu installieren und zu nutzen. Die Lizenz für die Software ist kostenlos. Der Partner verpflichtet sich, die Payment Module und/oder Teile der Module ausschließlich für die Nutzung der von Novalnet gemäß dem Vertrag bereitgestellten Leistungen zu nutzen. Der Partner hat keinen Anspruch auf technische Unterstützung irgendwelcher Art. Novalnet ist insbesondere nicht verpflichtet, eine Wartung oder Überarbeitung der Software zu gewährleisten.
+
+Copyright:
+Alle Rechtsansprüche, Besitzrechte und geistigen Eigentumsrechte an und auf die Software sowie alle Kopien davon und jede damit im Zusammenhang stehende Dokumentation sind Eigentum von Novalnet (www.novalnet.de). Alle Rechte sind vorbehalten. Novalnet behält sich rechtliche Schritte im Falle einer Verletzung dieser Lizenzvereinbarung vor.
+
+Gewährleistung und Haftung:
+Die Payment Module werden ausdrücklich „so wie sie sind“ zur Verfügung gestellt. Für die fehlerfreie Funktion der Payment Module und/oder Teile der Payment Module übernimmt Novalnet keine Gewähr. Ebenso übernimmt Novalnet keine Haftung für Schäden und/oder Folgeschäden, die mittelbar oder unmittelbar mit dem Gebrauch und/oder der Nutzung der von Novalnet unentgeltlich zur Verfügung gestellten Payment Module in Verbindung gebracht werden können, es sei denn, dass der Schaden auf Vorsatz oder auf grobe Fahrlässigkeit beruht. Von diesem Haftungsausschluss nicht umfasst sind Schäden aus der Verletzung von Leib, Leben oder der Gesundheit.
+
+Rechtsansprüche und salvatorische Klausel:
+Es gilt das Recht der Bundesrepublik Deutschland. Gerichtsstand ist München. Sollte eine gegenwärtige oder zukünftige Bestimmung der Vereinbarung ganz oder teilweise aus anderen Gründen als den §§ 305-310 des Bürgerlichen Gesetzbuchs (BGB) unwirksam/nichtig oder nicht durchführbar sein oder werden, so wird hiervon die Gültigkeit der übrigen Bestimmungen des Vereinbarung nicht berührt. Die Parteien werden die unwirksame/nichtige oder nicht durchführbare Bestimmung durch eine wirksame ersetzen, die in ihrem rechtlichen und wirtschaftlichen Gehalt der unwirksamen/nichtigen oder nicht durchführbaren Bestimmung und dem Gesamtzweck der Vereinbarung entspricht. Das gleiche gilt, wenn sich nach Abschluss der Vereinbarung eine ergänzungsbedürftige Lücke ergibt. Die Bestimmung des § 139 BGB (Teilnichtigkeit) wird ausdrücklich ausgeschlossen.
+
+Sollten Sie weitere Informationen benötigen, steht Ihnen der Technik-Service der Novalnet AG gerne zur Verfügung:
+
+Novalnet AG
+Tel.: +49 89 9230683-19
+Fax: +49 89 9230683-11
+E-Mail: technic@novalnet.de
+
+
+English:
+
+Preamble:
+The following agreement governs the rights and responsibilities between you (the "Partner") and the Novalnet AG ("Novalnet") in relation to the cost-free software solutions Service and Support provided by Novalnet, by connecting your e-commerce systems to the payment platform of Novalnet. Services, which Novalnet offers in accordance with a service contract to its partners, are not affected explicitly by this agreement. From this particular agreement, is not explicitly affected the services Novalnet under the contract between the parties to the service contract partners are providing. By installing and using the software, you automatically confirm that you have read this freeware license agreement and agree with it. If you do not agree to these conditions, as a partner, please do not install and use the software.
+
+License:
+For the payment module provided by Novalnet for each individual version, Novalnet grants a limited, non-exclusive, right of use for a service agreement concluded between the parties. The license agreement authorises you to install and use the software on one or more computers. The Partner undertakes to use the Payment Modules and / or parts of the Modules exclusively for the use of the services provided by Novalnet in accordance with the Agreement. The Partner is not entitled to technical support of any kind whatsoever. In particular, Novalnet is not obliged to ensure the maintenance, repair or revision of the Software.
+
+Copyright:
+All title, ownership rights and intellectual property rights to and from the Software, as well as all copies of the software, and any related documentation, are the property of Novalnet (www.novalnet.de). All rights are reserved. Novalnet reserves legal measures in case of a breach of this Agreement.
+
+Guarantee and Liability:
+Novalnet shall only be liable to the extent that Novalnet, its legal representatives, employees and / or vicarious agents are guilty of intentional or gross negligent conduct. The liability is however limited to the foreseeable losses that are typical of the contract, of which Novalnet would have to be typically reckoned with given the known circumstances at the time the contract was concluded.
+
+The limitation of liability does not apply to the extent of breach of essential contractual obligations by Novalnet, its vicarious agents, employees and / or legal representatives. Cardinal contractual obligations refer to those obligations that one contracting party has to grant to the other contracting party in accordance with the sense and purpose of the agreement or whose fulfilment is essential for the due and proper implementation of the contract in the first place and the observance of which the other contracting party can regularly rely upon. In this case, liability is however is limited to the damage that is typically predictable at the time of conclusion of the contract. In a statutorily prescribed no-fault liability- in particular any potential liability under the Product Liability Act or due to legal guarantee liability - shall remain unaffected by the above limitations of liability. The same applies to the liability of Novalnet in the case of negligent injury to life, body or health.
+
+Legal claims and severability clause:
+The laws of the Federal Republic of Germany will be applicable. The place for court of law or going to court will be Munich. Should any present or future provision of the Agreement, in whole or in part, become invalid, for reasons other than the § § 305-310 of the Civil Code (BGB), the validity of the remaining provisions of the agreement will not be affected. The parties shall replace the ineffective, invalid or unenforceable provision by a valid one that will be void in its legal and economic substance, of the ineffective or not feasible provision, and also in compliance with the overall purpose of the agreement. The same applies, if after the conclusion of the agreement, there are gaps or loopholes found in the agreement. The provision of § 139 BGB (severability) is totally excluded.
+
+If you need further information, kindly contact our Technical service Team:
+
+Novalnet AG
+Tel.: +49 89 9230683-19
+Fax: +49 89 9230683-11
+E-Mail: technic@novalnet.de
diff --git a/Logger/Handler/NovalnetDebug.php b/Logger/Handler/NovalnetDebug.php
new file mode 100755
index 0000000..6eca371
--- /dev/null
+++ b/Logger/Handler/NovalnetDebug.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+namespace Novalnet\Payment\Logger\Handler;
+
+use Magento\Framework\Logger\Handler\Base as BaseHandler;
+use Monolog\Logger as MonologLogger;
+
+class NovalnetDebug extends BaseHandler
+{
+    /**
+     * @var mixed
+     */
+    protected $loggerType = MonologLogger::DEBUG;
+
+    /**
+     * @var string
+     */
+    protected $fileName = '/var/log/novalnet/debug.log';
+}
diff --git a/Logger/Handler/NovalnetError.php b/Logger/Handler/NovalnetError.php
new file mode 100755
index 0000000..0f48c88
--- /dev/null
+++ b/Logger/Handler/NovalnetError.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+namespace Novalnet\Payment\Logger\Handler;
+
+use Magento\Framework\Logger\Handler\Base as BaseHandler;
+use Monolog\Logger as MonologLogger;
+
+/**
+ * Class NovalnetInfo
+ */
+class NovalnetError extends BaseHandler
+{
+    /**
+     * @var mixed
+     */
+    protected $loggerType = MonologLogger::ERROR;
+
+    /**
+     * @var string
+     */
+    protected $fileName = '/var/log/novalnet/error.log';
+}
diff --git a/Logger/Handler/NovalnetNotice.php b/Logger/Handler/NovalnetNotice.php
new file mode 100755
index 0000000..2a5ae86
--- /dev/null
+++ b/Logger/Handler/NovalnetNotice.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+namespace Novalnet\Payment\Logger\Handler;
+
+use Magento\Framework\Logger\Handler\Base as BaseHandler;
+use Monolog\Logger as MonologLogger;
+
+class NovalnetNotice extends BaseHandler
+{
+    /**
+     * @var mixed
+     */
+    protected $loggerType = MonologLogger::NOTICE;
+
+    /**
+     * @var string
+     */
+    protected $fileName = '/var/log/novalnet/notice.log';
+}
diff --git a/Logger/NovalnetLogger.php b/Logger/NovalnetLogger.php
new file mode 100755
index 0000000..a948309
--- /dev/null
+++ b/Logger/NovalnetLogger.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+namespace Novalnet\Payment\Logger;
+
+class NovalnetLogger extends \Monolog\Logger
+{
+    
+}
diff --git a/Model/Adminhtml/Source/Activemethods.php b/Model/Adminhtml/Source/Activemethods.php
new file mode 100755
index 0000000..cf154d9
--- /dev/null
+++ b/Model/Adminhtml/Source/Activemethods.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\Adminhtml\Source;
+
+/**
+ * Source model for enabled Novalnet payment methods
+ */
+class Activemethods implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * @var \Magento\Framework\App\Request\Http
+     */
+    protected $request;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @param \Magento\Framework\App\Request\Http $request
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     */
+    public function __construct(
+        \Magento\Framework\App\Request\Http $request,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig
+    ) {
+        $this->request = $request;
+        $this->scopeConfig = $scopeConfig;
+        $this->novalnetConfig = $novalnetConfig;
+    }
+
+    /**
+     * Options getter (Active Payment methods)
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        $methods = [];
+        $activePayment = false;
+        $storeId = (int) $this->request->getParam('store');
+        $websiteId = (int) $this->request->getParam('website');
+        $scope = \Magento\Store\Model\ScopeInterface::SCOPE_STORE;
+        $scopeValue = null;
+
+        if ($storeId) {
+            $scopeValue = $storeId;
+        }
+
+        if ($websiteId) {
+            $scope = \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE;
+            $scopeValue = $websiteId;
+        }
+
+        foreach ($this->novalnetConfig->getPaymentMethodCodes() as $paymentCode) {
+            $paymentActive = $this->scopeConfig->getValue('payment/' . $paymentCode . '/active', $scope, $scopeValue);
+
+            if ($paymentActive == true) {
+                $paymentTitle = $this->scopeConfig->getValue(
+                    'payment/' . $paymentCode . '/title',
+                    $scope,
+                    $scopeValue
+                );
+                $methods[$paymentCode] = ['value' => $paymentCode, 'label' => $paymentTitle];
+                $activePayment = true;
+            }
+        }
+
+        if (!$activePayment) {
+            $methods[$paymentCode] = ['value' => '', 'label' => __('No active payment method for this store')];
+        }
+
+        return $methods;
+    }
+}
diff --git a/Model/Adminhtml/Source/ApplepayButtonStyle.php b/Model/Adminhtml/Source/ApplepayButtonStyle.php
new file mode 100755
index 0000000..2fbbf74
--- /dev/null
+++ b/Model/Adminhtml/Source/ApplepayButtonStyle.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\Adminhtml\Source;
+
+/**
+ * Source model for Credit card types options
+ */
+class ApplepayButtonStyle implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * Options getter (Applepay button style)
+     *
+     * @return array $options
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => 'plain',
+                'label' => __('Default')
+            ],
+            [
+                'value' => 'buy',
+                'label' => __('Buy')
+            ],
+            [
+                'value' => 'donate',
+                'label' => __('Donate')
+            ],
+            [
+                'value' => 'book',
+                'label' => __('Book')
+            ],
+            [
+                'value' => 'contribute',
+                'label' => __('Contribute')
+            ],
+            [
+                'value' => 'check-out',
+                'label' => __('Check out')
+            ],
+            [
+                'value' => 'order',
+                'label' => __('Order')
+            ],
+            [
+                'value' => 'subscribe',
+                'label' => __('Subscribe')
+            ],
+            [
+                'value' => 'tip',
+                'label' => __('Tip')
+            ],
+            [
+                'value' => 'rent',
+                'label' => __('Rent')
+            ],
+            [
+                'value' => 'reload',
+                'label' => __('Reload')
+            ],
+            [
+                'value' => 'support',
+                'label' => __('Support')
+            ],
+        ];
+    }
+}
diff --git a/Model/Adminhtml/Source/ApplepayButtonTheme.php b/Model/Adminhtml/Source/ApplepayButtonTheme.php
new file mode 100755
index 0000000..9e16419
--- /dev/null
+++ b/Model/Adminhtml/Source/ApplepayButtonTheme.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\Adminhtml\Source;
+
+/**
+ * Source model for Credit card types options
+ */
+class ApplepayButtonTheme implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * Options getter (Applepay button themes)
+     *
+     * @return array $options
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => 'black',
+                'label' => __('Dark')
+            ],
+            [
+                'value' => 'white',
+                'label' => __('Light')
+            ],
+            [
+                'value' => 'white-outline',
+                'label' => __('Light-Outline')
+            ],
+        ];
+    }
+}
diff --git a/Model/Adminhtml/Source/ApplepayEnabledPages.php b/Model/Adminhtml/Source/ApplepayEnabledPages.php
new file mode 100755
index 0000000..3a50e64
--- /dev/null
+++ b/Model/Adminhtml/Source/ApplepayEnabledPages.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\Adminhtml\Source;
+
+/**
+ * Source model for Credit card types options
+ */
+class ApplepayEnabledPages implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * Options getter (Applepay Enabled Pages in the shop)
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => 'shopping_cart_page',
+                'label' => __('Shopping cart page')
+            ],
+            [
+                'value' => 'mini_cart_page',
+                'label' => __('Mini cart page')
+            ],
+            [
+                'value' => 'product_page',
+                'label' => __('Product page')
+            ],
+            [
+                'value' => 'guest_checkout_page',
+                'label' => __('Guest checkout page')
+            ],
+        ];
+    }
+}
diff --git a/Model/Adminhtml/Source/CcCardTypes.php b/Model/Adminhtml/Source/CcCardTypes.php
new file mode 100755
index 0000000..1357951
--- /dev/null
+++ b/Model/Adminhtml/Source/CcCardTypes.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\Adminhtml\Source;
+
+/**
+ * Source model for Credit card types options
+ */
+class CcCardTypes implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * Options getter (Credit Card types)
+     *
+     * @return array $options
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => 'VI',
+                'label' => __('Visa')
+            ],
+            [
+                'value' => 'MC',
+                'label' => __('MasterCard')
+            ],
+            [
+                'value' => 'AE',
+                'label' => __('American Express')
+            ],
+            [
+                'value' => 'MA',
+                'label' => __('Maestro')
+            ],
+            [
+                'value' => 'CI',
+                'label' => __('Cartasi')
+            ],
+            [
+                'value' => 'UP',
+                'label' => __('Union Pay')
+            ],
+            [
+                'value' => 'DC',
+                'label' => __('Discover')
+            ],
+            [
+                'value' => 'DI',
+                'label' => __('Diners')
+            ],
+            [
+                'value' => 'JCB',
+                'label' => __('Jcb')
+            ],
+            [
+                'value' => 'CB',
+                'label' => __('Carte Bleue')
+            ],
+        ];
+    }
+}
diff --git a/Model/Adminhtml/Source/CustomerGroups.php b/Model/Adminhtml/Source/CustomerGroups.php
new file mode 100755
index 0000000..d57aee1
--- /dev/null
+++ b/Model/Adminhtml/Source/CustomerGroups.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\Adminhtml\Source;
+
+class CustomerGroups implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * @var \Magento\Customer\Model\ResourceModel\Group\Collection
+     */
+    private $customerGroupColl;
+
+    /**
+     * @param \Magento\Customer\Model\ResourceModel\Group\Collection $customerGroupColl
+     */
+    public function __construct(\Magento\Customer\Model\ResourceModel\Group\Collection $customerGroupColl)
+    {
+        $this->customerGroupColl = $customerGroupColl;
+    }
+
+    /**
+     * Options getter (Customer Groups)
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return $this->customerGroupColl->toOptionArray();
+    }
+}
diff --git a/Model/Adminhtml/Source/GooglepayButtonTheme.php b/Model/Adminhtml/Source/GooglepayButtonTheme.php
new file mode 100755
index 0000000..8d23404
--- /dev/null
+++ b/Model/Adminhtml/Source/GooglepayButtonTheme.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\Adminhtml\Source;
+
+class GooglepayButtonTheme implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * Options getter (GooglePay button types)
+     *
+     * @return array $options
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => 'default',
+                'label' => __('Default')
+            ],
+            [
+                'value' => 'black',
+                'label' => __('Black')
+            ],
+            [
+                'value' => 'white',
+                'label' => __('White')
+            ]
+        ];
+    }
+}
diff --git a/Model/Adminhtml/Source/GooglepayButtonType.php b/Model/Adminhtml/Source/GooglepayButtonType.php
new file mode 100755
index 0000000..7bdddc7
--- /dev/null
+++ b/Model/Adminhtml/Source/GooglepayButtonType.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\Adminhtml\Source;
+
+class GooglepayButtonType implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * Options getter (GooglePay button types)
+     *
+     * @return array $options
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => 'book',
+                'label' => __('Book')
+            ],
+            [
+                'value' => 'buy',
+                'label' => __('Buy')
+            ],
+            [
+                'value' => 'checkout',
+                'label' => __('Checkout')
+            ],
+            [
+                'value' => 'donate',
+                'label' => __('Donate')
+            ],
+            [
+                'value' => 'order',
+                'label' => __('Order')
+            ],
+            [
+                'value' => 'pay',
+                'label' => __('Pay')
+            ],
+            [
+                'value' => 'plain',
+                'label' => __('Plain')
+            ],
+            [
+                'value' => 'subscribe',
+                'label' => __('Subscribe')
+            ]
+        ];
+    }
+}
diff --git a/Model/Adminhtml/Source/GooglepayEnabledPages.php b/Model/Adminhtml/Source/GooglepayEnabledPages.php
new file mode 100755
index 0000000..d96a9af
--- /dev/null
+++ b/Model/Adminhtml/Source/GooglepayEnabledPages.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\Adminhtml\Source;
+
+/**
+ * Source model for Credit card types options
+ */
+class GooglepayEnabledPages implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * Options getter (Googlepay Enabled Pages in the shop)
+     *
+     * @return array $options
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => 'shopping_cart_page',
+                'label' => __('Shopping cart page')
+            ],
+            [
+                'value' => 'mini_cart_page',
+                'label' => __('Mini cart page')
+            ],
+            [
+                'value' => 'product_page',
+                'label' => __('Product page')
+            ],
+            [
+                'value' => 'guest_checkout_page',
+                'label' => __('Guest checkout page')
+            ],
+        ];
+    }
+}
diff --git a/Model/Adminhtml/Source/InstalmentCycles.php b/Model/Adminhtml/Source/InstalmentCycles.php
new file mode 100755
index 0000000..090a3c1
--- /dev/null
+++ b/Model/Adminhtml/Source/InstalmentCycles.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\Adminhtml\Source;
+
+class InstalmentCycles implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * Options getter (Total period for recurring transaction)
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        $methods = [];
+        $allCycles =  [2 => 2 . __(' cycles'),
+                       3 => 3 . __(' cycles'),
+                       4 => 4 . __(' cycles'),
+                       6 => 6 . __(' cycles'),
+                       8 => 8 . __(' cycles'),
+                       9 => 9 . __(' cycles'),
+                       10 => 10 . __(' cycles'),
+                       12 => 12 . __(' cycles'),
+                       15 => 15 . __(' cycles'),
+                       18 => 18 . __(' cycles'),
+                       24 => 24 . __(' cycles')
+        ];
+
+        foreach ($allCycles as $key => $value) {
+            $methods[$key] = ['value' => $key, 'label' => $value];
+        }
+
+        return $methods;
+    }
+}
diff --git a/Model/Adminhtml/Source/PaymentAction.php b/Model/Adminhtml/Source/PaymentAction.php
new file mode 100755
index 0000000..ab75690
--- /dev/null
+++ b/Model/Adminhtml/Source/PaymentAction.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\Adminhtml\Source;
+
+use Magento\Payment\Model\Method\AbstractMethod;
+
+class PaymentAction implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * Options getter (Payment Actions)
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => AbstractMethod::ACTION_AUTHORIZE,
+                'label' => __('Authorize')
+            ],
+            [
+                'value' => AbstractMethod::ACTION_AUTHORIZE_CAPTURE,
+                'label' => __('Capture')
+            ]
+        ];
+    }
+}
diff --git a/Model/Adminhtml/Source/PaymentActionWithZeroAmount.php b/Model/Adminhtml/Source/PaymentActionWithZeroAmount.php
new file mode 100755
index 0000000..af13566
--- /dev/null
+++ b/Model/Adminhtml/Source/PaymentActionWithZeroAmount.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\Adminhtml\Source;
+
+use Magento\Payment\Model\Method\AbstractMethod;
+use Novalnet\Payment\Model\NNConfig;
+
+class PaymentActionWithZeroAmount implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * Options getter (Payment Actions with zero amount booking)
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => AbstractMethod::ACTION_AUTHORIZE,
+                'label' => __('Authorize')
+            ],
+            [
+                'value' => AbstractMethod::ACTION_AUTHORIZE_CAPTURE,
+                'label' => __('Capture')
+            ],
+            [
+                'value' => NNConfig::ACTION_ZERO_AMOUNT_BOOKING,
+                'label' => __('Authorize with zero amount')
+            ]
+        ];
+    }
+}
diff --git a/Model/Callback.php b/Model/Callback.php
new file mode 100755
index 0000000..4059c85
--- /dev/null
+++ b/Model/Callback.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model;
+
+/**
+ * Novalnet model for handling Novalnet callback executions
+ */
+class Callback extends \Magento\Framework\Model\AbstractModel
+{
+    /**
+     * @param \Magento\Framework\Model\Context                        $context
+     * @param \Magento\Framework\Registry                             $registry
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb           $resourceCollection
+     */
+    public function __construct(
+        \Magento\Framework\Model\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
+        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null
+    ) {
+        parent::__construct($context, $registry, $resource, $resourceCollection);
+    }
+
+    /**
+     * Initialize resource model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(\Novalnet\Payment\Model\ResourceModel\Callback::class);
+    }
+
+    /**
+     * Load order callback status by order id
+     *
+     * @param mixed $orderId
+     * @return mixed
+     */
+    public function loadLogByOrderId($orderId)
+    {
+        $this->load($orderId, 'order_id');
+        return $this;
+    }
+}
diff --git a/Model/NNConfig.php b/Model/NNConfig.php
new file mode 100755
index 0000000..9e672f9
--- /dev/null
+++ b/Model/NNConfig.php
@@ -0,0 +1,324 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model;
+
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class NNConfig
+{
+    public const NOVALNET_PAYMENT_URL = 'https://payport.novalnet.de/v2/payment';
+    public const NOVALNET_AUTHORIZE_URL = 'https://payport.novalnet.de/v2/authorize';
+    public const NOVALNET_CAPTURE_URL = 'https://payport.novalnet.de/v2/transaction/capture';
+    public const NOVALNET_REFUND_URL = 'https://payport.novalnet.de/v2/transaction/refund';
+    public const NOVALNET_CANCEL_URL = 'https://payport.novalnet.de/v2/transaction/cancel';
+    public const NOVALNET_INSTALMENT_CANCEL = 'https://payport.novalnet.de/v2/instalment/cancel';
+    public const NOVALNET_MERCHANT_DETAIL_URL = 'https://payport.novalnet.de/v2/merchant/details';
+    public const NOVALNET_TRANSACTION_DETAIL_URL = 'https://payport.novalnet.de/v2/transaction/details';
+    public const NOVALNET_WEBHOOK_CONFIG_URL = 'https://payport.novalnet.de/v2/webhook/configure';
+    public const ACTION_ZERO_AMOUNT_BOOKING = 'zeroAmountBooking';
+
+    /**
+     * @var array
+     */
+    protected $paymentTypes = [
+        ConfigProvider::NOVALNET_SEPA => 'DIRECT_DEBIT_SEPA',
+        ConfigProvider::NOVALNET_CC => 'CREDITCARD',
+        ConfigProvider::NOVALNET_APPLEPAY => 'APPLEPAY',
+        ConfigProvider::NOVALNET_GOOGLEPAY => 'GOOGLEPAY',
+        ConfigProvider::NOVALNET_INVOICE => 'INVOICE',
+        ConfigProvider::NOVALNET_PREPAYMENT => 'PREPAYMENT',
+        ConfigProvider::NOVALNET_INVOICE_GUARANTEE => 'GUARANTEED_INVOICE',
+        ConfigProvider::NOVALNET_SEPA_GUARANTEE => 'GUARANTEED_DIRECT_DEBIT_SEPA',
+        ConfigProvider::NOVALNET_INVOICE_INSTALMENT => 'INSTALMENT_INVOICE',
+        ConfigProvider::NOVALNET_SEPA_INSTALMENT => 'INSTALMENT_DIRECT_DEBIT_SEPA',
+        ConfigProvider::NOVALNET_IDEAL => 'IDEAL',
+        ConfigProvider::NOVALNET_BANKTRANSFER => 'ONLINE_TRANSFER',
+        ConfigProvider::NOVALNET_ONLINEBANKTRANSFER => 'ONLINE_BANK_TRANSFER',
+        ConfigProvider::NOVALNET_GIROPAY => 'GIROPAY',
+        ConfigProvider::NOVALNET_CASHPAYMENT => 'CASHPAYMENT',
+        ConfigProvider::NOVALNET_PRZELEWY => 'PRZELEWY24',
+        ConfigProvider::NOVALNET_EPS => 'EPS',
+        ConfigProvider::NOVALNET_PAYPAL => 'PAYPAL',
+        ConfigProvider::NOVALNET_POSTFINANCE_CARD => 'POSTFINANCE_CARD',
+        ConfigProvider::NOVALNET_POSTFINANCE => 'POSTFINANCE',
+        ConfigProvider::NOVALNET_BANCONTACT => 'BANCONTACT',
+        ConfigProvider::NOVALNET_MULTIBANCO => 'MULTIBANCO',
+        ConfigProvider::NOVALNET_ALIPAY => 'ALIPAY',
+        ConfigProvider::NOVALNET_WECHATPAY => 'WECHATPAY',
+        ConfigProvider::NOVALNET_TRUSTLY => 'TRUSTLY',
+        ConfigProvider::NOVALNET_BLIK => 'BLIK'
+    ];
+
+    /**
+     * @var array
+     */
+    public $oneClickPayments = [
+        ConfigProvider::NOVALNET_CC,
+        ConfigProvider::NOVALNET_SEPA,
+        ConfigProvider::NOVALNET_SEPA_GUARANTEE,
+        ConfigProvider::NOVALNET_SEPA_INSTALMENT,
+        ConfigProvider::NOVALNET_PAYPAL,
+    ];
+
+    /**
+     * @var array
+     */
+     protected $zeroAmountPayments = [
+        ConfigProvider::NOVALNET_CC,
+        ConfigProvider::NOVALNET_SEPA
+     ];
+
+    /**
+     * @var array
+     */
+     protected $redirectPayments = [
+        ConfigProvider::NOVALNET_PAYPAL,
+        ConfigProvider::NOVALNET_BANKTRANSFER,
+        ConfigProvider::NOVALNET_ONLINEBANKTRANSFER,
+        ConfigProvider::NOVALNET_IDEAL,
+        ConfigProvider::NOVALNET_BANCONTACT,
+        ConfigProvider::NOVALNET_EPS,
+        ConfigProvider::NOVALNET_GIROPAY,
+        ConfigProvider::NOVALNET_PRZELEWY,
+        ConfigProvider::NOVALNET_POSTFINANCE_CARD,
+        ConfigProvider::NOVALNET_POSTFINANCE,
+        ConfigProvider::NOVALNET_ALIPAY,
+        ConfigProvider::NOVALNET_WECHATPAY,
+        ConfigProvider::NOVALNET_TRUSTLY,
+        ConfigProvider::NOVALNET_BLIK,
+     ];
+
+    /**
+     * @var array
+     */
+     public $subscriptionSupportedPayments = [
+        ConfigProvider::NOVALNET_SEPA,
+        ConfigProvider::NOVALNET_CC,
+        ConfigProvider::NOVALNET_INVOICE,
+        ConfigProvider::NOVALNET_PREPAYMENT,
+        ConfigProvider::NOVALNET_INVOICE_GUARANTEE,
+        ConfigProvider::NOVALNET_SEPA_GUARANTEE,
+        ConfigProvider::NOVALNET_PAYPAL
+     ];
+
+    /**
+     * @var array
+     */
+     protected $allowedCountry = [ 'AT', 'DE', 'CH' ];
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+     protected $scopeConfig;
+
+    /**
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     */
+     public function __construct(
+         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     ) {
+         $this->scopeConfig = $scopeConfig;
+     }
+
+    /**
+     * Get Payment methods
+     *
+     * @return array
+     */
+     public function getPaymentMethodCodes()
+     {
+         return array_keys($this->paymentTypes);
+     }
+
+    /**
+     * Get Payment Type by method code
+     *
+     * @param string $code
+     * @return string
+     */
+     public function getPaymentType($code)
+     {
+         return $this->paymentTypes[$code];
+     }
+
+    /**
+     * Get Payment method code by Type
+     *
+     * @param string $paymentType
+     * @return mixed
+     */
+     public function getPaymentCodeByType($paymentType)
+     {
+         return array_search($paymentType, $this->paymentTypes);
+     }
+
+    /**
+     * Check is one click Payment method by code
+     *
+     * @param string $code
+     * @return bool
+     */
+     public function isOneClickPayment($code)
+     {
+         return (bool) (in_array($code, $this->oneClickPayments));
+     }
+
+    /**
+     * Check is zero amount booking supported
+     *
+     * @param string $code
+     * @return bool
+     */
+     public function isZeroAmountBookingSupported($code)
+     {
+         return (bool) (in_array($code, $this->zeroAmountPayments));
+     }
+
+    /**
+     * Check is one Subscription Supported Payment method by code
+     *
+     * @param string $code
+     * @return bool
+     */
+     public function isSubscriptionSupported($code)
+     {
+         return (bool) (in_array($code, $this->subscriptionSupportedPayments));
+     }
+
+    /**
+     * Check is redirect Payment method by code
+     *
+     * @param string $code
+     * @return bool
+     */
+     public function isRedirectPayment($code)
+     {
+         return (bool) (in_array($code, $this->redirectPayments));
+     }
+
+    /**
+     * Check Allowed country
+     *
+     * @param string $county
+     * @param bool $b2b
+     * @return bool
+     */
+     public function isAllowedCountry($county, $b2b = false)
+     {
+         if ($b2b) {
+             $allowedCountryB2B = $this->scopeConfig->getValue(
+                 'general/country/eu_countries',
+                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+             );
+             $allowedCountryB2B = (!empty($allowedCountryB2B)) ? explode(",", $allowedCountryB2B) : [];
+             array_push($allowedCountryB2B, 'CH');
+         }
+
+         return (bool) (($b2b && in_array($county, $allowedCountryB2B)) || in_array($county, $this->allowedCountry));
+     }
+
+    /**
+     * Get Novalnet Global Configuration values
+     *
+     * @param string $field
+     * @param int|null $storeId
+     * @return string
+     */
+     public function getGlobalConfig($field, $storeId = null)
+     {
+         return $this->scopeConfig->getValue(
+             'payment/novalnet/' . $field,
+             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+             $storeId
+         );
+     }
+
+    /**
+     * Get Novalnet Global on-hold status
+     *
+     * @param int|null $storeId
+     * @return string
+     */
+     public function getGlobalOnholdStatus($storeId = null)
+     {
+         return $this->scopeConfig->getValue(
+             'novalnet_global/novalnet/onhold_status',
+             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+             $storeId
+         );
+     }
+
+    /**
+     * Get Novalnet Global Merchant Script Configuration values
+     *
+     * @param string $field
+     * @param int $storeId
+     * @return string
+     */
+     public function getMerchantScriptConfig($field, $storeId = null)
+     {
+         return $this->scopeConfig->getValue(
+             'payment/merchant_script/' . $field,
+             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+             $storeId
+         );
+     }
+
+    /**
+     * Get Novalnet Payment Configuration values
+     *
+     * @param string $code
+     * @param string $field
+     * @param int $storeId
+     * @return string
+     */
+     public function getPaymentConfig($code, $field, $storeId = null)
+     {
+         return $this->scopeConfig->getValue(
+             'payment/' . $code . '/' . $field,
+             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+             $storeId
+         );
+     }
+
+    /**
+     * Get Novalnet Payment Test Mode
+     *
+     * @param string $paymentMethodCode
+     * @param int $storeId
+     * @return int
+     */
+     public function getTestMode($paymentMethodCode, $storeId = null)
+     {
+         if ($paymentMethodCode) {
+             $livePaymentMethods = $this->scopeConfig->getValue(
+                 'payment/novalnet/live_mode',
+                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                 $storeId
+             );
+
+             $livePaymentMethods = (!empty($livePaymentMethods)) ? explode(',', $livePaymentMethods) : [];
+
+             return (in_array($paymentMethodCode, $livePaymentMethods) === false) ? 1 : 0;
+         }
+
+         return 1;
+     }
+}
diff --git a/Model/NNRepository.php b/Model/NNRepository.php
new file mode 100755
index 0000000..a1a4fd8
--- /dev/null
+++ b/Model/NNRepository.php
@@ -0,0 +1,2545 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model;
+
+use Magento\Sales\Model\Order;
+use Magento\Framework\DataObject;
+use Novalnet\Payment\Model\NNConfig;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use \Magento\Checkout\Model\Type\Onepage;
+use \Magento\Customer\Api\Data\GroupInterface;
+
+class NNRepository implements \Novalnet\Payment\Api\NNRepositoryInterface
+{
+    /**
+     * @var array
+     */
+    private $mandatoryParams = [
+        'event' => [
+            'type',
+            'checksum',
+            'tid'
+        ],
+        'merchant' => [
+            'vendor',
+            'project'
+        ],
+        'transaction' => [
+            'tid',
+            'payment_type',
+            'status',
+        ],
+        'result' => [
+            'status'
+        ],
+    ];
+
+    /**
+     * @var mixed
+     */
+    private $response;
+
+    /**
+     * @var mixed
+     */
+    private $order;
+
+    /**
+     * @var array
+     */
+    private $eventData;
+
+    /**
+     * @var string
+     */
+    private $eventType;
+
+    /**
+     * @var int
+     */
+    private $eventTid;
+
+    /**
+     * @var int
+     */
+    private $parentTid;
+
+    /**
+     * @var \Magento\Sales\Model\Order
+     */
+    private $salesOrderModel;
+
+    /**
+     * @var \Magento\Framework\UrlInterface
+     */
+    private $urlInterface;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    private $requestInterface;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Payment\Transaction
+     */
+    private $transactionModel;
+
+    /**
+     * @var \Magento\Framework\Pricing\Helper\Data
+     */
+    private $pricingHelper;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     */
+    private $timeZone;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var \Magento\Framework\Mail\Template\TransportBuilder
+     */
+    private $transportBuilder;
+
+    /**
+     * @var \Magento\Framework\Translate\Inline\StateInterface
+     */
+    private $inlineTranslation;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Email\Sender\OrderSender
+     */
+    private $orderEmailSender;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Address\Renderer
+     */
+    private $salesOrderAddressRenderer;
+
+    /**
+     * @var \Magento\Payment\Helper\Data
+     */
+    private $paymentHelper;
+
+    /**
+     * @var \Magento\Framework\HTTP\Client\Curl
+     */
+    private $clientFactory;
+
+    /**
+     * @var \Magento\Sales\Model\Order\CreditmemoFactory
+     */
+    private $creditMemoFacory;
+
+    /**
+     * @var \Magento\Sales\Model\Service\CreditmemoService
+     */
+    private $creditmemoService;
+
+    /**
+     * @var \Novalnet\Payment\Model\Callback
+     */
+    private $callbackModel;
+
+    /**
+     * @var \Novalnet\Payment\Model\TransactionStatus
+     */
+    private $transactionStatusModel;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    private $novalnetRequestHelper;
+
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    private $novalnetConfig;
+
+    /**
+     * @var \Magento\Quote\Model\QuoteIdMaskFactory
+     */
+    private $quoteIdMaskFactory;
+
+    /**
+     * @var \Magento\Checkout\Model\Session
+     */
+    private $checkoutSession;
+
+    /**
+     * @var \Magento\Customer\Model\Session
+     */
+    private $customerSession;
+
+    /**
+     * @var mixed
+     */
+    private $additionalMessage;
+
+    /**
+     * @var mixed
+     */
+    private $callbackMessage;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    private $serializer;
+
+    /**
+     * @var \Novalnet\Payment\Logger\NovalnetLogger
+     */
+    private $novalnetLogger;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Email\Sender\InvoiceSender
+     */
+    private $invoiceSender;
+
+    /**
+     * @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader
+     */
+    private $creditmemoLoader;
+
+    /**
+     * @var \Magento\Framework\Event\ManagerInterface
+     */
+    private $eventManager;
+
+    /**
+     * @var \Magento\Checkout\Model\Cart
+     */
+    private $cart;
+
+    /**
+     * @var \Magento\Checkout\Helper\Data
+     */
+    private $checkoutHelper;
+
+    /**
+     * @var \Magento\Quote\Api\Data\EstimateAddressInterfaceFactory
+     */
+    private $estimatedAddressFactory;
+
+    /**
+     * @var \Magento\Quote\Api\ShippingMethodManagementInterface
+     */
+    private $shippingMethodManager;
+
+    /**
+     * @var \Magento\Quote\Api\CartManagementInterface
+     */
+    private $quoteManagement;
+
+    /**
+     * @var \Magento\Catalog\Api\ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var \Magento\Framework\Pricing\PriceCurrencyInterface
+     */
+    private $priceCurrency;
+
+    /**
+     * @var \Magento\Tax\Helper\Data
+     */
+    private $taxHelper;
+
+    /**
+     * @var \Magento\Directory\Model\CountryFactory
+     */
+    private $countryFactory;
+
+    /**
+     * @var \Magento\Catalog\Model\ProductFactory
+     */
+    private $productFactory;
+
+    /**
+     * @var \Magento\Tax\Api\TaxCalculationInterface
+     */
+    private $taxCalculation;
+
+    /**
+     * @var \Zend\Uri\Uri
+     */
+    private $zendUri;
+
+    /**
+     * @var \Magento\Directory\Model\Currency
+     */
+    private $currencyModel;
+
+    /**
+     * @var string
+     */
+    private $currentTime;
+
+    /**
+     * @var mixed
+     */
+    private $orderNo;
+
+    /**
+     * @var mixed
+     */
+    private $testMode;
+
+    /**
+     * @var mixed
+     */
+    private $emailBody;
+
+    /**
+     * @var mixed
+     */
+    private $storeId;
+
+    /**
+     * @var string
+     */
+    private $paymentAccessKey;
+
+    /**
+     * @var mixed
+     */
+    private $payment;
+
+    /**
+     * @var string
+     */
+    private $code;
+
+    /**
+     * @var mixed
+     */
+    private $paymentTxnId;
+
+    /**
+     * @var string
+     */
+    private $currency;
+
+    /**
+     * @var string
+     */
+    private $emailFromAddr;
+
+    /**
+     * @var string
+     */
+    private $emailFromName;
+
+    /**
+     * @var string
+     */
+    private $emailToName;
+
+    /**
+     * @var string
+     */
+    private $emailToAddr;
+
+    /**
+     * @var string
+     */
+    private $emailSubject;
+
+    /**
+     * @var string
+     */
+    private $storeFrontendName;
+
+    /**
+     * @param \Magento\Sales\Model\Order $salesOrderModel
+     * @param \Magento\Framework\UrlInterface $urlInterface
+     * @param \Magento\Framework\App\RequestInterface $requestInterface
+     * @param \Magento\Sales\Model\Order\Payment\Transaction $transactionModel
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory
+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timeZone
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
+     * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
+     * @param \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderEmailSender
+     * @param \Magento\Sales\Model\Order\Address\Renderer $salesOrderAddressRenderer
+     * @param \Magento\Payment\Helper\Data $paymentHelper
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Framework\HTTP\Client\Curl $clientFactory
+     * @param \Magento\Sales\Model\Order\CreditmemoFactory $creditMemoFacory
+     * @param \Magento\Sales\Model\Service\CreditmemoService $creditmemoService
+     * @param \Novalnet\Payment\Model\Callback $callbackModel
+     * @param \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+     * @param \Magento\Sales\Model\Order\Email\Sender\InvoiceSender $invoiceSender
+     * @param \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader $creditmemoLoader
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param \Magento\Checkout\Model\Cart $cart
+     * @param \Magento\Checkout\Helper\Data $checkoutHelper
+     * @param \Magento\Quote\Api\Data\EstimateAddressInterfaceFactory $estimatedAddressFactory
+     * @param \Magento\Quote\Api\ShippingMethodManagementInterface $shippingMethodManager
+     * @param \Magento\Quote\Api\CartManagementInterface $quoteManagement
+     * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+     * @param \Magento\Tax\Helper\Data $taxHelper
+     * @param \Magento\Directory\Model\CountryFactory $countryFactory
+     * @param \Magento\Catalog\Model\ProductFactory $productFactory
+     * @param \Magento\Tax\Api\TaxCalculationInterface $taxCalculation
+     * @param \Zend\Uri\Uri $zendUri
+     * @param \Magento\Directory\Model\Currency $currencyModel
+     */
+    public function __construct(
+        Order $salesOrderModel,
+        \Magento\Framework\UrlInterface $urlInterface,
+        \Magento\Framework\App\RequestInterface $requestInterface,
+        \Magento\Sales\Model\Order\Payment\Transaction $transactionModel,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory,
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timeZone,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
+        \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
+        \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderEmailSender,
+        \Magento\Sales\Model\Order\Address\Renderer $salesOrderAddressRenderer,
+        \Magento\Payment\Helper\Data $paymentHelper,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Framework\HTTP\Client\Curl $clientFactory,
+        \Magento\Sales\Model\Order\CreditmemoFactory $creditMemoFacory,
+        \Magento\Sales\Model\Service\CreditmemoService $creditmemoService,
+        \Novalnet\Payment\Model\Callback $callbackModel,
+        \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger,
+        \Magento\Sales\Model\Order\Email\Sender\InvoiceSender $invoiceSender,
+        \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader $creditmemoLoader,
+        \Magento\Framework\Event\ManagerInterface $eventManager,
+        \Magento\Checkout\Model\Cart $cart,
+        \Magento\Checkout\Helper\Data $checkoutHelper,
+        \Magento\Quote\Api\Data\EstimateAddressInterfaceFactory $estimatedAddressFactory,
+        \Magento\Quote\Api\ShippingMethodManagementInterface $shippingMethodManager,
+        \Magento\Quote\Api\CartManagementInterface $quoteManagement,
+        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
+        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
+        \Magento\Tax\Helper\Data $taxHelper,
+        \Magento\Directory\Model\CountryFactory $countryFactory,
+        \Magento\Catalog\Model\ProductFactory $productFactory,
+        \Magento\Tax\Api\TaxCalculationInterface $taxCalculation,
+        \Zend\Uri\Uri $zendUri,
+        \Magento\Directory\Model\Currency $currencyModel
+    ) {
+        $this->salesOrderModel = $salesOrderModel;
+        $this->urlInterface = $urlInterface;
+        $this->requestInterface = $requestInterface;
+        $this->transactionModel = $transactionModel;
+        $this->pricingHelper = $pricingHelper;
+        $this->dateTime = $dateTime;
+        $this->storeManager = $storeManager;
+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
+        $this->timeZone = $timeZone;
+        $this->scopeConfig = $scopeConfig;
+        $this->transportBuilder = $transportBuilder;
+        $this->inlineTranslation = $inlineTranslation;
+        $this->orderEmailSender = $orderEmailSender;
+        $this->paymentHelper = $paymentHelper;
+        $this->salesOrderAddressRenderer = $salesOrderAddressRenderer;
+        $this->checkoutSession = $checkoutSession;
+        $this->customerSession = $customerSession;
+        $this->clientFactory = $clientFactory;
+        $this->creditMemoFacory = $creditMemoFacory;
+        $this->creditmemoService = $creditmemoService;
+        $this->callbackModel = $callbackModel;
+        $this->transactionStatusModel = $transactionStatusModel;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->jsonHelper = $jsonHelper;
+        $this->serializer = $serializer;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetLogger = $novalnetLogger;
+        $this->invoiceSender = $invoiceSender;
+        $this->creditmemoLoader = $creditmemoLoader;
+        $this->eventManager = $eventManager;
+        $this->cart = $cart;
+        $this->checkoutHelper = $checkoutHelper;
+        $this->estimatedAddressFactory = $estimatedAddressFactory;
+        $this->shippingMethodManager = $shippingMethodManager;
+        $this->quoteManagement = $quoteManagement;
+        $this->productRepository = $productRepository;
+        $this->priceCurrency = $priceCurrency;
+        $this->taxHelper = $taxHelper;
+        $this->countryFactory = $countryFactory;
+        $this->productFactory = $productFactory;
+        $this->taxCalculation = $taxCalculation;
+        $this->zendUri = $zendUri;
+        $this->currencyModel = $currencyModel;
+    }
+
+    /**
+     * Novalnet product activation key auto config
+     *
+     * @api
+     * @param string $signature
+     * @param string $payment_access_key
+     * @return string
+     */
+    public function activateProductKey($signature, $payment_access_key)
+    {
+        $data['merchant'] = ['signature' => $signature];
+        $data['custom'] = ['lang' => $this->novalnetRequestHelper->getDefaultLanguage()];
+        $this->clientFactory->setHeaders(
+            $this->novalnetRequestHelper->getRequestHeaders($payment_access_key)
+        );
+        $this->clientFactory->post(NNConfig::NOVALNET_MERCHANT_DETAIL_URL, $this->jsonHelper->jsonEncode($data));
+        $response = (!empty($this->clientFactory->getBody())) ? json_decode($this->clientFactory->getBody(), true) : [];
+
+        return $this->clientFactory->getBody();
+    }
+
+    /**
+     * Novalnet Webhook URL configuration
+     *
+     * @api
+     * @param string $signature
+     * @param string $payment_access_key
+     * @return string
+     */
+    public function configWebhookUrl($signature, $payment_access_key)
+    {
+        $webhook_url = $this->requestInterface->getParam('webhookurl');
+        if (filter_var($webhook_url, FILTER_VALIDATE_URL) === false) {
+            $data['result'] = ['status' => 'failure', 'status_text' => __('Please enter valid URL')];
+            return $this->jsonHelper->jsonEncode($data);
+        }
+        $data['merchant'] = ['signature' => $signature];
+        $data['custom'] = ['lang' => $this->novalnetRequestHelper->getDefaultLanguage()];
+        $data['webhook'] = ['url' => $webhook_url];
+        $this->clientFactory->setHeaders(
+            $this->novalnetRequestHelper->getRequestHeaders($payment_access_key)
+        );
+        $this->clientFactory->post(NNConfig::NOVALNET_WEBHOOK_CONFIG_URL, $this->jsonHelper->jsonEncode($data));
+        $response = (!empty($this->clientFactory->getBody())) ? json_decode($this->clientFactory->getBody(), true) : [];
+
+        return $this->clientFactory->getBody();
+    }
+
+    /**
+     * Get redirect URL
+     *
+     * @api
+     * @param string[] $data
+     * @return string
+     */
+    public function getRedirectURL($data)
+    {
+        $quoteId = $data['quote_id'];
+        $this->novalnetLogger->notice('Redirect from checkout to redirect_url webapi');
+        if (!$this->customerSession->isLoggedIn()) {
+            $quoteMaskData = $this->quoteIdMaskFactory->create()->load($quoteId, 'masked_id');
+            $quoteId = $quoteMaskData->getQuoteId();
+        }
+
+        $this->novalnetLogger->notice('quote_id retrieved ' . $quoteId);
+
+        // Loads session quote from checkout
+        $sessionQuoteId = $this->checkoutSession->getLastQuoteId();
+        $orderId = $this->checkoutSession->getLastOrderId();
+
+        $this->novalnetLogger->notice('order_id retrieved ' . $orderId);
+
+        if ($quoteId != $sessionQuoteId) {
+            $orderId = $this->salesOrderModel->getCollection()->addFieldToFilter('quote_id', $quoteId)
+                ->getFirstItem()->getId();
+        }
+
+        $order = $this->salesOrderModel->load($orderId);
+
+        $this->novalnetLogger->notice('Order loaded successfully ' . $order->getIncrementId());
+        $payment = $order->getPayment();
+        $additionalData = (!empty($payment->getAdditionalData())) ? json_decode($payment->getAdditionalData(), true) : [];
+
+        if (!empty($additionalData['NnRedirectURL'])) {
+            // set the order status to pending_payment before redirect to novalnet
+            $order->setState(Order::STATE_PENDING_PAYMENT)
+                ->setStatus(Order::STATE_PENDING_PAYMENT)
+                ->save();
+            $order->addStatusHistoryComment(__('Customer was redirected to Novalnet'))
+                ->save();
+
+            $this->novalnetLogger->notice('Order status and comments updated successfully');
+
+            return $additionalData['NnRedirectURL'];
+        } else {
+            return $this->urlInterface->getUrl('checkout/cart');
+        }
+    }
+
+    /**
+     * Remove Novalnet payment token
+     *
+     * @api
+     * @param int $transactionRowId
+     * @return bool
+     */
+    public function removeToken($transactionRowId)
+    {
+        $transactionStatus = $this->transactionStatusModel->load($transactionRowId);
+        if ($transactionStatus->getTokenInfo()) {
+            $transactionStatus->setTokenInfo(null)->save();
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get Instalment payment options
+     *
+     * @api
+     * @param string $code
+     * @param float $total
+     * @return string
+     */
+    public function getInstalmentOptions($code, $total)
+    {
+        $instalmentCycles = $this->novalnetConfig->getPaymentConfig($code, 'instalment_cycles');
+        $instalmentCycles = (!empty($instalmentCycles)) ? explode(',', $instalmentCycles) : [];
+        $storeId = $this->storeManager->getStore()->getId();
+        $allCycles = [];
+        $i =1;
+        foreach ($instalmentCycles as $cycle) {
+            if (($total/$cycle) >= 9.99) {
+                $formattedAmount = strip_tags($this->novalnetRequestHelper->getAmountWithSymbol(sprintf('%0.2f', $total / $cycle), $storeId));
+                $allCycles[$i] = ['instalment_key' => $cycle.' X ' . $formattedAmount . '(' .(__(' per month'). ')'), 'instalment_value' => $cycle];
+                $i++;
+            }
+        }
+        return $this->jsonHelper->jsonEncode($allCycles);
+    }
+
+    /**
+     * Get Instalment payment cycle details
+     *
+     * @api
+     * @param float $amount
+     * @param int $period
+     * @return string
+     */
+    public function getInstalmentCycleAmount($amount, $period)
+    {
+        $cycleAmount   = sprintf('%0.2f', $amount / $period);
+        $splitedAmount = $cycleAmount * ( $period - 1 );
+        $lastCycle =  (sprintf('%0.2f', $amount - $splitedAmount) * 100)/100;
+        $data = ['cycle_amount' => $cycleAmount, 'last_cycle' => $lastCycle, 'amount' => $amount];
+        return $this->jsonHelper->jsonEncode($data);
+    }
+
+    /**
+     * Novalnet payment callback
+     *
+     * @api
+     * @return string
+     */
+    public function callback()
+    {
+        if ($this->assignGlobalParams()) {
+            if ($this->eventType == 'PAYMENT') {
+                if (empty($this->paymentTxnId)) {
+                    $this->handleCommunicationFailure();
+                } else {
+                    $this->displayMessage('Novalnet Callback executed. The Transaction ID already existed');
+                }
+            } elseif ($this->eventType == 'TRANSACTION_CAPTURE') {
+                $this->transactionCapture();
+            } elseif ($this->eventType == 'TRANSACTION_CANCEL') {
+                $this->transactionCancellation();
+            } elseif ($this->eventType == 'TRANSACTION_REFUND') {
+                $this->refundProcess();
+            } elseif ($this->eventType == 'TRANSACTION_UPDATE') {
+                $this->transactionUpdate();
+            } elseif ($this->eventType == 'CREDIT') {
+                $this->creditProcess();
+            } elseif ($this->eventType == 'INSTALMENT') {
+                $this->instalmentProcess();
+            } elseif ($this->eventType == 'INSTALMENT_CANCEL') {
+                $this->instalmentCancelProcess();
+            } elseif (in_array($this->eventType, ['CHARGEBACK', 'RETURN_DEBIT', 'REVERSAL'])) {
+                $this->chargebackProcess();
+            } elseif (in_array($this->eventType, ['PAYMENT_REMINDER_1', 'PAYMENT_REMINDER_2'])) {
+                $this->paymentReminderProcess();
+            } elseif ($this->eventType == 'SUBMISSION_TO_COLLECTION_AGENCY') {
+                $this->collectionProcess();
+            } else {
+                $this->displayMessage("The webhook notification has been received for the unhandled EVENT type($this->eventType)");
+            }
+        }
+
+        return $this->additionalMessage . $this->callbackMessage;
+    }
+
+    /**
+     * Assign Global params for callback process
+     *
+     * @return boolean
+     */
+    private function assignGlobalParams()
+    {
+        try {
+            $this->eventData = (!empty($this->requestInterface->getContent())) ? json_decode($this->requestInterface->getContent(), true) : [];
+        } catch (\Exception $e) {
+            $this->novalnetLogger->error("Received data is not in the JSON format $e");
+            $this->displayMessage("Received data is not in the JSON format $e");
+        }
+
+        // Get callback setting params (from shop admin)
+        $this->testMode = $this->novalnetConfig->getMerchantScriptConfig('test_mode');
+        $this->emailBody = '';
+
+        // Check whether the IP address is authorized
+        if (!$this->checkIP()) {
+            return false;
+        }
+
+        if (empty($this->eventData)) {
+            $this->displayMessage('No params passed over!');
+            return false;
+        }
+
+        $this->response = new DataObject();
+        $this->response->setData($this->eventData); // Assign response params to object data
+
+        // Set Event data
+        $this->eventType = $this->response->getData('event/type');
+        $this->parentTid = !empty($this->response->getData('event/parent_tid'))
+            ? $this->response->getData('event/parent_tid') : $this->response->getData('event/tid');
+        $this->eventTid  = $this->response->getData('event/tid');
+        $this->orderNo = $this->response->getData('transaction/order_no');
+        $this->order = $this->getOrder();
+        if ($this->order === false) {
+            return false;
+        }
+        $this->currentTime = $this->dateTime->date('d-m-Y H:i:s');
+        $this->storeId = $this->order->getStoreId(); // Get order store id
+
+        $this->paymentAccessKey = $this->novalnetConfig->getGlobalConfig('payment_access_key', $this->storeId);
+        $this->payment = $this->order->getPayment(); // Get payment object
+        $this->code = $this->payment->getMethodInstance()->getCode(); // Get payment method code
+        $this->paymentTxnId = $this->payment->getLastTransId(); // Get payment last transaction id
+        $this->currency = $this->order->getOrderCurrencyCode(); // Get order currency
+        if (!$this->validateEventData()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check whether the ip address is authorised
+     *
+     * @return boolean
+     */
+    private function checkIP()
+    {
+        // Authenticating the server request based on IP.
+        $requestReceivedIp = $this->novalnetRequestHelper->getRequestIp();
+        $novalnetHostIp = gethostbyname('pay-nn.de');
+
+        if (!empty($novalnetHostIp) && !empty($requestReceivedIp)) {
+            if ($novalnetHostIp !== $requestReceivedIp && !$this->testMode) {
+                $this->displayMessage(
+                    __('Unauthorised access from the IP [ %1 ]', $requestReceivedIp)
+                );
+
+                return false;
+            }
+        } else {
+            $this->displayMessage('Unauthorised access from the IP');
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Validate required parameter from the server request
+     *
+     * @return bool
+     */
+    private function validateEventData()
+    {
+        foreach ($this->mandatoryParams as $category => $parameters) {
+            if (empty($this->response->getData($category))) {
+                // Could be a possible manipulation in the notification data
+                $this->displayMessage('Required parameter category(' . $category . ') not received');
+
+                return false;
+            } else {
+                foreach ($parameters as $parameter) {
+                    if (empty($this->response->getData($category .'/'. $parameter))) {
+                        // Could be a possible manipulation in the notification data
+                        $this->displayMessage(
+                            'Required parameter(' . $parameter . ') in the category(' . $category . ') not received'
+                        );
+
+                        return false;
+                    }
+                }
+            }
+        }
+
+        // Validate the received checksum.
+        if (!$this->validateChecksum()) {
+            return false;
+        }
+
+        // Validate TID's from the event data
+        if (!empty($this->parentTid) && !preg_match('/^\d{17}$/', $this->parentTid)
+        ) {
+            $this->displayMessage(
+                'Invalid TID[' . $this->parentTid
+                . '] for Order :' . $this->response->getData('transaction/order_no')
+            );
+
+            return false;
+        } elseif (!empty($this->eventTid) && !preg_match('/^\d{17}$/', $this->eventTid)) {
+            $this->displayMessage(
+                'Invalid TID[' . $this->eventTid
+                . '] for Order :' . $this->response->getData('transaction/order_no')
+            );
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Validate checksum in response
+     *
+     * @return bool
+     */
+    private function validateChecksum()
+    {
+        $checksumString  = $this->response->getData('event/tid') . $this->response->getData('event/type')
+            . $this->response->getData('result/status');
+
+        if (isset($this->response->getData('transaction')['amount'])) {
+            $checksumString .= $this->response->getData('transaction/amount');
+        }
+
+        if ($this->response->getData('transaction/currency')) {
+            $checksumString .= $this->response->getData('transaction/currency');
+        }
+
+        $accessKey = trim($this->paymentAccessKey);
+        if (!empty($accessKey)) {
+            $checksumString .= strrev($accessKey);
+        }
+
+        $generatedChecksum = hash('sha256', $checksumString);
+        if ($generatedChecksum !== $this->response->getData('event/checksum')) {
+            $this->displayMessage('While notifying some data has been changed. The hash check failed');
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Get order reference.
+     *
+     * @return mixed
+     */
+    private function getOrder()
+    {
+        if ($this->orderNo) {
+            $order = $this->salesOrderModel->loadByIncrementId($this->orderNo);
+        }
+
+        if (!isset($order) || empty($order->getIncrementId())) {
+            $orderCollection = $this->transactionModel->getCollection()->addFieldToFilter('txn_id', $this->parentTid);
+            if (!empty($orderCollection)) {
+                $order = $orderCollection->getFirstItem()->getOrder();
+            }
+        }
+
+        if (empty($order) || empty($order->getIncrementId())) {
+            $this->displayMessage('Required (Transaction ID) not Found!');
+            return false;
+        }
+
+        return $order;
+    }
+
+    /**
+     * Complete the order in-case response failure from Novalnet server
+     *
+     * @return bool
+     */
+    private function handleCommunicationFailure()
+    {
+        if ($this->novalnetConfig->getPaymentType($this->code) != $this->response->getData('transaction/payment_type')) {
+            $this->displayMessage(
+                'Novalnet callback received. Payment type ( ' . $this->response->getData('transaction/payment_type')
+                . ' ) is not matched with ' . $this->code . '!'
+            );
+            return false;
+        }
+        // Unhold order if it is being held
+        if ($this->order->canUnhold()) {
+            $this->order->unhold()->save();
+        }
+
+        // update and save the payment additional data
+        $additionalData = $this->novalnetRequestHelper->buildAdditionalData($this->response, $this->payment);
+        $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+
+        $amount = $this->novalnetRequestHelper->getFormattedAmount(
+            $this->response->getData('transaction/amount'),
+            'RAW'
+        );
+
+        // Set order status based on Novalnet transaction status
+        if ($this->response->getData('result/status') == 'SUCCESS' &&
+            in_array($this->response->getData('transaction/status'), ['PENDING', 'ON_HOLD', 'CONFIRMED'])
+        ) {
+            if ($this->order->canInvoice() && $this->response->getData('transaction/status') == 'CONFIRMED') {
+                // capture transaction
+                $this->payment->setTransactionId($additionalData['NnTid'])
+                    ->setLastTransId($additionalData['NnTid'])
+                    ->capture(null)
+                    ->setAmount($amount)
+                    ->setIsTransactionClosed(false)
+                    ->setShouldCloseParentTransaction(false)
+                    ->save();
+            } else {
+                // authorize transaction
+                $this->payment->authorize(true, $amount)->save();
+            }
+
+            $orderStatus = $this->getOrderStatus();
+            $this->order->setState(Order::STATE_PROCESSING)
+                ->addStatusToHistory($orderStatus, __('Customer successfully returned from Novalnet'))
+                ->save();
+            if (!empty($this->response->getData('transaction/payment_data/token'))) {
+                $this->novalnetRequestHelper->savePaymentToken($this->order, $this->code, $this->response);
+            }
+
+            // Order email
+            if ($this->order->getCanSendNewEmailFlag()) {
+                try {
+                    $this->orderEmailSender->send($this->order);
+                    $invoice = current($this->order->getInvoiceCollection()->getItems());
+                    if ($invoice) {
+                        $this->invoiceSender->send($invoice);
+                    }
+                } catch (\Exception $e) {
+                    $this->novalnetLogger->error($e);
+                }
+            }
+        } else {
+            // Cancel the order based on Novalnet transaction status
+            $this->novalnetRequestHelper->saveCanceledOrder($this->response, $this->order);
+            $this->displayMessage('Payment cancelled for the transaction ' . $this->eventTid);
+        }
+
+        $this->displayMessage('Novalnet Callback Script executed successfully on ' . $this->currentTime);
+    }
+
+    /**
+     * Log callback transaction information
+     *
+     * @param  \Novalnet\Payment\Model\Callback $callbackModel
+     * @param  float $amount
+     * @param  string $orderNo
+     * @return void
+     */
+    private function logCallbackInfo($callbackModel, $amount, $orderNo)
+    {
+        // Get the original/parent transaction id
+        $callbackModel->setOrderId($orderNo)
+            ->setCallbackAmount($amount)
+            ->setReferenceTid($this->eventTid)
+            ->setCallbackTid($this->parentTid)
+            ->setCallbackDatetime($this->currentTime)
+            ->save();
+    }
+
+    /**
+     * Get payment order status for CREDIT Event
+     *
+     * @return void
+     */
+    private function getOrderStatusforCreditEvent()
+    {
+        if ($this->response->getData('transaction/status') == 'CONFIRMED') {
+            $orderStatus = $this->novalnetConfig->getPaymentConfig($this->code, 'order_status_after_payment', $this->storeId);
+        }
+
+        $orderStatus = !empty($orderStatus) ? $orderStatus : Order::STATE_PROCESSING;
+        $orderState = Order::STATE_PROCESSING;
+        $this->order->setState(
+            $orderState,
+            true,
+            __('Novalnet webhook set status (%1) for Order ID = %2', $orderState, $this->orderNo)
+        );
+        $this->order->addStatusToHistory(
+            $orderStatus,
+            __('Novalnet webhook added order status %1', $orderStatus)
+        );
+        $this->order->save();
+    }
+
+    /**
+     * Get payment order status
+     *
+     * @return string
+     */
+    private function getOrderStatus()
+    {
+        $orderStatus = 'pending';
+        if ($this->response->getData('transaction/status') == 'ON_HOLD') {
+            $orderStatus = $this->novalnetConfig->getGlobalOnholdStatus($this->storeId);
+        } elseif ($this->response->getData('transaction/status') == 'CONFIRMED' || $this->response->getData('transaction/status') == 'PENDING' && !$this->novalnetConfig->isRedirectPayment($this->code)
+            && !in_array(
+                $this->code,
+                [
+                ConfigProvider::NOVALNET_INVOICE_INSTALMENT,
+                ConfigProvider::NOVALNET_SEPA_INSTALMENT,
+                ConfigProvider::NOVALNET_SEPA_GUARANTEE,
+                ConfigProvider::NOVALNET_INVOICE_GUARANTEE
+                ]
+            )
+        ) {
+            $orderStatus = $this->novalnetConfig->getPaymentConfig($this->code, 'order_status', $this->storeId);
+        }
+
+        return !empty($orderStatus) ? $orderStatus : Order::STATE_PROCESSING;
+    }
+
+    /**
+     * Show callback process transaction comments
+     *
+     * @param  string  $text
+     * @param  boolean $pullOut
+     * @return void
+     */
+    private function displayMessage($text, $pullOut = true)
+    {
+        if ($pullOut === false) {
+            $this->additionalMessage = $text;
+        } else {
+            $this->callbackMessage = $text;
+        }
+
+        $this->novalnetLogger->notice($text);
+    }
+
+    /**
+     * Send callback notification E-mail
+     *
+     * @return bool
+     */
+    private function sendCallbackMail()
+    {
+        // Get email configuration settings
+        $this->getEmailConfig();
+
+        if ($this->emailBody && $this->emailFromAddr && $this->emailToAddr) {
+            if (!$this->sendEmailMagento()) {
+                $this->displayMessage('Mailing failed!' . '<br>', false);
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Get email config
+     *
+     * @return void
+     */
+    private function getEmailConfig()
+    {
+        $this->storeFrontendName = $this->storeManager->getStore()->getFrontendName();
+        $this->emailFromAddr = $this->getConfigValue('trans_email/ident_general/email');
+        $this->emailFromName = $this->getConfigValue('trans_email/ident_general/name');
+        $this->emailToAddr = $this->novalnetConfig->getMerchantScriptConfig('mail_to_addr');
+        $this->emailToName = 'store admin'; // Adapt for your need
+        $this->emailSubject = 'Novalnet Callback Script Access Report - ' . $this->storeFrontendName;
+    }
+
+    /**
+     * Send callback notification E-mail (with callback template)
+     *
+     * @return boolean
+     */
+    private function sendEmailMagento()
+    {
+        try {
+            $emailToAddrs = str_replace(' ', '', $this->emailToAddr);
+            $emailToAddrs = (!empty($emailToAddrs)) ? explode(',', $emailToAddrs) : [];
+            $templateVars = [
+                'fromName' => $this->emailFromName,
+                'fromEmail' => $this->emailFromAddr,
+                'toName' => $this->emailToName,
+                'toEmail' => $this->emailToAddr,
+                'subject' => $this->emailSubject
+            ];
+
+            if (!empty($this->emailBody) &&
+                is_object($this->emailBody) &&
+                $this->emailBody instanceof \Magento\Framework\Phrase
+            ) {
+                $templateVars['body'] = $this->emailBody->render();
+            } else {
+                $templateVars['body'] = $this->emailBody;
+            }
+
+            $from = ['email' => $this->emailFromAddr, 'name' => $this->emailFromName];
+            $this->inlineTranslation->suspend();
+
+            $storeId = $this->storeManager->getStore()->getId();
+            $templateOptions = [
+                'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
+                'store' => $storeId
+            ];
+            $transport = $this->transportBuilder->setTemplateIdentifier(
+                'novalnet_callback_email_template',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            )->setTemplateOptions($templateOptions)
+                ->setTemplateVars($templateVars)
+                ->setFrom($from)
+                ->addTo($emailToAddrs)
+                ->getTransport();
+
+            $transport->sendMessage();
+            $this->inlineTranslation->resume();
+            $this->displayMessage(__FUNCTION__ . ': Sending Email succeeded! <br>', false);
+        } catch (\Exception $e) {
+            $this->novalnetLogger->error("Email sending failed: $e");
+            $this->displayMessage('Email sending failed: ', false);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Retrieves Novalnet configuration values
+     *
+     * @param  string $path
+     * @return string
+     */
+    private function getConfigValue($path)
+    {
+        return $this->scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+    }
+
+    /**
+     * Capture transaction
+     *
+     * @return void
+     */
+    private function transactionCapture()
+    {
+        $invoiceDuedate = $this->response->getData('transaction/due_date');
+        $additionalData = [];
+        if (!empty($this->payment->getAdditionalData())) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($this->payment->getAdditionalData())
+                    ? $this->serializer->unserialize($this->payment->getAdditionalData())
+                    : json_decode($this->payment->getAdditionalData(), true);
+        }
+
+        $transactionStatus = !empty($additionalData['NnStatus'])
+            ? $this->novalnetRequestHelper->getStatus($additionalData['NnStatus'], $this->order) : '';
+
+        if ($this->order->canInvoice() &&
+            in_array($transactionStatus, ['ON_HOLD', 'PENDING'])
+        ) {
+            if ($invoiceDuedate && $this->response->getData('result/status') == 'SUCCESS') {
+                $formatDate = $this->timeZone->formatDate($invoiceDuedate, \IntlDateFormatter::LONG);
+                if (isset($additionalData['NnInvoiceComments'])) {
+                    $note = (!empty($additionalData['NnInvoiceComments'])) ? explode('|', $additionalData['NnInvoiceComments']) : [];
+                    $additionalData['NnInvoiceComments'] = (!empty($note)) ? implode('|', $note) : '';
+                    $additionalData['NnDueDate'] = $formatDate;
+                }
+                if ($this->code == ConfigProvider::NOVALNET_CASHPAYMENT) {
+                    $additionalData['CpDueDate'] = $formatDate;
+                }
+                $additionalData['dueDateUpdateAt'] = $this->dateTime->date('d-m-Y H:i:s');
+                $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+            }
+
+            $this->emailBody = $message = __(
+                'The transaction has been confirmed on %1',
+                $this->currentTime
+            );
+            $additionalData['NnStatus'] = $this->response->getData('transaction/status');
+            $additionalData['NnComments'] = empty($additionalData['NnComments']) ?
+                '<br>'. $message . '<br>' : $additionalData['NnComments'] . '<br>' . $message . '<br>';
+
+            if (in_array(
+                $this->payment->getMethod(),
+                [ConfigProvider::NOVALNET_INVOICE_INSTALMENT, ConfigProvider::NOVALNET_SEPA_INSTALMENT]
+            )) {
+                $additionalData = $this->getInstalmentAdditionalData($additionalData);
+            }
+
+            $transactionStatus = $this->transactionStatusModel->loadByAttribute($this->parentTid, 'tid');
+            $transactionStatus->setStatus($additionalData['NnStatus'])->save();
+            // Capture the Authorized transaction
+            $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))
+                ->capture(null)->save();
+
+            $orderStatus = $this->getOrderStatus();
+            $this->order->setState(Order::STATE_PROCESSING)
+                ->addStatusToHistory($orderStatus, 'The transaction has been confirmed')
+                ->save();
+            $invoice = current($this->order->getInvoiceCollection()->getItems());
+            if ($invoice) {
+                $this->invoiceSender->send($invoice);
+            }
+        } else {
+            // transaction already captured or transaction not been authorized.
+            $message = 'Order already captured.';
+        }
+
+        $this->sendCallbackMail();
+        $this->displayMessage($message);
+    }
+
+    /**
+     * Get Instalment payment Additional data
+     *
+     * @param  array $additionalData
+     * @return array $additionalData
+     */
+    private function getInstalmentAdditionalData($additionalData)
+    {
+        $additionalData['PaidInstall'] = $this->response->getData('instalment/cycles_executed');
+        $additionalData['DueInstall'] = $this->response->getData('instalment/pending_cycles');
+        $additionalData['NextCycle'] = $this->response->getData('instalment/next_cycle_date');
+        if ($futureInstalmentDates = $this->response->getData('instalment/cycle_dates')) {
+            foreach (array_keys($futureInstalmentDates) as $cycle) {
+                $additionalData['InstalmentDetails'][$cycle] = ['amount' => $additionalData['InstallPaidAmount'],
+                    'nextCycle' => !empty($futureInstalmentDates[$cycle + 1]) ? date('Y-m-d', strtotime($futureInstalmentDates[$cycle + 1])) : '',
+                    'paidDate' => ($cycle == 1) ? date('Y-m-d') : '',
+                    'status' => ($cycle == 1) ? 'Paid' : 'Pending',
+                    'reference' => ($cycle == 1) ? $this->response->getData('transaction/tid') : ''];
+            }
+        }
+        return $additionalData;
+    }
+
+    /**
+     * Check transaction cancellation
+     *
+     * @return void
+     */
+    private function transactionCancellation()
+    {
+        $transactionStatus = $this->transactionStatusModel->loadByAttribute($this->parentTid, 'tid');
+
+        $this->novalnetRequestHelper->saveCanceledOrder($this->response, $this->order, $this->response->getData('transaction/status'));
+        $this->emailBody = $message = __(
+            'The transaction has been canceled on %1',
+            $this->currentTime
+        );
+
+        $additionalData = [];
+        if (!empty($this->payment->getAdditionalData())) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($this->payment->getAdditionalData())
+                ? $this->serializer->unserialize($this->payment->getAdditionalData())
+                : json_decode($this->payment->getAdditionalData(), true);
+        }
+
+        $additionalData['NnComments'] = empty($additionalData['NnComments'])
+            ? '<br>' . $message : $additionalData['NnComments'] . '<br><br>' . $message;
+        $additionalData['NnStatus'] = $this->response->getData('transaction/status');
+        $transactionStatus->setStatus($additionalData['NnStatus'])->save();
+        $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+        $this->sendCallbackMail();
+        $this->displayMessage($message);
+    }
+
+    /**
+     * Handle payment refund/bookback process
+     *
+     * @return void
+     */
+    private function refundProcess()
+    {
+        $refundTid = empty($this->response->getData('transaction/refund/tid'))
+            ? $this->response->getData('transaction/tid') : $this->response->getData('transaction/refund/tid');
+        $refundAmount = empty($this->response->getData('transaction/refund/amount'))
+            ? $this->response->getData('transaction/amount') : $this->response->getData('transaction/refund/amount');
+        $this->emailBody = $message = __(
+            'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+            $this->parentTid,
+            $this->novalnetRequestHelper->getFormattedAmount($refundAmount, 'RAW') . ' ' . $this->currency,
+            $refundTid
+        );
+        $shopInvoked = !empty($this->response->getData('custom/shop_invoked'))
+            ? $this->response->getData('custom/shop_invoked') : 0;
+
+        if (!$shopInvoked) {
+            $additionalData = [];
+            if (!empty($this->payment->getAdditionalData())) {
+                $additionalData = $this->novalnetRequestHelper->isSerialized($this->payment->getAdditionalData())
+                        ? $this->serializer->unserialize($this->payment->getAdditionalData())
+                        : json_decode($this->payment->getAdditionalData(), true);
+            }
+
+            $additionalData['NnComments'] = empty($additionalData['NnComments']) ? '<br>' . $message :
+                $additionalData['NnComments'] . '<br><br>' . $message;
+            $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+        }
+
+        if ($this->order->getState() != Order::STATE_CLOSED && $this->order->canCreditmemo() && !$shopInvoked) {
+            $refundData = [];
+            $grandTotal = $this->novalnetRequestHelper->getFormattedAmount($this->order->getGrandTotal());
+            $totalRefunded = $this->novalnetRequestHelper->getFormattedAmount($this->order->getTotalOnlineRefunded());
+            $totalRefundNow = $totalRefunded + $refundAmount;
+            if ($totalRefunded >= $grandTotal || $refundAmount >= $grandTotal) {
+                $adjustmentNegative = $grandTotal - $refundAmount;
+                $refundData['adjustment_negative'] = $this->novalnetRequestHelper->getFormattedAmount($adjustmentNegative, 'RAW');
+                $creditmemo = $this->creditMemoFacory->createByOrder($this->order, $refundData);
+                $this->creditmemoService->refund($creditmemo);
+            } elseif ($totalRefunded < $grandTotal && $totalRefundNow <= $grandTotal) {
+                $refundData['adjustment_positive'] = ($this->novalnetRequestHelper->getFormattedAmount($refundAmount, 'RAW'));
+                $itemToCredit = [];
+                foreach ($this->order->getAllItems() as $item) {
+                    $itemToCredit[$item->getId()] = ['qty'=> 0];
+                }
+                $refundData['adjustment_negative'] = 0;
+                $refundData['shipping_amount'] = 0;
+                $refundData['items'] = $itemToCredit;
+                $this->creditmemoLoader->setOrderId($this->order->getId()); //pass order id
+                $this->creditmemoLoader->setCreditmemo($refundData);
+                $creditmemo = $this->creditmemoLoader->load();
+                $this->creditmemoService->refund($creditmemo);
+            }
+        }
+
+        $this->sendCallbackMail();
+        $this->displayMessage($message);
+    }
+
+    /**
+     * Handle transaction update
+     *
+     * @return void
+     */
+    private function transactionUpdate()
+    {
+        $invoiceDuedate = $this->response->getData('transaction/due_date');
+        $transactionPaymentType = $this->response->getData('transaction/payment_type');
+        $transaction = $this->transactionStatusModel->loadByAttribute($this->parentTid, 'tid');
+        $message = "Novalnet callback received for the unhandled transaction type($transactionPaymentType) for $this->eventType EVENT";
+        $additionalData = [];
+        if (!empty($this->payment->getAdditionalData())) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($this->payment->getAdditionalData())
+                ? $this->serializer->unserialize($this->payment->getAdditionalData())
+                : json_decode($this->payment->getAdditionalData(), true);
+        }
+        $transactionStatus = $this->novalnetRequestHelper->getStatus($transaction->getStatus(), $this->order);
+
+        if ($invoiceDuedate && $this->response->getData('result/status') == 'SUCCESS') {
+            $formatDate = $this->timeZone->formatDate($invoiceDuedate, \IntlDateFormatter::LONG);
+            $nnAmount = $this->pricingHelper->currency(
+                $this->novalnetRequestHelper->getFormattedAmount(($this->response->getData('instalment/cycle_amount') ? $this->response->getData('instalment/cycle_amount')
+                : $this->response->getData('transaction/amount')), 'RAW'),
+                true,
+                false
+            );
+            $additionalData['NnAmount'] = $nnAmount;
+            $this->emailBody = $message =  __(
+                'The transaction has been updated with amount %1 and due date with %2',
+                $additionalData['NnAmount'],
+                $formatDate
+            );
+            if (isset($additionalData['NnInvoiceComments'])) {
+                $note = (!empty($additionalData['NnInvoiceComments'])) ? explode('|', $additionalData['NnInvoiceComments']) : [];
+                $additionalData['NnInvoiceComments'] = (!empty($note)) ? implode('|', $note) : '';
+                $additionalData['NnDueDate'] = $formatDate;
+            }
+            if ($this->code == ConfigProvider::NOVALNET_CASHPAYMENT) {
+                $additionalData['CpDueDate'] = $formatDate;
+                $this->emailBody = $message =  __(
+                    'The transaction has been updated with amount %1 and slip expiry date with %2',
+                    $additionalData['NnAmount'],
+                    $formatDate
+                );
+            }
+            $additionalData['dueDateUpdateAt'] = $this->dateTime->date('d-m-Y H:i:s');
+            $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+        }
+
+        if ($transactionStatus == 'PENDING') {
+            if ($this->response->getData('transaction/status') == 'ON_HOLD') {
+                $orderStatus = $this->novalnetConfig->getGlobalOnholdStatus($this->storeId);
+                $this->emailBody = $message = __(
+                    'The transaction status has been changed from pending to on hold for the TID: %1 on %2.',
+                    $this->parentTid,
+                    $this->currentTime
+                );
+                $additionalData['NnStatus'] = $this->response->getData('transaction/status');
+                $additionalData['NnComments'] = empty($additionalData['NnComments']) ?
+                    '<br>' . $message . '<br>' : $additionalData['NnComments'] . '<br>' . $message . '<br>';
+                $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+            } elseif ($this->response->getData('transaction/status') == 'CONFIRMED') {
+                if (in_array(
+                    $this->payment->getMethod(),
+                    [ConfigProvider::NOVALNET_INVOICE_INSTALMENT, ConfigProvider::NOVALNET_SEPA_INSTALMENT]
+                )) {
+                    $additionalData = $this->getInstalmentAdditionalData($additionalData);
+                }
+                $this->emailBody = $message = __(
+                    'Transaction updated successfully for the TID: %1 with the amount %2 on %3',
+                    $this->eventTid,
+                    $amount = $this->novalnetRequestHelper->getFormattedAmount(
+                        $this->response->getData('transaction/amount'),
+                        'RAW'
+                    ).' '.$this->currency,
+                    $this->currentTime
+                );
+
+                $additionalData['NnStatus'] = $this->response->getData('transaction/status');
+                $additionalData['NnComments'] = empty($additionalData['NnComments']) ?
+                    '<br>' . $message . '<br>' : $additionalData['NnComments'] . '<br>' . $message . '<br>';
+                $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+                $this->payment->setTransactionId($this->parentTid . '-capture')
+                    ->setIsTransactionClosed(true)
+                    ->capture(null)->save();
+                $orderStatus = $this->novalnetConfig->getPaymentConfig($this->code, 'order_status', $this->storeId);
+            }
+
+            $transaction->setStatus($this->response->getData('transaction/status'))->save();
+            if (!empty($orderStatus)) {
+                $this->order->setState(Order::STATE_PROCESSING)
+                    ->setStatus($orderStatus)
+                    ->save();
+            }
+            $invoice = current($this->order->getInvoiceCollection()->getItems());
+            if ($invoice && $this->response->getData('transaction/status') == 'CONFIRMED') {
+                $this->invoiceSender->send($invoice);
+            }
+        } elseif ($transactionStatus == 'ON_HOLD' && $this->response->getData('transaction/status') == 'ON_HOLD' &&
+            in_array($this->code, [ConfigProvider::NOVALNET_SEPA, ConfigProvider::NOVALNET_SEPA_GUARANTEE, ConfigProvider::NOVALNET_INVOICE_GUARANTEE, ConfigProvider::NOVALNET_PREPAYMENT])) {
+                $this->emailBody = $message = __(
+                    'Transaction updated successfully for the TID: %1 with the amount %2 on %3',
+                    $this->eventTid,
+                    $amount = $this->novalnetRequestHelper->getFormattedAmount(
+                        $this->response->getData('transaction/amount'),
+                        'RAW'
+                    ).' '.$this->currency,
+                    $this->currentTime
+                );
+                $additionalData['NnComments'] = empty($additionalData['NnComments']) ?
+                        '<br>' . $message . '<br>' : $additionalData['NnComments'] . '<br>' . $message . '<br>';
+                $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+        }
+
+        $this->sendCallbackMail();
+        $this->displayMessage($message);
+    }
+
+    /**
+     * Handle payment credit process
+     *
+     * @return void
+     */
+    private function creditProcess()
+    {
+        $transactionPaymentType = $this->response->getData('transaction/payment_type');
+        $message = "Novalnet callback received for the unhandled transaction type($transactionPaymentType) for $this->eventType EVENT";
+        $amount = $this->novalnetRequestHelper->getFormattedAmount(
+            $this->response->getData('transaction/amount'),
+            'RAW'
+        );
+
+        if (in_array(
+            $transactionPaymentType,
+            ['INVOICE_CREDIT', 'ONLINE_TRANSFER_CREDIT', 'CASHPAYMENT_CREDIT', 'MULTIBANCO_CREDIT']
+        )) {
+            $additionalData = [];
+            if (!empty($this->payment->getAdditionalData())) {
+                $additionalData = $this->novalnetRequestHelper->isSerialized($this->payment->getAdditionalData())
+                    ? $this->serializer->unserialize($this->payment->getAdditionalData())
+                    : json_decode($this->payment->getAdditionalData(), true);
+            }
+            $updatedAmount = str_replace(',', '.', $this->currencyModel->format($additionalData['NnAmount'], ['display' => \Magento\Framework\Currency::NO_SYMBOL], false));
+            $updatedAmount = $this->novalnetRequestHelper->getFormattedAmount($updatedAmount);
+            // Loads callback model using the Increment ID
+            $callbackInfo = $this->callbackModel->loadLogByOrderId($this->orderNo);
+            $transactionStatus = $this->transactionStatusModel->loadByAttribute($this->parentTid, 'tid');
+            $totalAmount = $this->response->getData('transaction/amount') + $callbackInfo->getCallbackAmount();
+            // Get original order amount
+            $grandTotal = $this->novalnetRequestHelper->getFormattedAmount($this->order->getGrandTotal());
+            $totalAmountRefunded = $this->novalnetRequestHelper->getFormattedAmount($this->order->getTotalRefunded());
+            // Log callback data for reference
+            $this->logCallbackInfo($callbackInfo, $totalAmount, $this->orderNo);
+            $message = __(
+                'Credit has been successfully received for the TID: %1 with amount %2 on %3. Please refer PAID order details in our Novalnet Admin Portal for the TID: %4',
+                $this->parentTid,
+                $amount . ' ' . $this->currency,
+                $this->currentTime,
+                $this->eventTid
+            );
+
+            $additionalData['NnStatus'] = ($this->response->getData('transaction/status'))
+                ? $this->response->getData('transaction/status') : '';
+            $transactionStatus->setStatus($this->response->getData('transaction/status'))->save();
+            $currentGrandTotal = 0;
+            if ($totalAmountRefunded) {
+                $currentGrandTotal = $grandTotal - $totalAmountRefunded;
+                if ($totalAmount >= $currentGrandTotal) {
+                    $additionalData['NnPaid'] = 1;
+                }
+            } elseif ($totalAmount >= $grandTotal) {
+                $additionalData['NnPaid'] = 1;
+            }
+            if (($totalAmount < $grandTotal) ||
+                $transactionPaymentType == 'ONLINE_TRANSFER_CREDIT'
+            ) {
+                if ($transactionPaymentType == 'ONLINE_TRANSFER_CREDIT' && ($totalAmount > $grandTotal)) {
+                    $message = $message  . '<br>' . __(
+                        'Credit has been successfully received for the TID: %1 with amount %2 on %3. Please refer PAID order details in our Novalnet Admin Portal for the TID: %4',
+                        $this->parentTid,
+                        $amount . ' ' . $this->currency,
+                        $this->currentTime,
+                        $this->eventTid
+                    );
+                }
+
+                $this->emailBody = $message;
+                $additionalData['NnComments'] = empty($additionalData['NnComments'])
+                    ? '<br>' . $message
+                    : $additionalData['NnComments'] . '<br><br>' . $message;
+                $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+                if ($totalAmountRefunded) {
+                    if (($totalAmount >= $currentGrandTotal)) {
+                        $this->getOrderStatusforCreditEvent(); // Set order status
+                    }
+                } elseif ($updatedAmount) {
+                    if (($totalAmount >= $updatedAmount)) {
+                        $this->getOrderStatusforCreditEvent(); // Set order status
+                    }
+                }
+            } elseif ($this->order->canInvoice()) {
+                $this->emailBody = $message;
+                $additionalData['NnComments'] = empty($additionalData['NnComments'])
+                    ? '<br>' . $message
+                    : $additionalData['NnComments'] . '<br><br>' . $message;
+                $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+                // Save payment information with invoice for Novalnet successful transaction
+                $this->payment->setTransactionId($this->parentTid . '-capture')
+                    ->setIsTransactionClosed(true)
+                    ->capture(null)->save();
+                $this->order->save();
+                $this->order->setPayment($this->payment)->save();
+                $invoice = $this->order->getInvoiceCollection()->getFirstItem();
+                if ($invoice) {
+                    $this->invoiceSender->send($invoice);
+                }
+                $this->getOrderStatusforCreditEvent(); // Set order status
+            } elseif ($this->payment->getAdditionalInformation($this->code . '_callbackSuccess') != 1) {
+                $this->emailBody = $message;
+                $additionalData['NnComments'] = empty($additionalData['NnComments']) ? '<br>' . $message
+                : $additionalData['NnComments'] . '<br><br>' . $message;
+                $this->payment->setAdditionalInformation($this->code
+                . '_callbackSuccess', 1);
+                $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+                $orderStatus = $this->getOrderStatusforCreditEvent(); // Set order status
+                $this->order->setPayment($this->payment)->save();
+
+                $invoice = $this->order->getInvoiceCollection()->getFirstItem();
+                $invoice->setState(\Magento\Sales\Model\Order\Invoice::STATE_PAID);
+                $invoice->save();
+            } else {
+                $message = 'Callback Script executed already. Refer Order :' . $this->orderNo;
+            }
+        } else {
+            $message = __(
+                'Credit has been successfully received for the TID: %1 with amount %2 on %3. Please refer PAID order details in our Novalnet Admin Portal for the TID: %4',
+                $this->parentTid,
+                $amount . ' ' . $this->currency,
+                $this->currentTime,
+                $this->eventTid
+            );
+            $additionalData = [];
+            if (!empty($this->payment->getAdditionalData())) {
+                $additionalData = $this->novalnetRequestHelper->isSerialized($this->payment->getAdditionalData())
+                    ? $this->serializer->unserialize($this->payment->getAdditionalData())
+                    : json_decode($this->payment->getAdditionalData(), true);
+            }
+            $this->emailBody = $message;
+            $additionalData['NnComments'] = empty($additionalData['NnComments']) ? '<br>' . $message
+                : $additionalData['NnComments'] . '<br><br>' . $message;
+            $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+        }
+
+        $this->sendCallbackMail();
+        $this->displayMessage($message);
+    }
+
+    /**
+     * Handle payment INSTALMENT process
+     *
+     * @return void
+     */
+    private function instalmentProcess()
+    {
+        $additionalData = [];
+        if (!empty($this->payment->getAdditionalData())) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($this->payment->getAdditionalData())
+                    ? $this->serializer->unserialize($this->payment->getAdditionalData())
+                    : json_decode($this->payment->getAdditionalData(), true);
+        }
+
+        $additionalData['NnTid'] = $this->response->getData('transaction/tid');
+        $instalmentTransactionAmount = $this->novalnetRequestHelper->getFormattedAmount(
+            $this->response->getData('instalment/cycle_amount'),
+            'RAW'
+        );
+        $paidAmount = $additionalData['InstallPaidAmount'] + $instalmentTransactionAmount;
+        $additionalData['InstallPaidAmount'] = $paidAmount;
+        $additionalData['PaidInstall'] = $this->response->getData('instalment/cycles_executed');
+        $additionalData['DueInstall'] = $this->response->getData('instalment/pending_cycles');
+        $additionalData['NextCycle'] = $this->response->getData('instalment/next_cycle_date');
+        if ($this->response->getData('instalment/prepaid')) {
+            $additionalData['prepaid'] = $this->response->getData('instalment/prepaid');
+        } else {
+            if (isset($additionalData['prepaid'])) {
+                 unset($additionalData['prepaid']);
+            }
+        }
+        $additionalData['InstallCycleAmount'] = $instalmentTransactionAmount;
+        $additionalData['NnAmount'] = $this->pricingHelper->currencyByStore($instalmentTransactionAmount, $this->order->getStore()->getStoreId(), true, false);
+
+        if ($this->response->getData('transaction/payment_type') == 'INSTALMENT_INVOICE') {
+            $note = (!empty($additionalData['NnInvoiceComments'])) ? explode('|', $additionalData['NnInvoiceComments']) : [];
+            if ($this->response->getData('transaction/due_date')) {
+                $formatDate = $this->timeZone->formatDate(
+                    $this->response->getData('transaction/due_date'),
+                    \IntlDateFormatter::LONG
+                );
+                $additionalData['NnDueDate'] = $formatDate;
+            }
+
+            $note[5] = 'InvoiceAmount:' . $this->pricingHelper->currencyByStore(
+                $instalmentTransactionAmount,
+                $this->order->getStore()->getStoreId(),
+                true,
+                false
+            );
+
+            $note[6] = 'Payment Reference:' . $this->response->getData('transaction/tid');
+            if (isset($note[7])) {
+                unset($note[7]);
+            }
+            $additionalData['NnInvoiceComments'] = (!empty($note)) ? implode('|', $note) : '';
+        }
+
+        $additionalData['InstalmentDetails'][$this->response->getData('instalment/cycles_executed')] = [
+            'amount' => $instalmentTransactionAmount,
+            'nextCycle' => $this->response->getData('instalment/next_cycle_date'),
+            'paidDate' => date('Y-m-d'),
+            'status' => 'Paid',
+            'reference' => $this->response->getData('transaction/tid')
+        ];
+        $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+
+        // Send instalment email to end customer
+        if (!$this->novalnetConfig->getGlobalConfig('instalment_mail', $this->storeId)) {
+            $this->sendInstalmentmail();
+        }
+
+        $this->displayMessage('Novalnet Callbackscript received. Instalment payment executed properly');
+    }
+
+    /**
+     * Handle payment INSTALMENT process
+     *
+     * @return void
+     */
+    private function instalmentCancelProcess()
+    {
+        $this->emailBody = $message = __(
+            'Instalment has been cancelled for the TID %1 on %2',
+            $this->parentTid,
+            $this->currentTime
+        );
+
+        $additionalData = (!empty($this->payment->getAdditionalData())) ? ($this->novalnetRequestHelper->isSerialized($this->payment->getAdditionalData())
+                ? $this->serializer->unserialize($this->payment->getAdditionalData())
+                : json_decode($this->payment->getAdditionalData(), true)) : [] ;
+
+        $additionalData['NnComments'] = empty($additionalData['NnComments']) ? '<br>' . $message :
+            $additionalData['NnComments'] . '<br><br>' . $message;
+        $additionalData['InstalmentCancel'] = 1;
+        $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+        $this->order->setState(Order::STATE_CLOSED)->setStatus(Order::STATE_CLOSED)->save();
+
+        $this->sendCallbackMail();
+        $this->displayMessage($message);
+    }
+
+    /**
+     * Send Instalment mail
+     *
+     * @return mixed
+     */
+    private function sendInstalmentmail()
+    {
+        $this->getEmailConfig();
+        $from = ['email' => $this->emailFromAddr, 'name' => $this->emailFromName];
+        $additionalData = $this->order->getPayment()->getAdditionalData();
+        if (!empty($additionalData)) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($additionalData)
+                    ? $this->serializer->unserialize($additionalData)
+                    : json_decode($additionalData, true);
+        }
+
+        $templateVars = [
+            'order'      => $this->order,
+            'orderNo'    => $this->orderNo,
+            'storeName' => $this->storeFrontendName,
+            'order_id'   => $this->order->getId(),
+            'customer_name' => $this->order->getCustomerName(),
+            'cycleAmount' => $this->novalnetRequestHelper->getFormattedAmount($this->response->getData('instalment/cycle_amount'), 'RAW'),
+            'currency' => $this->currency,
+            'formattedShippingAddress' => !empty($this->order->getShippingAddress()) ? $this->salesOrderAddressRenderer->format($this->order->getShippingAddress(), 'html') : '',
+            'formattedBillingAddress' => $this->salesOrderAddressRenderer->format($this->order->getBillingAddress(), 'html'),
+            'store' => $this->order->getStore(),
+            'payment_html' => $this->paymentHelper->getInfoBlockHtml(
+                $this->order->getPayment(),
+                $this->order->getStore()->getStoreId()
+            ),
+            'sepaPayment' => ((!isset($additionalData['prepaid']) || empty($additionalData['prepaid'])) && ($this->response->getData('transaction/payment_type') == 'INSTALMENT_DIRECT_DEBIT_SEPA')) ? 1 : ""
+        ];
+
+        try {
+            $this->inlineTranslation->suspend();
+            $templateOptions = [
+                'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
+                'store' => $this->order->getStore()->getStoreId()
+            ];
+
+            $transport = $this->transportBuilder->setTemplateIdentifier(
+                'novalnet_callback_instalment_email_template',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            )->setTemplateOptions($templateOptions)
+                ->setTemplateVars($templateVars)
+                ->setFrom($from)
+                ->addTo($this->order->getCustomerEmail())
+                ->getTransport();
+
+            $transport->sendMessage();
+            $this->inlineTranslation->resume();
+            $this->displayMessage(__FUNCTION__ . ': Sending Email succeeded!'.'<br>', false);
+        } catch (\Exception $e) {
+            $this->novalnetLogger->error("Email sending failed: $e");
+            $this->displayMessage('Email sending failed: ', false);
+            return false;
+        }
+    }
+
+    /**
+     * Handle payment CHARGEBACK/RETURN_DEBIT/REVERSAL process
+     *
+     * @return void
+     */
+    private function chargebackProcess()
+    {
+        // Update callback comments for Chargebacks
+        $this->emailBody = $message = __(
+            'Chargeback executed successfully for the TID: %1 amount: %2 on %3. The subsequent TID: %4',
+            $this->parentTid,
+            $this->novalnetRequestHelper->getFormattedAmount(
+                $this->response->getData('transaction/amount'),
+                'RAW'
+            ) . ' ' . $this->currency,
+            $this->currentTime,
+            $this->response->getData('transaction/tid')
+        );
+
+        $additionalData = [];
+        if (!empty($this->payment->getAdditionalData())) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($this->payment->getAdditionalData())
+                    ? $this->serializer->unserialize($this->payment->getAdditionalData())
+                    : json_decode($this->payment->getAdditionalData(), true);
+        }
+
+        $additionalData['NnComments'] = empty($additionalData['NnComments']) ? '<br>' . $message :
+            $additionalData['NnComments'] . '<br><br>' . $message;
+        $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+
+        $this->sendCallbackMail();
+        $this->displayMessage($message);
+    }
+
+    /**
+     * Handle payment reminder process
+     *
+     * @return void
+     */
+    private function paymentReminderProcess()
+    {
+        $reminderCount = explode('_', $this->response->getData('event/type'));
+        $reminderCount = end($reminderCount);
+        $this->emailBody = $message = __(
+            'Payment Reminder %1 has been sent to the customer.',
+            $reminderCount
+        );
+
+        $additionalData = [];
+        if (!empty($this->payment->getAdditionalData())) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($this->payment->getAdditionalData())
+                    ? $this->serializer->unserialize($this->payment->getAdditionalData())
+                    : json_decode($this->payment->getAdditionalData(), true);
+        }
+
+        $additionalData['NnComments'] = empty($additionalData['NnComments']) ? '<br>' . $message :
+            $additionalData['NnComments'] . '<br><br>' . $message;
+        $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+
+        $this->sendCallbackMail();
+        $this->displayMessage($message);
+    }
+
+    /**
+     * Handle collection process
+     *
+     * @return void
+     */
+    private function collectionProcess()
+    {
+        $this->emailBody = $message = __(
+            'The transaction has been submitted to the collection agency. Collection Reference: %1',
+            $this->response->getData('collection/reference')
+        );
+
+        $additionalData = [];
+        if (!empty($this->payment->getAdditionalData())) {
+            $additionalData = $this->novalnetRequestHelper->isSerialized($this->payment->getAdditionalData())
+                    ? $this->serializer->unserialize($this->payment->getAdditionalData())
+                    : json_decode($this->payment->getAdditionalData(), true);
+        }
+
+        $additionalData['NnComments'] = empty($additionalData['NnComments']) ? '<br>' . $message :
+            $additionalData['NnComments'] . '<br><br>' . $message;
+        $this->payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+
+        $this->sendCallbackMail();
+        $this->displayMessage($message);
+    }
+
+    /**
+     * Get Cart Contents
+     *
+     * @api
+     * @return string
+     */
+    public function getCart()
+    {
+        $quote = $this->cart->getQuote();
+
+        try {
+            $result = $this->getCartItems($quote);
+            return $this->jsonHelper->jsonEncode($result);
+        } catch (\Exception $e) {
+            throw new CouldNotSaveException(__($e->getMessage()), $e);
+        }
+    }
+
+    /**
+     * Get express checkout request params for Product page
+     *
+     * @api
+     * @param string[] $data
+     * @return string
+     */
+    public function getProductPageParams($data)
+    {
+        $product = $this->loadProductById($data['product_id']);
+
+        if (!$product || !$product->getId()) {
+            return [];
+        }
+
+        $quote = $this->cart->getQuote();
+        $updateRequired = true;
+        if ($quote->getItemsCount()) {
+            $items = $quote->getAllVisibleItems();
+            foreach ($items as $item) {
+                if ($item->getProduct()->getId() == $product->getId()) {
+                    $updateRequired = false;
+                }
+            }
+        }
+
+        $params = $this->getCartItems($quote, 'product_page');
+        $amount = $params['total']['amount'];
+        $items = $params['displayItems'];
+
+        if ($updateRequired) {
+            $shouldInclTax = $this->shouldCartPriceInclTax($quote->getStore());
+            $price = $this->getProductDataPrice(
+                $product,
+                $product->getFinalPrice(),
+                $shouldInclTax,
+                $quote->getCustomerId(),
+                $quote->getStore()->getStoreId()
+            );
+
+            $productTotal = $this->novalnetRequestHelper->getFormattedAmount($price);
+            $productTotal = ($productTotal) ? $productTotal : 0;
+            $amount += $productTotal;
+
+            $productLabel = $product->getName();
+            $formattedPrice = $this->priceCurrency->format($price, false);
+            $productLabel .= sprintf(' (%s x %s)', '1', $formattedPrice);
+
+            $items[] = [
+                'label' => $productLabel,
+                'type' => 'SUBTOTAL',
+                'amount' => (string) $productTotal
+            ];
+        }
+
+        $result = [
+            'total' => [
+                'amount' => (string) $amount
+            ],
+            'displayItems' => $items,
+            'isEnabled' => $params['isEnabled'],
+            'is_pending' => $params['is_pending'],
+            'sheetConfig' => $params['sheetConfig'],
+            'isVirtual'  => ($quote->getItemsCount()) ? $quote->getIsVirtual() : null
+        ];
+
+        return $this->jsonHelper->jsonEncode($result);
+    }
+
+    /**
+     * Add to Cart
+     *
+     * @api
+     * @param string $data
+     * @return string
+     */
+    public function addToCart($data)
+    {
+        try {
+            $this->zendUri->setQuery($data);
+            $productInfo = $this->zendUri->getQueryAsArray();
+            $productId = $productInfo['product'];
+            $relatedProduct = $productInfo['related_product'];
+
+            if (isset($productInfo['qty'])) {
+                $filter = new \Magento\Framework\Filter\LocalizedToNormalized(
+                    ['locale' => $this->novalnetRequestHelper->getDefaultLanguage()]
+                );
+                $productInfo['qty'] = $filter->filter($productInfo['qty']);
+            }
+
+            $quote = $this->cart->getQuote();
+
+            $storeId = $this->storeManager->getStore()->getId();
+            $product = $this->productRepository->getById($productId, false, $storeId);
+            $isNewItem = true;
+
+            foreach ($quote->getAllItems() as $item) {
+                if ($item->getProductId() == $productId) {
+                    // update existing item in cart
+                    $item = $this->cart->updateItem($item->getId(), $productInfo);
+                    if ($item->getHasError()) {
+                        throw new LocalizedException(__($item->getMessage()));
+                    }
+
+                    $isNewItem = false;
+                    break;
+                }
+            }
+
+            if ($isNewItem) {
+                // add new item to cart
+                $item = $this->cart->addProduct($product, $productInfo);
+                if ($item->getHasError()) {
+                    throw new LocalizedException(__($item->getMessage()));
+                }
+
+                if (!empty($relatedProduct)) {
+                    $this->cart->addProductsByIds(explode(',', $relatedProduct));
+                }
+            }
+
+            $this->cart->save();
+            $quote->setTotalsCollectedFlag(false)->collectTotals()->save();
+
+            return $this->jsonHelper->jsonEncode([]);
+
+        } catch (\Exception $e) {
+            throw new CouldNotSaveException(__($e->getMessage()), $e);
+        }
+    }
+
+    /**
+     * Estimate Shipping by Address
+     *
+     * @api
+     * @param string[] $address
+     * @return string
+     */
+    public function estimateShippingMethod($address)
+    {
+        try {
+            $quote = $this->cart->getQuote();
+            $needConversion = ($this->storeManager->getStore()->getCurrentCurrencyCode() == $this->storeManager->getStore()->getBaseCurrencyCode()) ? false : true;
+            $methods = [];
+
+            if (!$quote->isVirtual()) {
+                $shippingAddress = $quote->getShippingAddress()
+                      ->addData($this->getFormattedAddress($address))
+                      ->save();
+
+                $estimatedAddress = $this->estimatedAddressFactory->create()
+                    ->setCountryId($shippingAddress->getCountryId())
+                    ->setPostcode($shippingAddress->getPostcode())
+                    ->setRegion((string) $shippingAddress->getRegion())
+                    ->setRegionId($shippingAddress->getRegionId());
+
+                $availableShippingMethods = $this->shippingMethodManager->estimateByAddress($quote->getId(), $estimatedAddress);
+                $shouldInclTax = $this->shouldCartPriceInclTax($quote->getStore());
+
+                if ($availableShippingMethods) {
+                    foreach ($availableShippingMethods as $rate) {
+                        if ($rate->getErrorMessage()) {
+                            continue;
+                        }
+
+                        $methodRate = $shouldInclTax ? $rate->getPriceInclTax() : $rate->getPriceExclTax();
+                        $methodRate = ($methodRate && $needConversion) ? $methodRate / $quote->getBaseToQuoteRate() : $methodRate;
+                        array_push($methods, [
+                            'label' => $rate->getCarrierTitle() . ' - ' . $rate->getMethodTitle(),
+                            'amount' => (string) ($methodRate > 0) ? $this->novalnetRequestHelper->getFormattedAmount($methodRate) : $methodRate,
+                            'identifier' => $rate->getCarrierCode() . '_' . $rate->getMethodCode()
+                        ]);
+                    }
+                }
+
+                if ($methods) {
+                    $shippingAddress->setShippingMethod($methods[0]['identifier'])->setCollectShippingRates(true);
+                }
+            }
+
+            $quote->collectTotals();
+            $result = $this->getCartItems($quote);
+            $result['methods'] = $methods;
+            return $this->jsonHelper->jsonEncode($result);
+        } catch (\Exception $e) {
+            throw new CouldNotSaveException(__($e->getMessage()), $e);
+        }
+    }
+
+    /**
+     * Apply shipping method and calculate totals
+     *
+     * @api
+     * @param string[] $shippingMethod
+     * @return string
+     */
+    public function applyShippingMethod($shippingMethod)
+    {
+        $quote = $this->cart->getQuote();
+        try {
+            if (!$quote->isVirtual()) {
+                $shippingAddress = $quote->getShippingAddress();
+                $quote->setShippingAddress($shippingAddress);
+                $quote->getShippingAddress()->setCollectShippingRates(true)->setShippingMethod($shippingMethod['identifier']);
+                $quote->setTotalsCollectedFlag(false)->collectTotals()->save();
+            }
+
+            return $this->jsonHelper->jsonEncode(
+                $this->getCartItems($quote)
+            );
+        } catch (\Exception $e) {
+            throw new CouldNotSaveException(__($e->getMessage()), $e);
+        }
+    }
+
+    /**
+     * Get Cart items
+     *
+     * @param \Magento\Quote\Model\Quote $quote
+     * @param string $page
+     * @return array
+     */
+    public function getCartItems($quote, $page = 'mini_cart_page')
+    {
+        $currency = $quote->getBaseCurrencyCode();
+        if (empty($currency)) {
+            $currency = $quote->getStore()->getBaseCurrencyCode();
+        }
+        $discount = $quote->getBaseSubtotal() - $quote->getBaseSubtotalWithDiscount();
+        $needConversion = ($this->storeManager->getStore()->getCurrentCurrencyCode() == $this->storeManager->getStore()->getBaseCurrencyCode()) ? false : true;
+        $taxAmount = $quote->getTotals()['tax']->getValue();
+        $shouldInclTax = $this->shouldCartPriceInclTax($quote->getStore());
+        $displayItems = [];
+        $items = $quote->getAllVisibleItems();
+        $getQuoteFormat = $quote->getIsVirtual();
+        foreach ($items as $item) {
+
+            if ($item->getParentItem()) {
+                continue;
+            }
+
+            $rowTotal = $shouldInclTax ? $item->getBaseRowTotalInclTax() : $item->getBaseRowTotal();
+            $rowTotal = $this->novalnetRequestHelper->getFormattedAmount($rowTotal);
+            $rowTotal = ($rowTotal) ? $rowTotal : 0;
+
+            $price = $shouldInclTax ? $item->getBasePriceInclTax() : $item->getBasePrice();
+
+            $label = $item->getName();
+            if ($item->getQty() > 0) {
+                $formattedPrice = $this->priceCurrency->format($price, false, PriceCurrencyInterface::DEFAULT_PRECISION, null, $currency);
+                $label .= sprintf(' (%s x %s)', $item->getQty(), $formattedPrice);
+            }
+
+            $displayItems[] = [
+                'label' => $label,
+                'type' => 'SUBTOTAL',
+                'amount' => (string) $rowTotal
+            ];
+        }
+
+        if ($discount) {
+            $displayItems[] = [
+                'label' => __('Discount'),
+                'type' => 'SUBTOTAL',
+                'amount' => (string) '-' . $this->novalnetRequestHelper->getFormattedAmount($discount)
+            ];
+        }
+
+        if ($taxAmount) {
+            $taxAmount = $needConversion ? $this->deltaRounding($taxAmount / $quote->getBaseToQuoteRate()) : $taxAmount;
+            $displayItems[] = [
+                'label' => __('Tax'),
+                'type' => 'SUBTOTAL',
+                'amount' => (string) $this->novalnetRequestHelper->getFormattedAmount($taxAmount)
+            ];
+        }
+
+        if ($quote->getItemsCount() && !$quote->getIsVirtual()) {
+            $shippingAmount = $quote->getShippingAmount();
+            if ($shippingAmount && $needConversion) {
+                $shippingAmount = $shippingAmount / $quote->getBaseToQuoteRate();
+            }
+
+            if ($shippingAmount !== null) {
+                $displayItems[] = [
+                    'label' => (!empty($quote->getShippingDescription())) ? $quote->getShippingDescription() : __('Shipping'),
+                    'type' => 'SUBTOTAL',
+                    'amount' => (string) ($shippingAmount > 0) ? $this->novalnetRequestHelper->getFormattedAmount($shippingAmount) : $shippingAmount
+                ];
+            }
+        }
+
+        $baseGrandTotal = $this->novalnetRequestHelper->getFormattedAmount($quote->getBaseGrandTotal());
+        $baseGrandTotal = ($baseGrandTotal) ? $baseGrandTotal : 0;
+        return [
+            'currency' => (!empty($currency)) ? strtoupper($currency) : '',
+            'total' => [
+                'amount' => (string) $baseGrandTotal
+            ],
+            'displayItems' => $displayItems,
+            'isVirtual' => $getQuoteFormat,
+            'isEnabled' => $this->novalnetRequestHelper->isPageEnabledForExpressCheckout($page),
+            'is_pending' => $this->novalnetRequestHelper->isAmountPendingForExpressCheckout(),
+            'sheetConfig' => $this->novalnetRequestHelper->paymentSheetConfigurations()
+        ];
+    }
+
+    /**
+     * Place Order
+     *
+     * @api
+     * @param string[] $paymentData
+     * @param string[] $billingAddress
+     * @param string[] $shippingAddress
+     * @param string[] $shippingMethod
+     * @param bool $isPaymentPage
+     * @return string
+     */
+    public function placeOrder($paymentData, $billingAddress, $shippingAddress = [], $shippingMethod = [], $isPaymentPage = false)
+    {
+        try {
+            $quote = $this->cart->getQuote();
+            $quote->reserveOrderId()->save();
+            $walletToken = $paymentData['token'];
+            $paymentMethodCode = $paymentData['methodCode'];
+
+            if (empty($billingAddress['email']) && !empty($shippingAddress['email'])) {
+                $billingAddress['email'] = $shippingAddress['email'];
+            }
+
+            if (empty($billingAddress['phoneNumber']) && !empty($shippingAddress['phoneNumber'])) {
+                $billingAddress['phoneNumber'] = $shippingAddress['phoneNumber'];
+            }
+
+            // set billing address
+            $quote->getBillingAddress()->addData($this->getFormattedAddress($billingAddress));
+
+            if (!$isPaymentPage && !$quote->isVirtual()) {
+
+                if (empty($shippingAddress['email']) && !empty($billingAddress['email'])) {
+                    $shippingAddress['email'] = $billingAddress['email'];
+                }
+
+                if (empty($shippingAddress['phoneNumber']) && !empty($billingAddress['phoneNumber'])) {
+                    $shippingAddress['phoneNumber'] = $billingAddress['phoneNumber'];
+                }
+
+                $shippingIdentifier = $shippingMethod['identifier'];
+
+                // set shipping address and shipping method
+                $quote->getShippingAddress()
+                    ->addData($this->getFormattedAddress($shippingAddress))
+                    ->setShippingMethod($shippingIdentifier)
+                    ->setCollectShippingRates(true);
+            }
+
+            $quote->setTotalsCollectedFlag(false)->collectTotals();
+            $this->storeManager->setCurrentStore($quote->getStoreId());
+
+            if (!$this->customerSession->isLoggedIn()) {
+                $quote->setCheckoutMethod(Onepage::METHOD_GUEST)
+                      ->setCustomerId(null)
+                      ->setCustomerEmail($billingAddress['email'])
+                      ->setCustomerIsGuest(true)
+                      ->setCustomerGroupId(GroupInterface::NOT_LOGGED_IN_ID);
+
+                //set customer name for guest user (account information)
+                if ($quote->getCustomerFirstname() === null && $quote->getCustomerLastname() === null) {
+                    $quote->setCustomerFirstname($quote->getBillingAddress()->getFirstname())
+                        ->setCustomerLastname($quote->getBillingAddress()->getLastname());
+                    if ($quote->getBillingAddress()->getMiddlename() === null) {
+                        $quote->setCustomerMiddlename($quote->getBillingAddress()->getMiddlename());
+                    }
+                }
+            } else {
+                $quote->setCheckoutMethod(Onepage::METHOD_CUSTOMER);
+            }
+
+            $transactionData = [
+                'method' => $paymentMethodCode,
+                'additional_data' => [
+                     $paymentMethodCode . '_wallet_token' => $walletToken
+                 ]
+            ];
+
+            if (!empty($paymentData['doRedirect'])) {
+                $transactionData['additional_data'][$paymentMethodCode . '_do_redirect'] = $paymentData['doRedirect'];
+            }
+
+            //set payment additional data
+            $quote->getPayment()->importData($transactionData);
+
+            $quote->collectTotals()->save();
+
+            $this->eventManager->dispatch(
+                'checkout_submit_before',
+                ['quote' => $quote]
+            );
+
+            //submit current quote to place order
+            $order = $this->quoteManagement->submit($quote);
+
+            $payment = $order->getPayment();
+            $additionalData = (!empty($payment->getAdditionalData())) ? $this->jsonHelper->jsonDecode($payment->getAdditionalData(), true) : [];
+
+            if ($paymentMethodCode == ConfigProvider::NOVALNET_GOOGLEPAY) {
+                $additionalData['NnGpaysuccesstext'] = " (" . $paymentData['cardBrand'] . " **** ". $paymentData['lastFour'] .")";
+            } elseif ($paymentMethodCode == ConfigProvider::NOVALNET_APPLEPAY) {
+                $additionalData['NnApplepaysuccesstext'] = " (" . $paymentData['cardBrand'] . " **** ". $paymentData['lastFour'] .")";
+            }
+
+            $payment->setAdditionalData($this->jsonHelper->jsonEncode($additionalData))->save();
+
+            if (!$order || !$order->getId()) {
+                throw new LocalizedException(
+                    __('A server error stopped your order from being placed. Please try to place your order again.')
+                );
+            } else {
+                $this->eventManager->dispatch(
+                    'checkout_type_onepage_save_order_after',
+                    ['order' => $order, 'quote' => $quote]
+                );
+
+                $this->checkoutSession->setLastQuoteId($quote->getId())
+                    ->setLastSuccessQuoteId($quote->getId())
+                    ->setLastOrderId($order->getId())
+                    ->setLastRealOrderId($order->getIncrementId())
+                    ->setLastOrderStatus($order->getStatus());
+            }
+
+            $this->eventManager->dispatch(
+                'checkout_submit_all_after',
+                [
+                    'order' => $order,
+                    'quote' => $quote
+                ]
+            );
+
+            $redirectURL = $this->urlInterface->getUrl('checkout/onepage/success');
+            if (!empty($additionalData['NnRedirectURL'])) {
+                $order->setState(Order::STATE_PENDING_PAYMENT)
+                    ->setStatus(Order::STATE_PENDING_PAYMENT)
+                    ->save();
+                $order->addStatusHistoryComment(__('Customer was redirected to Novalnet'))
+                    ->save();
+
+                $this->novalnetLogger->notice('Order status and comments updated successfully');
+                $redirectURL = $additionalData['NnRedirectURL'];
+            }
+
+            return $this->jsonHelper->jsonEncode([
+                    'redirectUrl' => $redirectURL
+                ]);
+
+        } catch (\Exception $e) {
+            throw new CouldNotSaveException(__($e->getMessage()), $e);
+        }
+    }
+
+    /**
+     * Format Tax Amount to Magento Rounding
+     *
+     * @param float $amount
+     * @return double
+     */
+    public function deltaRounding($amount)
+    {
+        $temp = 0;
+        $deltaValue = 0.000001;
+        $sum = $amount + $deltaValue;
+        $rounded = $this->priceCurrency->round($sum, 2);
+        $temp = $rounded - $sum;
+
+        return $this->priceCurrency->round($amount - $temp, 2);
+    }
+
+    /**
+     * Get Quote
+     *
+     * @return \Magento\Quote\Model\Quote
+     */
+    public function getQuote()
+    {
+        $quote = $this->checkoutHelper->getCheckout()->getQuote();
+        if (!$quote->getId()) {
+            $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+            $quote = $objectManager->create(\Magento\Checkout\Model\Session::class)->getQuote();
+        }
+
+        return $quote;
+    }
+
+    /**
+     * Should Cart Price Include Tax
+     *
+     * @param null|int|string|Store $store
+     * @return bool
+     */
+    public function shouldCartPriceInclTax($store = null)
+    {
+        if ($this->taxHelper->displayCartBothPrices($store)) {
+            return true;
+        } elseif ($this->taxHelper->displayCartPriceInclTax($store)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get Formatted shipping Address
+     *
+     * @param array $info
+     * @return array
+     */
+    public function getFormattedAddress($info)
+    {
+        $regionName = (!empty($info['administrativeArea'])) ? $info['administrativeArea'] : $info['locality'];
+        $countryName = (!empty($info['countryCode'])) ? $info['countryCode'] : '';
+        $regionId = $this->getRegionIdByName($regionName, $countryName);
+
+        return [
+            'firstname' => !empty($info['firstName']) ? $info['firstName'] : '',
+            'lastname' => !empty($info['lastName']) ? $info['lastName'] : '',
+            'company' => '',
+            'email' => !empty($info['email']) ? $info['email'] : '',
+            'street' => !empty($info['addressLines']) ? $info['addressLines'] : 'Unspecified Street',
+            'city' => !empty($info['locality']) ? $info['locality'] : '',
+            'region_id' => $regionId,
+            'region' => $regionName,
+            'postcode' => !empty($info['postalCode']) ? $info['postalCode'] : '',
+            'country_id' => $countryName,
+            'telephone' => !empty($info['phoneNumber']) ? $info['phoneNumber'] : 'Unspecified Telephone',
+            'fax' => ''
+        ];
+    }
+
+    /**
+     * Get regions from country code
+     *
+     * @param mixed $countryCode
+     * @return mixed
+     */
+    public function getRegionsForCountry($countryCode)
+    {
+        $values = [];
+
+        $country = $this->countryFactory->create()->loadByCode($countryCode);
+
+        if (empty($country)) {
+            return $values;
+        }
+
+        $regions = $country->getRegions();
+
+        foreach ($regions as $region) {
+            if ($region) {
+                $values['byCode'][strtolower(trim($region->getCode()))] = $region->getId();
+                $values['byName'][strtolower(trim($region->getName()))] = $region->getId();
+            }
+        }
+
+        return $values;
+    }
+
+    /**
+     * Get Region id with region name
+     *
+     * @param mixed $regionName
+     * @param mixed $regionCountry
+     * @return string
+     */
+    public function getRegionIdByName($regionName, $regionCountry)
+    {
+        $regions = $this->getRegionsForCountry($regionCountry);
+
+        $regionName = (!empty($regionName)) ? strtolower(trim($regionName)) : '';
+
+        if (isset($regions['byName'][$regionName])) {
+            return $regions['byName'][$regionName];
+        } elseif (isset($regions['byCode'][$regionName])) {
+            return $regions['byCode'][$regionName];
+        }
+
+        return '';
+    }
+
+    /**
+     * Load product model with product id
+     *
+     * @param mixed $productId
+     * @return mixed
+     */
+    public function loadProductById($productId)
+    {
+        $model = $this->productFactory->create();
+        return $model->load($productId);
+    }
+
+    /**
+     * Get Product Price with(without) Taxes
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @param float|null $price
+     * @param bool $inclTax
+     * @param int|null $customerId
+     * @param int|null $storeId
+     *
+     * @return float
+     */
+    public function getProductDataPrice($product, $price = null, $inclTax = false, $customerId = null, $storeId = null)
+    {
+        if (!($taxAttribute = $product->getCustomAttribute('tax_class_id'))) {
+            return $price;
+        }
+
+        if (!$price) {
+            $price = $product->getPrice();
+        }
+
+        $productRateId = $taxAttribute->getValue();
+        $rate = $this->taxCalculation->getCalculatedRate($productRateId, $customerId, $storeId);
+        if ((int) $this->scopeConfig->getValue(
+            'tax/calculation/price_includes_tax',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
+        ) === 1
+        ) {
+            $priceExclTax = $price / (1 + ($rate / 100));
+        } else {
+            $priceExclTax = $price;
+        }
+
+        $priceInclTax = $priceExclTax + ($priceExclTax * ($rate / 100));
+        $productPrice = $inclTax ? $priceInclTax : $priceExclTax;
+
+        return $this->priceCurrency->round($productPrice, PriceCurrencyInterface::DEFAULT_PRECISION);
+    }
+}
diff --git a/Model/ResourceModel/Callback.php b/Model/ResourceModel/Callback.php
new file mode 100755
index 0000000..941c713
--- /dev/null
+++ b/Model/ResourceModel/Callback.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\ResourceModel;
+
+/**
+ * Novalnet resource model for callback
+ */
+class Callback extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+    /**
+     * Initialize connection
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('novalnet_payment_callback', 'id');
+    }
+}
diff --git a/Model/ResourceModel/Callback/Collection.php b/Model/ResourceModel/Callback/Collection.php
new file mode 100755
index 0000000..a455c01
--- /dev/null
+++ b/Model/ResourceModel/Callback/Collection.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\ResourceModel\Callback;
+
+class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+{
+    /**
+     * Resource initializing
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            \Novalnet\Payment\Model\Callback::class,
+            \Novalnet\Payment\Model\ResourceModel\Callback::class
+        );
+    }
+}
diff --git a/Model/ResourceModel/TransactionStatus.php b/Model/ResourceModel/TransactionStatus.php
new file mode 100755
index 0000000..5b3d411
--- /dev/null
+++ b/Model/ResourceModel/TransactionStatus.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\ResourceModel;
+
+/**
+ * Novalnet resource model for transaction status
+ */
+class TransactionStatus extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+{
+    /**
+     * Initialize connection
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init('novalnet_payment_transactionstatus', 'id');
+    }
+}
diff --git a/Model/ResourceModel/TransactionStatus/Collection.php b/Model/ResourceModel/TransactionStatus/Collection.php
new file mode 100755
index 0000000..cfea3d3
--- /dev/null
+++ b/Model/ResourceModel/TransactionStatus/Collection.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\ResourceModel\TransactionStatus;
+
+class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+{
+    /**
+     * Resource initializing
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            \Novalnet\Payment\Model\TransactionStatus::class,
+            \Novalnet\Payment\Model\ResourceModel\TransactionStatus::class
+        );
+    }
+}
diff --git a/Model/TransactionStatus.php b/Model/TransactionStatus.php
new file mode 100755
index 0000000..3c81ba7
--- /dev/null
+++ b/Model/TransactionStatus.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+
+/**
+ * Novalnet model for handling Novalnet transaction status
+ */
+class TransactionStatus extends \Magento\Framework\Model\AbstractModel
+{
+    /**
+     * @param \Magento\Framework\Model\Context                        $context
+     * @param \Magento\Framework\Registry                             $registry
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb           $resourceCollection
+     */
+    public function __construct(
+        \Magento\Framework\Model\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
+        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null
+    ) {
+        parent::__construct($context, $registry, $resource, $resourceCollection);
+    }
+
+    /**
+     * Initialize resource model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(\Novalnet\Payment\Model\ResourceModel\TransactionStatus::class);
+    }
+
+    /**
+     * Load order transaction status by custom attribute value. Attribute value should be unique
+     *
+     * @param int $value
+     * @param string $attribute
+     * @return mixed
+     */
+    public function loadByAttribute($value, $attribute)
+    {
+        $this->load($value, $attribute);
+        return $this;
+    }
+}
diff --git a/Model/Ui/ConfigProvider.php b/Model/Ui/ConfigProvider.php
new file mode 100755
index 0000000..bfb393e
--- /dev/null
+++ b/Model/Ui/ConfigProvider.php
@@ -0,0 +1,571 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Model\Ui;
+
+use Novalnet\Payment\Model\NNConfig;
+
+class ConfigProvider implements \Magento\Checkout\Model\ConfigProviderInterface
+{
+    public const NOVALNET_CC = 'novalnetCc';
+    public const NOVALNET_SEPA = 'novalnetSepa';
+    public const NOVALNET_INVOICE = 'novalnetInvoice';
+    public const NOVALNET_PREPAYMENT = 'novalnetPrepayment';
+    public const NOVALNET_INVOICE_GUARANTEE = 'novalnetInvoiceGuarantee';
+    public const NOVALNET_SEPA_GUARANTEE = 'novalnetSepaGuarantee';
+    public const NOVALNET_CASHPAYMENT = 'novalnetCashpayment';
+    public const NOVALNET_PAYPAL = 'novalnetPaypal';
+    public const NOVALNET_BANKTRANSFER = 'novalnetBanktransfer';
+    public const NOVALNET_ONLINEBANKTRANSFER = 'novalnetOnlineBanktransfer';
+    public const NOVALNET_IDEAL = 'novalnetIdeal';
+    public const NOVALNET_APPLEPAY = 'novalnetApplepay';
+    public const NOVALNET_GOOGLEPAY = 'novalnetGooglepay';
+    public const NOVALNET_EPS = 'novalnetEps';
+    public const NOVALNET_GIROPAY = 'novalnetGiropay';
+    public const NOVALNET_PRZELEWY = 'novalnetPrzelewy';
+    public const NOVALNET_POSTFINANCE = 'novalnetPostFinance';
+    public const NOVALNET_POSTFINANCE_CARD = 'novalnetPostFinanceCard';
+    public const NOVALNET_INVOICE_INSTALMENT = 'novalnetInvoiceInstalment';
+    public const NOVALNET_SEPA_INSTALMENT = 'novalnetSepaInstalment';
+    public const NOVALNET_MULTIBANCO = 'novalnetMultibanco';
+    public const NOVALNET_BANCONTACT = 'novalnetBancontact';
+    public const NOVALNET_ALIPAY = 'novalnetAlipay';
+    public const NOVALNET_TRUSTLY = 'novalnetTrustly';
+    public const NOVALNET_WECHATPAY = 'novalnetWechatpay';
+    public const NOVALNET_BLIK = 'novalnetBlik';
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    protected $filesystem;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    protected $request;
+
+    /**
+     * @var \Magento\Checkout\Model\Session
+     */
+    protected $checkoutSession;
+
+    /**
+     * @var \Magento\Framework\View\Asset\Repository
+     */
+    protected $assetRepo;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $storeManager;
+
+    /**
+     * @var \Magento\Framework\HTTP\PhpEnvironment\ServerAddress
+     */
+    protected $serverAddress;
+
+    /**
+     * @var \Novalnet\Payment\Model\TransactionStatus
+     */
+    protected $transactionStatusModel;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    protected $jsonHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @var NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @param \Magento\Framework\Filesystem $filesystem
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Framework\View\Asset\Repository $assetRepo
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\HTTP\PhpEnvironment\ServerAddress $serverAddress
+     * @param \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param NNConfig $novalnetConfig
+     */
+    public function __construct(
+        \Magento\Framework\Filesystem $filesystem,
+        \Magento\Framework\App\RequestInterface $request,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        \Magento\Framework\View\Asset\Repository $assetRepo,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\HTTP\PhpEnvironment\ServerAddress $serverAddress,
+        \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        NNConfig $novalnetConfig
+    ) {
+        $this->filesystem = $filesystem;
+        $this->request = $request;
+        $this->checkoutSession = $checkoutSession;
+        $this->assetRepo = $assetRepo;
+        $this->storeManager = $storeManager;
+        $this->serverAddress = $serverAddress;
+        $this->transactionStatusModel = $transactionStatusModel;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->jsonHelper = $jsonHelper;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Retrieve assoc array of checkout configuration
+     *
+     * @return array
+     */
+    public function getConfig()
+    {
+        $novalnetCcStyles = $this->getCcStyleConfig();
+
+        return [
+            'payment' => [
+                self::NOVALNET_CC => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_CC),
+                    'icon' => $this->getCcAvailableTypes(self::NOVALNET_CC),
+                    'cardLogoUrl' => $this->getCardLogoUrl(),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_CC),
+                    'storePayment' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_CC, 'shop_type'),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_CC, 'instructions'),
+                    'storedPayments' => $this->getOneClickToken(self::NOVALNET_CC),
+                    'tokenId' => $this->getOneClickToken(self::NOVALNET_CC, true),
+                    'iframeParams' => $this->getCcIframeParams(),
+                    'inlineForm' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_CC, 'inline_form'),
+                    'enforce_3d' => ($this->novalnetConfig->getPaymentConfig(self::NOVALNET_CC, 'enforce_3d')) ? $this->novalnetConfig->getPaymentConfig(self::NOVALNET_CC, 'enforce_3d') : 0,
+                    'labelStyle' => isset($novalnetCcStyles['standard_style_label']) ? $novalnetCcStyles['standard_style_label'] : '',
+                    'inputStyle' => isset($novalnetCcStyles['standard_style_input']) ? $novalnetCcStyles['standard_style_input'] : '',
+                    'styleText' => isset($novalnetCcStyles['standard_style_css']) ? $novalnetCcStyles['standard_style_css'] : '',
+                    'currencyCode' => $this->storeManager->getStore()->getBaseCurrencyCode(),
+                    'isZeroAmountBooking' => ($this->novalnetConfig->getPaymentConfig(self::NOVALNET_CC, 'payment_action') == NNConfig::ACTION_ZERO_AMOUNT_BOOKING) ? true : false
+                ],
+                self::NOVALNET_APPLEPAY => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_APPLEPAY),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_APPLEPAY),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_APPLEPAY, 'instructions'),
+                    'sellerName' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_APPLEPAY, 'seller_name'),
+                    'btnType' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_APPLEPAY, 'button_style'),
+                    'btnTheme' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_APPLEPAY, 'button_theme'),
+                    'btnHeight' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_APPLEPAY, 'button_height'),
+                    'btnRadius' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_APPLEPAY, 'button_corner_radius'),
+                    'langCode' => $this->novalnetRequestHelper->getLanguageCodeForPaymentSheet(),
+                    'countryCode' => $this->novalnetRequestHelper->getCountryCode(),
+                    'currencyCode' => $this->storeManager->getStore()->getBaseCurrencyCode(),
+                    'clientKey' => $this->novalnetConfig->getGlobalConfig('client_key'),
+                    'is_pending' => $this->novalnetRequestHelper->isAmountPendingForExpressCheckout(),
+                    'guest_page' => $this->novalnetRequestHelper->isPageEnabledForExpressCheckout('guest_checkout_page')
+                ],
+                self::NOVALNET_GOOGLEPAY => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_GOOGLEPAY),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_GOOGLEPAY),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_GOOGLEPAY, 'instructions'),
+                    'is_pending' => $this->novalnetRequestHelper->isAmountPendingForExpressCheckout(),
+                    'guest_page' => $this->novalnetRequestHelper->isPageEnabledForExpressCheckout('guest_checkout_page'),
+                    'sellerName' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_GOOGLEPAY, 'seller_name'),
+                    'btnType' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_GOOGLEPAY, 'button_type'),
+                    'btnTheme' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_GOOGLEPAY, 'button_theme'),
+                    'btnHeight' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_GOOGLEPAY, 'button_height'),
+                    'btnRadius' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_GOOGLEPAY, 'button_corner_radius'),
+                    'langCode' => $this->novalnetRequestHelper->getLanguageCodeForPaymentSheet(),
+                    'countryCode' => $this->novalnetRequestHelper->getCountryCode(),
+                    'currencyCode' => $this->storeManager->getStore()->getBaseCurrencyCode(),
+                    'clientKey' => $this->novalnetConfig->getGlobalConfig('client_key'),
+                    'partnerId' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_GOOGLEPAY, 'merchant_id'),
+                    'enforce3d' => ($this->novalnetConfig->getPaymentConfig(self::NOVALNET_GOOGLEPAY, 'enforce_3d')) ? $this->novalnetConfig->getPaymentConfig(self::NOVALNET_GOOGLEPAY, 'enforce_3d') : 0
+                ],
+                self::NOVALNET_SEPA => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_SEPA),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_SEPA),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_SEPA, 'instructions'),
+                    'storePayment' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_SEPA, 'shop_type'),
+                    'storedPayments' => $this->getOneClickToken(self::NOVALNET_SEPA),
+                    'tokenId' => $this->getOneClickToken(self::NOVALNET_SEPA, true),
+                    'isZeroAmountBooking' => ($this->novalnetConfig->getPaymentConfig(self::NOVALNET_SEPA, 'payment_action') == NNConfig::ACTION_ZERO_AMOUNT_BOOKING) ? true : false
+                ],
+                self::NOVALNET_INVOICE => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_INVOICE),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_INVOICE),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_INVOICE, 'instructions')
+                ],
+                self::NOVALNET_PREPAYMENT => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_PREPAYMENT),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_PREPAYMENT),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_PREPAYMENT, 'instructions'),
+                ],
+                self::NOVALNET_INVOICE_GUARANTEE => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_INVOICE_GUARANTEE),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_INVOICE_GUARANTEE),
+                    'allow_b2b_customer' => $this->novalnetConfig->getPaymentConfig(
+                        self::NOVALNET_INVOICE_GUARANTEE,
+                        'allow_b2b_customer'
+                    ),
+                    'payment_guarantee_force' => $this->novalnetConfig->getPaymentConfig(
+                        self::NOVALNET_INVOICE_GUARANTEE,
+                        'payment_guarantee_force'
+                    ),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(
+                        self::NOVALNET_INVOICE_GUARANTEE,
+                        'instructions'
+                    ),
+                ],
+                self::NOVALNET_SEPA_GUARANTEE => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_SEPA_GUARANTEE),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_SEPA_GUARANTEE),
+                    'allow_b2b_customer' => $this->novalnetConfig->getPaymentConfig(
+                        self::NOVALNET_SEPA_GUARANTEE,
+                        'allow_b2b_customer'
+                    ),
+                    'payment_guarantee_force' => $this->novalnetConfig->getPaymentConfig(
+                        self::NOVALNET_SEPA_GUARANTEE,
+                        'payment_guarantee_force'
+                    ),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(
+                        self::NOVALNET_SEPA_GUARANTEE,
+                        'instructions'
+                    ),
+                    'storePayment' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_SEPA_GUARANTEE, 'shop_type'),
+                    'storedPayments' => $this->getOneClickToken(self::NOVALNET_SEPA_GUARANTEE),
+                    'tokenId' => $this->getOneClickToken(self::NOVALNET_SEPA_GUARANTEE, true)
+                ],
+                self::NOVALNET_CASHPAYMENT => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_CASHPAYMENT),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_CASHPAYMENT),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_CASHPAYMENT, 'instructions'),
+                ],
+                self::NOVALNET_MULTIBANCO => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_MULTIBANCO),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_MULTIBANCO),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_MULTIBANCO, 'instructions'),
+                ],
+                self::NOVALNET_PAYPAL => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_PAYPAL),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_PAYPAL),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_PAYPAL, 'instructions'),
+                    'storePayment' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_PAYPAL, 'shop_type'),
+                    'storedPayments' => $this->getOneClickToken(self::NOVALNET_PAYPAL),
+                    'tokenId' => $this->getOneClickToken(self::NOVALNET_PAYPAL, true)
+                ],
+                self::NOVALNET_BANKTRANSFER => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_BANKTRANSFER),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_BANKTRANSFER),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_BANKTRANSFER, 'instructions'),
+                ],
+                self::NOVALNET_ONLINEBANKTRANSFER => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_ONLINEBANKTRANSFER),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_ONLINEBANKTRANSFER),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_ONLINEBANKTRANSFER, 'instructions'),
+                ],
+                self::NOVALNET_ALIPAY => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_ALIPAY),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_ALIPAY),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_ALIPAY, 'instructions'),
+                ],
+                self::NOVALNET_TRUSTLY => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_TRUSTLY),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_TRUSTLY),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_TRUSTLY, 'instructions'),
+                ],
+                self::NOVALNET_WECHATPAY => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_WECHATPAY),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_WECHATPAY),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_WECHATPAY, 'instructions'),
+                ],
+                self::NOVALNET_IDEAL => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_IDEAL),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_IDEAL),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_IDEAL, 'instructions'),
+                ],
+                self::NOVALNET_BLIK => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_BLIK),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_BLIK),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_BLIK, 'instructions')
+                ],
+                self::NOVALNET_BANCONTACT => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_BANCONTACT),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_BANCONTACT),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_BANCONTACT, 'instructions'),
+                ],
+                self::NOVALNET_EPS => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_EPS),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_EPS),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_EPS, 'instructions'),
+                ],
+                self::NOVALNET_GIROPAY => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_GIROPAY),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_GIROPAY),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_GIROPAY, 'instructions'),
+                ],
+                self::NOVALNET_PRZELEWY => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_PRZELEWY),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_PRZELEWY),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_PRZELEWY, 'instructions'),
+                ],
+                self::NOVALNET_POSTFINANCE => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_POSTFINANCE),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_POSTFINANCE),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_POSTFINANCE, 'instructions'),
+                ],
+                self::NOVALNET_POSTFINANCE_CARD => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_POSTFINANCE_CARD),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_POSTFINANCE_CARD),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_POSTFINANCE_CARD, 'instructions'),
+                ],
+                self::NOVALNET_INVOICE_INSTALMENT => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_INVOICE_INSTALMENT),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_INVOICE_INSTALMENT),
+                    'allow_b2b_customer' => $this->novalnetConfig->getPaymentConfig(
+                        self::NOVALNET_INVOICE_INSTALMENT,
+                        'allow_b2b_customer'
+                    ),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(
+                        self::NOVALNET_INVOICE_INSTALMENT,
+                        'instructions'
+                    ),
+                    'instalmentCycles' => $this->novalnetConfig->getPaymentConfig(
+                        self::NOVALNET_INVOICE_INSTALMENT,
+                        'instalment_cycles'
+                    )
+                ],
+                self::NOVALNET_SEPA_INSTALMENT => [
+                    'logo' => $this->getPaymentLogo(self::NOVALNET_SEPA_INSTALMENT),
+                    'testmode' => $this->novalnetConfig->getTestMode(self::NOVALNET_SEPA_INSTALMENT),
+                    'allow_b2b_customer' => $this->novalnetConfig->getPaymentConfig(
+                        self::NOVALNET_SEPA_INSTALMENT,
+                        'allow_b2b_customer'
+                    ),
+                    'instructions' => $this->novalnetConfig->getPaymentConfig(
+                        self::NOVALNET_SEPA_INSTALMENT,
+                        'instructions'
+                    ),
+                    'instalmentCycles' => $this->novalnetConfig->getPaymentConfig(
+                        self::NOVALNET_SEPA_INSTALMENT,
+                        'instalment_cycles'
+                    ),
+                    'storePayment' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_SEPA_INSTALMENT, 'shop_type'),
+                    'storedPayments' => $this->getOneClickToken(self::NOVALNET_SEPA_INSTALMENT),
+                    'tokenId' => $this->getOneClickToken(self::NOVALNET_SEPA_INSTALMENT, true)
+                ],
+            ]
+        ];
+    }
+
+    /**
+     * Retrieve Credit Card iframe params
+     *
+     * @return array
+     */
+    public function getCcIframeParams()
+    {
+        return [
+            'client_key' => $this->novalnetConfig->getGlobalConfig('client_key'),
+            'lang' => $this->novalnetRequestHelper->getDefaultLanguage(),
+            'cardHolderName' => $this->novalnetRequestHelper->getAccountHolder()
+        ];
+    }
+
+    /**
+     * Retrieve Credit Card style configuration
+     *
+     * @return array
+     */
+    public function getCcStyleConfig()
+    {
+        $ccStyleConfig = $this->novalnetConfig->getPaymentConfig(self::NOVALNET_CC, 'cc_style');
+        if (!empty($ccStyleConfig)) {
+            return $this->novalnetRequestHelper->isSerialized($ccStyleConfig)
+                    ? $this->serializer->unserialize($ccStyleConfig)
+                    : json_decode($ccStyleConfig, true);
+        }
+
+        return [];
+    }
+
+    /**
+     * Retrieve availables Credit Card types
+     *
+     * @param string $code
+     * @return array|bool
+     */
+    public function getCcAvailableTypes($code)
+    {
+        $availableTypes = $this->novalnetConfig->getPaymentConfig(self::NOVALNET_CC, 'cc_types');
+        $icons = [];
+        $ccIcons = [];
+
+        if ($availableTypes && $this->novalnetConfig->getGlobalConfig('enable_payment_logo')) {
+            foreach ($this->getCreditcardAssetUrl($code, $availableTypes) as $icon) {
+                $icons = [
+                    'src'   => $icon,
+                    'title' => $this->novalnetConfig->getPaymentConfig(self::NOVALNET_CC, 'title')
+                ];
+                $ccIcons[] = $icons;
+            }
+
+            return $ccIcons;
+        }
+
+        return false;
+    }
+
+    /**
+     * Loads the Credit card images source asset path
+     *
+     * @param string $code
+     * @param string $availableTypes
+     * @return string|array
+     */
+    public function getCreditcardAssetUrl($code, $availableTypes)
+    {
+        $cardTypes = ['VI' => 'novalnetvisa', 'MC' => 'novalnetmastercard',
+            'AE' => 'novalnetamex', 'MA' => 'novalnetmaestro', 'CI' => 'novalnetcartasi', 'UP' => 'novalnetunionpay',
+            'DC' => 'novalnetdiscover', 'DI' => 'novalnetdiners', 'JCB' => 'novalnetjcb', 'CB' => 'novalnetcartebleue'];
+        $asset = [];
+        $assetUrl = [];
+        $params = ['_secure' => $this->request->isSecure()];
+        if ($availableTypes) {
+            $availableTypes = (!empty($availableTypes)) ? explode(',', $availableTypes) : [];
+            foreach ($cardTypes as $code => $value) {
+                if (in_array($code, $availableTypes)) {
+                    $asset[$code] = $this->assetRepo->createAsset(
+                        'Novalnet_Payment::images/'. ($value) .'.png',
+                        $params
+                    );
+                    $assetUrl[] = $asset[$code]->getUrl();
+                }
+            }
+        }
+
+        return $assetUrl;
+    }
+
+    /**
+     * Retrieve one click tokens
+     *
+     * @param  string $paymentMethodCode
+     * @param  string|bool $token
+     * @return array
+     */
+    public function getOneClickToken($paymentMethodCode, $token = false)
+    {
+        $data = [];
+        $tokenId = 'new_account';
+        $customerSession = $this->novalnetRequestHelper->getCustomerSession();
+        if ($customerSession->isLoggedIn() && $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'shop_type')) {
+            if (strpos($paymentMethodCode, self::NOVALNET_SEPA) !== false) {
+                $paymentMethodCode = self::NOVALNET_SEPA;
+            }
+            $transactionStatusCollection = $this->transactionStatusModel->getCollection()
+                ->setOrder('order_id', 'DESC')
+                ->setPageSize(3)
+                ->addFieldToFilter('token_info', ['neq' => 'NULL'])
+                ->addFieldToFilter('customer_id', $customerSession->getCustomer()->getId())
+                ->addFieldToFilter('payment_method', ['like' => $paymentMethodCode . '%']);
+
+            foreach ($transactionStatusCollection as $key => $transactionStatus) {
+                if ($transactionStatus->getTokenInfo() && !empty(json_decode($transactionStatus->getTokenInfo(), true))) {
+                    $text = "";
+                    if ($paymentMethodCode == self::NOVALNET_CC) {
+                        $tokenInfo = json_decode($transactionStatus->getTokenInfo(), true);
+                        if (empty($tokenInfo['NnCardNumber']) || empty($tokenInfo['NnCardExpiryMonth']) || empty($tokenInfo['NnCardExpiryYear'])) {
+                            continue;
+                        }
+
+                        $text = __(
+                            "ending in %1 (expires %2/%3)",
+                            substr($tokenInfo['NnCardNumber'], -4),
+                            sprintf("%02d", $tokenInfo['NnCardExpiryMonth']),
+                            substr($tokenInfo['NnCardExpiryYear'], 2)
+                        );
+                    }
+
+                    if ($tokenId == 'new_account') {
+                        $tokenId = $transactionStatus->getToken();
+                    }
+
+                    $data[] = [
+                        'id' => $transactionStatus->getId(),
+                        'NnToken' => $transactionStatus->getToken(),
+                        'token_info' => json_decode($transactionStatus->getTokenInfo(), true),
+                        'text' => (!empty($text) ? $text : '')
+                    ];
+
+                }
+            }
+        }
+        if ($token) {
+            return $tokenId;
+        }
+        return $data;
+    }
+
+    /**
+     * Get Payment Logo
+     *
+     * @param  string $paymentMethodCode
+     * @return mixed
+     */
+    public function getPaymentLogo($paymentMethodCode)
+    {
+        $logoImageSrc = false;
+        if ($this->novalnetConfig->getGlobalConfig('enable_payment_logo') && !empty($paymentMethodCode)) {
+            $params = ['_secure' => $this->request->isSecure()];
+            $asset = $this->assetRepo->createAsset(
+                'Novalnet_Payment::images/'. strtolower($paymentMethodCode) .'.png',
+                $params
+            );
+            $logoImageSrc = $asset->getUrl();
+        }
+
+        return $logoImageSrc;
+    }
+
+    /**
+     * Get Payment Logo
+     *
+     * @return mixed
+     */
+    public function getCardLogoUrl()
+    {
+        $logoImageSrc = false;
+        $params = ['_secure' => $this->request->isSecure()];
+        $asset = $this->assetRepo->createAsset(
+            'Novalnet_Payment::images/',
+            $params
+        );
+        return $asset->getUrl();
+    }
+}
diff --git a/Observer/DataAssignObserver.php b/Observer/DataAssignObserver.php
new file mode 100755
index 0000000..8a0ed99
--- /dev/null
+++ b/Observer/DataAssignObserver.php
@@ -0,0 +1,406 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Observer;
+
+use Magento\Framework\Event\Observer;
+use Magento\Payment\Observer\AbstractDataAssignObserver;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class DataAssignObserver extends AbstractDataAssignObserver
+{
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    protected $datetime;
+
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Magento\Checkout\Model\Cart
+     */
+    protected $cart;
+
+    /**
+     * @var \Novalnet\Payment\Logger\NovalnetLogger
+     */
+    private $novalnetLogger;
+
+    /**
+     * @var \Magento\Backend\Model\Session\Quote
+     */
+    private $backendQuoteSession;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $datetime
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Magento\Backend\Model\Session\Quote $backendQuoteSession
+     * @param \Magento\Checkout\Model\Cart $cart
+     * @param \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Stdlib\DateTime\DateTime $datetime,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Magento\Backend\Model\Session\Quote $backendQuoteSession,
+        \Magento\Checkout\Model\Cart $cart,
+        \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->datetime = $datetime;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->backendQuoteSession = $backendQuoteSession;
+        $this->cart = $cart;
+        $this->novalnetLogger = $novalnetLogger;
+    }
+
+    /**
+     * Get Quote
+     *
+     * @return object $quote
+     */
+    public function getCartQuote()
+    {
+        $quote = (!$this->novalnetRequestHelper->isAdmin())
+            ? $this->cart->getQuote()
+            : $this->backendQuoteSession->getQuote();
+        return $quote;
+    }
+
+    /**
+     * Execute
+     *
+     * @param Observer $observer
+     * @return void
+     */
+    public function execute(Observer $observer)
+    {
+        $method = $this->readMethodArgument($observer);
+        $paymentMethodCode = $method->getCode();
+        $this->novalnetRequestHelper->getMethodSession($paymentMethodCode, true);
+
+        $parameters = [
+            '_pan_hash', '_unique_id', '_do_redirect', '_iban', '_create_token', '_token', '_cycle', '_dob', '_wallet_token', '_bic'
+        ];
+        $this->setMethodSession($observer, $paymentMethodCode, $parameters);
+    }
+
+    /**
+     * Set method session
+     *
+     * @param \Magento\Framework\Event\Observer $observer
+     * @param string $paymentMethodCode
+     * @param array $parameters
+     * @return void
+     */
+    private function setMethodSession($observer, $paymentMethodCode, $parameters)
+    {
+        $additionalData = $this->readDataArgument($observer)->getAdditionalData();
+        $methodSession = $this->novalnetRequestHelper->getMethodSession($paymentMethodCode);
+        $this->validateGuaranteePayment($paymentMethodCode);
+        $this->validateBillingShippingAddress($paymentMethodCode);
+
+        foreach ($parameters as $parameter) {
+            if (!empty($additionalData[$paymentMethodCode . $parameter])) {
+                $methodSession->setData(
+                    $paymentMethodCode . $parameter,
+                    $additionalData[$paymentMethodCode . $parameter]
+                );
+            }
+        }
+
+        $forcedPayment = '';
+        $birthDate = !empty($additionalData[$paymentMethodCode . '_dob']) ? $additionalData[$paymentMethodCode . '_dob'] : '';
+
+        if (!empty($paymentMethodCode) && preg_match('/(.*)Guarantee/', $paymentMethodCode, $reassignedPaymentMethodCode)) {
+            $forcedPayment = $reassignedPaymentMethodCode[1];
+        }
+
+        // validate DOB and address - if failed proceed as force (non gurantee payment)
+        if (in_array($paymentMethodCode, [
+                ConfigProvider::NOVALNET_INVOICE_GUARANTEE,
+                ConfigProvider::NOVALNET_SEPA_GUARANTEE
+            ]) &&
+            (($birthDate && !$this->validateBirthDate($birthDate)) || !$this->checkBillingShippingAreSame() || !$this->checkGuaranteeConditions($paymentMethodCode) || !$this->validateSubscriptionConditions($paymentMethodCode))
+        ) {
+            if ($this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'payment_guarantee_force') &&
+                $forcedPayment && $this->novalnetConfig->getPaymentConfig($forcedPayment, 'active')
+            ) {
+                $methodSession = $this->novalnetRequestHelper->getMethodSession($paymentMethodCode);
+                $forcedPaymentSession = $this->novalnetRequestHelper->getMethodSession($forcedPayment);
+
+                if ($forcedPayment == ConfigProvider::NOVALNET_SEPA) {
+                    $forcedPaymentSession->setData($forcedPayment.'_iban', $methodSession->getData($paymentMethodCode.'_iban'));
+                    $forcedPaymentSession->setData($forcedPayment.'_bic', $methodSession->getData($paymentMethodCode.'_bic'));
+                }
+
+                $forcedPaymentSession->setData($forcedPayment.'_token', $methodSession->getData($paymentMethodCode.'_token'));
+                $forcedPaymentSession->setData($forcedPayment.'_create_token', $methodSession->getData($paymentMethodCode.'_create_token'));
+                $forcedPaymentSession->setData($forcedPayment.'_dob', $methodSession->getData($paymentMethodCode.'_dob'));
+                $quote = $this->getCartQuote();
+                $quote->getPayment()->setMethod($forcedPayment);
+
+                if ($this->novalnetRequestHelper->isAdmin()) {
+                    $methodSession->setData($paymentMethodCode.'_force', 1);
+                    $methodSession->setData($paymentMethodCode.'_force_payment', $forcedPayment);
+                }
+
+                $this->novalnetLogger->notice("Update payment method from $paymentMethodCode to $forcedPayment");
+            } else {
+                throw new \Magento\Framework\Exception\LocalizedException(__('You need to be at least 18 years old'));
+            }
+        }
+    }
+
+    /**
+     * To check billing and shipping address are same
+     *
+     * @return boolean
+     */
+    public function checkBillingShippingAreSame()
+    {
+        $quote = $this->getCartQuote();
+        if ($quote->getIsVirtual()) {
+            return true;
+        }
+
+        $billingAddress = $quote->getBillingAddress();
+        $shipingAddress = $quote->getShippingAddress();
+        $billingStreet = $this->getStreet($billingAddress);
+        $shipingStreet = $this->getStreet($shipingAddress);
+
+        if ($billingStreet == $shipingStreet &&
+            $billingAddress->getCity() == $shipingAddress->getCity() &&
+            $billingAddress->getCountryId() ==$shipingAddress->getCountryId() &&
+            $billingAddress->getPostcode() == $shipingAddress->getPostcode()
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * To check guarantee conditions
+     *
+     * @param string $paymentMethodCode
+     * @return bool
+     */
+    public function checkGuaranteeConditions($paymentMethodCode)
+    {
+        $quote = $this->getCartQuote();
+        $orderAmount = $this->novalnetRequestHelper->getFormattedAmount($quote->getBaseGrandTotal());
+        $countryCode = (!empty($quote->getBillingAddress()->getCountryId())) ? strtoupper($quote->getBillingAddress()->getCountryId()) : ''; // Get country code
+        $b2b = (bool) $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'allow_b2b_customer');
+
+        if ($quote->getBaseCurrencyCode() != 'EUR') {
+            return false;
+        } elseif ($orderAmount < 999) {
+            return false;
+        } elseif (!$this->novalnetConfig->isAllowedCountry($countryCode, $b2b)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check customer DOB is valid
+     *
+     * @param  string $birthDate
+     * @return boolean
+     */
+    public function validateBirthDate($birthDate)
+    {
+        if (empty($birthDate)) {
+            return true;
+        }
+        $age = strtotime('+18 years', strtotime($birthDate));
+        $currentDate = $this->datetime->gmtTimestamp();
+        return ($currentDate < $age) ? false : true;
+    }
+
+    /**
+     * To validate billing and shipping address
+     *
+     * @param  string $paymentMethodCode
+     * @return void
+     */
+    public function validateBillingShippingAddress($paymentMethodCode)
+    {
+        if (in_array($paymentMethodCode, [
+            ConfigProvider::NOVALNET_INVOICE_GUARANTEE,
+            ConfigProvider::NOVALNET_SEPA_GUARANTEE,
+            ConfigProvider::NOVALNET_SEPA_INSTALMENT,
+            ConfigProvider::NOVALNET_INVOICE_INSTALMENT
+        ])) {
+            // throw error on (non forced gurantee || instalment) address check failed
+            if (!$this->checkBillingShippingAreSame() &&
+                !$this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'payment_guarantee_force') // non force
+            ) {
+                $errorPaymentName = in_array(
+                    $paymentMethodCode,
+                    [ConfigProvider::NOVALNET_SEPA_GUARANTEE, ConfigProvider::NOVALNET_INVOICE_GUARANTEE]
+                ) ? __('payment guarantee') : __('instalment payment');
+
+                throw new \Magento\Framework\Exception\LocalizedException(__(
+                    "The payment cannot be processed, because the basic requirements for the %1 haven't been met (The shipping address must be the same as the billing address)",
+                    $errorPaymentName
+                ));
+            }
+        }
+    }
+
+    /**
+     * Check Allowed Country
+     *
+     * @param  string $paymentMethodCode
+     * @return mixed
+     */
+    public function validateGuaranteePayment($paymentMethodCode)
+    {
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $coreSession = $objectManager->create(\Magento\Framework\Session\SessionManagerInterface::class);
+
+        //skip conditions for recurring order
+        if ($coreSession->getRecurringProcess()) {
+            return true;
+        }
+
+        if (in_array(
+            $paymentMethodCode,
+            [
+                ConfigProvider::NOVALNET_INVOICE_GUARANTEE,
+                ConfigProvider::NOVALNET_SEPA_GUARANTEE,
+                ConfigProvider::NOVALNET_SEPA_INSTALMENT,
+                ConfigProvider::NOVALNET_INVOICE_INSTALMENT
+            ]
+        )) {
+            $quote = $this->getCartQuote();
+            $orderAmount = $this->novalnetRequestHelper->getFormattedAmount($quote->getBaseGrandTotal());
+            $countryCode = (!empty($quote->getBillingAddress()->getCountryId())) ? strtoupper($quote->getBillingAddress()->getCountryId()) : ''; // Get country code
+            $b2b = (bool) $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'allow_b2b_customer');
+            $billingAddress = $quote->getBillingAddress();
+            $errorPaymentName = in_array(
+                $paymentMethodCode,
+                [ConfigProvider::NOVALNET_SEPA_GUARANTEE, ConfigProvider::NOVALNET_INVOICE_GUARANTEE]
+            ) ? __('payment guarantee') : __('instalment payment');
+            $errorText = '';
+            if ($quote->getBaseCurrencyCode() != 'EUR') {
+                $errorText = __('Only EUR currency allowed %1', $errorPaymentName);
+            } elseif ($orderAmount < 999) {
+                $errorText = __('Minimum order amount should be %1', $errorPaymentName);
+            } elseif (!$this->novalnetConfig->isAllowedCountry($countryCode, $b2b)) {
+                $errorText = __('Only DE, AT, CH countries allowed %1', $errorPaymentName);
+            }
+
+            if (!empty($errorText) && !$this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'payment_guarantee_force')) {
+                throw new \Magento\Framework\Exception\LocalizedException(__(
+                    $errorText
+                ));
+            }
+        }
+    }
+
+    /**
+     * Validate subscription conditions for Guarantee payments
+     *
+     * @param string $paymentMethodCode
+     * @return bool
+     */
+    public function validateSubscriptionConditions($paymentMethodCode)
+    {
+        if (in_array(
+            $paymentMethodCode,
+            [
+                ConfigProvider::NOVALNET_INVOICE_GUARANTEE,
+                ConfigProvider::NOVALNET_SEPA_GUARANTEE
+            ]
+        )) {
+            $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+            $coreSession = $objectManager->create(\Magento\Framework\Session\SessionManagerInterface::class);
+
+            //skip conditions for recurring order
+            if ($coreSession->getRecurringProcess()) {
+                return true;
+            }
+
+            $errorText = '';
+            $quote = $this->getCartQuote();
+            $subscription = false;
+            if (!empty($quote->getItems())) {
+                foreach ($quote->getItems() as $item) {
+                    $additionalData = (!empty($item->getAdditionalData())) ? json_decode($item->getAdditionalData(), true) : [];
+                    if (!empty($additionalData['period_unit']) && !empty($additionalData['billing_frequency'])) {
+                        $subscription = true;
+                        break;
+                    }
+                }
+            }
+            if ($subscription) {
+                if ($quote->getItemsCount() > 1) {
+                    $errorText = __('Multi cart not supported for this payment');
+                } elseif ($quote->getItemsCount() == 1) {
+                    foreach ($quote->getAllItems() as $item) {
+                        $orderAmount = $this->novalnetRequestHelper->getFormattedAmount($item->getBaseRowTotal());
+                        if ($orderAmount < 999) {
+                            $errorText = __('Minimum order amount should be %1', 'payment guarantee');
+                        }
+                    }
+                }
+            }
+
+            if (!empty($errorText) && $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'payment_guarantee_force')) {
+                return false;
+            } if (!empty($errorText)) {
+                throw new \Magento\Framework\Exception\LocalizedException(__(
+                    $errorText
+                ));
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Get Street from address
+     *
+     * @param object $address
+     * @return string
+     */
+    public function getStreet($address)
+    {
+        if (method_exists($address, 'getStreetFull')) {
+            $street = $address->getStreetFull();
+        } else {
+            $street = implode(' ', [$address->getStreetLine1(), $address->getStreetLine2()]);
+        }
+
+        return $street;
+    }
+}
diff --git a/Observer/OrderPlacebefore.php b/Observer/OrderPlacebefore.php
new file mode 100755
index 0000000..c345b75
--- /dev/null
+++ b/Observer/OrderPlacebefore.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class OrderPlacebefore implements ObserverInterface
+{
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Novalnet\Payment\Logger\NovalnetLogger
+     */
+    private $novalnetLogger;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+    ) {
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->novalnetLogger = $novalnetLogger;
+    }
+
+    /**
+     * Execute
+     *
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return void
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        $paymentMethodCode = $observer->getOrder()->getPayment()->getMethod();
+        if (in_array(
+            $paymentMethodCode,
+            [
+                ConfigProvider::NOVALNET_INVOICE_GUARANTEE,
+                ConfigProvider::NOVALNET_SEPA_GUARANTEE
+             ]
+        ) && $this->novalnetRequestHelper->isAdmin()) {
+            $methodSession = $this->novalnetRequestHelper->getMethodSession($paymentMethodCode);
+            $forcedPayment = $methodSession->getData($paymentMethodCode.'_force_payment');
+            if ($methodSession->getData($paymentMethodCode.'_force') && $forcedPayment) {
+                //set payment methode to proceed guarantee force
+                $observer->getOrder()->getPayment()->setMethod($forcedPayment);
+                $this->novalnetLogger->notice("Update payment method from $paymentMethodCode to $forcedPayment");
+            }
+        }
+    }
+}
diff --git a/Observer/PaymentMethodIsActive.php b/Observer/PaymentMethodIsActive.php
new file mode 100755
index 0000000..ed62457
--- /dev/null
+++ b/Observer/PaymentMethodIsActive.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Observer;
+
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class PaymentMethodIsActive implements ObserverInterface
+{
+    /**
+     * @var \Magento\Sales\Model\Order
+     */
+    protected $salesOrderModel;
+
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @param \Magento\Sales\Model\Order $salesOrderModel
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     */
+    public function __construct(
+        \Magento\Sales\Model\Order $salesOrderModel,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+    ) {
+        $this->salesOrderModel = $salesOrderModel;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+    }
+
+    /**
+     * Execute
+     *
+     * @param Observer $observer
+     *
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    public function execute(Observer $observer)
+    {
+        $event = $observer->getEvent();
+        $methodInstance = $event->getData('method_instance');
+        $quote = $event->getData('quote');
+        $result = $event->getData('result');
+        $paymentMethodCode = $methodInstance->getCode();
+
+        if ($quote && $result->getData('is_available') && strpos($paymentMethodCode, 'novalnet') === 0) {
+
+            $available = $this->novalnetRequestHelper->validateBasicParams()
+                && $this->validateOrdersCount($paymentMethodCode)
+                && $this->validateCustomerGroup($paymentMethodCode);
+
+            if (in_array(
+                $paymentMethodCode,
+                [
+                    ConfigProvider::NOVALNET_SEPA_GUARANTEE,
+                    ConfigProvider::NOVALNET_INVOICE_GUARANTEE,
+                    ConfigProvider::NOVALNET_SEPA_INSTALMENT,
+                    ConfigProvider::NOVALNET_INVOICE_INSTALMENT
+                ]
+            )) {
+                $orderAmount = $this->novalnetRequestHelper->getFormattedAmount($quote->getBaseGrandTotal());
+                $countryCode = (!empty($quote->getBillingAddress()->getCountryId())) ? strtoupper($quote->getBillingAddress()->getCountryId()) : ''; // Get country code
+                $b2b = (bool) $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'allow_b2b_customer');
+                $force = "";
+
+                if (in_array(
+                    $paymentMethodCode,
+                    [ConfigProvider::NOVALNET_SEPA_INSTALMENT, ConfigProvider::NOVALNET_INVOICE_INSTALMENT]
+                )) {
+                    $allcycle = $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'instalment_cycles');
+                    $allcycle = (!empty($allcycle)) ? explode(',', $allcycle) : [];
+                    $orderAmount = isset($allcycle[0]) ? ($orderAmount / $allcycle[0]) : $orderAmount;
+                } else {
+                    $force = $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'payment_guarantee_force');
+                }
+
+                if (!$force && ($orderAmount < 999 || $quote->getBaseCurrencyCode() != 'EUR'
+                    || !$this->novalnetConfig->isAllowedCountry($countryCode, $b2b) ||
+                    ($this->novalnetRequestHelper->isAdmin() && !$this->checkBillingShippingAreSame($quote)))
+                ) {
+                    $available = false;
+                }
+            }
+
+            if (in_array(
+                $paymentMethodCode,
+                [
+                ConfigProvider::NOVALNET_SEPA,
+                ConfigProvider::NOVALNET_INVOICE,
+                ]
+            )) {
+                $paymentCode = (!empty($paymentMethodCode) && preg_match('/Sepa/', $paymentMethodCode)) ? ConfigProvider::NOVALNET_SEPA_GUARANTEE : ConfigProvider::NOVALNET_INVOICE_GUARANTEE;
+                $force = $this->novalnetConfig->getPaymentConfig($paymentCode, 'payment_guarantee_force');
+                $active = $this->novalnetConfig->getPaymentConfig($paymentCode, 'active');
+                if ($active && !$force) {
+                    $available = false;
+                }
+            }
+
+            $result->setData('is_available', $available);
+        }
+    }
+
+    /**
+     * Check orders count by customer id
+     *
+     * @param  string $paymentMethodCode
+     * @return bool
+     */
+    public function validateOrdersCount($paymentMethodCode)
+    {
+        $minOrderCount = $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'orders_count');
+        if ($minOrderCount) {
+            if ($this->novalnetRequestHelper->getCustomerSession()->isLoggedIn()) {
+                $customerId = $this->novalnetRequestHelper->getCustomerSession()->getCustomer()->getId();
+            } elseif ($this->novalnetRequestHelper->isAdmin()) {
+                $customerId = $this->novalnetRequestHelper->getAdminCheckoutSession()->getCustomerId();
+            } else {
+                return false;
+            }
+
+            // get orders by customer id
+            $ordersCount = $this->salesOrderModel->getCollection()->addFieldToFilter('customer_id', $customerId)
+                ->count();
+            return ($ordersCount >= trim($minOrderCount));
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Check whether the payment is available for current customer group
+     *
+     * @param  string $paymentMethodCode
+     * @return boolean
+     */
+    public function validateCustomerGroup($paymentMethodCode)
+    {
+        // Excluded customer groups from payment configuration
+        $excludedGroups = $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'user_group_excluded');
+        if (!$this->novalnetRequestHelper->isAdmin() && !empty($excludedGroups) && strlen($excludedGroups)) {
+            $excludedGroups = (!empty($excludedGroups)) ? explode(',', $excludedGroups) : [];
+            $customerGroupId = $this->novalnetRequestHelper->getCustomerSession()->getCustomer()->getGroupId();
+            if (!$this->novalnetRequestHelper->getCustomerSession()->isLoggedIn()) {
+                $customerGroupId = 0;
+            }
+            return !in_array($customerGroupId, $excludedGroups);
+        }
+
+        return true;
+    }
+
+    /**
+     * Check billing and shipping address are same for guarantee payments
+     *
+     * @param mixed $quote
+     * @return boolean
+     */
+    public function checkBillingShippingAreSame($quote)
+    {
+        $billingAddress = $quote->getBillingAddress();
+        $shippingAddress = !$quote->getIsVirtual() ? $quote->getShippingAddress() : '';
+        $billingStreet = (!empty($billingAddress->getStreet())) ? implode(',', $billingAddress->getStreet()) : '';
+        $shippingStreet = (!empty($shippingAddress->getStreet())) ? implode(',', $shippingAddress->getStreet()) : '';
+        return ($shippingAddress == '' || (($billingAddress->getCity() == $shippingAddress->getCity())
+            && ($billingStreet == $shippingStreet)
+            && ($billingAddress->getPostcode() == $shippingAddress->getPostcode())
+            && ($billingAddress->getCountry() == $shippingAddress->getCountry()))
+        );
+    }
+}
diff --git a/Observer/ProcessCaptureAction.php b/Observer/ProcessCaptureAction.php
new file mode 100755
index 0000000..35a55cb
--- /dev/null
+++ b/Observer/ProcessCaptureAction.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+use Novalnet\Payment\Model\NNConfig;
+
+class ProcessCaptureAction implements ObserverInterface
+{
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * @var \Magento\Framework\UrlInterface
+     */
+    protected $urlInterface;
+
+    /**
+     * @var \Magento\Framework\DB\TransactionFactory
+     */
+    protected $dbTransaction;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Email\Sender\InvoiceSender
+     */
+    protected $invoiceSender;
+
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Novalnet\Payment\Logger\NovalnetLogger
+     */
+    protected $novalnetLogger;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Framework\UrlInterface $urlInterface
+     * @param \Magento\Framework\DB\TransactionFactory $dbTransaction
+     * @param \Magento\Sales\Model\Order\Email\Sender\InvoiceSender $invoiceSender
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     */
+    public function __construct(
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\UrlInterface $urlInterface,
+        \Magento\Framework\DB\TransactionFactory $dbTransaction,
+        \Magento\Sales\Model\Order\Email\Sender\InvoiceSender $invoiceSender,
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer
+    ) {
+        $this->urlInterface = $urlInterface;
+        $this->dbTransaction = $dbTransaction;
+        $this->invoiceSender = $invoiceSender;
+        $this->logger = $logger;
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->novalnetLogger = $novalnetLogger;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Process capture Action
+     *
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return mixed
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        try {
+            $invoice = $observer->getEvent()->getInvoice();
+            $order = $invoice->getOrder();
+            $storeId = $order->getStoreId();
+            $paymentMethodCode = $order->getPayment()->getMethod();
+
+            if (!empty($paymentMethodCode) && preg_match('/novalnet/', $paymentMethodCode)) {
+
+                if ($paymentMethodCode == ConfigProvider::NOVALNET_INVOICE) {
+                    $additionalData = [];
+                    if (!empty($order->getPayment()->getAdditionalData())) {
+                        $additionalData = $this->novalnetRequestHelper->isSerialized($order->getPayment()->getAdditionalData())
+                            ? $this->serializer->unserialize($order->getPayment()->getAdditionalData())
+                            : json_decode($order->getPayment()->getAdditionalData(), true);
+                    }
+                    if (!empty($additionalData['NnGuarantee'])) {
+                        $state = \Magento\Sales\Model\Order\Invoice::STATE_PAID;
+                    } else {
+                        $state = \Magento\Sales\Model\Order\Invoice::STATE_OPEN;
+                    }
+                    // set Invoice state as Open
+                    $invoice->setState($state);
+                }
+
+                $currentUrl = (!empty($this->urlInterface->getCurrentUrl())) ? $this->urlInterface->getCurrentUrl() : '';
+
+                if ($this->novalnetRequestHelper->isAdmin() &&
+                    !preg_match('/sales_order_create/i', $currentUrl)
+                ) {
+                    $captureOrderStatus = $this->novalnetConfig->getPaymentConfig(
+                        $paymentMethodCode,
+                        'order_status',
+                        $storeId
+                    );
+                    // Set capture status for Novalnet payments
+                    $order->setState(\Magento\Sales\Model\Order::STATE_PROCESSING)
+                    ->setStatus($captureOrderStatus)
+                    ->save();
+
+                    $order->addStatusHistoryComment(__('The transaction has been confirmed'), false)
+                    ->save();
+                }
+
+                if ($this->novalnetRequestHelper->isAdmin() && (preg_match('/order_create/i', $currentUrl) || preg_match('/ordercapture/i', $currentUrl))) {
+                    $this->dbTransaction->create()->addObject($invoice)->addObject($order)->save();
+                    $shopVersion = (string) $this->novalnetRequestHelper->getMagentoVersion();
+                    if (version_compare('2.4.0', $shopVersion) == 1) {
+                        $this->invoiceSender->send($invoice);
+                    }
+                }
+            }
+        } catch (\Exception $e) {
+            $this->logger->critical($e);
+            $this->novalnetLogger->error($e);
+        }
+
+        return $this;
+    }
+}
diff --git a/Observer/ProcessNovalnetPayment.php b/Observer/ProcessNovalnetPayment.php
new file mode 100755
index 0000000..1e0b01c
--- /dev/null
+++ b/Observer/ProcessNovalnetPayment.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Sales\Model\Order;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+use Novalnet\Payment\Model\NNConfig;
+
+class ProcessNovalnetPayment implements ObserverInterface
+{
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Serialize
+     */
+    protected $serializer;
+
+    /**
+     * @var \Magento\Sales\Model\Service\InvoiceService
+     */
+    protected $invoiceService;
+
+    /**
+     * @var \Magento\Framework\DB\Transaction
+     */
+    protected $transaction;
+
+    /**
+     * @var \Magento\Framework\Session\SessionManagerInterface
+     */
+    protected $coreSession;
+
+    /**
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Serialize\Serializer\Serialize $serializer
+     * @param \Magento\Sales\Model\Service\InvoiceService $invoiceService
+     * @param \Magento\Framework\DB\Transaction $transaction
+     * @param \Magento\Framework\Session\SessionManagerInterface $coreSession
+     */
+    public function __construct(
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig,
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Serialize\Serializer\Serialize $serializer,
+        \Magento\Sales\Model\Service\InvoiceService $invoiceService,
+        \Magento\Framework\DB\Transaction $transaction,
+        \Magento\Framework\Session\SessionManagerInterface $coreSession
+    ) {
+        $this->novalnetConfig = $novalnetConfig;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->serializer = $serializer;
+        $this->invoiceService = $invoiceService;
+        $this->transaction = $transaction;
+        $this->coreSession = $coreSession;
+    }
+
+    /**
+     * If it's redrected to checkout onepage/multishipping success page - do this
+     *
+     * @param  \Magento\Framework\Event\Observer $observer
+     * @return void
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        $order = $observer->getEvent()->getOrder();
+        if ($order) {
+            $storeId = $order->getStoreId();
+            $paymentMethodCode = $order->getPayment()->getMethod();
+
+            if (!empty($paymentMethodCode) && preg_match('/novalnet/', $paymentMethodCode) && $order->getPayment()->getAdditionalData()) {
+
+                // unset session data after request formation
+                $subscription = false;
+                foreach ($order->getItems() as $item) {
+                    $additionalData = [];
+                    if (!empty($item->getAdditionalData())) {
+                        $additionalData = json_decode($item->getAdditionalData(), true);
+                    }
+
+                    if (!empty($additionalData['period_unit']) && !empty($additionalData['billing_frequency'])) {
+                        $subscription = true;
+                        break;
+                    }
+                }
+                if ($subscription != true) {
+                    $this->novalnetRequestHelper->getMethodSession($paymentMethodCode, true);
+                }
+                $additionalData = (!empty($order->getPayment()->getAdditionalData())) ? json_decode($order->getPayment()->getAdditionalData(), true) : [];
+                $transactionStatus = !empty($additionalData['NnStatus']) ? $additionalData['NnStatus'] : '';
+                if (!isset($additionalData['NnRedirectURL'])) {
+                    $orderStatus = 'pending';
+
+                    if ($transactionStatus == 'ON_HOLD' || ($this->novalnetConfig->isZeroAmountBookingSupported($paymentMethodCode) && $this->novalnetConfig->getPaymentConfig($paymentMethodCode, 'payment_action') == NNConfig::ACTION_ZERO_AMOUNT_BOOKING)) {
+                        $orderStatus = $this->novalnetConfig->getGlobalOnholdStatus($storeId);
+                    } elseif ($transactionStatus == 'CONFIRMED' || ($transactionStatus == 'PENDING' && in_array(
+                        $paymentMethodCode,
+                        [
+                            ConfigProvider::NOVALNET_INVOICE,
+                            ConfigProvider::NOVALNET_PREPAYMENT,
+                            ConfigProvider::NOVALNET_CASHPAYMENT,
+                            ConfigProvider::NOVALNET_MULTIBANCO
+                        ]
+                    )
+                    )) {
+                        $orderStatus = $this->novalnetConfig->getPaymentConfig(
+                            $paymentMethodCode,
+                            'order_status',
+                            $storeId
+                        );
+                    }
+
+                    if (($paymentMethodCode == ConfigProvider::NOVALNET_PAYPAL) && $this->coreSession->getRecurringProcess() && $transactionStatus == 'CONFIRMED') {
+                        $invoice = $this->invoiceService->prepareInvoice($order);
+                        $invoice->setRequestedCaptureCase(\Magento\Sales\Model\Order\Invoice::CAPTURE_OFFLINE);
+                        $invoice->register();
+                        $invoice->save();
+                        $transactionSave = $this->transaction->addObject(
+                            $invoice
+                        )->addObject(
+                            $invoice->getOrder()
+                        );
+                        $transactionSave->save();
+                    }
+
+                    $orderStatus = $orderStatus ? $orderStatus : Order::STATE_PROCESSING;
+                    // Verifies and sets order status
+                    $order->setState(Order::STATE_PROCESSING)
+                          ->setStatus($orderStatus);
+                    $order->save();
+                }
+            }
+        }
+    }
+}
diff --git a/Observer/SavePaymentDataForRecurring.php b/Observer/SavePaymentDataForRecurring.php
new file mode 100755
index 0000000..baf503a
--- /dev/null
+++ b/Observer/SavePaymentDataForRecurring.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class SavePaymentDataForRecurring implements ObserverInterface
+{
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    protected $date;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    protected $jsonHelper;
+
+    /**
+     * @var \Novalnet\Payment\Model\TransactionStatus
+     */
+    protected $transactionStatusModel;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Stdlib\DateTime\DateTime $date,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel
+    ) {
+        $this->date = $date;
+        $this->jsonHelper = $jsonHelper;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->transactionStatusModel = $transactionStatusModel;
+    }
+
+    /**
+     * Save payment data for future recurring order
+     *
+     * @param  \Magento\Framework\Event\Observer $observer
+     * @return void
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        $order = $observer->getOrder();
+        $paymentMethodCode = $observer->getPaymentCode();
+        if (!empty($paymentMethodCode) && preg_match('/novalnet/', $paymentMethodCode)) {
+            $token = $this->getToken($paymentMethodCode, $order->getIncrementId());
+            $profileData = $observer->getItem();
+            if (!empty($token)) {
+                $profileData->setToken($token);
+            }
+
+            //Save date of birth and company for future recurring
+            if (in_array($paymentMethodCode, [ConfigProvider::NOVALNET_INVOICE_GUARANTEE, ConfigProvider::NOVALNET_SEPA_GUARANTEE])) {
+                $methodSession = $this->novalnetRequestHelper->getMethodSession($paymentMethodCode);
+                $recurringData = [];
+                if ($methodSession->getData($paymentMethodCode . '_dob')) {
+                    $recurringData['dob'] = $this->date->date(
+                        'Y-m-d',
+                        $methodSession->getData($paymentMethodCode . '_dob')
+                    );
+                }
+                $profileData->setAdditionalData($this->jsonHelper->jsonEncode($recurringData));
+            }
+            // unset session data after request formation
+            $this->novalnetRequestHelper->getMethodSession($paymentMethodCode, true);
+        }
+    }
+
+    /**
+     * Get Token
+     *
+     * @param string $paymentMethodCode
+     * @param int $orderId
+     * @return string
+     */
+    public function getToken($paymentMethodCode, $orderId)
+    {
+        $methodSession = $this->novalnetRequestHelper->getMethodSession($paymentMethodCode);
+        $token = $methodSession->getData($paymentMethodCode . '_token');
+        if (empty($token)) {
+            $transactionStatus = $this->transactionStatusModel->getCollection()->setPageSize(1)
+                ->addFieldToFilter('order_id', $orderId)
+                ->getFirstItem();
+            $token = $transactionStatus->getToken();
+        }
+        return $token;
+    }
+}
diff --git a/Observer/SetPaymentDataForRecurring.php b/Observer/SetPaymentDataForRecurring.php
new file mode 100755
index 0000000..5d82847
--- /dev/null
+++ b/Observer/SetPaymentDataForRecurring.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class SetPaymentDataForRecurring implements ObserverInterface
+{
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetRequestHelper;
+
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    protected $date;
+
+    /**
+     * @var \Novalnet\Payment\Model\TransactionStatus
+     */
+    protected $transactionStatusModel;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetRequestHelper
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
+     * @param \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetRequestHelper,
+        \Magento\Framework\Stdlib\DateTime\DateTime $date,
+        \Novalnet\Payment\Model\TransactionStatus $transactionStatusModel
+    ) {
+        $this->date = $date;
+        $this->novalnetRequestHelper = $novalnetRequestHelper;
+        $this->transactionStatusModel = $transactionStatusModel;
+    }
+
+    /**
+     * Save payment data for future recurring order
+     *
+     * @param  \Magento\Framework\Event\Observer $observer
+     * @return void
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        $paymentData = $observer->getPaymentData()->getData();
+        $paymentDataObject = $observer->getPaymentData();
+        $profile = $observer->getProfile();
+        $paymentCode = $observer->getPaymentCode();
+        if (in_array($paymentCode, [ConfigProvider::NOVALNET_CC, ConfigProvider::NOVALNET_SEPA ,ConfigProvider::NOVALNET_PAYPAL])) {
+            $recurringDetails = $profile->getToken();
+
+            if (!empty($profile->getToken())) {
+                $paymentData['additional_data'][$paymentCode.'_token'] = $profile->getToken();
+            }
+        } elseif (in_array($paymentCode, [ConfigProvider::NOVALNET_INVOICE_GUARANTEE, ConfigProvider::NOVALNET_SEPA_GUARANTEE])) {
+            if (!empty($profile->getAdditionalData())) {
+                $additionalData = json_decode($profile->getAdditionalData(), true);
+                if (isset($additionalData['dob'])) {
+                    $paymentData['additional_data'][$paymentCode.'_dob'] = $additionalData['dob'];
+                }
+                if (!empty($profile->getToken())) {
+                    $paymentData['additional_data'][$paymentCode.'_token'] = $profile->getToken();
+                }
+            }
+        }
+        $paymentDataObject->setData($paymentData);
+    }
+}
diff --git a/Observer/SetVoidStatus.php b/Observer/SetVoidStatus.php
new file mode 100755
index 0000000..b7248ed
--- /dev/null
+++ b/Observer/SetVoidStatus.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Sales\Model\Order;
+
+class SetVoidStatus implements ObserverInterface
+{
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     */
+    public function __construct(
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig
+    ) {
+        $this->novalnetConfig = $novalnetConfig;
+    }
+
+    /**
+     * Set Canceled/Void status for Novalnet payments
+     *
+     * @param  \Magento\Framework\Event\Observer $observer
+     * @return void
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        $payment = $observer->getEvent()->getPayment();
+        if (!empty($payment->getMethodInstance()->getCode()) && preg_match('/novalnet/i', $payment->getMethodInstance()->getCode())) {
+
+            $order = $payment->getOrder();
+            $order->setState(Order::STATE_PROCESSING)
+                ->setStatus(Order::STATE_CANCELED)
+                ->save();
+            $order->addStatusHistoryComment(__('The transaction has been canceled'), false)
+                ->save();
+        }
+    }
+}
diff --git a/Observer/ShortcutButtons.php b/Observer/ShortcutButtons.php
new file mode 100755
index 0000000..0f273d3
--- /dev/null
+++ b/Observer/ShortcutButtons.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Event\Observer;
+
+class ShortcutButtons implements ObserverInterface
+{
+    /**
+     * Render Apple Pay Buttons In Cart & Minicart
+     *
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return void
+     */
+    public function execute(Observer $observer)
+    {
+        /** @var \Magento\Catalog\Block\ShortcutButtons $shortcutButtons */
+        $shortcutButtons = $observer->getEvent()->getContainer();
+
+        /** @var \Magento\Framework\View\Element\Template $shortcut */
+        $shortcut = $shortcutButtons->getLayout()->createBlock(
+            \Novalnet\Payment\Block\Checkout\Cart\Shortcut::class,
+            '',
+            []
+        );
+
+        $shortcut->setIsInCatalogProduct(
+            $observer->getEvent()->getIsCatalogProduct()
+        )->setShowOrPosition(
+            $observer->getEvent()->getOrPosition()
+        );
+
+        $shortcut->setIsShoppingCart($observer->getEvent()->getIsShoppingCart());
+
+        $shortcut->setIsCart(get_class($shortcutButtons) == \Magento\Checkout\Block\QuoteShortcutButtons::class);
+
+        $shortcutButtons->addShortcut($shortcut);
+    }
+}
diff --git a/Observer/SubscriptionSupportedPayments.php b/Observer/SubscriptionSupportedPayments.php
new file mode 100755
index 0000000..36ad55e
--- /dev/null
+++ b/Observer/SubscriptionSupportedPayments.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Sales\Model\Order;
+
+class SubscriptionSupportedPayments implements ObserverInterface
+{
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @param \Novalnet\Payment\Model\NNConfig $novalnetConfig
+     */
+    public function __construct(
+        \Novalnet\Payment\Model\NNConfig $novalnetConfig
+    ) {
+        $this->novalnetConfig = $novalnetConfig;
+    }
+
+    /**
+     * Set Subscription Supported Novalnet payments
+     *
+     * @param  \Magento\Framework\Event\Observer $observer
+     * @return void
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        $paymentMethods = $observer->getPaymentMethods();
+        if (!empty($paymentMethods)) {
+            $payments = $paymentMethods->getData();
+            foreach ($payments as $paymentCode => $payment) {
+                if (!empty($paymentCode) && preg_match('/novalnet/i', $paymentCode) && !$this->novalnetConfig->isSubscriptionSupported($paymentCode)) {
+                    unset($payments[$paymentCode]);
+                }
+            }
+            $paymentMethods->setData($payments);
+        }
+    }
+}
diff --git a/Plugin/Checkout/LayoutProcessor.php b/Plugin/Checkout/LayoutProcessor.php
new file mode 100755
index 0000000..48689cc
--- /dev/null
+++ b/Plugin/Checkout/LayoutProcessor.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Plugin\Checkout;
+
+use Novalnet\Payment\Model\Ui\ConfigProvider;
+
+class LayoutProcessor
+{
+    /**
+     * @var \Novalnet\Payment\Helper\Request
+     */
+    protected $novalnetHelper;
+
+    /**
+     * @var \Novalnet\Payment\Model\NNConfig
+     */
+    protected $novalnetConfig;
+
+    /**
+     * @param \Novalnet\Payment\Helper\Request $novalnetHelper
+     * @param \Novalnet\Payment\Model\NNConfig $NNConfig
+     */
+    public function __construct(
+        \Novalnet\Payment\Helper\Request $novalnetHelper,
+        \Novalnet\Payment\Model\NNConfig $NNConfig
+    ) {
+        $this->novalnetHelper = $novalnetHelper;
+        $this->novalnetConfig = $NNConfig;
+    }
+
+    /**
+     * After process
+     *
+     * @param \Magento\Checkout\Block\Checkout\LayoutProcessor $subject
+     * @param array $jsLayout
+     * @return mixed
+     */
+    public function afterProcess(
+        \Magento\Checkout\Block\Checkout\LayoutProcessor $subject,
+        array $jsLayout
+    ) {
+        $isEnabled = $this->novalnetHelper->isPageEnabledForExpressCheckout('guest_checkout_page');
+
+        if ($this->novalnetHelper->getCustomerSession()->isLoggedIn() || (!$isEnabled['novalnetApplepay'] && !$isEnabled['novalnetGooglepay'])) {
+            if (isset($jsLayout['components']['checkout']['children']['steps']
+                ['children']['shipping-step']['children']['novalnet-guest-checkout'])) {
+                    unset($jsLayout['components']['checkout']['children']['steps']
+                         ['children']['shipping-step']['children']['novalnet-guest-checkout']);
+            }
+        }
+
+        return $jsLayout;
+    }
+}
diff --git a/Setup/Patch/Data/RemoveAccessKey.php b/Setup/Patch/Data/RemoveAccessKey.php
new file mode 100755
index 0000000..c69fdc3
--- /dev/null
+++ b/Setup/Patch/Data/RemoveAccessKey.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+namespace Novalnet\Payment\Setup\Patch\Data;
+
+use Magento\Payment\Model\Method\AbstractMethod;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+class RemoveAccessKey implements DataPatchInterface
+{
+    /**
+     * @var \Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var \Magento\Config\Model\ResourceModel\Config\Data
+     */
+    private $configResource;
+
+    /**
+     * @var \Magento\Framework\App\Config\ConfigResource\ConfigInterface
+     */
+    private $resourceConfig;
+
+    /**
+     * @var \Novalnet\Payment\Logger\NovalnetLogger
+     */
+    private $novalnetLogger;
+
+    /**
+     * @param \Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory $collectionFactory
+     * @param \Magento\Config\Model\ResourceModel\Config\Data $configResource
+     * @param \Magento\Framework\App\Config\ConfigResource\ConfigInterface $resourceConfig
+     * @param \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+     */
+    public function __construct(
+        \Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory $collectionFactory,
+        \Magento\Config\Model\ResourceModel\Config\Data $configResource,
+        \Magento\Framework\App\Config\ConfigResource\ConfigInterface  $resourceConfig,
+        \Novalnet\Payment\Logger\NovalnetLogger $novalnetLogger
+    ) {
+        $this->collectionFactory = $collectionFactory;
+        $this->configResource = $configResource;
+        $this->resourceConfig = $resourceConfig;
+        $this->novalnetLogger = $novalnetLogger;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $novalnetGlobalConfig = [
+            'novalnet_global/novalnet/payment_access_key',
+            'novalnet_global/novalnet/signature',
+            'payment/novalnet/payment_access_key',
+            'payment/novalnet/signature'
+        ];
+
+        $novalnetMapping = [
+            'novalnet_global/novalnet/live_mode'                        => 'payment/novalnet/live_mode',
+            'novalnet_global/novalnet/enable_payment_logo'              => 'payment/novalnet/enable_payment_logo',
+            'novalnet_global/novalnet/restore_cart'                     => 'payment/novalnet/restore_cart',
+            'novalnet_global/merchant_script/test_mode'                 => 'payment/merchant_script/test_mode',
+            'novalnet_global/merchant_script/mail_to_addr'              => 'payment/merchant_script/mail_to_addr',
+            'payment/novalnetSepa/enable_guarantee'                     => 'payment/novalnetSepaGuarantee/active',
+            'payment/novalnetSepa/sepa_duedate'                         => 'payment/novalnetSepa/due_date',
+            'payment/novalnetSepaInstalment/sepa_duedate'               => 'payment/novalnetSepaInstalment/due_date',
+            'payment/novalnetInvoice/enable_guarantee'                  => 'payment/novalnetInvoiceGuarantee/active',
+            'payment/novalnetInvoice/payment_duration'                  => 'payment/novalnetInvoice/due_date',
+            'payment/novalnetCashpayment/payment_duration'              => 'payment/novalnetCashpayment/due_date',
+            'payment/novalnetSepa/guarantee_min_order_total'            => 'payment/novalnetSepaGuarantee/min_order_total',
+            'payment/novalnetInvoice/guarantee_min_order_total'         => 'payment/novalnetInvoiceGuarantee/min_order_total',
+            'payment/novalnetSepa/payment_guarantee_force'              => 'payment/novalnetSepaGuarantee/payment_guarantee_force',
+            'payment/novalnetSepa/active'                               => 'payment/novalnetSepaGuarantee/payment_guarantee_force',
+            'payment/novalnetInvoice/payment_guarantee_force'           => 'payment/novalnetInvoiceGuarantee/payment_guarantee_force',
+            'payment/novalnetInvoice/active'                            => 'payment/novalnetInvoiceGuarantee/payment_guarantee_force',
+            'payment/novalnetInvoiceInstalment/min_order_total'         => 'payment/novalnetInvoiceInstalment/min_order_total',
+            'payment/novalnetSepaInstalment/min_order_total'            => 'payment/novalnetSepaInstalment/min_order_total',
+            'payment/novalnetInvoiceInstalment/instalment_total_period' => 'payment/novalnetInvoiceInstalment/instalment_cycles',
+            'payment/novalnetSepaInstalment/instalment_total_period'    => 'payment/novalnetSepaInstalment/instalment_cycles',
+            'payment/novalnetCc/order_status_after_payment'             => 'payment/novalnetCc/order_status',
+            'payment/novalnetPaypal/order_status_after_payment'         => 'payment/novalnetPaypal/order_status',
+            'payment/novalnetBanktransfer/order_status_after_payment'   => 'payment/novalnetBanktransfer/order_status',
+            'payment/novalnetIdeal/order_status_after_payment'          => 'payment/novalnetIdeal/order_status',
+            'payment/novalnetEps/order_status_after_payment'            => 'payment/novalnetEps/order_status',
+            'payment/novalnetGiropay/order_status_after_payment'        => 'payment/novalnetGiropay/order_status',
+            'payment/novalnetPrzelewy/order_status_after_payment'       => 'payment/novalnetPrzelewy/order_status',
+        ];
+
+        //set default value for enable payment logo option
+        $this->resourceConfig->saveConfig(
+            'payment/novalnet/enable_payment_logo',
+            1,
+            'default',
+            0
+        );
+        //set default value for restore cart
+        $this->resourceConfig->saveConfig(
+            'payment/novalnet/restore_cart',
+            1,
+            'default',
+            0
+        );
+        //set default value for ip control
+        $this->resourceConfig->saveConfig(
+            'payment/merchant_script/test_mode',
+            0,
+            'default',
+            0
+        );
+
+        $novalnetConfigurations = $this->collectionFactory->create()->addFieldToFilter('path', [
+            ['like' => '%novalnet_global%'],
+            ['like' => '%novalnetInvoice%'],
+            ['like' => '%novalnetSepa%'],
+            ['like' => '%novalnetCashpayment%'],
+            ['like' => '%order_status_after_payment'],
+            ['like' => '%paymentaction'],
+        ]);
+
+        foreach ($novalnetConfigurations as $config) {
+            if (in_array($config->getPath(), $novalnetGlobalConfig)) {
+                //Remove payment access key and signature
+                $this->configResource->delete($config);
+                $this->novalnetLogger->notice('Removed Novalnet global configuration. The config path: ' . $config->getPath());
+            } elseif (isset($novalnetMapping[$config->getPath()])) {
+                $value = $config->getValue();
+                //update guarantee min order total into EUR
+                if (!empty($config->getPath()) && preg_match('/guarantee_min_order_total/', $config->getPath()) && !empty($config->getValue())) {
+                    $value = $this->getFormattedAmount(
+                        $config->getValue(),
+                        'RAW'
+                    );
+                } elseif (!empty($config->getPath()) && preg_match('/guarantee_min_order_total/', $config->getPath()) && empty($config->getValue())) {
+                    $value = $this->getFormattedAmount(
+                        999,
+                        'RAW'
+                    );
+                }
+
+                //update min order total for Instalment payments
+                if (!empty($config->getPath()) && preg_match('/Instalment\/min_order_total/', $config->getPath())) {
+                    $value = '19.98';
+                }
+
+                //update Guarantee Force configuration
+                if (!empty($config->getPath()) && preg_match('/payment_guarantee_force/', $config->getPath())) {
+                    $value = 0;
+                }
+
+                $this->resourceConfig->saveConfig(
+                    $novalnetMapping[$config->getPath()],
+                    $value,
+                    $config->getScope(),
+                    $config->getScopeId()
+                );
+                $this->novalnetLogger->notice(
+                    'Update Novalnet payment config path & value. Old path: ' . $config->getPath() .
+                    ' New path: ' . $novalnetMapping[$config->getPath()] . ' Values is: ' . $value
+                );
+            } else {
+                //update payment_action configuration
+                if (!empty($config->getPath()) && preg_match('/novalnet/', $config->getPath()) && preg_match('/paymentaction/', $config->getPath())) {
+                    $path = preg_replace('/paymentaction/i', 'payment_action', $config->getPath());
+                    if ($config->getValue() == 1) {
+                        $value = AbstractMethod::ACTION_AUTHORIZE;
+                    } else {
+                        $value = AbstractMethod::ACTION_AUTHORIZE_CAPTURE;
+                    }
+                    $this->resourceConfig->saveConfig(
+                        $path,
+                        $value,
+                        $config->getScope(),
+                        $config->getScopeId()
+                    );
+                    $this->novalnetLogger->notice(
+                        'Update Novalnet payment config path & value. Old path: ' . $config->getPath() .
+                        ' New path: ' . $path . ' Values is: ' . $value
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * Get the formated amount in cents/euro
+     *
+     * @param mixed $amount
+     * @param string $type
+     * @return mixed
+     */
+    public function getFormattedAmount($amount, $type = 'CENT')
+    {
+        if (!empty($amount)) {
+            return ($type == 'RAW') ? number_format($amount / 100, 2, '.', '') : round($amount, 2) * 100;
+        }
+
+        return null;
+    }
+}
diff --git a/composer.json b/composer.json
new file mode 100755
index 0000000..b9ae91e
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,16 @@
+{
+    "name": "novalnet/module-payment",
+    "description": "Demonstrates integration with payment gateway",
+    "type": "magento2-module",
+    "version": "12.4.5",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [ "registration.php" ],
+        "psr-4": {
+            "Novalnet\\Payment\\": ""
+        }
+    }
+}
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
new file mode 100755
index 0000000..b0692a2
--- /dev/null
+++ b/etc/adminhtml/di.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Backend\Block\Widget\Button\Toolbar">
+        <plugin name="salesOrderViewButton" type="Novalnet\Payment\Block\Adminhtml\Button\Control" />
+    </type>
+</config>
diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml
new file mode 100755
index 0000000..f29ea22
--- /dev/null
+++ b/etc/adminhtml/routes.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="novalnetpayment" frontName="novalnetpayment">
+            <module name="Novalnet_Payment" />
+        </route>
+    </router>
+</config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
new file mode 100755
index 0000000..42357dc
--- /dev/null
+++ b/etc/adminhtml/system.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="payment">
+            <group id="novalnet_global" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+                <comment><![CDATA[<div class='novalnet-payment-logo'></div><div class='novalnet-payment-text'>Secured and trusted means of accepting all payment methods supported worldwide. <br>Novalnet provides the most convenient way to increase your sales and deliver seamless checkout experience for your customers.</div>]]></comment>
+                <fieldset_css>novalnet-section</fieldset_css>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
+                <include path="Novalnet_Payment::system/novalnet_documentation.xml"/>
+                <include path="Novalnet_Payment::system/novalnet_global_config.xml"/>
+                <group id="nn_payment_methods" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <fieldset_css>novalnet-payment-section</fieldset_css>
+                    <label>Payments</label>
+                    <include path="Novalnet_Payment::system/novalnet_payment_notice.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_sepa.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_cc.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_applepay.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_googlepay.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_invoice.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_prepayment.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_invoice_guarantee.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_sepa_guarantee.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_invoice_instalment.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_sepa_instalment.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_ideal.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_banktransfer.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_giropay.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_cashpayment.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_przelewy.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_eps.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_paypal.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_postfinance_card.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_postfinance.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_bancontact.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_multibanco.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_online_banktransfer.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_alipay.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_wechatpay.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_trustly.xml"/>
+                    <include path="Novalnet_Payment::system/novalnet_blik.xml"/>
+                </group>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/etc/adminhtml/system/novalnet_alipay.xml b/etc/adminhtml/system/novalnet_alipay.xml
new file mode 100755
index 0000000..6fcc8e4
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_alipay.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetAlipay" translate="label" type="text" sortOrder="24" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Alipay</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetAlipay/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetAlipay/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <frontend_class>validate-number</frontend_class>
+            <validate>validate-length maximum-length-5</validate>
+            <config_path>payment/novalnetAlipay/sort_order</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetAlipay/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetAlipay/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetAlipay/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="70" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetAlipay/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="80" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetAlipay/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetAlipay/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetAlipay/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetAlipay/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_applepay.xml b/etc/adminhtml/system/novalnet_applepay.xml
new file mode 100755
index 0000000..b17cd62
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_applepay.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetApplepay" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Apple Pay</label>
+        <comment>Your customers can checkout using Apple Pay from any page in your web store</comment>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetApplepay/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetApplepay/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetApplepay/sort_order</config_path>
+        </field>
+        <field id="seller_name" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Business name</label>
+            <comment>The business name is rendered in the Apple Pay payment sheet, and this text will appear as PAY 'BUSINESS NAME' so that the customer knows where he is paying to.</comment>
+            <config_path>payment/novalnetApplepay/seller_name</config_path>
+        </field>
+        <field id="payment_action" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment Action</label>
+            <tooltip>Choose whether or not the payment should be charged immediately. Capture completes the transaction by transferring the funds from buyer account to merchant account. Authorize verifies payment details and reserves funds to capture it later, giving time for the merchant to decide on the order.</tooltip>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\PaymentAction</source_model>
+            <config_path>payment/novalnetApplepay/payment_action</config_path>
+        </field>
+        <field id="manual_checking_amount" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum transaction amount for authorization</label>
+            <validate>validate-greater-than-zero validate-digits validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetApplepay/manual_checking_amount</config_path>
+            <depends>
+                <field id="payment_action">authorize</field>
+            </depends>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetApplepay/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetApplepay/instructions</config_path>
+        </field>
+        <group id="applepay_button_configuration" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
+            <label>Button Design</label>
+            <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
+            <field id="button_style" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Button Type</label>
+                <source_model>Novalnet\Payment\Model\Adminhtml\Source\ApplepayButtonStyle</source_model>
+                <config_path>payment/novalnetApplepay/button_style</config_path>
+            </field>
+            <field id="button_theme" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Button Theme</label>
+                <source_model>Novalnet\Payment\Model\Adminhtml\Source\ApplepayButtonTheme</source_model>
+                <config_path>payment/novalnetApplepay/button_theme</config_path>
+            </field>
+            <field id="button_height" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Button Height</label>
+                <comment>Range from 30 to 64 pixels</comment>
+                <config_path>payment/novalnetApplepay/button_height</config_path>
+                <validate>validate-digits validate-digits-range digits-range-30-64</validate>
+            </field>
+            <field id="button_corner_radius" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Button Corner Radius</label>
+                <comment>Range from 0 to 10 pixels</comment>
+                <config_path>payment/novalnetApplepay/button_corner_radius</config_path>
+                <validate>validate-digits validate-digits-range digits-range-0-10</validate>
+            </field>
+            <field id="enabled_pages" translate="label" type="multiselect" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Display the Apple Pay button on</label>
+                <can_be_empty>1</can_be_empty>
+                <tooltip>The selected pages will display the Apple pay button to pay instantly as an express checkout option</tooltip>
+                <source_model>Novalnet\Payment\Model\Adminhtml\Source\ApplepayEnabledPages</source_model>
+                <config_path>payment/novalnetApplepay/enabled_pages</config_path>
+            </field>
+        </group>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_bancontact.xml b/etc/adminhtml/system/novalnet_bancontact.xml
new file mode 100755
index 0000000..55905a0
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_bancontact.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetBancontact" translate="label" type="text" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Bancontact</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetBancontact/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetBancontact/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetBancontact/sort_order</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetBancontact/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetBancontact/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetBancontact/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="70" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetBancontact/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="80" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetBancontact/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetBancontact/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetBancontact/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetBancontact/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_banktransfer.xml b/etc/adminhtml/system/novalnet_banktransfer.xml
new file mode 100755
index 0000000..162041f
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_banktransfer.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetBanktransfer" translate="label" type="text" sortOrder="13" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Sofort</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetBanktransfer/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetBanktransfer/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <frontend_class>validate-number</frontend_class>
+            <validate>validate-length maximum-length-5</validate>
+            <config_path>payment/novalnetBanktransfer/sort_order</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetBanktransfer/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetBanktransfer/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetBanktransfer/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="70" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetBanktransfer/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="80" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetBanktransfer/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetBanktransfer/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetBanktransfer/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetBanktransfer/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_blik.xml b/etc/adminhtml/system/novalnet_blik.xml
new file mode 100755
index 0000000..bc0822c
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_blik.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetBlik" translate="label" type="text" sortOrder="27" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Blik</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetBlik/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetBlik/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetBlik/sort_order</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetBlik/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetBlik/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetBlik/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="70" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetBlik/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="80" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetBlik/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetBlik/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetBlik/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetBlik/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_cashpayment.xml b/etc/adminhtml/system/novalnet_cashpayment.xml
new file mode 100755
index 0000000..3b1a4e0
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_cashpayment.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetCashpayment" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Barzahlen/viacash</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetCashpayment/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetCashpayment/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetCashpayment/sort_order</config_path>
+        </field>
+        <field id="due_date" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Slip expiry date (in days)</label>
+            <tooltip>Enter the number of days to pay the amount at store near you. If the field is empty, 14 days will be set as default.</tooltip>
+            <validate>validate-digits</validate>
+            <config_path>payment/novalnetCashpayment/due_date</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetCashpayment/order_status</config_path>
+        </field>
+        <field id="order_status_after_payment" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Webhook order status</label>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetCashpayment/order_status_after_payment</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetCashpayment/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetCashpayment/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="90" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetCashpayment/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="100" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetCashpayment/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetCashpayment/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetCashpayment/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetCashpayment/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_cc.xml b/etc/adminhtml/system/novalnet_cc.xml
new file mode 100755
index 0000000..3a12f93
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_cc.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetCc" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Credit/Debit Cards</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetCc/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetCc/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetCc/sort_order</config_path>
+        </field>
+        <field id="enforce_3d" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Enforce 3D secure payment outside EU</label>
+            <tooltip>By enabling this option, all payments from cards issued outside the EU will be authenticated via 3DS 2.0 SCA.</tooltip>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetCc/enforce_3d</config_path>
+        </field>
+        <field id="payment_action" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment Action</label>
+            <tooltip>Choose whether or not the payment should be charged immediately. Capture completes the transaction by transferring the funds from buyer account to merchant account. Authorize verifies payment details and reserves funds to capture it later, giving time for the merchant to decide on the order.</tooltip>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\PaymentActionWithZeroAmount</source_model>
+            <config_path>payment/novalnetCc/payment_action</config_path>
+        </field>
+        <field id="manual_checking_amount" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum transaction amount for authorization</label>
+            <validate>validate-greater-than-zero validate-digits validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetCc/manual_checking_amount</config_path>
+            <depends>
+                <field id="payment_action">authorize</field>
+            </depends>
+        </field>
+        <field id="shop_type" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>One-click shopping</label>
+            <tooltip>Payment details stored during the checkout process can be used for future payments</tooltip>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetCc/shop_type</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetCc/order_status</config_path>
+        </field>
+        <field id="inline_form" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Display inline credit card form</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <tooltip><![CDATA[Inline form: The following fields will be shown in the checkout in two lines: card holder & credit card number / expiry date / CVC]]></tooltip>
+            <config_path>payment/novalnetCc/inline_form</config_path>
+        </field>
+        <field id="cc_style" translate="label" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Form appearance</label>
+            <frontend_model>Novalnet\Payment\Block\System\Config\Form\Field\CreditcardStyle</frontend_model>
+            <backend_model>Magento\Config\Model\Config\Backend\Serialized</backend_model>
+            <config_path>payment/novalnetCc/cc_style</config_path>
+        </field>
+        <field id="cc_types" translate="label" type="multiselect" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Display Credit/Debit card logos</label>
+            <can_be_empty>1</can_be_empty>
+            <tooltip>The selected card logos will be displayed on the checkout page</tooltip>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CcCardTypes</source_model>
+            <config_path>payment/novalnetCc/cc_types</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetCc/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetCc/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="140" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetCc/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="150" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetCc/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetCc/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="170" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetCc/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="180" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetCc/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_documentation.xml b/etc/adminhtml/system/novalnet_documentation.xml
new file mode 100755
index 0000000..4842201
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_documentation.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="nnconfig_doc" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+         <label>Documentation</label>
+        <comment><![CDATA[Please read the Installation Guide before you start and login to the <a href='https://admin.novalnet.de/' target='_blank'> Novalnet Admin Portal </a> using your merchant account. To get a merchant account, mail to <a href='mailto:sales@novalnet.de'>sales@novalnet.de</a> or call +49 (089) 923068320]]></comment>
+        <field id="version" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+            <frontend_model>Novalnet\Payment\Block\System\Config\Form\Field\ModuleVersion</frontend_model>
+            <label>Module version</label>
+            <config_path>payment/novalnet/version</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_eps.xml b/etc/adminhtml/system/novalnet_eps.xml
new file mode 100755
index 0000000..0f836d7
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_eps.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetEps" translate="label" type="text" sortOrder="17" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Eps</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetEps/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetEps/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetEps/sort_order</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetEps/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetEps/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetEps/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="70" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetEps/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="80" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetEps/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetEps/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetEps/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetEps/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_giropay.xml b/etc/adminhtml/system/novalnet_giropay.xml
new file mode 100755
index 0000000..5f5a7d4
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_giropay.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetGiropay" translate="label" type="text" sortOrder="14" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Giropay</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetGiropay/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetGiropay/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetGiropay/sort_order</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetGiropay/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetGiropay/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetGiropay/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="70" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetGiropay/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="80" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetGiropay/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetGiropay/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetGiropay/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetGiropay/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_global_config.xml b/etc/adminhtml/system/novalnet_global_config.xml
new file mode 100755
index 0000000..8649b9d
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_global_config.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnet" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Configuration</label>
+        <field id="signature" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Product Activation Key</label>
+            <config_path>payment/novalnet/signature</config_path>
+        </field>
+        <field id="payment_access_key" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment Access Key</label>
+            <config_path>payment/novalnet/payment_access_key</config_path>
+        </field>
+        <field id="vendor_config" translate="button_label attribute button_label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+            <attribute type="button_label">Activate</attribute>
+            <frontend_model>Novalnet\Payment\Block\System\Config\Form\Field\VendorAutoConfig</frontend_model>
+            <config_path>payment/novalnet/vendor_config</config_path>
+            <comment><![CDATA[Enter the Novalnet Product activation key that is required for authentication and click Activate. You will find the Product activation key in the <a href='https://admin.novalnet.de/' target='_blank'>Novalnet Admin Portal</a>: Projects > Choose your project > API credentials > API Signature (Product activation key)]]></comment>
+        </field>
+        <field id="client_key" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Client Key</label>
+            <config_path>payment/novalnet/client_key</config_path>
+            <frontend_model>Novalnet\Payment\Block\System\Config\Form\Field\Disabled</frontend_model>
+        </field>
+        <field id="tariff_id" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Select Tariff ID</label>
+            <config_path>payment/novalnet/tariff_id</config_path>
+            <tooltip>Select a Tariff ID to match the preferred tariff plan you created at the Novalnet Admin Portal for this project</tooltip>
+        </field>
+        <field id="live_mode" translate="label" type="multiselect" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Enable Live Mode</label>
+            <tooltip>Selected payment methods will be in Live Mode</tooltip>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\Activemethods</source_model>
+            <can_be_empty>1</can_be_empty>
+            <config_path>payment/novalnet/live_mode</config_path>
+        </field>
+        <field id="enable_payment_logo" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Display payment method logo</label>
+            <tooltip>The payment method logo will be displayed on the checkout page</tooltip>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnet/enable_payment_logo</config_path>
+        </field>
+        <field id="restore_cart" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Products remain in the shopping cart after cancelled payment</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnet/restore_cart</config_path>
+        </field>
+        <field id="instalment_mail" translate="label" type="select" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Deactivate Instalment Renewal Notification E-mail to end-customer</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnet/instalment_mail</config_path>
+        </field>
+        <field id="onhold_status" translate="label" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>On-hold order status</label>
+            <tooltip>Status to be used for on-hold orders until the transaction is confirmed or canceled</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>novalnet_global/novalnet/onhold_status</config_path>
+        </field>
+        <group id="merchant_script" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification / Webhook URL Setup</label>
+            <comment><![CDATA[To setup your shop Notification / Webhook URL, you must add the following webhook endpoint in this format <b>{Shop_url/rest/V1/novalnet/callback}</b> in below <b>Notification / Webhook URL</b> field and click on <b>Configure</b> button to receive notification about transactions.]]></comment>
+            <field id="vendor_script_url" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                <label><![CDATA[Notification &amp; Webhook URL]]></label>
+                <comment>Notification / Webhook URL is required to keep the merchant’s database/system synchronized with the Novalnet account (e.g. delivery status). Refer the Installation Guide for more information</comment>
+                <frontend_model>Novalnet\Payment\Block\System\Config\Form\Field\WebhookURL</frontend_model>
+                <validate>validate-url validate-no-html-tags</validate>
+                <config_path>payment/merchant_script/vendor_script_url</config_path>
+            </field>
+            <field id="test_mode" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
+                <label>Allow manual testing of the Notification / Webhook URL</label>
+                <tooltip>Enable this to test the Novalnet Notification / Webhook URL manually. Disable this before setting your shop live to block unauthorized calls from external parties</tooltip>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                <config_path>payment/merchant_script/test_mode</config_path>
+            </field>
+            <field id="mail_to_addr" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Send e-mail to</label>
+                <validate>validate-no-html-tags validate-email</validate>
+                <tooltip>Notification / Webhook URL execution messages will be sent to this e-mail</tooltip>
+                <config_path>payment/merchant_script/mail_to_addr</config_path>
+            </field>
+        </group>
+    </group>
+
+</include>
diff --git a/etc/adminhtml/system/novalnet_googlepay.xml b/etc/adminhtml/system/novalnet_googlepay.xml
new file mode 100755
index 0000000..073e900
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_googlepay.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetGooglepay" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Google Pay</label>
+        <comment>Your customers can checkout using Google Pay from any page in your web store</comment>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetGooglepay/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetGooglepay/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetGooglepay/sort_order</config_path>
+        </field>
+        <field id="enforce_3d" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Enforce 3D secure payment outside EU</label>
+            <tooltip>By enabling this option, all payments from cards issued outside the EU will be authenticated via 3DS 2.0 SCA.</tooltip>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetGooglepay/enforce_3d</config_path>
+        </field>
+        <field id="seller_name" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Business name</label>
+            <comment>The business name is rendered in the Google Pay payment sheet, and this text will appear as PAY 'BUSINESS NAME' so that the customer knows where he is paying to.</comment>
+            <config_path>payment/novalnetGooglepay/seller_name</config_path>
+        </field>
+        <field id="merchant_id" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Google Merchant ID</label>
+            <validate>required-entry</validate>
+            <comment><![CDATA[Please note that Google's merchant identifier is required for processing the payment method in the live environment. Google's merchant identifier is issued after registration with the <a href='https://pay.google.com/business/console/' target='_blank'>Google Pay and Wallet Console</a>. See <a href='https://developers.google.com/pay/api/web/guides/test-and-deploy/request-prod-access' target='_blank'>Request production access</a> for more information about the approval process and obtaining a Google merchant identifier. The registration also involves submitting the integration with sufficient screen-shots, so collect this information by enabling the payment method in test mode. To suppress the validation of this field while saving the configuration, use this test identifier BCR2DN4XXXTN7FSI for testing and submission of your integration to Google.]]></comment>
+            <config_path>payment/novalnetGooglepay/merchant_id</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="payment_action" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment Action</label>
+            <tooltip>Choose whether or not the payment should be charged immediately. Capture completes the transaction by transferring the funds from buyer account to merchant account. Authorize verifies payment details and reserves funds to capture it later, giving time for the merchant to decide on the order.</tooltip>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\PaymentAction</source_model>
+            <config_path>payment/novalnetGooglepay/payment_action</config_path>
+        </field>
+        <field id="manual_checking_amount" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum transaction amount for authorization</label>
+            <validate>validate-greater-than-zero validate-digits validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetGooglepay/manual_checking_amount</config_path>
+            <depends>
+                <field id="payment_action">authorize</field>
+            </depends>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetGooglepay/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetGooglepay/instructions</config_path>
+        </field>
+        <group id="googlepay_button_configuration" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="110">
+            <label>Button Design</label>
+            <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
+            <field id="button_type" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Button Type</label>
+                <source_model>Novalnet\Payment\Model\Adminhtml\Source\GooglepayButtonType</source_model>
+                <config_path>payment/novalnetGooglepay/button_type</config_path>
+            </field>
+            <field id="button_theme" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Button Theme</label>
+                <source_model>Novalnet\Payment\Model\Adminhtml\Source\GooglepayButtonTheme</source_model>
+                <config_path>payment/novalnetGooglepay/button_theme</config_path>
+            </field>
+            <field id="button_height" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Button Height</label>
+                <comment>Range from 40 to 100 pixels</comment>
+                <config_path>payment/novalnetGooglepay/button_height</config_path>
+                <validate>validate-digits validate-digits-range digits-range-40-100</validate>
+            </field>
+            <field id="enabled_pages" translate="label" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Display the Google Pay button on</label>
+                <can_be_empty>1</can_be_empty>
+                <tooltip>The selected pages will display the Google Pay button to pay instantly as an express checkout option</tooltip>
+                <source_model>Novalnet\Payment\Model\Adminhtml\Source\GooglepayEnabledPages</source_model>
+                <config_path>payment/novalnetGooglepay/enabled_pages</config_path>
+            </field>
+        </group>
+    </group>
+</include>
+
diff --git a/etc/adminhtml/system/novalnet_ideal.xml b/etc/adminhtml/system/novalnet_ideal.xml
new file mode 100755
index 0000000..a1867ba
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_ideal.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetIdeal" translate="label" type="text" sortOrder="12" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>iDEAL</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetIdeal/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetIdeal/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetIdeal/sort_order</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetIdeal/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetIdeal/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetIdeal/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="70" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetIdeal/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="80" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetIdeal/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetIdeal/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetIdeal/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetIdeal/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_invoice.xml b/etc/adminhtml/system/novalnet_invoice.xml
new file mode 100755
index 0000000..e92aa80
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_invoice.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetInvoice" translate="label" type="text" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Invoice</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetInvoice/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetInvoice/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetInvoice/sort_order</config_path>
+        </field>
+        <field id="due_date" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment due date (in days)</label>
+            <tooltip>Enter the number of days to transfer the payment amount to Novalnet (must be greater than 7 days). In case if the field is empty, 14 days will be set as due date by default</tooltip>
+            <validate>validate-digits validate-greater-than-zero validate-digits-range digits-range-7-999999999</validate>
+            <config_path>payment/novalnetInvoice/due_date</config_path>
+        </field>
+        <field id="payment_action" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment Action</label>
+            <tooltip>Choose whether or not the payment should be charged immediately. Capture completes the transaction by transferring the funds from buyer account to merchant account. Authorize verifies payment details and reserves funds to capture it later, giving time for the merchant to decide on the order.</tooltip>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\PaymentAction</source_model>
+            <config_path>payment/novalnetInvoice/payment_action</config_path>
+        </field>
+        <field id="manual_checking_amount" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum transaction amount for authorization</label>
+            <validate>validate-greater-than-zero validate-digits validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetInvoice/manual_checking_amount</config_path>
+            <depends>
+                <field id="payment_action">authorize</field>
+            </depends>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetInvoice/order_status</config_path>
+        </field>
+        <field id="order_status_after_payment" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Webhook order status</label>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetInvoice/order_status_after_payment</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetInvoice/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetInvoice/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="110" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetInvoice/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="120" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetInvoice/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetInvoice/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="140" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetInvoice/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetInvoice/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_invoice_guarantee.xml b/etc/adminhtml/system/novalnet_invoice_guarantee.xml
new file mode 100755
index 0000000..2a83110
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_invoice_guarantee.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetInvoiceGuarantee" translate="label" type="text" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Invoice with payment guarantee</label>
+        <comment><![CDATA[<b>Basic requirements for payment guarantee</b><br>Allowed B2C countries: DE, AT, CH<br>Allowed B2B countries: European Union<br>Allowed currency: EUR<br>Minimum order amount: 9.99 EUR or more<br>Age limit: 18 years or more<br>The billing address must be the same as the shipping address<br><br>]]></comment>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetInvoiceGuarantee/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetInvoiceGuarantee/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetInvoiceGuarantee/sort_order</config_path>
+        </field>
+        <field id="payment_action" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment Action</label>
+            <tooltip>Choose whether or not the payment should be charged immediately. Capture completes the transaction by transferring the funds from buyer account to merchant account. Authorize verifies payment details and reserves funds to capture it later, giving time for the merchant to decide on the order.</tooltip>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\PaymentAction</source_model>
+            <config_path>payment/novalnetInvoiceGuarantee/payment_action</config_path>
+        </field>
+        <field id="manual_checking_amount" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum transaction amount for authorization</label>
+            <validate>validate-greater-than-zero validate-digits validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetInvoiceGuarantee/manual_checking_amount</config_path>
+            <depends>
+                <field id="payment_action">authorize</field>
+            </depends>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetInvoiceGuarantee/order_status</config_path>
+        </field>
+        <field id="guarantee_force_js" translate="label" type="hidden" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <frontend_model>Novalnet\Payment\Block\System\Config\Form\Field\Guaranteeforce</frontend_model>
+        </field>
+        <field id="payment_guarantee_force" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Force non-guarantee payment</label>
+            <tooltip>Even if payment guarantee is enabled, payments will still be processed as non-guarantee payments if the payment guarantee requirements are not met. Review the requirements under 'Enable Payment Guarantee' in the Installation Guide.</tooltip>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <validate>validate-invoiceguarantee-force</validate>
+            <config_path>payment/novalnetInvoiceGuarantee/payment_guarantee_force</config_path>
+        </field>
+        <field id="allow_b2b_customer" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Allow B2B Customers</label>
+            <tooltip>Allow B2B customers to place order</tooltip>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetInvoiceGuarantee/allow_b2b_customer</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetInvoiceGuarantee/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetInvoiceGuarantee/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="120" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetInvoiceGuarantee/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="130" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetInvoiceGuarantee/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="140" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <tooltip>Minimum order amount: 9.99 EUR or more</tooltip>
+            <validate>validate-number validate-novalnet-guarantee-order-total validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetInvoiceGuarantee/min_order_total</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetInvoiceGuarantee/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetInvoiceGuarantee/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_invoice_instalment.xml b/etc/adminhtml/system/novalnet_invoice_instalment.xml
new file mode 100755
index 0000000..c6edefc
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_invoice_instalment.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetInvoiceInstalment" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Instalment by Invoice</label>
+        <comment><![CDATA[<b>Basic requirements for the instalment payment</b><br>Allowed B2C countries: DE, AT, CH<br>Allowed B2B countries: European Union<br>Allowed currency: EUR<br>Minimum order amount: 19.98 EUR or more<br>Please note that the instalment cycle amount has to be a minimum of 9.99 EUR and the instalment cycles which do not meet this criteria will not be displayed in the instalment plan<br>Age limit: 18 years or more<br>The billing address must be the same as the shipping address<br><br>]]></comment>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetInvoiceInstalment/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetInvoiceInstalment/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetInvoiceInstalment/sort_order</config_path>
+        </field>
+        <field id="instalment_cycles" translate="label" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Instalment cycles</label>
+            <tooltip>Select the various instalment cycles that can be availed in the instalment plan</tooltip>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\InstalmentCycles</source_model>
+            <validate>validate-select</validate>
+            <config_path>payment/novalnetInvoiceInstalment/instalment_cycles</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="payment_action" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment Action</label>
+            <tooltip>Choose whether or not the payment should be charged immediately. Capture completes the transaction by transferring the funds from buyer account to merchant account. Authorize verifies payment details and reserves funds to capture it later, giving time for the merchant to decide on the order.</tooltip>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\PaymentAction</source_model>
+            <config_path>payment/novalnetInvoiceInstalment/payment_action</config_path>
+        </field>
+        <field id="manual_checking_amount" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum transaction amount for authorization</label>
+            <validate>validate-greater-than-zero validate-digits validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetInvoiceInstalment/manual_checking_amount</config_path>
+            <depends>
+                <field id="payment_action">authorize</field>
+            </depends>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetInvoiceInstalment/order_status</config_path>
+        </field>
+        <field id="allow_b2b_customer" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Allow B2B Customers</label>
+            <tooltip>Allow B2B customers to place order</tooltip>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetInvoiceInstalment/allow_b2b_customer</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetInvoiceInstalment/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetInvoiceInstalment/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="110" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetInvoiceInstalment/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="120" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetInvoiceInstalment/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <tooltip>Minimum order amount: 19.98 EUR or more</tooltip>
+            <validate>validate-number validate-novalnet-instalment-order-total validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetInvoiceInstalment/min_order_total</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="140" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetInvoiceInstalment/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetInvoiceInstalment/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_multibanco.xml b/etc/adminhtml/system/novalnet_multibanco.xml
new file mode 100755
index 0000000..53c1e3c
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_multibanco.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetMultibanco" translate="label" type="text" sortOrder="22" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Multibanco</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetMultibanco/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetMultibanco/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetMultibanco/sort_order</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetMultibanco/order_status</config_path>
+        </field>
+        <field id="order_status_after_payment" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Webhook order status</label>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetMultibanco/order_status_after_payment</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetMultibanco/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetMultibanco/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="80" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetMultibanco/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="90" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetMultibanco/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetMultibanco/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetMultibanco/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetMultibanco/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_online_banktransfer.xml b/etc/adminhtml/system/novalnet_online_banktransfer.xml
new file mode 100755
index 0000000..65fc680
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_online_banktransfer.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetOnlineBanktransfer" translate="label" type="text" sortOrder="23" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Online bank transfer</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetOnlineBanktransfer/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetOnlineBanktransfer/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <frontend_class>validate-number</frontend_class>
+            <validate>validate-length maximum-length-5</validate>
+            <config_path>payment/novalnetOnlineBanktransfer/sort_order</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetOnlineBanktransfer/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetOnlineBanktransfer/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetOnlineBanktransfer/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="70" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetOnlineBanktransfer/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="80" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetOnlineBanktransfer/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetOnlineBanktransfer/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetOnlineBanktransfer/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetOnlineBanktransfer/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_payment_notice.xml b/etc/adminhtml/system/novalnet_payment_notice.xml
new file mode 100755
index 0000000..5e916eb
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_payment_notice.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="activate_novalnet_payment_notice" translate="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+        <frontend_model>Novalnet\Payment\Block\System\Config\Form\Field\Notification</frontend_model>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_paypal.xml b/etc/adminhtml/system/novalnet_paypal.xml
new file mode 100755
index 0000000..547e47a
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_paypal.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetPaypal" translate="label" type="text" sortOrder="18" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>PayPal</label>
+        <comment><![CDATA[To accept PayPal transactions, configure your PayPal API info in the <a href='https://admin.novalnet.de/' target='_blank'> Novalnet Admin Portal </a> > PROJECT > 'Project' Information > Payment Methods > Paypal > Configure.]]></comment>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetPaypal/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetPaypal/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetPaypal/sort_order</config_path>
+        </field>
+        <field id="payment_action" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment Action</label>
+            <tooltip>Choose whether or not the payment should be charged immediately. Capture completes the transaction by transferring the funds from buyer account to merchant account. Authorize verifies payment details and reserves funds to capture it later, giving time for the merchant to decide on the order.</tooltip>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\PaymentAction</source_model>
+            <config_path>payment/novalnetPaypal/payment_action</config_path>
+        </field>
+        <field id="manual_checking_amount" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum transaction amount for authorization</label>
+            <validate>validate-greater-than-zero validate-digits validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetPaypal/manual_checking_amount</config_path>
+            <depends>
+                <field id="payment_action">authorize</field>
+            </depends>
+        </field>
+        <field id="shop_type" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>One-click shopping</label>
+            <tooltip>Payment details stored during the checkout process can be used for future payments</tooltip>
+            <comment>In order to use this option you must have billing agreement option enabled in your PayPal account. Please contact your account manager at PayPal.</comment>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetPaypal/shop_type</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetPaypal/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetPaypal/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetPaypal/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="100" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetPaypal/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="110" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetPaypal/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetPaypal/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetPaypal/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="140" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetPaypal/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_postfinance.xml b/etc/adminhtml/system/novalnet_postfinance.xml
new file mode 100755
index 0000000..5a1e067
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_postfinance.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetPostFinance" translate="label" type="text" sortOrder="19" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>PostFinance E-Finance</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetPostFinance/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetPostFinance/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetPostFinance/sort_order</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetPostFinance/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetPostFinance/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetPostFinance/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="70" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetPostFinance/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="80" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetPostFinance/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetPostFinance/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetPostFinance/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetPostFinance/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_postfinance_card.xml b/etc/adminhtml/system/novalnet_postfinance_card.xml
new file mode 100755
index 0000000..678b45b
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_postfinance_card.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetPostFinanceCard" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>PostFinance Card</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetPostFinanceCard/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetPostFinanceCard/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetPostFinanceCard/sort_order</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetPostFinanceCard/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetPostFinanceCard/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetPostFinanceCard/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="70" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetPostFinanceCard/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="80" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetPostFinanceCard/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetPostFinanceCard/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetPostFinanceCard/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetPostFinanceCard/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_prepayment.xml b/etc/adminhtml/system/novalnet_prepayment.xml
new file mode 100755
index 0000000..1831ee7
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_prepayment.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetPrepayment" translate="label" type="text" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Prepayment</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetPrepayment/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetPrepayment/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetPrepayment/sort_order</config_path>
+        </field>
+       <field id="due_date" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment due date (in days)</label>
+            <tooltip>Enter the number of days after which the payment should be processed (must be between 7 and 28 days)</tooltip>
+            <validate>validate-digits validate-greater-than-zero validate-digits-range digits-range-7-28</validate>
+            <config_path>payment/novalnetPrepayment/due_date</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetPrepayment/order_status</config_path>
+        </field>
+        <field id="order_status_after_payment" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Webhook order status</label>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetPrepayment/order_status_after_payment</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetPrepayment/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetPrepayment/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="90" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetPrepayment/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="100" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetPrepayment/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetPrepayment/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetPrepayment/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetPrepayment/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_przelewy.xml b/etc/adminhtml/system/novalnet_przelewy.xml
new file mode 100755
index 0000000..0cdbf36
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_przelewy.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetPrzelewy" translate="label" type="text" sortOrder="16" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Przelewy24</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetPrzelewy/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetPrzelewy/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetPrzelewy/sort_order</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetPrzelewy/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetPrzelewy/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetPrzelewy/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="70" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetPrzelewy/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="80" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetPrzelewy/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetPrzelewy/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetPrzelewy/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetPrzelewy/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_sepa.xml b/etc/adminhtml/system/novalnet_sepa.xml
new file mode 100755
index 0000000..44ee995
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_sepa.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetSepa" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Direct Debit SEPA</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetSepa/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetSepa/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetSepa/sort_order</config_path>
+        </field>
+        <field id="due_date" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment due date (in days)</label>
+            <tooltip>Enter the number of days after which the payment should be processed (must be between 2 and 14 days)</tooltip>
+            <validate>validate-digits validate-greater-than-zero validate-digits-range digits-range-2-14</validate>
+            <config_path>payment/novalnetSepa/due_date</config_path>
+        </field>
+        <field id="payment_action" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment Action</label>
+            <tooltip>Choose whether or not the payment should be charged immediately. Capture completes the transaction by transferring the funds from buyer account to merchant account. Authorize verifies payment details and reserves funds to capture it later, giving time for the merchant to decide on the order.</tooltip>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\PaymentActionWithZeroAmount</source_model>
+            <config_path>payment/novalnetSepa/payment_action</config_path>
+        </field>
+        <field id="manual_checking_amount" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum transaction amount for authorization</label>
+            <validate>validate-greater-than-zero validate-digits validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetSepa/manual_checking_amount</config_path>
+            <depends>
+                <field id="payment_action">authorize</field>
+            </depends>
+        </field>
+        <field id="shop_type" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>One-click shopping</label>
+            <tooltip>Payment details stored during the checkout process can be used for future payments</tooltip>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetSepa/shop_type</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetSepa/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetSepa/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetSepa/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="110" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetSepa/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="120" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetSepa/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetSepa/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="140" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetSepa/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetSepa/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_sepa_guarantee.xml b/etc/adminhtml/system/novalnet_sepa_guarantee.xml
new file mode 100755
index 0000000..7365e3e
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_sepa_guarantee.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetSepaGuarantee" translate="label" type="text" sortOrder="9" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Direct Debit SEPA with payment guarantee</label>
+        <comment><![CDATA[<b>Basic requirements for payment guarantee</b><br>Allowed B2C countries: DE, AT, CH<br>Allowed B2B countries: European Union<br>Allowed currency: EUR<br>Minimum order amount: 9.99 EUR or more<br>Age limit: 18 years or more<br>The billing address must be the same as the shipping address<br><br>]]></comment>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetSepaGuarantee/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetSepaGuarantee/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetSepaGuarantee/sort_order</config_path>
+        </field>
+        <field id="due_date" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment due date (in days)</label>
+            <tooltip>Enter the number of days after which the payment should be processed (must be between 2 and 14 days)</tooltip>
+            <validate>validate-digits validate-greater-than-zero validate-digits-range digits-range-2-14</validate>
+            <config_path>payment/novalnetSepaGuarantee/due_date</config_path>
+        </field>
+        <field id="payment_action" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment Action</label>
+            <tooltip>Choose whether or not the payment should be charged immediately. Capture completes the transaction by transferring the funds from buyer account to merchant account. Authorize verifies payment details and reserves funds to capture it later, giving time for the merchant to decide on the order.</tooltip>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\PaymentAction</source_model>
+            <config_path>payment/novalnetSepaGuarantee/payment_action</config_path>
+        </field>
+        <field id="manual_checking_amount" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum transaction amount for authorization</label>
+            <validate>validate-greater-than-zero validate-digits validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetSepaGuarantee/manual_checking_amount</config_path>
+            <depends>
+                <field id="payment_action">authorize</field>
+            </depends>
+        </field>
+        <field id="shop_type" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>One-click shopping</label>
+            <tooltip>Payment details stored during the checkout process can be used for future payments</tooltip>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetSepaGuarantee/shop_type</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetSepaGuarantee/order_status</config_path>
+        </field>
+        <field id="payment_guarantee_force" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Force non-guarantee payment</label>
+            <tooltip>Even if payment guarantee is enabled, payments will still be processed as non-guarantee payments if the payment guarantee requirements are not met. Review the requirements under 'Enable Payment Guarantee' in the Installation Guide.</tooltip>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <validate>validate-sepaguarantee-force</validate>
+            <config_path>payment/novalnetSepaGuarantee/payment_guarantee_force</config_path>
+        </field>
+        <field id="allow_b2b_customer" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Allow B2B Customers</label>
+            <tooltip>Allow B2B customers to place order</tooltip>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetSepaGuarantee/allow_b2b_customer</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetSepaGuarantee/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetSepaGuarantee/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="130" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetSepaGuarantee/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="140" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetSepaGuarantee/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <tooltip>Minimum order amount: 9.99 EUR or more</tooltip>
+            <validate>validate-number validate-novalnet-guarantee-order-total validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetSepaGuarantee/min_order_total</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetSepaGuarantee/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="170" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetSepaGuarantee/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_sepa_instalment.xml b/etc/adminhtml/system/novalnet_sepa_instalment.xml
new file mode 100755
index 0000000..e6eb887
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_sepa_instalment.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetSepaInstalment" translate="label" type="text" sortOrder="11" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Instalment by Direct Debit SEPA</label>
+        <comment><![CDATA[<b>Basic requirements for the instalment payment</b><br>Allowed B2C countries: DE, AT, CH<br>Allowed B2B countries: European Union<br>Allowed currency: EUR<br>Minimum order amount: 19.98 EUR or more<br>Please note that the instalment cycle amount has to be a minimum of 9.99 EUR and the instalment cycles which do not meet this criteria will not be displayed in the instalment plan<br>Age limit: 18 years or more<br>The billing address must be the same as the shipping address<br><br>]]></comment>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetSepaInstalment/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetSepaInstalment/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <validate>validate-length maximum-length-5</validate>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/novalnetSepaInstalment/sort_order</config_path>
+        </field>
+        <field id="due_date" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment due date (in days)</label>
+            <tooltip>Enter the number of days after which the payment should be processed (must be between 2 and 14 days)</tooltip>
+            <validate>validate-digits validate-greater-than-zero validate-digits-range digits-range-2-14</validate>
+            <config_path>payment/novalnetSepaInstalment/due_date</config_path>
+        </field>
+        <field id="instalment_cycles" translate="label" type="multiselect" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Instalment cycles</label>
+            <tooltip>Select the various instalment cycles that can be availed in the instalment plan</tooltip>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\InstalmentCycles</source_model>
+            <validate>validate-select</validate>
+            <config_path>payment/novalnetSepaInstalment/instalment_cycles</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="payment_action" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment Action</label>
+            <tooltip>Choose whether or not the payment should be charged immediately. Capture completes the transaction by transferring the funds from buyer account to merchant account. Authorize verifies payment details and reserves funds to capture it later, giving time for the merchant to decide on the order.</tooltip>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\PaymentAction</source_model>
+            <config_path>payment/novalnetSepaInstalment/payment_action</config_path>
+        </field>
+        <field id="manual_checking_amount" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum transaction amount for authorization</label>
+            <validate>validate-greater-than-zero validate-digits validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetSepaInstalment/manual_checking_amount</config_path>
+            <depends>
+                <field id="payment_action">authorize</field>
+            </depends>
+        </field>
+        <field id="shop_type" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>One-click shopping</label>
+            <tooltip>Payment details stored during the checkout process can be used for future payments</tooltip>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetSepaInstalment/shop_type</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetSepaInstalment/order_status</config_path>
+        </field>
+        <field id="allow_b2b_customer" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Allow B2B Customers</label>
+            <tooltip>Allow B2B customers to place order</tooltip>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetSepaInstalment/allow_b2b_customer</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetSepaInstalment/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetSepaInstalment/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="130" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetSepaInstalment/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="140" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetSepaInstalment/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <tooltip>Minimum order amount: 19.98 EUR or more</tooltip>
+            <validate>validate-number validate-novalnet-instalment-order-total validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetSepaInstalment/min_order_total</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetSepaInstalment/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="170" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetSepaInstalment/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_trustly.xml b/etc/adminhtml/system/novalnet_trustly.xml
new file mode 100755
index 0000000..5a43a4b
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_trustly.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetTrustly" translate="label" type="text" sortOrder="26" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Trustly</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetTrustly/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetTrustly/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <frontend_class>validate-number</frontend_class>
+            <validate>validate-length maximum-length-5</validate>
+            <config_path>payment/novalnetTrustly/sort_order</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetTrustly/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetTrustly/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetTrustly/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="70" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetTrustly/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="80" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetTrustly/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetTrustly/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetTrustly/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetTrustly/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/adminhtml/system/novalnet_wechatpay.xml b/etc/adminhtml/system/novalnet_wechatpay.xml
new file mode 100755
index 0000000..ad8e9ff
--- /dev/null
+++ b/etc/adminhtml/system/novalnet_wechatpay.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="novalnetWechatpay" translate="label" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>WeChat Pay</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+            <label>Display payment method</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/novalnetWechatpay/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Novalnet Title</label>
+            <config_path>payment/novalnetWechatpay/title</config_path>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Define a sorting order</label>
+            <tooltip>This payment method will be sorted among others (in the ascending order) as per the given sort number</tooltip>
+            <frontend_class>validate-number</frontend_class>
+            <validate>validate-length maximum-length-5</validate>
+            <config_path>payment/novalnetWechatpay/sort_order</config_path>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Completed order status</label>
+            <tooltip>Status to be used for successful orders</tooltip>
+            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+            <config_path>payment/novalnetWechatpay/order_status</config_path>
+        </field>
+        <field id="instructions" translate="label" type="textarea" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Notification for the buyer</label>
+            <tooltip>The entered text will be displayed on the checkout page</tooltip>
+            <validate>validate-no-html-tags</validate>
+            <config_path>payment/novalnetWechatpay/instructions</config_path>
+        </field>
+        <field id="user_group_excluded" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>User Group Excluded</label>
+            <can_be_empty>1</can_be_empty>
+            <source_model>Novalnet\Payment\Model\Adminhtml\Source\CustomerGroups</source_model>
+            <config_path>payment/novalnetWechatpay/user_group_excluded</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="70" showInDefault="9"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/novalnetWechatpay/allowspecific</config_path>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="80" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <config_path>payment/novalnetWechatpay/specificcountry</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetWechatpay/min_order_total</config_path>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Maximum Order Total</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-15</validate>
+            <config_path>payment/novalnetWechatpay/max_order_total</config_path>
+        </field>
+        <field id="orders_count" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Minimum Orders Count</label>
+            <validate>validate-number validate-zero-or-greater validate-length maximum-length-5</validate>
+            <tooltip>Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method</tooltip>
+            <config_path>payment/novalnetWechatpay/orders_count</config_path>
+        </field>
+    </group>
+</include>
diff --git a/etc/config.xml b/etc/config.xml
new file mode 100755
index 0000000..ed95e49
--- /dev/null
+++ b/etc/config.xml
@@ -0,0 +1,538 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <novalnet_global>
+            <novalnet>
+                <onhold_status>holded</onhold_status>
+            </novalnet>
+        </novalnet_global>
+        <payment>
+            <novalnetSepa>
+                <active>0</active>
+                <title>SEPA-Lastschrift</title>
+                <sort_order>1</sort_order>
+                <payment_action>authorize_capture</payment_action>
+                <shop_type>1</shop_type>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetSepaFacade</model>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <is_gateway>1</is_gateway>
+                <can_use_checkout>1</can_use_checkout>
+                <can_use_internal>1</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetSepa>
+            <novalnetCc>
+                <active>0</active>
+                <title>Kredit-/Debitkarte</title>
+                <sort_order>2</sort_order>
+                <cc_types>VI,MC,AE,MA,CI,UP,DC,DI,JCB,CB</cc_types>
+                <payment_action>authorize_capture</payment_action>
+                <shop_type>1</shop_type>
+                <inline_form>1</inline_form>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetCcFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_use_checkout>1</can_use_checkout>
+                <can_use_internal>1</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetCc>
+            <novalnetApplepay>
+                <active>0</active>
+                <title>Apple Pay</title>
+                <sort_order>3</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <enabled_pages>shopping_cart_page,mini_cart_page,product_page,guest_checkout_page</enabled_pages>
+                <button_style>apple-pay-button-text-buy</button_style>
+                <button_theme>apple-pay-button-black-with-text</button_theme>
+                <button_height>50</button_height>
+                <button_corner_radius>0</button_corner_radius>
+                <payment_action>authorize_capture</payment_action>
+                <model>NovalnetApplepayFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetApplepay>
+            <novalnetGooglepay>
+                <active>0</active>
+                <title>Google Pay</title>
+                <sort_order>4</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <enabled_pages>shopping_cart_page,mini_cart_page,product_page,guest_checkout_page</enabled_pages>
+                <button_style>buy</button_style>
+                <button_theme>black</button_theme>
+                <button_height>50</button_height>
+                <payment_action>authorize_capture</payment_action>
+                <model>NovalnetGooglepayFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <is_gateway>1</is_gateway>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetGooglepay>
+            <novalnetInvoice>
+                <active>0</active>
+                <title>Kauf auf Rechnung</title>
+                <sort_order>5</sort_order>
+                <payment_action>authorize_capture</payment_action>
+                <order_status>processing</order_status>
+                <order_status_after_payment>complete</order_status_after_payment>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetInvoiceFacade</model>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <is_gateway>1</is_gateway>
+                <can_use_checkout>1</can_use_checkout>
+                <can_use_internal>1</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetInvoice>
+            <novalnetPrepayment>
+                <active>0</active>
+                <title>Vorkasse</title>
+                <sort_order>6</sort_order>
+                <payment_action>authorize</payment_action>
+                <order_status>pending</order_status>
+                <order_status_after_payment>processing</order_status_after_payment>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetPrepaymentFacade</model>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <is_gateway>1</is_gateway>
+                <can_use_checkout>1</can_use_checkout>
+                <can_use_internal>1</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetPrepayment>
+            <novalnetInvoiceGuarantee>
+                <active>0</active>
+                <title>Rechnung mit Zahlungsgarantie</title>
+                <sort_order>7</sort_order>
+                <allow_b2b_customer>1</allow_b2b_customer>
+                <payment_guarantee_force>0</payment_guarantee_force>
+                <payment_action>authorize_capture</payment_action>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <min_order_total>9.99</min_order_total>
+                <model>NovalnetInvoiceGuaranteeFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <is_gateway>1</is_gateway>
+                <can_use_checkout>1</can_use_checkout>
+                <can_use_internal>1</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetInvoiceGuarantee>
+            <novalnetSepaGuarantee>
+                <active>0</active>
+                <title>SEPA-Lastschrift mit Zahlungsgarantie</title>
+                <sort_order>8</sort_order>
+                <allow_b2b_customer>1</allow_b2b_customer>
+                <payment_guarantee_force>0</payment_guarantee_force>
+                <payment_action>authorize_capture</payment_action>
+                <shop_type>1</shop_type>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <min_order_total>9.99</min_order_total>
+                <model>NovalnetSepaGuaranteeFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <is_gateway>1</is_gateway>
+                <can_use_checkout>1</can_use_checkout>
+                <can_use_internal>1</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetSepaGuarantee>
+            <novalnetInvoiceInstalment>
+                <active>0</active>
+                <title>Ratenzahlung per Rechnung</title>
+                <sort_order>9</sort_order>
+                <instalment_cycles>2,3,4,6,8,9,10,12</instalment_cycles>
+                <allow_b2b_customer>1</allow_b2b_customer>
+                <payment_action>authorize_capture</payment_action>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <min_order_total>19.98</min_order_total>
+                <model>NovalnetInvoiceInstalmentFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <is_gateway>1</is_gateway>
+                <can_use_checkout>1</can_use_checkout>
+                <can_use_internal>1</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetInvoiceInstalment>
+            <novalnetSepaInstalment>
+                <active>0</active>
+                <title>Ratenzahlung per SEPA-Lastschrift</title>
+                <sort_order>10</sort_order>
+                <instalment_cycles>2,3,4,6,8,9,10,12</instalment_cycles>
+                <allow_b2b_customer>1</allow_b2b_customer>
+                <payment_action>authorize_capture</payment_action>
+                <shop_type>1</shop_type>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <min_order_total>19.98</min_order_total>
+                <model>NovalnetSepaInstalmentFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <is_gateway>1</is_gateway>
+                <can_use_checkout>1</can_use_checkout>
+                <can_use_internal>1</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetSepaInstalment>
+            <novalnetIdeal>
+                <active>0</active>
+                <title>iDEAL</title>
+                <sort_order>11</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetIdealFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetIdeal>
+            <novalnetBanktransfer>
+                <active>0</active>
+                <title>Sofortüberweisung</title>
+                <sort_order>12</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetBanktransferFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetBanktransfer>
+            <novalnetGiropay>
+                <active>0</active>
+                <title>giropay</title>
+                <sort_order>13</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetGiropayFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetGiropay>
+            <novalnetCashpayment>
+                <active>0</active>
+                <title>Barzahlen/viacash</title>
+                <sort_order>14</sort_order>
+                <payment_action>authorize</payment_action>
+                <order_status>pending</order_status>
+                <order_status_after_payment>processing</order_status_after_payment>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetCashpaymentFacade</model>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <is_gateway>1</is_gateway>
+                <can_use_checkout>1</can_use_checkout>
+                <can_use_internal>1</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetCashpayment>
+            <novalnetPrzelewy>
+                <active>0</active>
+                <title>Przelewy24</title>
+                <sort_order>15</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetPrzelewyFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetPrzelewy>
+            <novalnetEps>
+                <active>0</active>
+                <title>eps</title>
+                <sort_order>16</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetEpsFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetEps>
+            <novalnetPaypal>
+                <active>0</active>
+                <title>PayPal</title>
+                <sort_order>17</sort_order>
+                <payment_action>authorize_capture</payment_action>
+                <shop_type>0</shop_type>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetPaypalFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetPaypal>
+            <novalnetPostFinanceCard>
+                <active>0</active>
+                <title>PostFinance Card</title>
+                <sort_order>18</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetPostFinanceCardFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetPostFinanceCard>
+            <novalnetPostFinance>
+                <active>0</active>
+                <title>PostFinance E-Finance</title>
+                <sort_order>19</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetPostFinanceFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetPostFinance>
+            <novalnetBancontact>
+                <active>0</active>
+                <title>Bancontact</title>
+                <sort_order>20</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetBancontactFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetBancontact>
+            <novalnetMultibanco>
+                <active>0</active>
+                <title>Multibanco</title>
+                <sort_order>21</sort_order>
+                <payment_action>authorize</payment_action>
+                <order_status>processing</order_status>
+                <order_status_after_payment>complete</order_status_after_payment>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetMultibancoFacade</model>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <is_gateway>1</is_gateway>
+                <can_use_checkout>1</can_use_checkout>
+                <can_use_internal>1</can_use_internal>
+            </novalnetMultibanco>
+            <novalnetOnlineBanktransfer>
+                <active>0</active>
+                <title>Onlineüberweisung</title>
+                <sort_order>22</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetOnlineBanktransferFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetOnlineBanktransfer>
+            <novalnetAlipay>
+                <active>0</active>
+                <title>Alipay</title>
+                <sort_order>23</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetAlipayFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetAlipay>
+            <novalnetWechatpay>
+                <active>0</active>
+                <title>WeChat Pay</title>
+                <sort_order>24</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetWechatpayFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetWechatpay>
+            <novalnetTrustly>
+                <active>0</active>
+                <title>Trustly</title>
+                <sort_order>25</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetTrustlyFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetTrustly>
+            <novalnetBlik>
+                <active>0</active>
+                <title>Blik</title>
+                <sort_order>11</sort_order>
+                <order_status>processing</order_status>
+                <allowspecific>0</allowspecific>
+                <model>NovalnetBlikFacade</model>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_refund>1</can_refund>
+                <can_cancel>1</can_cancel>
+                <can_void>1</can_void>
+                <can_use_checkout>1</can_use_checkout>
+                <is_gateway>1</is_gateway>
+                <order_place_redirect_url>1</order_place_redirect_url>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+            </novalnetBlik>
+        </payment>
+    </default>
+</config>
diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
new file mode 100755
index 0000000..27c53f7
--- /dev/null
+++ b/etc/csp_whitelist.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="frame-src">
+            <values>
+                <value id="novalnet_secure" type="host">secure.novalnet.de</value>
+                <value id="novalnet_barzahlen" type="host">customers.barzahlen.de</value>
+                <value id="novalnet_barzahlen_sandbox" type="host">customers-sandbox.barzahlen.de</value>
+            </values>
+        </policy>
+        <policy id="script-src">
+            <values>
+                <value id="novalnet_payport" type="host">cdn.novalnet.de</value>
+                <value id="novalnet_barzahlen" type="host">cdn.barzahlen.de</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/etc/db_schema.xml b/etc/db_schema.xml
new file mode 100755
index 0000000..1efcc63
--- /dev/null
+++ b/etc/db_schema.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="novalnet_payment_callback" resource="default" engine="innodb" comment="Novalnet Callback execution details">
+        <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true" comment="Entity ID"/>
+        <column xsi:type="varchar" name="order_id" nullable="true" length="32" comment="Order ID"/>
+        <column xsi:type="int" name="callback_amount" unsigned="true" nullable="true" comment="Amount processed for the order"/>
+        <column xsi:type="varchar" name="reference_tid" nullable="true" length="32" comment="Reference TID for the Novalnet order"/>
+        <column xsi:type="timestamp" name="callback_datetime" on_update="true" nullable="true" default="CURRENT_TIMESTAMP"
+                comment="Timestamp for the callback execution"/>
+        <column xsi:type="varchar" name="callback_tid" nullable="true" length="32" comment="Callback TID for the Novalnet order"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <index referenceId="NOVALNET_PAYMENT_CALLBACK_ORDER_ID" indexType="btree">
+            <column name="order_id"/>
+        </index>
+    </table>
+    <table name="novalnet_payment_transactionstatus" resource="default" engine="innodb" comment="Novalnet Transaction details">
+        <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true" comment="Entity ID"/>
+        <column xsi:type="varchar" name="order_id" nullable="true" length="32" comment="Order ID"/>
+        <column xsi:type="varchar" name="tid" nullable="true" length="32" comment="Transaction ID"/>
+        <column xsi:type="varchar" name="status" nullable="true" length="64" comment="Transaction status for the Novalnet order"/>
+        <column xsi:type="varchar" name="customer_id" nullable="true" length="32" comment="Customer ID"/>
+        <column xsi:type="varchar" name="payment_method" nullable="true" length="128" comment="Payment Type of Transaction"/>
+        <column xsi:type="varchar" name="token" nullable="true" length="255" comment="Payment token"/>
+        <column xsi:type="text" name="token_info" nullable="true" comment="Payment token Information"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <index referenceId="NOVALNET_PAYMENT_TRANSACTIONSTATUS_CUSTOMER_ID" indexType="btree">
+            <column name="customer_id"/>
+        </index>
+        <index referenceId="NOVALNET_PAYMENT_TRANSACTIONSTATUS_ORDER_ID" indexType="btree">
+            <column name="order_id"/>
+        </index>
+    </table>
+</schema>
diff --git a/etc/di.xml b/etc/di.xml
new file mode 100755
index 0000000..3457eb5
--- /dev/null
+++ b/etc/di.xml
@@ -0,0 +1,2250 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Novalnet\Payment\Api\NNRepositoryInterface" type="Novalnet\Payment\Model\NNRepository" />
+    <!-- Novalnet Credit Card Facade configuration -->
+    <virtualType name="NovalnetCcFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_CC</argument>
+            <argument name="formBlockType" xsi:type="string">Novalnet\Payment\Block\Form\Cc</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Cc</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetCcValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetCcValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetCcCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetCcConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_CC</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Credit Card Commands -->
+    <virtualType name="NovalnetCcCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="initialize" xsi:type="string">NovalnetCcInitializeCommand</item>
+                <item name="authorize" xsi:type="string">NovalnetCcAuthorizeCommand</item>
+                <item name="capture" xsi:type="string">NovalnetCcCaptureCommand</item>
+                <item name="refund" xsi:type="string">NovalnetRefundCommand</item>
+                <item name="void" xsi:type="string">NovalnetVoidCommand</item>
+                <item name="cancel" xsi:type="string">NovalnetVoidCommand</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Credit Card Initialize command -->
+    <virtualType name="NovalnetCcInitializeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\InitializeDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\CcPaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionInitialize</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Credit Card Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetCcConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Credit Card Authorize command -->
+    <virtualType name="NovalnetCcAuthorizeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\CcPaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionAuthorize</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Credit Card Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetCcConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Credit Card Capture command -->
+    <virtualType name="NovalnetCcCaptureCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\CaptureDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\CcPaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionCapture</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Credit Card Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetCcConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Credit Card Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetCcConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Credit Card Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetCcConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Credit Card Value handlers -->
+    <virtualType name="NovalnetCcValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetCcConfigValueHandler</item>
+                <item name="can_initialize" xsi:type="string">Novalnet\Payment\Gateway\Config\CanInitializeHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+                <item name="order_place_redirect_url" xsi:type="string">Novalnet\Payment\Gateway\Config\OrderPlaceRedirectUrlHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetCcConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetCcConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Credit Card Value validators -->
+    <virtualType name="NovalnetCcValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetCcCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetCcCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetCcConfig</argument>
+        </arguments>
+    </virtualType>
+
+     <!-- Novalnet Apple Pay Facade Configuration -->
+    <virtualType name="NovalnetApplepayFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_APPLEPAY</argument>
+            <argument name="formBlockType" xsi:type="string">Novalnet\Payment\Block\Form\Applepay</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Applepay</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetApplepayValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetApplepayValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetApplepayCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetApplepayConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_APPLEPAY</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Apple Pay Commands -->
+    <virtualType name="NovalnetApplepayCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="initialize" xsi:type="string">NovalnetApplepayInitializeCommand</item>
+                <item name="authorize" xsi:type="string">NovalnetApplepayAuthorizeCommand</item>
+                <item name="capture" xsi:type="string">NovalnetApplepayCaptureCommand</item>
+                <item name="refund" xsi:type="string">NovalnetRefundCommand</item>
+                <item name="void" xsi:type="string">NovalnetVoidCommand</item>
+                <item name="cancel" xsi:type="string">NovalnetVoidCommand</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Apple Pay Initialize command -->
+    <virtualType name="NovalnetApplepayInitializeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\InitializeDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\CcPaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionInitialize</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Apple Pay Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetApplepayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Apple Pay Authorize command -->
+    <virtualType name="NovalnetApplepayAuthorizeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\CcPaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionAuthorize</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Apple Pay Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetApplepayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Apple Pay Capture command -->
+    <virtualType name="NovalnetApplepayCaptureCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\CaptureDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\CcPaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionCapture</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Apple Pay Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetApplepayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Apple Pay Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetApplepayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Apple Pay Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetApplepayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Apple Pay Value handlers -->
+    <virtualType name="NovalnetApplepayValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetApplepayConfigValueHandler</item>
+                <item name="can_initialize" xsi:type="string">Novalnet\Payment\Gateway\Config\CanInitializeHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetApplepayConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetApplepayConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Apple Pay Value validators -->
+    <virtualType name="NovalnetApplepayValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetApplepayCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetApplepayCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetApplepayConfig</argument>
+        </arguments>
+    </virtualType>
+
+     <!-- Novalnet Google Pay Facade Configuration -->
+    <virtualType name="NovalnetGooglepayFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_GOOGLEPAY</argument>
+            <argument name="formBlockType" xsi:type="string">Novalnet\Payment\Block\Form\Googlepay</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Googlepay</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetGooglepayValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetGooglepayValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetGooglepayCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetGooglepayConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_GOOGLEPAY</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Google Pay Commands -->
+    <virtualType name="NovalnetGooglepayCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="initialize" xsi:type="string">NovalnetGooglepayInitializeCommand</item>
+                <item name="authorize" xsi:type="string">NovalnetGooglepayAuthorizeCommand</item>
+                <item name="capture" xsi:type="string">NovalnetGooglepayCaptureCommand</item>
+                <item name="refund" xsi:type="string">NovalnetRefundCommand</item>
+                <item name="void" xsi:type="string">NovalnetVoidCommand</item>
+                <item name="cancel" xsi:type="string">NovalnetVoidCommand</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Google Pay Initialize command -->
+    <virtualType name="NovalnetGooglepayInitializeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\InitializeDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\CcPaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionInitialize</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Google Pay Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetGooglepayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Google Pay Authorize command -->
+    <virtualType name="NovalnetGooglepayAuthorizeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\CcPaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionAuthorize</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Google Pay Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetGooglepayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Google Pay Capture command -->
+    <virtualType name="NovalnetGooglepayCaptureCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\CaptureDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\CcPaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionCapture</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Google Pay Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetGooglepayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Google Pay Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetGooglepayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Google Pay Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetGooglepayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Google Pay Value handlers -->
+    <virtualType name="NovalnetGooglepayValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetGooglepayConfigValueHandler</item>
+                <item name="can_initialize" xsi:type="string">Novalnet\Payment\Gateway\Config\CanInitializeHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetGooglepayConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetGooglepayConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Google Pay Value validators -->
+    <virtualType name="NovalnetGooglepayValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetGooglepayCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetGooglepayCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetGooglepayConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet Sepa Facade configuration -->
+    <virtualType name="NovalnetSepaFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_SEPA</argument>
+            <argument name="formBlockType" xsi:type="string">Novalnet\Payment\Block\Form\Sepa</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Sepa</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetSepaValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetSepaValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetDirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetSepaConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_SEPA</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Sepa Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Sepa Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Sepa Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Sepa Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Sepa Value handlers -->
+    <virtualType name="NovalnetSepaValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetSepaConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetSepaConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetSepaConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Sepa Value validators -->
+    <virtualType name="NovalnetSepaValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetSepaCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetSepaCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet Invoice Facade configuration -->
+    <virtualType name="NovalnetInvoiceFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_INVOICE</argument>
+            <argument name="formBlockType" xsi:type="string">Novalnet\Payment\Block\Form\Invoice</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Invoice</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetInvoiceValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetInvoiceValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetDirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetInvoiceConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_INVOICE</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Invoice Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Invoice Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Invoice Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Invoice Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Invoice Value handlers -->
+    <virtualType name="NovalnetInvoiceValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetInvoiceConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetInvoiceConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetInvoiceConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Invoice Value validators -->
+    <virtualType name="NovalnetInvoiceValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetInvoiceCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetInvoiceCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet Invoice Guarantee Facade configuration -->
+    <virtualType name="NovalnetInvoiceGuaranteeFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_INVOICE_GUARANTEE</argument>
+            <argument name="formBlockType" xsi:type="string">Novalnet\Payment\Block\Form\InvoiceGuarantee</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\InvoiceGuarantee</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetInvoiceGuaranteeValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetInvoiceGuaranteeValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetInvoiceGuaranteeCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetInvoiceGuaranteeConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_INVOICE_GUARANTEE</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Direct Payment CommandPool -->
+    <virtualType name="NovalnetInvoiceGuaranteeCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="initialize" xsi:type="string">NovalnetInitializeCommand</item>
+                <item name="authorize" xsi:type="string">NovalnetDirectPaymentAuthorizeCommand</item>
+                <item name="capture" xsi:type="string">NovalnetCaptureCommand</item>
+                <item name="refund" xsi:type="string">NovalnetRefundCommand</item>
+                <item name="void" xsi:type="string">NovalnetVoidCommand</item>
+                <item name="cancel" xsi:type="string">NovalnetVoidCommand</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Invoice Guarantee Initialize command -->
+    <virtualType name="NovalnetInvoiceGuaranteeInitializeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\InitializeDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\CcPaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionInitialize</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Invoice Guarantee Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceGuaranteeConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Invoice Guarantee Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceGuaranteeConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Invoice Guarantee Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceGuaranteeConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Invoice Guarantee Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceGuaranteeConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Invoice Guarantee Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceGuaranteeConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Invoice Guarantee Value handlers -->
+    <virtualType name="NovalnetInvoiceGuaranteeValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetInvoiceGuaranteeConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetInvoiceGuaranteeConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetInvoiceGuaranteeConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Invoice Guarantee Value validators -->
+    <virtualType name="NovalnetInvoiceGuaranteeValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetInvoiceGuaranteeCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetInvoiceGuaranteeCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceGuaranteeConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet Sepa Guarantee Facade configuration -->
+    <virtualType name="NovalnetSepaGuaranteeFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_SEPA_GUARANTEE</argument>
+            <argument name="formBlockType" xsi:type="string">Novalnet\Payment\Block\Form\SepaGuarantee</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\SepaGuarantee</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetSepaGuaranteeValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetSepaGuaranteeValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetSepaGuaranteeCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetSepaGuaranteeConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_SEPA_GUARANTEE</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Direct Payment CommandPool -->
+    <virtualType name="NovalnetSepaGuaranteeCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="initialize" xsi:type="string">NovalnetInitializeCommand</item>
+                <item name="authorize" xsi:type="string">NovalnetDirectPaymentAuthorizeCommand</item>
+                <item name="capture" xsi:type="string">NovalnetCaptureCommand</item>
+                <item name="refund" xsi:type="string">NovalnetRefundCommand</item>
+                <item name="void" xsi:type="string">NovalnetVoidCommand</item>
+                <item name="cancel" xsi:type="string">NovalnetVoidCommand</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Sepa Guarantee Initialize command -->
+    <virtualType name="NovalnetSepaGuaranteeInitializeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\InitializeDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\CcPaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionInitialize</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Sepa Guarantee Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaGuaranteeConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Sepa Guarantee Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaGuaranteeConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Sepa Guarantee Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaGuaranteeConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Sepa Guarantee Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaGuaranteeConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Sepa Guarantee Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaGuaranteeConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Sepa Guarantee Value handlers -->
+    <virtualType name="NovalnetSepaGuaranteeValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetSepaGuaranteeConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetSepaGuaranteeConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetSepaGuaranteeConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Sepa Guarantee Value validators -->
+    <virtualType name="NovalnetSepaGuaranteeValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetSepaGuaranteeCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetSepaGuaranteeCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaGuaranteeConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet Prepayment Facade configuration -->
+    <virtualType name="NovalnetPrepaymentFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_PREPAYMENT</argument>
+            <argument name="formBlockType" xsi:type="string">Novalnet\Payment\Block\Form\Prepayment</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Prepayment</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetPrepaymentValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetPrepaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetDirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetPrepaymentConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_PREPAYMENT</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Prepayment Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPrepaymentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Prepayment Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPrepaymentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Prepayment Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPrepaymentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Prepayment Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPrepaymentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Prepayment Value handlers -->
+    <virtualType name="NovalnetPrepaymentValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetPrepaymentConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetPrepaymentConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetPrepaymentConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Prepayment Value validators -->
+    <virtualType name="NovalnetPrepaymentValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetPrepaymentCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetPrepaymentCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPrepaymentConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet Cashpayment Facade configuration -->
+    <virtualType name="NovalnetCashpaymentFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_CASHPAYMENT</argument>
+            <argument name="formBlockType" xsi:type="string">Novalnet\Payment\Block\Form\Cashpayment</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Cashpayment</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetCashpaymentValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetCashpaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetDirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetCashpaymentConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_CASHPAYMENT</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Cashpayment Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetCashpaymentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Cashpayment Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetCashpaymentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Cashpayment Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetCashpaymentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Cashpayment Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetCashpaymentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Cashpayment Value handlers -->
+    <virtualType name="NovalnetCashpaymentValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetCashpaymentConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetCashpaymentConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetCashpaymentConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Cashpayment Value validators -->
+    <virtualType name="NovalnetCashpaymentValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetCashpaymentCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetCashpaymentCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetCashpaymentConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet Multibanco Facade configuration -->
+    <virtualType name="NovalnetMultibancoFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_MULTIBANCO</argument>
+            <argument name="formBlockType" xsi:type="string">Novalnet\Payment\Block\Form\Multibanco</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Multibanco</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetMultibancoValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetMultibancoValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetDirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetMultibancoConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_MULTIBANCO</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Multibanco Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetMultibancoConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Multibanco Value handlers -->
+    <virtualType name="NovalnetMultibancoValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetMultibancoConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetMultibancoConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetMultibancoConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Multibanco Value validators -->
+    <virtualType name="NovalnetMultibancoValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetMultibancoCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetMultibancoCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetMultibancoConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet Paypal Facade configuration -->
+    <virtualType name="NovalnetPaypalFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_PAYPAL</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Paypal</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetPaypalValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetPaypalValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetRedirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetPaypalConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_PAYPAL</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Paypal Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPaypalConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Paypal Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPaypalConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Paypal Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPaypalConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Paypal Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPaypalConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Paypal Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPaypalConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Paypal Value handlers -->
+    <virtualType name="NovalnetPaypalValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetPaypalConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetPaypalConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetPaypalConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Paypal Value validators -->
+    <virtualType name="NovalnetPaypalValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetPaypalCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetPaypalCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPaypalConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet Banktransfer Facade configuration -->
+    <virtualType name="NovalnetBanktransferFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_BANKTRANSFER</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Banktransfer</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetBanktransferValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetBanktransferValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetRedirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetBanktransferConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_BANKTRANSFER</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Banktransfer Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBanktransferConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Banktransfer Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBanktransferConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Banktransfer Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBanktransferConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Banktransfer Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBanktransferConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Banktransfer Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBanktransferConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Banktransfer Value handlers -->
+    <virtualType name="NovalnetBanktransferValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetBanktransferConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetBanktransferConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetBanktransferConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Banktransfer Value validators -->
+    <virtualType name="NovalnetBanktransferValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetBanktransferCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetBanktransferCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBanktransferConfig</argument>
+        </arguments>
+    </virtualType>
+
+ <!-- Novalnet OnlineBanktransfer Facade configuration -->
+    <virtualType name="NovalnetOnlineBanktransferFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_ONLINEBANKTRANSFER</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\OnlineBanktransfer</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetOnlineBanktransferValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetOnlineBanktransferValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetRedirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetOnlineBanktransferConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_ONLINEBANKTRANSFER</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet OnlineBanktransfer Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetOnlineBanktransferConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet OnlineBanktransfer Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetOnlineBanktransferConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet OnlineBanktransfer Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetOnlineBanktransferConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet OnlineBanktransfer Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetOnlineBanktransferConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet OnlineBanktransfer Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetOnlineBanktransferConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet OnlineBanktransfer Value handlers -->
+    <virtualType name="NovalnetOnlineBanktransferValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetOnlineBanktransferConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetOnlineBanktransferConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetOnlineBanktransferConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet OnlineBanktransfer Value validators -->
+    <virtualType name="NovalnetOnlineBanktransferValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetOnlineBanktransferCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetOnlineBanktransferCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetOnlineBanktransferConfig</argument>
+        </arguments>
+    </virtualType>
+
+ <!-- Novalnet Alipay Facade configuration -->
+    <virtualType name="NovalnetAlipayFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_ALIPAY</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Alipay</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetAlipayValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetAlipayValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetRedirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetAlipayConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_ALIPAY</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Alipay Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetAlipayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Alipay Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetAlipayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Alipay Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetAlipayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Alipay Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetAlipayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Alipay Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetAlipayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Alipay Value handlers -->
+    <virtualType name="NovalnetAlipayValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetAlipayConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetAlipayConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetAlipayConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Alipay Value validators -->
+    <virtualType name="NovalnetAlipayValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetAlipayCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetAlipayCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetAlipayConfig</argument>
+        </arguments>
+    </virtualType>
+
+
+ <!-- Novalnet Wechatpay Facade configuration -->
+    <virtualType name="NovalnetWechatpayFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_WECHATPAY</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Wechatpay</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetWechatpayValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetWechatpayValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetRedirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetWechatpayConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_WECHATPAY</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Wechatpay Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetWechatpayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Wechatpay Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetWechatpayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Wechatpay Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetWechatpayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Wechatpay Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetWechatpayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Wechatpay Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetWechatpayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Wechatpay Value handlers -->
+    <virtualType name="NovalnetWechatpayValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetWechatpayConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetWechatpayConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetWechatpayConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Wechatpay Value validators -->
+    <virtualType name="NovalnetWechatpayValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetWechatpayCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetWechatpayCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetWechatpayConfig</argument>
+        </arguments>
+    </virtualType>
+
+ <!-- Novalnet Trustly Facade configuration -->
+    <virtualType name="NovalnetTrustlyFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_TRUSTLY</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Trustly</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetTrustlyValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetTrustlyValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetRedirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetTrustlyConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_TRUSTLY</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Trustly Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetTrustlyConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Trustly Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetTrustlyConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Trustly Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetTrustlyConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Trustly Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetTrustlyConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Trustly Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetTrustlyConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Trustly Value handlers -->
+    <virtualType name="NovalnetTrustlyValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetTrustlyConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetTrustlyConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetTrustlyConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Trustly Value validators -->
+    <virtualType name="NovalnetTrustlyValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetTrustlyCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetTrustlyCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetTrustlyConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet Ideal Facade configuration -->
+    <virtualType name="NovalnetIdealFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_IDEAL</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Ideal</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetIdealValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetIdealValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetRedirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetIdealConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_IDEAL</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Ideal Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetIdealConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Ideal Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetIdealConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Ideal Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetIdealConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Ideal Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetIdealConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Ideal Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetIdealConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Ideal Value handlers -->
+    <virtualType name="NovalnetIdealValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetIdealConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetIdealConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetIdealConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Ideal Value validators -->
+    <virtualType name="NovalnetIdealValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetIdealCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetIdealCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetIdealConfig</argument>
+        </arguments>
+    </virtualType>
+
+<!-- Novalnet Blik Facade configuration -->
+    <virtualType name="NovalnetBlikFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_BLIK</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Blik</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetBlikValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetBlikValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetRedirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetBlikConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_BLIK</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Blik Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBlikConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Blik Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBlikConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Blik Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBlikConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Blik Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBlikConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Blik Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBlikConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Blik Value handlers -->
+    <virtualType name="NovalnetBlikValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetBlikConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetBlikConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetBlikConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Blik Value validators -->
+    <virtualType name="NovalnetBlikValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetBlikCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetBlikCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBlikConfig</argument>
+        </arguments>
+    </virtualType>
+
+     <!-- Novalnet Bancontact Facade configuration -->
+    <virtualType name="NovalnetBancontactFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_BANCONTACT</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Bancontact</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetBancontactValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetBancontactValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetRedirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetBancontactConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_BANCONTACT</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Bancontact Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBancontactConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Bancontact Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBancontactConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Bancontact Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBancontactConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Bancontact Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBancontactConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Bancontact Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBancontactConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Bancontact Value handlers -->
+    <virtualType name="NovalnetBancontactValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetBancontactConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetBancontactConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetBancontactConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Bancontact Value validators -->
+    <virtualType name="NovalnetBancontactValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetBancontactCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetBancontactCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetBancontactConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet Eps Facade configuration -->
+    <virtualType name="NovalnetEpsFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_EPS</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Eps</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetEpsValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetEpsValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetRedirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetEpsConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_EPS</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Eps Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetEpsConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Eps Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetEpsConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Eps Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetEpsConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Eps Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetEpsConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Eps Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetEpsConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Eps Value handlers -->
+    <virtualType name="NovalnetEpsValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetEpsConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetEpsConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetEpsConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Eps Value validators -->
+    <virtualType name="NovalnetEpsValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetEpsCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetEpsCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetEpsConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet Giropay Facade configuration -->
+    <virtualType name="NovalnetGiropayFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_GIROPAY</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Giropay</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetGiropayValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetGiropayValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetRedirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetGiropayConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_GIROPAY</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Giropay Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetGiropayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Giropay Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetGiropayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Giropay Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetGiropayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Giropay Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetGiropayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Giropay Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetGiropayConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Giropay Value handlers -->
+    <virtualType name="NovalnetGiropayValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetGiropayConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetGiropayConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetGiropayConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Giropay Value validators -->
+    <virtualType name="NovalnetGiropayValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetGiropayCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetGiropayCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetGiropayConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet Przelewy Facade configuration -->
+    <virtualType name="NovalnetPrzelewyFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_PRZELEWY</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\Przelewy</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetPrzelewyValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetPrzelewyValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetRedirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetPrzelewyConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_PRZELEWY</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Przelewy Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPrzelewyConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Przelewy Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPrzelewyConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Przelewy Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPrzelewyConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Przelewy Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPrzelewyConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Przelewy Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPrzelewyConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet Przelewy Value handlers -->
+    <virtualType name="NovalnetPrzelewyValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetPrzelewyConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetPrzelewyConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetPrzelewyConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Przelewy Value validators -->
+    <virtualType name="NovalnetPrzelewyValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetPrzelewyCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetPrzelewyCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPrzelewyConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet PostFinance Facade configuration -->
+    <virtualType name="NovalnetPostFinanceFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_POSTFINANCE</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\PostFinance</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetPostFinanceValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetPostFinanceValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetRedirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetPostFinanceConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_POSTFINANCE</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet PostFinance Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPostFinanceConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet PostFinance Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPostFinanceConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet PostFinance Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPostFinanceConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet PostFinance Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPostFinanceConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet PostFinance Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPostFinanceConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet PostFinance Value handlers -->
+    <virtualType name="NovalnetPostFinanceValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetPostFinanceConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetPostFinanceConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetPostFinanceConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet PostFinance Value validators -->
+    <virtualType name="NovalnetPostFinanceValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetPostFinanceCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetPostFinanceCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPostFinanceConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet PostFinanceCard Facade configuration -->
+    <virtualType name="NovalnetPostFinanceCardFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_POSTFINANCE_CARD</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\PostFinanceCard</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetPostFinanceCardValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetPostFinanceCardValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetRedirectPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetPostFinanceCardConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_POSTFINANCE_CARD</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet PostFinanceCard Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPostFinanceCardConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet PostFinanceCard Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPostFinanceCardConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet PostFinanceCard Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPostFinanceCardConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet PostFinanceCard Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPostFinanceCardConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet PostFinanceCard Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPostFinanceCardConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet PostFinanceCard Value handlers -->
+    <virtualType name="NovalnetPostFinanceCardValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetPostFinanceCardConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetPostFinanceCardConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetPostFinanceCardConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet PostFinanceCard Value validators -->
+    <virtualType name="NovalnetPostFinanceCardValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetPostFinanceCardCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetPostFinanceCardCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetPostFinanceCardConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet SepaInstalment Facade configuration -->
+    <virtualType name="NovalnetSepaInstalmentFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_SEPA_INSTALMENT</argument>
+            <argument name="formBlockType" xsi:type="string">Novalnet\Payment\Block\Form\SepaInstalment</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\SepaInstalment</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetSepaInstalmentValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetSepaInstalmentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetSepaInstalmentCommandPool</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NovalnetSepaInstalmentConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_SEPA_INSTALMENT</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Direct Payment CommandPool -->
+    <virtualType name="NovalnetSepaInstalmentCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="initialize" xsi:type="string">NovalnetInitializeCommand</item>
+                <item name="authorize" xsi:type="string">NovalnetDirectPaymentAuthorizeCommand</item>
+                <item name="capture" xsi:type="string">NovalnetCaptureCommand</item>
+                <item name="refund" xsi:type="string">NovalnetRefundCommand</item>
+                <item name="void" xsi:type="string">NovalnetVoidCommand</item>
+                <item name="cancel" xsi:type="string">NovalnetVoidCommand</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet SepaInstalment Initialize command -->
+    <virtualType name="NovalnetSepaInstalmentInitializeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\InitializeDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\CcPaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionInitialize</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet SepaInstalment Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaInstalmentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet SepaInstalment Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaInstalmentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet SepaInstalment Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaInstalmentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet SepaInstalment Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaInstalmentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet SepaInstalment Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaInstalmentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet SepaInstalment Value handlers -->
+    <virtualType name="NovalnetSepaInstalmentValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetSepaInstalmentConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetSepaInstalmentConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetSepaInstalmentConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet SepaInstalment Value validators -->
+    <virtualType name="NovalnetSepaInstalmentValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetSepaInstalmentCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetSepaInstalmentCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetSepaInstalmentConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet InvoiceInstalment Facade configuration -->
+    <virtualType name="NovalnetInvoiceInstalmentFacade" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_INVOICE_INSTALMENT</argument>
+            <argument name="formBlockType" xsi:type="string">Novalnet\Payment\Block\Form\InvoiceInstalment</argument>
+            <argument name="infoBlockType" xsi:type="string">Novalnet\Payment\Block\Info\InvoiceInstalment</argument>
+            <argument name="valueHandlerPool" xsi:type="object">NovalnetInvoiceInstalmentValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">NovalnetInvoiceInstalmentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">NovalnetInvoiceInstalmentCommandPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetInvoiceInstalmentConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">\Novalnet\Payment\Model\Ui\ConfigProvider::NOVALNET_INVOICE_INSTALMENT</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Direct Payment CommandPool -->
+    <virtualType name="NovalnetInvoiceInstalmentCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="initialize" xsi:type="string">NovalnetInitializeCommand</item>
+                <item name="authorize" xsi:type="string">NovalnetDirectPaymentAuthorizeCommand</item>
+                <item name="capture" xsi:type="string">NovalnetCaptureCommand</item>
+                <item name="refund" xsi:type="string">NovalnetRefundCommand</item>
+                <item name="void" xsi:type="string">NovalnetVoidCommand</item>
+                <item name="cancel" xsi:type="string">NovalnetVoidCommand</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet InvoiceInstalment Initialize command -->
+    <virtualType name="NovalnetInvoiceInstalmentInitializeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\InitializeDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\CcPaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionInitialize</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet InvoiceInstalment Initialize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\InitializeDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceInstalmentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet InvoiceInstalment Authorize Request -->
+    <type name="Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceInstalmentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet InvoiceInstalment Capture Request -->
+    <type name="Novalnet\Payment\Gateway\Request\CaptureDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceInstalmentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet InvoiceInstalment Void Request -->
+    <type name="Novalnet\Payment\Gateway\Request\VoidDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceInstalmentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet InvoiceInstalment Refund Request -->
+    <type name="Novalnet\Payment\Gateway\Request\RefundDataBuilder">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceInstalmentConfig</argument>
+        </arguments>
+    </type>
+    <!-- Novalnet InvoiceInstalment Value handlers -->
+    <virtualType name="NovalnetInvoiceInstalmentValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">NovalnetInvoiceInstalmentConfigValueHandler</item>
+                <item name="payment_action" xsi:type="string">Novalnet\Payment\Gateway\Config\PaymentActionHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetInvoiceInstalmentConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">NovalnetInvoiceInstalmentConfig</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet InvoiceInstalment Value validators -->
+    <virtualType name="NovalnetInvoiceInstalmentValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">NovalnetInvoiceInstalmentCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="NovalnetInvoiceInstalmentCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">NovalnetInvoiceInstalmentConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Novalnet Direct Payment CommandPool -->
+    <virtualType name="NovalnetDirectPaymentCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="authorize" xsi:type="string">NovalnetDirectPaymentAuthorizeCommand</item>
+                <item name="capture" xsi:type="string">NovalnetCaptureCommand</item>
+                <item name="refund" xsi:type="string">NovalnetRefundCommand</item>
+                <item name="void" xsi:type="string">NovalnetVoidCommand</item>
+                <item name="cancel" xsi:type="string">NovalnetVoidCommand</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Redirect Payment CommandPool -->
+    <virtualType name="NovalnetRedirectPaymentCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="initialize" xsi:type="string">NovalnetInitializeCommand</item>
+                <item name="authorize" xsi:type="string">NovalnetRedirectPaymentAuthorizeCommand</item>
+                <item name="capture" xsi:type="string">NovalnetCaptureCommand</item>
+                <item name="refund" xsi:type="string">NovalnetRefundCommand</item>
+                <item name="void" xsi:type="string">NovalnetVoidCommand</item>
+                <item name="cancel" xsi:type="string">NovalnetVoidCommand</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Initialize command -->
+    <virtualType name="NovalnetInitializeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\InitializeDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\PaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionInitialize</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Direct Payment Authorize command -->
+    <virtualType name="NovalnetDirectPaymentAuthorizeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\AuthorizationDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\PaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionAuthorize</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Redirect Payment Authorize command -->
+    <virtualType name="NovalnetRedirectPaymentAuthorizeCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\RedirectAuthorizeDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\RedirectAuthorizeHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionRedirect</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Capture command -->
+    <virtualType name="NovalnetCaptureCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\CaptureDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\PaymentHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionCapture</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Void command -->
+    <virtualType name="NovalnetVoidCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\VoidDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\VoidHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionVoid</argument>
+        </arguments>
+    </virtualType>
+    <!-- Novalnet Refund command -->
+    <virtualType name="NovalnetRefundCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Novalnet\Payment\Gateway\Request\RefundDataBuilder</argument>
+            <argument name="handler" xsi:type="object">Novalnet\Payment\Gateway\Response\RefundHandler</argument>
+            <argument name="transferFactory" xsi:type="object">Novalnet\Payment\Gateway\Http\TransferFactory</argument>
+            <argument name="validator" xsi:type="object">Novalnet\Payment\Gateway\Validator\ResponseCodeValidator</argument>
+            <argument name="client" xsi:type="object">Novalnet\Payment\Gateway\Http\Client\TransactionRefund</argument>
+        </arguments>
+    </virtualType>
+    <!--Novalnet logger -->
+    <type name="Novalnet\Payment\Logger\Handler\NovalnetInfo">
+        <arguments>
+            <argument name="filesystem" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+        </arguments>
+    </type>
+    <type name="Novalnet\Payment\Logger\NovalnetLogger">
+        <arguments>
+            <argument name="name" xsi:type="string">NovalnetLogger</argument>
+            <argument name="handlers"  xsi:type="array">
+                <item name="novalnetNotice" xsi:type="object">Novalnet\Payment\Logger\Handler\NovalnetNotice</item>
+                <item name="novalnetDebug" xsi:type="object">Novalnet\Payment\Logger\Handler\NovalnetDebug</item>
+                <item name="novalnetError" xsi:type="object">Novalnet\Payment\Logger\Handler\NovalnetError</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/etc/email_templates.xml b/etc/email_templates.xml
new file mode 100755
index 0000000..5713b40
--- /dev/null
+++ b/etc/email_templates.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Email:etc/email_templates.xsd">
+    <template id="novalnet_callback_email_template" label="Novalnet Callback Email" file="novalnet_callback_email.html" type="html" module="Novalnet_Payment" area="frontend"/>
+    <template id="novalnet_callback_instalment_email_template" label="Novalnet Callback Instalment Email" file="novalnet_callback_instalment_email.html" type="html" module="Novalnet_Payment" area="frontend"/>
+</config>
diff --git a/etc/events.xml b/etc/events.xml
new file mode 100755
index 0000000..30aef51
--- /dev/null
+++ b/etc/events.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="payment_method_is_active">
+        <observer name="novalnet_payment_method_is_active" instance="Novalnet\Payment\Observer\PaymentMethodIsActive"/>
+    </event>
+    <event name="payment_method_assign_data">
+        <observer name="novalnet_payment_data_assign" instance="Novalnet\Payment\Observer\DataAssignObserver" />
+    </event>
+    <event name="checkout_submit_all_after">
+        <observer name="novalnet_payment_set_order_status" instance="Novalnet\Payment\Observer\ProcessNovalnetPayment" />
+    </event>
+    <event name="sales_order_invoice_pay">
+        <observer name="novalnet_payment_invoice_mail" instance="Novalnet\Payment\Observer\ProcessCaptureAction" />
+    </event>
+    <event name="sales_order_payment_void">
+        <observer name="novalnet_payment_void_status" instance="Novalnet\Payment\Observer\SetVoidStatus" />
+    </event>
+    <event name="sales_order_place_before">
+      <observer name="novalnet_payment_sales_order_place_before" instance="Novalnet\Payment\Observer\OrderPlacebefore"/>
+   </event>
+   <event name="shortcut_buttons_container">
+        <observer name="novalnet_payment_shortcut_buttons" instance="Novalnet\Payment\Observer\ShortcutButtons"/>
+    </event>
+   <event name="save_subscription_profile">
+        <observer name="novalnet_payment_shortcut_buttons" instance="Novalnet\Payment\Observer\SavePaymentDataForRecurring"/>
+    </event>
+   <event name="subscription_payment_additionaldata">
+        <observer name="novalnet_payment_shortcut_buttons" instance="Novalnet\Payment\Observer\SetPaymentDataForRecurring"/>
+    </event>
+   <event name="subscription_supported_payment_methods">
+        <observer name="novalnet_payment_subscription_supported_payments" instance="Novalnet\Payment\Observer\SubscriptionSupportedPayments"/>
+    </event>
+</config>
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
new file mode 100755
index 0000000..09b13cb
--- /dev/null
+++ b/etc/frontend/di.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Checkout\Model\CompositeConfigProvider">
+        <arguments>
+            <argument name="configProviders" xsi:type="array">
+                <item name="novalnet_payment_config_provider" xsi:type="object">Novalnet\Payment\Model\Ui\ConfigProvider</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Checkout\Block\Checkout\LayoutProcessor">
+        <plugin name="novalnet_applepay_guest_checkout_layout" type="Novalnet\Payment\Plugin\Checkout\LayoutProcessor" sortOrder="100"/>
+    </type>  
+</config>
diff --git a/etc/frontend/routes.xml b/etc/frontend/routes.xml
new file mode 100755
index 0000000..ebbffdd
--- /dev/null
+++ b/etc/frontend/routes.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="standard">
+        <route id="novalnet" frontName="novalnet">
+            <module name="Novalnet_Payment" />
+        </route>
+    </router>
+</config>
diff --git a/etc/module.xml b/etc/module.xml
new file mode 100755
index 0000000..43ee342
--- /dev/null
+++ b/etc/module.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Novalnet_Payment" setup_version="12.4.5">
+        <sequence>
+            <module name="Magento_Sales"/>
+            <module name="Magento_Payment"/>
+            <module name="Magento_Checkout"/>
+        </sequence>
+    </module>
+</config>
diff --git a/etc/webapi.xml b/etc/webapi.xml
new file mode 100755
index 0000000..ccfcfce
--- /dev/null
+++ b/etc/webapi.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Webapi:etc/webapi.xsd">
+    <route url="/V1/novalnet/activate_product_key/:signature/:payment_access_key" method="GET">
+        <service class="Novalnet\Payment\Api\NNRepositoryInterface" method="activateProductKey"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/novalnet/config_webhook_url/:signature/:payment_access_key" method="GET">
+        <service class="Novalnet\Payment\Api\NNRepositoryInterface" method="configWebhookUrl"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/novalnet/payment/getRedirectURL" method="POST">
+        <service class="Novalnet\Payment\Api\NNRepositoryInterface" method="getRedirectURL"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/novalnet/payment/remove_token/:transaction_row_id" method="GET">
+        <service class="Novalnet\Payment\Api\NNRepositoryInterface" method="removeToken"/>
+        <resources>
+            <resource ref="self"/>
+        </resources>
+    </route>
+    <route url="/V1/novalnet/payment/instalment_options/:code/:total" method="GET">
+        <service class="Novalnet\Payment\Api\NNRepositoryInterface" method="getInstalmentOptions"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/novalnet/payment/instalment_cycle/:amount/:period" method="GET">
+        <service class="Novalnet\Payment\Api\NNRepositoryInterface" method="getInstalmentCycleAmount"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/novalnet/callback" method="POST">
+        <service class="Novalnet\Payment\Api\NNRepositoryInterface" method="callback"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/novalnet/payment/addToCart" method="POST">
+        <service class="Novalnet\Payment\Api\NNRepositoryInterface" method="addToCart"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/novalnet/payment/placeOrder" method="POST">
+        <service class="Novalnet\Payment\Api\NNRepositoryInterface" method="placeOrder"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/novalnet/payment/getCart" method="POST">
+        <service class="Novalnet\Payment\Api\NNRepositoryInterface" method="getCart"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/novalnet/payment/estimateShippingMethod" method="POST">
+        <service class="Novalnet\Payment\Api\NNRepositoryInterface" method="estimateShippingMethod"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/novalnet/payment/getProductPageParams" method="POST">
+        <service class="Novalnet\Payment\Api\NNRepositoryInterface" method="getProductPageParams"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/novalnet/payment/applyShippingMethod" method="POST">
+        <service class="Novalnet\Payment\Api\NNRepositoryInterface" method="applyShippingMethod"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+</routes>
diff --git a/i18n/de_DE.csv b/i18n/de_DE.csv
new file mode 100755
index 0000000..81381f8
--- /dev/null
+++ b/i18n/de_DE.csv
@@ -0,0 +1,358 @@
+"You will be redirected to Blik. Please don’t close or refresh the browser until the payment is completed","Sie werden zu Blik weitergeleitet. Um eine erfolgreiche Zahlung zu gewährleisten, darf die Seite nicht geschlossen oder neu geladen werden, bis die Bezahlung abgeschlossen ist"
+"Your order was successfully processed using Google Pay","Ihre Bestellung wurde erfolgreich mit Google Pay durchgeführt"
+"Your order was successfully processed using Apple Pay","Ihre Bestellung wurde erfolgreich mit Apple Pay durchgeführt"
+"Business name","Name des Geschäfts"
+"Google Merchant ID","Google-Händler-ID"
+"The business name is rendered in the Google Pay payment sheet, and this text will appear as PAY 'BUSINESS NAME' so that the customer knows where he is paying to.","Der Name des Geschäfts wird in den Zahlungsbeleg von Google Pay eingefügt und der Text wird als PAY 'Name des Geschäfts' angezeigt, so dass der Endkunde weiß, an wen er zahlt."
+"Display the Google Pay button on","Google-Pay-Button anzeigen auf"
+"Display the Apple Pay button on","Apple Pay-Button anzeigen auf"
+"Please note that Google's merchant identifier is required for processing the payment method in the live environment. Google's merchant identifier is issued after registration with the <a href='https://pay.google.com/business/console/' target='_blank'>Google Pay and Wallet Console</a>. See <a href='https://developers.google.com/pay/api/web/guides/test-and-deploy/request-prod-access' target='_blank'>Request production access</a> for more information about the approval process and obtaining a Google merchant identifier. The registration also involves submitting the integration with sufficient screen-shots, so collect this information by enabling the payment method in test mode. To suppress the validation of this field while saving the configuration, use this test identifier BCR2DN4XXXTN7FSI for testing and submission of your integration to Google.","Beachten Sie bitte, dass die Händler-ID von Google für die Ausführung dieser Zahlungsart in der Live-Umgebung benötigt wird. Die Händler-ID wird nach der Registrierung bei <a href='https://pay.google.com/business/console/' target='_blank'>Google Pay und der Wallet-Konsole</a> vergeben. Siehe auch: <a href='https://developers.google.com/pay/api/web/guides/test-and-deploy/request-prod-access' target='_blank'>Anfrage für Produktiv-Zugang stellen</a>, falls Sie mehr Informationen zum Genehmigungsverfahren benötigen und dazu, wie Sie eine Google Händler-ID erhalten. Die Registrierung beinhaltet auch, dass Sie Ihre Anbindung mit ausreichenden Screenshots einreichen, deshalb sammeln Sie diese Informationen, indem Sie die Zahlungsmethode im Testmodus aktivieren. Um die Validierung dieses Feldes zu überspringen, während Sie die Konfiguration speichern, verwenden Sie diese Test-ID, BCR2DN4XXXTN7FSI , zum Testen und Einreichen Ihrer Anbindung bei Google."
+"The selected pages will display the Google Pay button to pay instantly as an express checkout option","Auf den ausgewählten Seiten wird der Google Pay-Button angezeigt um mit der Express-Checkout-Option sofort zu bezahlen."
+"The selected pages will display the Apple Pay button to pay instantly as an express checkout option","Auf den ausgewählten Seiten wird der Apple Pay-Button angezeigt um mit der Express-Checkout-Option sofort zu bezahlen."
+"Payment Reminder %1 has been sent to the customer.","Zahlungserinnerung %1 wurde an den Kunden gesendet."
+"The transaction has been submitted to the collection agency. Collection Reference: %1","Die Transaktion wurde an das Inkassobüro übergeben. Inkasso-Referenz: %1"
+"Authorize with zero amount","Mit Nullbetrag autorisieren"
+"This order processed as a zero amount booking","Diese Transaktion wird mit Nullbuchung bearbeitet"
+"Amount has been booked successfully","Der Betrag wurde erfolgreich buchen"
+"Zero Amount has been updated successfully","Der Betrag 0 wurde erfolgreich geändert"
+"Zero Amount update has been failed","Die Nullbetragsaktualisierung ist fehlgeschlagen"
+"Are you sure you want to book the order amount?","Sind Sie sich sicher, dass Sie den Bestellbetrag buchen wollen?"
+"Book transaction","Transaktion durchführen"
+"Your order has been booked with the amount of %1. Your new TID for the booked amount: %2","Ihre Bestellung wurde mit einem Betrag von %1 gebucht. Ihre neue TID für den gebuchten Betrag: %2"
+"Zero amount booking","Transaktionen mit Betrag 0"
+"This order will be processed as zero amount booking which store your payment data for further online purchases.","Diese Bestellung wird als Nullbuchung verarbeitet. Ihre Zahlungsdaten werden für zukünftige Online-Einkäufe gespeichert."
+"Transaction booking amount","Buchungsbetrag der Transaktion"
+"(in minimum unit of currency. E.g. enter 100 which is equal to 1.00)","(in der kleinsten Währungseinheit, z.B. 100 Cent = entsprechen 1.00 EUR)"
+"You will be redirected to WeChat Pay. Please don’t close or refresh the browser until the payment is completed.","Sie werden zu WeChat Pay weitergeleitet. Um eine erfolgreiche Zahlung zu gewährleisten, darf die Seite nicht geschlossen oder neu geladen werden, bis die Bezahlung abgeschlossen ist."
+"You will be redirected to Trustly. Please don’t close or refresh the browser until the payment is completed.","Sie werden zu Trustly weitergeleitet. Um eine erfolgreiche Zahlung zu gewährleisten, darf die Seite nicht geschlossen oder neu geladen werden, bis die Bezahlung abgeschlossen ist."
+"You will be redirected to Alipay. Please don’t close or refresh the browser until the payment is completed.","Sie werden zu Alipay weitergeleitet. Um eine erfolgreiche Zahlung zu gewährleisten, darf die Seite nicht geschlossen oder neu geladen werden, bis die Bezahlung abgeschlossen ist."
+"On-hold order status","On-hold-Bestellstatus"
+"Status to be used for on-hold orders until the transaction is confirmed or canceled","Wählen Sie, welcher Status für On-hold-Bestellungen verwendet wird, solange diese nicht bestätigt oder storniert worden sind"
+"The instalment amount for this cycle %cycleAmount %currency will be debited from your account in one - three business days.","Die nächste Rate in Höhe von %cycleAmount %currency wird in ein bis drei Werktagen von Ihrem Konto abgebucht."
+"Documentation","Dokumentation"
+"Deactivate Instalment Renewal Notification E-mail to end-customer","Deaktivieren Sie Ratenzahlung Erneuerung E-Mail-Benachrichtigung an den Endverbraucher"
+"Configuration","Einstellungen"
+"Instalment has been cancelled.","Ratenzahlung wurde storniert."
+"Payments","Zahlungen"
+"Product Activation Key","Produktaktivierungsschlüssel"
+"Merchant details are configured successfully. Please select the Tariff ID and click","Ihre Händlerdaten wurden erfolgreich aktualisiert. Bitte wählen Sie die Tarif-ID und klicken Sie auf "
+"button to save the configuration.",", um alle Einstellungen zu speichern."
+"Activate"," Aktivieren"
+"Enter the Novalnet Product activation key that is required for authentication and click Activate. You will find the Product activation key in the <a href='https://admin.novalnet.de/' target='_blank'>Novalnet Admin Portal</a>: Projects > Choose your project > API credentials > API Signature (Product activation key)","Geben Sie den Novalnet-Produktaktivierungsschlüssel ein, der für die Authentifizierung erforderlich ist, und klicken Sie auf Aktivieren. Den Produktaktivierungsschlüssel finden Sie im <a href='https://admin.novalnet.de/' target='_blank'>Novalnet Admin-Portal</a> > Projekts > Wählen Sie Ihr Projekt > API-Anmeldeinformationen > API-Signature (Aktivierungsschlüssel des Produkts)."
+"Merchant ID","Händler-ID"
+"Project ID","Projekt-ID"
+"Authentication code","Authentifizierungscode"
+"Select Tariff ID","Auswahl der Tarif-ID"
+"Select a Tariff ID to match the preferred tariff plan you created at the Novalnet Admin Portal for this project","Wählen Sie eine Tarif-ID, die dem bevorzugten Tarifplan entspricht, den Sie im Novalnet Admin-Portal für dieses Projekt erstellt haben"
+"Payment Access Key","Zahlungs-Zugriffsschlüssel"
+"Enable Live Mode","Live-Modus aktivieren"
+"Selected payment methods will be in Live Mode","Für ausgewählten Zahlungsarten wird der Live-Modus gesetzt"
+"No active payment method for this store","Für diesen Shop ist keine Zahlungsart aktiviert."
+"Display payment method logo","Zahlungslogo anzeigen"
+"The payment method logo will be displayed on the checkout page","Das Logo der Zahlungsart wird auf der Checkout-Seite angezeigt"
+"Products remain in the shopping cart after cancelled payment","Produkte im Warenkorb nach Abbruch des Zahlungsvorgangs wiederherstellen"
+"For additional configurations login to <a href='https://admin.novalnet.de/' target='_blank'> Novalnet Merchant Administration portal</a>. To login to the Portal you need to have an account at Novalnet. If you don't have one yet, please contact <a href='mailto:sales@novalnet.de'>sales@novalnet.de</a> / tel. +49 (089) 923068320</br>","Um zusätzliche Einstellungen vorzunehmen"
+"To accept PayPal transactions, configure your PayPal API info in the <a href='https://admin.novalnet.de/' target='_blank'> Novalnet Admin Portal </a> > PROJECT > 'Project' Information > Payment Methods > Paypal > Configure.","Um PayPal-Transaktionen zu akzeptieren, konfigurieren Sie Ihre PayPal-API-Informationen im <a href='https://admin.novalnet.de/' target='_blank'>Novalnet Admin-Portal </a> > PROJEKT > Wählen Sie Ihr Projekt > Zahlungsmethoden > Paypal > Konfigurieren"
+"Order status management for on-hold transactions","Verwaltung des Bestellstatus für ausgesetzte Zahlungen"
+"Order status for the pending payment","Bestellstatus der ausstehenden Zahlung"
+"Onhold order status","On-hold-Bestellstatus"
+"Cancellation order status","Bestellstatus für Stornierung"
+"Notification / Webhook URL Setup","Benachrichtigungs- / Webhook-URL festlegen"
+"Allow manual testing of the Notification / Webhook URL","Deaktivieren Sie die IP-Adresskontrolle (nur zu Testzwecken)"
+"For additional configurations login to <a href='https://admin.novalnet.de/' target='_blank'> Novalnet Merchant Administration portal</a>. To login to the Portal you need to have an account at Novalnet. If you don't have one yet, please contact <a href='mailto:sales@novalnet.de'>sales@novalnet.de</a> / tel. +49 (089) 923068320</br></br>To use the PayPal payment method please enter your PayPal API details in <a href='https://admin.novalnet.de/' target='_blank'> Novalnet Merchant Administration portal</a>","Aktivieren Sie diese Option, um die Novalnet-Benachrichtigungs-/Webhook-URL manuell zu testen. Deaktivieren Sie die Option, bevor Sie Ihren Shop liveschalten, um unautorisierte Zugriffe von Dritten zu blockieren."
+"E-Mail address of the recipient","E-Mail-Benachrichtigungen werden an diese E-Mail-Adresse gesendet"
+"Notification &amp; Webhook URL","Benachrichtigungs- / Webhook-URL"
+"Notification / Webhook URL is required to keep the merchant’s database/system synchronized with the Novalnet account (e.g. delivery status). Refer the Installation Guide for more information","Eine Benachrichtigungs- / Webhook-URL ist erforderlich, um die Datenbank / das System des Händlers mit dem Novalnet-Account synchronisiert zu halten (z.B. Lieferstatus). Weitere Informationen finden Sie in der Installationsanleitung"
+"Payment Methods","Zahlungsmethode"
+"Credit/Debit Cards","Kredit-/Debitkarte"
+"Direct Debit SEPA","SEPA-Lastschrift"
+"Invoice","Kauf auf Rechnung"
+"Prepayment","Vorkasse"
+"Invoice with payment guarantee","Rechnung mit Zahlungsgarantie"
+"Direct Debit SEPA with payment guarantee","SEPA-Lastschrift mit Zahlungsgarantie"
+"Instalment by Direct Debit SEPA","Ratenzahlung per SEPA-Lastschrift"
+"Instalment by Invoice","Ratenzahlung per Rechnung"
+"PayPal","PayPal"
+"Sofort","Sofortüberweisung"
+"Online bank transfer","Onlineüberweisung"
+"iDEAL","iDEAL"
+"Eps","eps"
+"Giropay","giropay"
+"Przelewy24","Przelewy24"
+"PostFinance Card","PostFinance Card"
+"PostFinance E-Finance","PostFinance E-Finance"
+"Multibanco","Multibanco"
+"Bancontact","Bancontact"
+"Display payment method","Zahlungsart anzeigen"
+"Novalnet Title","Titel"
+"Define a sorting order","Geben Sie eine Sortierreihenfolge an"
+"This payment method will be sorted among others (in the ascending order) as per the given sort number","Die Zahlungsarten werden in Ihrem Checkout anhand der von Ihnen vorgegebenen Sortierreihenfolge angezeigt (in aufsteigender Reihenfolge)"
+"Payment logo","Logo der Zahlungsart"
+"Payment Action","Aktion für vom Besteller autorisierte Zahlungen"
+"Authorize","Zahlung autorisieren"
+"Choose whether or not the payment should be charged immediately. Capture completes the transaction by transferring the funds from buyer account to merchant account. Authorize verifies payment details and reserves funds to capture it later, giving time for the merchant to decide on the order.","Wählen Sie, ob die Zahlung sofort belastet werden soll oder nicht. Zahlung einziehen: Betrag sofort belasten. Zahlung autorisieren: Die Zahlung wird überprüft und autorisiert, aber erst zu einem späteren Zeitpunkt belastet. So haben Sie Zeit, über die Bestellung zu entscheiden."
+"Capture","Zahlung einziehen"
+"Novalnet Capture","Novalnet Erfassen"
+"Completed order status","Status für erfolgreichen Auftragsabschluss"
+"Status to be used for successful orders","Wählen Sie, welcher Status für erfolgreich abgeschlossene Bestellungen verwendet wird"
+"Payment due date (in days)","Fälligkeitsdatum (in Tagen)"
+"Enter the number of days after which the payment should be processed (must be between 2 and 14 days)","Geben Sie die Anzahl der Tage ein, nach denen der Zahlungsbetrag eingezogen werden soll (muss zwischen 2 und 14 Tagen liegen)."
+"Enter the number of days after which the payment should be processed (must be between 7 and 28 days)","Anzahl der Tage, die der Käufer Zeit hat, um den Betrag an Novalnet zu überweisen (muss zwischen 7 und 28 Tagen liegen). Wenn Sie dieses Feld leer lassen, werden standardmäßig 14 Tage als Fälligkeitsdatum festgelegt."
+"Minimum transaction amount for authorization","Mindesttransaktionsbetrag für die Autorisierung (in der kleinsten Währungseinheit, z.B. 100 Cent = entsprechen 1.00 EUR)"
+"Form appearance","Darstellung des Formulars"
+"Custom CSS Settings","Angepasste CSS-Einstellungen"
+"CSS settings for iframe form","CSS-Einstellungen für den iFrameformular"
+"NN CC Label Style","Beschriftung"
+"NN CC Input Style","Eingabe"
+"NN CC CSS text","Text für das CSS"
+"Notification for the buyer","Benachrichtigung des Käufers"
+"The entered text will be displayed on the checkout page","Der eingegebene Text wird auf der Checkout-Seite angezeigt"
+"User Group Excluded","Ausgeschlossene Benutzergruppe(n)"
+"Payment from Applicable Countries","Zahlung aus zugelassenen Ländern"
+"Payment from Specific Countries","Länderauswahl für Zahlungsmöglichkeit"
+"Minimum order amount (in minimum unit of currency. E.g. enter 100 which is equal to 1.00)","Mindestbestellbetrag (in der kleinsten Währungseinheit, z.B. 100 Cent = entsprechen 1.00 EUR)"
+"Minimum order amount: 19.98 EUR or more","Mindestbetrag der Bestellung: 19.98 EUR"
+"The minimum amount should be at least 9.99 EUR","Der Mindestbetrag sollte bei mindestens 9.99 EUR"
+"The minimum amount should be at least 19.98 EUR","Der Mindestbetrag sollte bei mindestens 19.98 EUR"
+"Minimum Order Total","Mindestwert für Gesamtbestellung"
+"Maximum Order Total","Höchstwert für Gesamtbestellung"
+"Minimum Orders Count","Mindestanzahl an bisherigen Bestellungen des Kunden"
+"Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method","Aktivieren Sie diese Zahlungsart für den jeweiligen Kunden nur dann, wenn er die geforderte Anzahl an früheren Bestellungen bei Ihnen überschreitet."
+"Your credit/debit card will be charged immediately after the order is completed","Ihre Karte wird nach Bestellabschluss sofort belastet"
+"Once you've submitted the order, you will receive an e-mail with account details to make payment","Sobald Sie die Bestellung absenden, erhalten Sie eine E-Mail mit den Kontodaten, um die Zahlung abzuschließen."
+"The payment will be processed in the test mode therefore amount for this transaction will not be charged","Die Zahlung wird im Testmodus durchgeführt, daher wird der Betrag für diese Transaktion nicht eingezogen."
+"Your credit card details are invalid","Ihre Kreditkartendaten sind ungültig."
+"Card holder name","Name des Karteninhabers"
+"Name on card","Name auf der Kreditkarte"
+"Card number","Kreditkartennummer"
+"XXXX XXXX XXXX XXXX","XXXX XXXX XXXX XXXX"
+"Expiry date","Ablaufdatum"
+"MM / YY","MM / YY"
+"CVC/CVV/CID","CVC/CVV/CID"
+"XXX","XXX"
+"what is this?","Was ist das?"
+"The amount will be debited from your account by Novalnet","Der Betrag wird durch Novalnet von Ihrem Konto abgebucht"
+"Account holder","Kontoinhaber"
+"IBAN","IBAN"
+"I hereby grant the mandate for the SEPA direct debit","Ich erteile hiermit das SEPA-Lastschriftmandat"
+"(electronic transmission)","(elektronische Übermittlung)"
+"and confirm that the given bank details are correct!","und bestätige, dass die Bankverbindung korrekt ist"
+"I authorise (A) Novalnet AG to send instructions to my bank to debit my account and (B) my bank to debit my account in accordance with the instructions from Novalnet AG.","Ich ermächtige den Zahlungsempfänger, Zahlungen von meinem Konto mittels Lastschrift einzuziehen. Zugleich weise ich mein Kreditinstitut an, die von dem Zahlungsempfänger auf mein Konto gezogenen Lastschriften einzulösen."
+"Creditor identifier: DE53ZZZ00000004253","Gläubiger-Identifikationsnummer: DE53ZZZ00000004253"
+"Note:","Hinweis:"
+"You are entitled to a refund from your bank under the terms and conditions of your agreement with bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.","Ich kann innerhalb von acht Wochen, beginnend mit dem Belastungsdatum, die Erstattung des belasteten Betrages verlangen. Es gelten dabei die mit meinem Kreditinstitut vereinbarten Bedingungen."
+"After the successful verification, you will be redirected to Novalnet secure order page to proceed with the payment","Sie werden auf die sichere Zahlungsseite von Novalnet weitergeleitet, um die Zahlung abzuschließen."
+"Are you sure you want to remove these account details?","Sind Sie sicher, dass Sie diese Kontodaten entfernen möchten?"
+"Are you sure you want to remove these Credit Card details?","Sind Sie sicher, dass Sie diese Kreditkartendaten entfernen möchten?"
+"Add new card details","Neue Kreditkarte hinzufügen"
+"Add new account details","Neue Kontodaten hinzufügen"
+"Save my card details for future purchases","Ich möchte meine Kartendaten für spätere Einkäufe speichern"
+"Save my account details for future purchases","Ich möchte meine Kontodaten für spätere Einkäufe speichern"
+"Save my PayPal details for future purchases","Ich möchte meine PayPal-Kontodaten für spätere Einkäufe speichern"
+"Test order","Testbestellung"
+"Novalnet Transaction ID: ","Novalnet-Transaktions-ID: "
+"Payment Failed","Zahlung fehlgeschlagen"
+"The transaction has been confirmed on %1","Die Transaktion wurde am %1 Uhr bestätigt"
+"The transaction has been canceled on %1","Die Transaktion wurde am %1 Uhr storniert"
+"Refund has been initiated for the TID:%1 with the amount %2","Die Rückerstattung für die TID %1 mit dem Betrag %2 wurde veranlasst"
+"Refund has been initiated for the TID: %1 with the amount %2. New TID:%3","Die Rückerstattung für die TID %1 mit dem Betrag %2 wurde veranlasst. Die neue TID : %3"
+"Customer was redirected to Novalnet","Besteller zu Novalnet umgeleitet"
+"Customer successfully returned from Novalnet","Der Kunde wurde erfolgreich von Novalnet zurückgeleitet."
+"The transaction has been confirmed","Die Buchung wurde bestätigt"
+"The transaction has been canceled","Die Transaktion wurde storniert"
+"While redirecting some data has been changed. The hash check failed.","Während der Umleitung wurden einige Daten geändert. Die Überprüfung des Hashes schlug fehl."
+"The transaction has been confirmed on %1","Die Buchung wurde am %1 Uhr bestätigt"
+"The transaction has been canceled on %1","Die Transaktion wurde am %1 Uhr storniert"
+"Refund/Bookback executed successfully for the TID: %1 amount: %2 on %3. The subsequent TID: %4","Rückerstattung / Bookback erfolgreich ausgeführt für die TID: %1: Betrag: %2 am %3. TID der Folgebuchung: %4"
+"The transaction status has been changed from pending to on hold for the TID: %1 on %2.","Der Status der Transaktion mit der TID: %1 wurde am %2 Uhr  von ausstehend auf ausgesetzt geändert."
+"Credit has been successfully received for the TID: %1 with amount %2 on %3. Please refer PAID order details in our Novalnet Admin Portal for the TID: %4","Die Gutschrift für die TID ist erfolgreich eingegangen: %1 mit Betrag %2 am %3. Bitte entnehmen Sie die TID den Einzelheiten der Bestellung bei BEZAHLT in unserem Novalnet Adminportal: %4"
+"Chargeback executed successfully for the TID: %1 amount: %2 on %3. The subsequent TID: %4","Chargeback erfolgreich importiert für die TID: %1 Betrag: %2 am %3 Uhr. TID der Folgebuchung: %4"
+"Transaction updated successfully for the TID: %1 with the amount %2 on %3","Transaktion mit TID %1 und Betrag %2 wurde am um erfolgreich aktualisiert %3"
+"The Transaction ID already existed","The Transaction ID already existed"
+"Enter the number of days to transfer the payment amount to Novalnet (must be greater than 7 days). In case if the field is empty, 14 days will be set as due date by default","Anzahl der Tage, die der Käufer Zeit hat, um den Betrag an Novalnet zu überweisen (muss mehr als 7 Tage betragen). Wenn Sie dieses Feld leer lassen, werden standardmäßig 14 Tage als Fälligkeitsdatum festgelegt"
+"Slip expiry date (in days)","Verfallsdatum des Zahlscheins (in Tagen)"
+"Enter the number of days to pay the amount at store near you. If the field is empty, 14 days will be set as default.","Anzahl der Tage, die der Käufer Zeit hat, um den Betrag in einer Filiale zu bezahlen. Wenn Sie dieses Feld leer lassen, ist der Zahlschein standardmäßig 14 Tage lang gültig"
+"Recurring Period for the instalment cycles","Wählen Sie die zeitliche Abfolge der einzelnen Raten"
+"On choosing an appropriate recurring period, each instalment cycle will be processed based on that","Wählen Sie einen passenden Zeitraum zwischen den zu zahlenden Raten aus"
+"Select the various instalment cycles that can be availed in the instalment plan","Wählen Sie die Anzahl der Raten aus."
+"Choose your instalment plan","Wählen Sie Ihren Ratenplan"
+"<b>Basic requirements for payment guarantee</b><br>Allowed B2C countries: DE, AT, CH<br>Allowed B2B countries: European Union<br>Allowed currency: EUR<br>Minimum order amount: 9.99 EUR or more<br>Age limit: 18 years or more<br>The billing address must be the same as the shipping address<br><br>","<b>Grundanforderungen für die Zahlungsgarantie</b><br>Erlaubte B2C-Länder: DE, AT, CH<br>Erlaubte B2B-Länder: Europäische Union<br>Zugelassene Währung: EUR<br>Mindestbetrag der Bestellung: 9.99 EUR<br>Mindestalter: 18 Jahre<br>Rechnungsadresse und Lieferadresse müssen übereinstimmen<br><br>"
+"<b>Basic requirements for the instalment payment</b><br>Allowed B2C countries: DE, AT, CH<br>Allowed B2B countries: European Union<br>Allowed currency: EUR<br>Minimum order amount: 19.98 EUR or more<br>Please note that the instalment cycle amount has to be a minimum of 9.99 EUR and the instalment cycles which do not meet this criteria will not be displayed in the instalment plan<br>Age limit: 18 years or more<br>The billing address must be the same as the shipping address<br><br>","<b>Voraussetzungen für die Ratenzahlung</b><br>Erlaubte B2C-Länder: DE, AT, CH<br>Erlaubte B2B-Länder: Europäische Union<br>Zugelassene Währung: EUR<br>Mindestbetrag der Bestellung: 19.98 EUR<br>Bitte beachten Sie, dass der Betrag einer Rate mindestens 9.99 EUR betragen muss und Raten, die diese Kriterien nicht erfüllen, nicht im Ratenplan angezeigt werden<br>Mindestalter: 18 Jahre<br>Rechnungsadresse und Lieferadresse müssen übereinstimmen<br><br>"
+"Choose the financing option that best fits your needs and you will be charged based on that chosen plan","Wählen Sie die Finanzierungsoption, die Ihren Bedürfnissen am besten entspricht. Die Raten werden Ihnen entsprechend dem gewählten Ratenplan berechnet"
+"Net loan amount: ","Netto-Kreditbetrag: "
+"The payment cannot be processed, because the basic requirements for the %1 haven't been met (The shipping address must be the same as the billing address)","Die Zahlung kann nicht ausgeführt werden, weil die Voraussetzungen für die Zahlungsgarantie nicht erfüllt sind (Die Lieferadresse muss mit der Rechnungsadresse identisch sein)"
+"The date should be in future","Das Datum sollte in der Zukunft liegen."
+"The transaction has been updated with due date %1","Die Transaktion wurde aktualisiert. Neues Fälligkeitsdatum: %1"
+"The transaction has been updated with amount %1 and slip expiry date with %2","Die Transaktion wurde aktualisiert. Neuer Betrag: %1, neues Fälligkeitsdatum des Zahlscheins: %2"
+"The transaction has been updated with amount %1","Die Transaktion wurde mit dem Betrag %1"
+"The transaction has been updated with amount %1 and due date with %2","Die Transaktion wurde mit dem Betrag %1 und dem Fälligkeitsdatum %2 aktualisiert."
+"The transaction has been updated with slip expiry date %1","Die Transaktion wurde aktualisiert. Neues Fälligkeitsdatum des Zahlscheins: %1"
+"Customer was redirected to Novalnet","Besteller zu Novalnet umgeleitet"
+"Customer successfully returned from Novalnet","Der Kunde wurde erfolgreich von Novalnet zurückgeleitet."
+"While redirecting some data has been changed. The hash check failed.","Während der Umleitung wurden einige Daten geändert. Die Überprüfung des Hashes schlug fehl."
+"Payment Failed","Zahlung fehlgeschlagen"
+"On successful checkout, you will receive a payment slip/SMS to pay your online purchase at one of our retail partners (e.g. supermarket)","Nach erfolgreichem Bestellabschluss erhalten Sie einen Zahlschein bzw. eine SMS. Damit können Sie Ihre Online-Bestellung bei einem unserer Partner im Einzelhandel (z.B. Drogerie, Supermarkt etc.) bezahlen"
+"The transaction has been confirmed successfully for the TID: %1","Die Transaktion mit der TID: %1 wurde erfolgreich bestätigt"
+"Please transfer the amount to the below mentioned account details of our payment processor Novalnet","Überweisen Sie bitte den Betrag an die unten aufgeführte Bankverbindung unseres Zahlungsdienstleisters Novalnet"
+"Your order is being verified. Once confirmed, we will send you our bank details to which the order amount should be transferred. Please note that this may take up to 24 hours","Ihre Bestellung wird überprüft. Nach der Bestätigung senden wir Ihnen unsere Bankverbindung, an die Sie bitte den Gesamtbetrag der Bestellung überweisen. Bitte beachten Sie, dass dies bis zu 24 Stunden dauern kann"
+"Your order is under verification and we will soon update you with the order status. Please note that this may take upto 24 hours.","Ihre Bestellung wird derzeit überprüft. Wir werden Sie in Kürze über den Bestellstatus informieren. Bitte beachten Sie, dass dies bis zu 24 Stunden dauern kann."
+"Slip expiry date: %1", "Verfallsdatum des Zahlscheins: %1"
+"Store(s) near you:","Barzahlen-Partnerfilialen in Ihrer Nähe:"
+"Please enter the refund amount","Geben Sie bitte den erstatteten Betrag ein"
+"(in minimum unit of currency. E.g. enter 100 which is equal to 1.00)","(in der kleinsten Währungseinheit, z.B. 100 Cent = entsprechen 1.00 EUR)"
+"Change the slip expiry date","Ablaufdatum des Zahlscheins ändern"
+"Change the due date","Fälligkeitsdatum ändern"
+"Slip expiry date","Verfallsdatum des Zahlscheins"
+"Transaction due date","Fälligkeitsdatum der Transaktion"
+"Amount","Betrag"
+"Update","Aktualisieren"
+"Refund","Rückerstattung"
+"Paid","Bezahlt"
+"Pending","Ausstehend"
+"Cancel","Stornieren"
+"Reference","Verwendungszweck"
+"Are you sure you want to change the slip expiry date?","Sind Sie sicher, dass Sie das Ablaufdatum des Zahlscheins ändern wollen?"
+"Are you sure you want to change the order due date?","Sind Sie sich sicher, dass Sie den das Fälligkeitsdatum der Bestellung ändern wollen?"
+"Pay now with Barzahlen","Jetzt mit Barzahlen bezahlen"
+" Cycles / "," Raten / "
+"Every month","pro Monat"
+"Every 2 months","pro 2 Monate"
+"Every 3 months","pro 3 Monate"
+"Every 4 months","pro 4 Monate"
+"Every 6 months","pro 6 Monate"
+"Your date of birth","Geben Sie bitte Ihr Geburtsdatum ein"
+"Date of Birth","Geburtsdatum"
+"Instalment","Ratenzahlung"
+"Instalment Information"," Information zu den Raten"
+"Processed Instalments","Bezahlte Raten"
+"Due Instalments","Offene Raten"
+"Next Instalment Date","Nächste Rate fällig am"
+"Instalment Cycle Amount","Betrag jeder Rate"
+"Total paid amount","Bezahlt gesamt"
+"Total due amount","Offen gesamt"
+"Paid Instalments","Bezahlte Raten"
+"Instalment Summary","Zusammenfassung"
+"Paid Date","Bezahlt am"
+"Instalment cycles","Anzahl der Raten"
+"Instalment Amount","Ratenbetrag"
+"%s Instalment","%s Ratenzahlung"
+" per month"," pro Monat"
+" Every %1 months"," pro %1 Monate"
+"The next instalment cycle have arrived for the instalment order %orderNo placed at the %store_name, kindly refer further details below.","Für Ihre Bestellung Nr. %orderNo bei %store_name ist die nächste Rate fällig. Bitte beachten Sie weitere Details unten."
+"Day","Tag"
+"Year","Jahr"
+"Month","Monat"
+"January","Januar"
+"Feburary","Februar"
+"March","März"
+"April","April"
+"May","Mai"
+"June","Juni"
+"July","Juli"
+"August","August"
+"September","September"
+"October","Oktober"
+"November","November"
+"December","Dezember"
+"Display inline credit card form","Inline-Kreditkartenformular anzeigen"
+"Inline form: The following fields will be shown in the checkout in two lines: card holder & credit card number / expiry date / CVC","Inline-Zahlungsformular: Die folgenden Felder werden im Checkout in zwei Zeilen angezeigt: Karteninhaber & Kreditkartennummer / Ablaufdatum / CVC-Code"
+"InvoiceAmount","Betrag"
+"On successful checkout, you will receive a payment reference. Using this payment reference, you can either pay in the Multibanco ATM or through your online bank account","Nach erfolgreichem Bestellabschluss erhalten Sie eine Zahlungsreferenz. Damit können Sie entweder an einem Multibanco-Geldautomaten oder im Onlinebanking bezahlen."
+"Payment References description","Bitte verwenden Sie einen der unten angegebenen Verwendungszwecke für die Überweisung. Nur so kann Ihr Geldeingang Ihrer Bestellung zugeordnet werden"
+"Configure","konfigurieren"
+"You will receive an e-mail with the Novalnet account details to complete the payment","Sie erhalten eine E-Mail mit den Bankdaten von Novalnet, um die Zahlung abzuschließen"
+"Send e-mail to","E-Mails senden an"
+"Notification / Webhook URL execution messages will be sent to this e-mail","E-Mail-Benachrichtigungen werden an diese E-Mail-Adresse gesendet"
+"Unauthorised access from the IP [ %1 ]","Unbefugter Zugriff von der IP [%1]"
+"One-click shopping","Kauf mit einem Klick"
+"Webhook order status","Callback / Webhook Bestellstatus"
+"The Selected logos will be displayed on the checkout page","Die gewählten Kartenlogos werden auf der Checkout-Seite nicht mehr angezeigt"
+"Force non-guarantee payment","Zahlung ohne Zahlungsgarantie erzwingen"
+"Even if payment guarantee is enabled, payments will still be processed as non-guarantee payments if the payment guarantee requirements are not met. Review the requirements under 'Enable Payment Guarantee' in the Installation Guide.","Falls die Zahlungsgarantie zwar aktiviert ist, jedoch die Voraussetzungen für Zahlungsgarantie nicht erfüllt sind, wird die Zahlung ohne Zahlungsgarantie verarbeitet. Die Voraussetzungen finden Sie in der Installationsanleitung unter 'Zahlungsgarantie aktivieren'"
+"Minimum order amount: 9.99 EUR or more","Mindestbetrag der Bestellung: 9.99 EUR"
+"You will be redirected to Sofort. Please don’t close or refresh the browser until the payment is completed","Sie werden zu Sofortüberweisung weitergeleitet. Um eine erfolgreiche Zahlung zu gewährleisten, darf die Seite nicht geschlossen oder neu geladen werden, bis die Bezahlung abgeschlossen ist"
+"You will be redirected to banking page. Please don’t close or refresh the browser until the payment is completed","Sie werden auf die Banking-Seite weitergeleitet. Bitte schließen oder aktualisieren Sie den Browser nicht, bis die Zahlung abgeschlossen ist"
+"You will be redirected to giropay. Please don’t close or refresh the browser until the payment is completed","Sie werden zu giropay weitergeleitet. Um eine erfolgreiche Zahlung zu gewährleisten, darf die Seite nicht geschlossen oder neu geladen werden, bis die Bezahlung abgeschlossen ist"
+"You will be redirected to Przelewy24. Please don’t close or refresh the browser until the payment is completed","Sie werden zu Przelewy24 weitergeleitet. Um eine erfolgreiche Zahlung zu gewährleisten, darf die Seite nicht geschlossen oder neu geladen werden, bis die Bezahlung abgeschlossen ist"
+"You will be redirected to eps. Please don’t close or refresh the browser until the payment is completed","Sie werden zu eps weitergeleitet. Um eine erfolgreiche Zahlung zu gewährleisten, darf die Seite nicht geschlossen oder neu geladen werden, bis die Bezahlung abgeschlossen ist"
+"You will be redirected to PayPal. Please don’t close or refresh the browser until the payment is completed","Sie werden zu PayPal weitergeleitet. Um eine erfolgreiche Zahlung zu gewährleisten, darf die Seite nicht geschlossen oder neu geladen werden, bis die Bezahlung abgeschlossen ist"
+"You will be redirected to PostFinance. Please don’t close or refresh the browser until the payment is completed","Sie werden zu PostFinance weitergeleitet. Um eine erfolgreiche Zahlung zu gewährleisten, darf die Seite nicht geschlossen oder neu geladen werden, bis die Bezahlung abgeschlossen ist"
+"You will be redirected to Bancontact. Please don’t close or refresh the browser until the payment is completed","Sie werden zu Bancontact weitergeleitet. Um eine erfolgreiche Zahlung zu gewährleisten, darf die Seite nicht geschlossen oder neu geladen werden, bis die Bezahlung abgeschlossen ist"
+"You will be redirected to iDEAL. Please don’t close or refresh the browser until the payment is completed","Sie werden zu iDEAL weitergeleitet. Um eine erfolgreiche Zahlung zu gewährleisten, darf die Seite nicht geschlossen oder neu geladen werden, bis die Bezahlung abgeschlossen ist"
+"Are you sure you want to capture the payment?","Sind Sie sicher, dass Sie die Zahlung einziehen möchten?"
+"Are you sure you want to cancel the payment?","Sind Sie sicher, dass Sie die Zahlung stornieren wollen?"
+"Payment reference 1","Verwendungszweck 1"
+"Payment reference 2","Verwendungszweck 2"
+"Payment Reference","Zahlungsreferenz"
+"Please read the Installation Guide before you start and login to the <a href='https://admin.novalnet.de/' target='_blank'> Novalnet Admin Portal </a> using your merchant account. To get a merchant account, mail to <a href='mailto:sales@novalnet.de'>sales@novalnet.de</a> or call +49 (089) 923068320","Bevor Sie beginnen, lesen Sie bitte die Installationsanleitung und melden Sie sich mit Ihrem Händlerkonto im <a href='https://admin.novalnet.de/' target='_blank'> Novalnet Admin-Portal </a> an. Um ein Händlerkonto zu erhalten, senden Sie bitte eine E-Mail an <a href='mailto:sales@novalnet.de'>sales@novalnet.de</a> oder rufen Sie uns unter +49 (089) 923068320 an"
+"Allow manual testing of the Notification / Webhook URL","Manuelles Testen der Benachrichtigungs- / Webhook-URL erlauben"
+"Enable this to test the Novalnet Notification / Webhook URL manually. Disable this before setting your shop live to block unauthorized calls from external parties","Aktivieren Sie diese Option, um die Novalnet-Benachrichtigungs-/Webhook-URL manuell zu testen. Deaktivieren Sie die Option, bevor Sie Ihren Shop liveschalten, um unautorisierte Zugriffe von Dritten zu blockieren"
+"ending in %1 (expires %2/%3)","mit Endziffern %1 (gültig bis %2/%3)"
+"IBAN","IBAN"
+"Please enter a valid Product Activation Key and Payment Access key.","Bitte geben Sie den gültigen Produktaktivierungsschlüssel und Paymentzugriffsschlüssel ein."
+"Make sure the Direct Debit SEPA payment is enabled to use this option.","Stellen Sie sicher, dass Sie die Zahlungsart SEPA-Lastschrift aktiviert haben, um diese Option nutzen zu können."
+"Make sure the Invoice payment is enabled to use this option.","Stellen Sie sicher, dass Sie die Zahlungsart Rechnung aktiviert haben, um diese Option nutzen zu können."
+"Configure the valid Product Activation Key and Payment Access key to activate the payment types under <b>Configuration</b> settings.","Geben Sie im Menu <b>Konfiguration</b> den gültigen Produktaktivierungsschlüssel und Paymentzugriffsschlüssel an, um die Zahlungsarten zu aktivieren."
+"Module version","Modul-Version"
+"Display Credit/Debit card logos","Kredit-/Debitkartenlogos ausblenden"
+"The selected card logos will be displayed on the checkout page","Die gewählten Kartenlogos werden auf der Checkout-Seite nicht mehr angezeigt"
+"Allow B2B Customers","B2B-Kunden erlauben"
+"Allow B2B customers to place order","B2B-Kunden erlauben, Bestellungen aufzugeben"
+"<div class='novalnet-payment-logo'></div><div class='novalnet-payment-text'>Secured and trusted means of accepting all payment methods supported worldwide. <br>Novalnet provides the most convenient way to increase your sales and deliver seamless checkout experience for your customers.</div>","<div class='novalnet-payment-logo'></div><div class='novalnet-payment-text'>Bieten Sie Ihren Kunden auf sichere und vertrauenswürdige Weise alle weltweit unterstützten Zahlungsarten. <br>Mit Novalnet können Sie Ihre Verkäufe steigern und Ihren Kunden ein ansprechendes Zahlungserlebnis aus einem Guss bieten.</div>"
+"Novalnet webhook added order status %1","Novalnet-Webhook hat den Bestellstatus %1 übermittelt"
+"Novalnet webhook set status (%1) for Order ID = %2","Novalnet-Webhook hat den Status für Bestellnummer %2 auf %1 gesetzt"
+"Please transfer the amount of %1 to the following account on or before %2","Bitte überweisen Sie den Betrag von %1 spätestens bis zum %2 auf das folgende Konto"
+"Please transfer the amount of %1 to the following account","Bitte überweisen Sie den Betrag von %1 auf das folgende Konto"
+"Only EUR currency allowed %1","Die Zahlung kann nicht ausgeführt werden, weil die Voraussetzungen für die %1 nicht erfüllt sind (Nur EUR als Währung erlaubt)"
+"Minimum order amount should be %1","Die Zahlung kann nicht ausgeführt werden, weil die Voraussetzungen für die %1 nicht erfüllt sind (Mindestbestellwert 9.99 EUR)"
+"Only DE, AT, CH countries allowed %1","Die Zahlung kann nicht ausgeführt werden, weil die Voraussetzungen für die Zahlungsgarantie nicht erfüllt sind (nur Deutschland, Österreich oder die Schweiz sind zulässig)"
+"Please use the following payment reference details to pay the amount of %1 at a Multibanco ATM or through your internet banking.","Bitte verwenden Sie die folgende Zahlungsreferenz, um den Betrag von %1 an einem Multibanco-Geldautomaten oder über Ihr Onlinebanking zu bezahlen."
+"Partner Payment Reference: %1","Partner-Zahlungsreferenz: %1"
+"DD.MM.YYYY","TT.MM.JJJJ"
+"Instalment cancel","Raten stornier"
+"TestMode","Testmodus"
+"Card type not accepted, try using another card type","Kartentyp wird nicht akzeptiert, versuchen Sie es mit einem anderen Kartentyp"
+"In order to use this option you must have billing agreement option enabled in your PayPal account. Please contact your account manager at PayPal.","Um diese Option zu verwenden, müssen Sie die Option Billing Agreement (Zahlungsvereinbarung) in Ihrem PayPal-Konto aktiviert haben. Kontaktieren Sie dazu bitte Ihren Kundenbetreuer bei PayPal."
+"Payment details stored during the checkout process can be used for future payments","Zahlungsdaten, die während des Bestellvorgangs gespeichert werden, können für zukünftige Zahlungen verwendet werden"
+"Failed","fehlgeschlagen"
+"Completed","abgeschlossen"
+"Please enter valid URL","Geben Sie ein gültiges URL"
+"To setup your shop Notification / Webhook URL, you must add the following webhook endpoint in this format <b>{Shop_url/rest/V1/novalnet/callback}</b> in below <b>Notification / Webhook URL</b> field and click on <b>Configure</b> button to receive notification about transactions.","Um eine Ihr Laden Benachrichtigungs- / Webhook-URL festlegen müssen im, hinzufügen den folgenden Webhook-Ausgangspunkt im Format <b>{Shop_url/rest/V1/novalnet/callback}</b> in unten <b>Benachrichtigungs- / Webhook-URL</b> Feld und klicken Sie auf <b>Konfigurieren</b> Schaltfläche an erhalten benachrichtigung über Transaktionen."
+"Save for future purchase","Speichern für zukünftige Einkäufe"
+"More security with the new Payment Policy (PSD2) Info","Mehr Sicherheit mit der neuen Zahlungsrichtlinie (PSD2)"
+"European card issuing banks often requires a password or some other form of authentication (EU Payment Services Directive 'PSD2') for secure payment. If the payment is not successful, you can try again. If you have any further questions, please contact your bank.","Europäische kartenausgebende Banken verlangen häufig für die sichere Zahlung ein Passwort oder eine andere Form der Authentifizierung (EU-Zahlungsdiensterichtlinie 'PSD2'). Falls die Zahlung nicht erfolgreich ist, können Sie es im Anschluss erneut versuchen. Bei weiteren Fragen kontaktieren Sie bitte Ihre Bank."
+"Enforce 3D secure payment outside EU","3D-Secure-Zahlungen außerhalb der EU erzwingen"
+"By enabling this option, all payments from cards issued outside the EU will be authenticated via 3DS 2.0 SCA.","Wenn Sie diese Option aktivieren, werden alle Zahlungen mit Karten, die außerhalb der EU ausgegeben wurden, mit der starken Kundenauthentifizierung (Strong Customer Authentication, SCA) von 3D-Secure 2.0 authentifiziert."
+"Your customers can checkout using Apple Pay from any page in your web store","Ihre Kunden können mit Apple Pay von jeder Seite Ihres Webshops aus bezahlen."
+"Your customers can checkout using Google Pay from any page in your web store","Ihre Kunden können mit Google Pay von jeder Seite Ihres Webshops aus bezahlen."
+"Button Design","Button-Design"
+"Button Type","Button-Typ"
+"Buy","Kaufen"
+"Donate","Spenden"
+"Book","Buchen"
+"Contribute","Beitragen"
+"Check out","Bezahlen"
+"Order","Bestellen"
+"Subscribe","Abonnieren"
+"Tip","Trinkgeld"
+"Rent","Mieten"
+"Reload","Aufladen"
+"Support","Unterstützen"
+"Button Theme","Button-Farbe"
+"Button Height","Button-Höhe"
+"Range from 30 to 64 pixels","zwischen 30 und 64 Pixel"
+"Button Corner Radius","Abrundungsgrad der Ecken des Buttons"
+"Range from 0 to 10 pixels","zwischen 0 und 10 Pixel"
+"Display the Apple Pay Button on","Apple Pay-Button anzeigen auf"
+"The selected Pages Will Display The Apple Pay Button, Just Below The Proceed To Checkout Button","Die Apple Pay-Schaltfläche wird auf den ausgewählten Seiten direkt unter der Schaltfläche "Zur Kasse gehen" angezeigt."
+"Shopping cart page","Warenkorb"
+"Mini cart page","Mini-Warenkorb"
+"Product page","Produktseite"
+"Guest checkout page","Checkout-Seite für Gastbestellungen"
+"Express Checkout","Express-Checkout"
+"Amount will be booked from your card after successful authentication","Der Betrag wird nach erfolgreicher Authentifizierung von Ihrer Karte abgebucht."
+"Dark","Dunkel"
+"Light","Hell"
+"Light-Outline","An Hintergrund anpassen"
+"Instalment has been cancelled for the TID %1 on %2","Die Ratenzahlung für die TID wurde gekündigt: %1 am %2"
+"Instalment confirmation %storeName Order no: %orderNo","Für Ihren Einkauf bei %storeName, Bestellnr. %orderNo, ist die nächste Rate fällig."
diff --git a/i18n/en_US.csv b/i18n/en_US.csv
new file mode 100755
index 0000000..86c2cfc
--- /dev/null
+++ b/i18n/en_US.csv
@@ -0,0 +1,354 @@
+"You will be redirected to Blik. Please don’t close or refresh the browser until the payment is completed","You will be redirected to Blik. Please don’t close or refresh the browser until the payment is completed"
+"Your order was successfully processed using Google Pay","Your order was successfully processed using Google Pay"
+"Your order was successfully processed using Apple Pay","Your order was successfully processed using Apple Pay"
+"Business name","Business name"
+"Google Merchant ID","Google Merchant ID"
+"The business name is rendered in the Google Pay payment sheet, and this text will appear as PAY 'BUSINESS NAME' so that the customer knows where he is paying to.","The business name is rendered in the Google Pay payment sheet, and this text will appear as PAY 'BUSINESS NAME' so that the customer knows where he is paying to."
+"Display the Google Pay button on","Display the Google Pay button on"
+"Display the Apple Pay button on","Display the Apple Pay button on"
+"Please note that Google's merchant identifier is required for processing the payment method in the live environment. Google's merchant identifier is issued after registration with the <a href='https://pay.google.com/business/console/' target='_blank'>Google Pay and Wallet Console</a>. See <a href='https://developers.google.com/pay/api/web/guides/test-and-deploy/request-prod-access' target='_blank'>Request production access</a> for more information about the approval process and obtaining a Google merchant identifier. The registration also involves submitting the integration with sufficient screen-shots, so collect this information by enabling the payment method in test mode. To suppress the validation of this field while saving the configuration, use this test identifier BCR2DN4XXXTN7FSI for testing and submission of your integration to Google.","Please note that Google's merchant identifier is required for processing the payment method in the live environment. Google's merchant identifier is issued after registration with the <a href='https://pay.google.com/business/console/' target='_blank'>Google Pay and Wallet Console</a>. See <a href='https://developers.google.com/pay/api/web/guides/test-and-deploy/request-prod-access' target='_blank'>Request production access</a> for more information about the approval process and obtaining a Google merchant identifier. The registration also involves submitting the integration with sufficient screen-shots, so collect this information by enabling the payment method in test mode. To suppress the validation of this field while saving the configuration, use this test identifier BCR2DN4XXXTN7FSI for testing and submission of your integration to Google."
+"The selected pages will display the Google Pay button to pay instantly as an express checkout option","The selected pages will display the Google Pay button to pay instantly as an express checkout option"
+"The selected pages will display the Apple Pay button to pay instantly as an express checkout option","The selected pages will display the Apple Pay button to pay instantly as an express checkout option"
+"Payment Reminder %1 has been sent to the customer.","Payment Reminder %1 has been sent to the customer."
+"The transaction has been submitted to the collection agency. Collection Reference: %1","The transaction has been submitted to the collection agency. Collection Reference: %1"
+"Authorize with zero amount","Authorize with zero amount"
+"This order processed as a zero amount booking","This order processed as a zero amount booking"
+"Amount has been booked successfully","Amount has been booked successfully"
+"Zero Amount has been updated successfully","Zero Amount has been updated successfully"
+"Zero Amount update has been failed","Zero Amount update has been failed"
+"Are you sure you want to book the order amount?","Are you sure you want to book the order amount?"
+"Book transaction","Book transaction"
+"Your order has been booked with the amount of %1. Your new TID for the booked amount: %2","Your order has been booked with the amount of %1. Your new TID for the booked amount: %2"
+"Zero amount booking","Zero amount booking"
+"This order will be processed as zero amount booking which store your payment data for further online purchases.","This order will be processed as zero amount booking which store your payment data for further online purchases."
+"Transaction booking amount","Transaction booking amount"
+"(in minimum unit of currency. E.g. enter 100 which is equal to 1.00)","(in minimum unit of currency. E.g. enter 100 which is equal to 1.00)"
+"You will be redirected to WeChat Pay. Please don’t close or refresh the browser until the payment is completed.","You will be redirected to WeChat Pay. Please don’t close or refresh the browser until the payment is completed."
+"You will be redirected to Trustly. Please don’t close or refresh the browser until the payment is completed.","You will be redirected to Trustly. Please don’t close or refresh the browser until the payment is completed."
+"You will be redirected to Alipay. Please don’t close or refresh the browser until the payment is completed.","You will be redirected to Alipay. Please don’t close or refresh the browser until the payment is completed."
+"On-hold order status","On-hold order status"
+"Status to be used for on-hold orders until the transaction is confirmed or canceled","Status to be used for on-hold orders until the transaction is confirmed or canceled"
+"The instalment amount for this cycle %cycleAmount %currency will be debited from your account in one - three business days.","The instalment amount for this cycle %cycleAmount %currency will be debited from your account in one - three business days."
+"Documentation","Documentation"
+"Deactivate Instalment Renewal Notification E-mail to end-customer","Deactivate Instalment Renewal Notification E-mail to end-customer"
+"Configuration","Configuration"
+"Instalment has been cancelled.","Instalment has been cancelled."
+"Payments","Payments"
+"Product Activation Key","Product Activation Key"
+"Payment Access Key","Payment Access Key"
+"Merchant details are configured successfully. Please select the Tariff ID and click","Merchant details are configured successfully. Please select the Tariff ID and click "
+"button to save the configuration."," button to save the configuration"
+"Activate","Activate"
+"Enter the Novalnet Product activation key that is required for authentication and click Activate. You will find the Product activation key in the <a href='https://admin.novalnet.de/' target='_blank'>Novalnet Admin Portal</a>: Projects > Choose your project > API credentials > API Signature (Product activation key)","Enter the Novalnet Product activation key that is required for authentication and click Activate. You will find the Product activation key in the <a href='https://admin.novalnet.de/' target='_blank'>Novalnet Admin Portal</a>: Projects > Choose your project > API credentials > API Signature (Product activation key)"
+"Merchant ID","Merchant ID"
+"Project ID","Project ID"
+"Authentication code","Authentication code"
+"Select Tariff ID","Select Tariff ID"
+"Select a Tariff ID to match the preferred tariff plan you created at the Novalnet Admin Portal for this project","Select a Tariff ID to match the preferred tariff plan you created at the Novalnet Admin Portal for this project"
+"Enable Live Mode","Enable Live Mode"
+"Selected payment methods will be in Live Mode","Selected payment methods will be in Live Mode"
+"No active payment method for this store","No active payment method for this store"
+"Display payment method logo","Display payment method logo"
+"The payment method logo will be displayed on the checkout page","The payment method logo will be displayed on the checkout page"
+"Products remain in the shopping cart after cancelled payment","Products remain in the shopping cart after cancelled payment"
+"For additional configurations login to <a href='https://admin.novalnet.de/' target='_blank'> Novalnet Merchant Administration portal</a>. To login to the Portal you need to have an account at Novalnet. If you don't have one yet, please contact <a href='mailto:sales@novalnet.de'>sales@novalnet.de</a> / tel. +49 (089) 923068320</br>"
+"To accept PayPal transactions, configure your PayPal API info in the <a href='https://admin.novalnet.de/' target='_blank'> Novalnet Admin Portal </a> > PROJECT > "Project" Information > Payment Methods > Paypal > Configure.","To accept PayPal transactions, configure your PayPal API info in the <a href='https://admin.novalnet.de/' target='_blank'> Novalnet Admin Portal </a> > PROJECT > "Project" Information > Payment Methods > Paypal > Configure."
+"Order status management for on-hold transactions","Order status management for on-hold transactions"
+"Order status for the pending payment","Order status for the pending payment"
+"Onhold order status","Onhold order status"
+"Cancellation order status","Cancellation order status"
+"Notification / Webhook URL Setup","Notification / Webhook URL Setup"
+"Allow manual testing of the Notification / Webhook URL","Allow manual testing of the Notification / Webhook URL"
+"E-Mail address of the recipient","Notification / Webhook URL execution messages will be sent to this e-mail."
+"Notification &amp; Webhook URL","Notification / Webhook URL"
+"Notification / Webhook URL is required to keep the merchant’s database/system synchronized with the Novalnet account (e.g. delivery status). Refer the Installation Guide for more information","Notification / Webhook URL is required to keep the merchant’s database/system synchronized with the Novalnet account (e.g. delivery status). Refer the Installation Guide for more information"
+"Payment Methods","Payment Methods"
+"Credit/Debit Cards","Credit/Debit Cards"
+"Direct Debit SEPA","Direct Debit SEPA"
+"Invoice","Invoice"
+"Prepayment","Prepayment"
+"Invoice with payment guarantee","Invoice with payment guarantee"
+"Direct Debit SEPA with payment guarantee","Direct Debit SEPA with payment guarantee"
+"Instalment by Direct Debit SEPA","Instalment by Direct Debit SEPA"
+"Instalment by Invoice","Instalment by Invoice"
+"Sofort","Sofort"
+"Online bank transfer","Online bank transfer"
+"PayPal","PayPal"
+"iDEAL","iDEAL"
+"Eps","eps"
+"Giropay","giropay"
+"Przelewy24","Przelewy24"
+"PostFinance Card","PostFinance Card"
+"PostFinance E-Finance","PostFinance E-Finance"
+"Multibanco","Multibanco"
+"Bancontact","Bancontact"
+"Display payment method","Display payment method"
+"Novalnet Title","Title"
+"Define a sorting order","Define a sorting order"
+"This payment method will be sorted among others (in the ascending order) as per the given sort number","The payment methods will be listed in your checkout (in ascending order) based on your given sorting order."
+"Payment logo","Payment logo"
+"Payment Action","Payment Action"
+"Authorize","Authorize"
+"Capture","Capture"
+"Choose whether or not the payment should be charged immediately. Capture completes the transaction by transferring the funds from buyer account to merchant account. Authorize verifies payment details and reserves funds to capture it later, giving time for the merchant to decide on the order.","Choose whether or not the payment should be charged immediately. Capture completes the transaction by transferring the funds from buyer account to merchant account. Authorize verifies payment details and reserves funds to capture it later, giving time for the merchant to decide on the order."
+"Novalnet Capture","Novalnet Capture"
+"Completed order status","Completed order status"
+"Status to be used for successful orders","Status to be used for successful orders"
+"Payment due date (in days)","Payment due date (in days)"
+"Enter the number of days after which the payment should be processed (must be between 2 and 14 days)","Number of days after which the payment is debited (must be between 2 and 14 days)."
+"Enter the number of days after which the payment should be processed (must be between 7 and 28 days)","Number of days given to the buyer to transfer the amount to Novalnet (must be between 7 and 28 days). If this field is left blank, 14 days will be set as due date by default."
+"Minimum transaction amount for authorization","Minimum transaction amount for authorization (in minimum unit of currency. E.g. enter 100 which is equal to 1.00)"
+"Form appearance","Form appearance"
+"Custom CSS Settings","Custom CSS Settings"
+"CSS settings for iframe form","CSS settings for iframe form"
+"NN CC Label Style","Label"
+"NN CC Input Style","Input"
+"NN CC CSS text","CSS text"
+"Notification for the buyer","Notification for the buyer"
+"The entered text will be displayed on the checkout page","The entered text will be displayed at the checkout page"
+"User Group Excluded","User Group Excluded"
+"Payment from Applicable Countries","Payment From Applicable Countries"
+"Payment from Specific Countries","Payment From Specific Countries"
+"Minimum order amount (in minimum unit of currency. E.g. enter 100 which is equal to 1.00)","Minimum order amount (in minimum unit of currency. E.g. enter 100 which is equal to 1.00)"
+"Minimum order amount: 19.98 EUR or more","Minimum order amount: 19.98 EUR or more"
+"The minimum amount should be at least 9.99 EUR","The minimum amount should be at least 9.99 EUR"
+"The minimum amount should be at least 19.98 EUR","The minimum amount should be at least 19.98 EUR"
+"Minimum Order Total","Minimum Order Total (in EUR)"
+"Maximum Order Total","Maximum Order Total (in EUR)"
+"Minimum Orders Count","Minimum number of orders count"
+"Default: '0' for disabled check | Minimum count of orders (in the past) needed for the customer to use this payment method","Enable this payment method for the particular customer only when they exceed this number of previous orders in your checkout."
+"Your credit/debit card will be charged immediately after the order is completed","Your credit/debit card will be charged immediately after the order is completed"
+"Once you've submitted the order, you will receive an e-mail with account details to make payment","Once you send the order, you will receive an e-mail with the account details to complete the payment."
+"The payment will be processed in the test mode therefore amount for this transaction will not be charged","The payment will be processed in the test mode therefore amount for this transaction will not be charged"
+"Your credit card details are invalid","Your credit card details are invalid"
+"Card holder name","Card holder name"
+"Name on card","Name on card"
+"Card number","Card number"
+"XXXX XXXX XXXX XXXX","XXXX XXXX XXXX XXXX"
+"Expiry date","Expiry date"
+"MM / YY","MM / YY"
+"CVC/CVV/CID","CVC/CVV/CID"
+"XXX","XXX"
+"what is this?","what is this?"
+"The amount will be debited from your account by Novalnet","The amount will be debited from your account by Novalnet"
+"Account holder","Account holder"
+"IBAN","IBAN"
+"I hereby grant the mandate for the SEPA direct debit","I hereby grant the mandate for the SEPA direct debit"
+"(electronic transmission)","(electronic transmission)"
+"and confirm that the given bank details are correct!","and confirm that the given bank details are correct"
+"I authorise (A) Novalnet AG to send instructions to my bank to debit my account and (B) my bank to debit my account in accordance with the instructions from Novalnet AG.","I authorise (A) Novalnet AG to send instructions to my bank to debit my account and (B) my bank to debit my account in accordance with the instructions from Novalnet AG."
+"Creditor identifier: DE53ZZZ00000004253","Creditor identifier: DE53ZZZ00000004253"
+"Note:","Note:"
+"You are entitled to a refund from your bank under the terms and conditions of your agreement with bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.","You are entitled to a refund from your bank under the terms and conditions of your agreement with bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited."
+"After the successful verification, you will be redirected to Novalnet secure order page to proceed with the payment","You will be redirected to the Novalnet secure payment page to complete the payment."
+"Are you sure you want to remove these account details?","Are you sure you want to remove these account details?"
+"Are you sure you want to remove these Credit Card details?","Are you sure you want to remove these Credit Card details?"
+"Add new card details","Add new card details"
+"Add new account details","Add new account details"
+"Save my card details for future purchases","I want to save my card details for later purchases"
+"Save my account details for future purchases","I want to save my account details for later purchases"
+"Save my PayPal details for future purchases","Save my PayPal account details for later purchases"
+"Test order","Test order"
+"Novalnet Transaction ID: ","Novalnet Transaction ID: "
+"Payment Failed","Payment Failed"
+"The transaction has been confirmed on %1","The transaction has been confirmed on %1"
+"The transaction has been canceled on %1","The transaction has been canceled on %1"
+"Refund has been initiated for the TID:%1 with the amount %2","Refund has been initiated for the TID:%1 with the amount %2"
+"Refund has been initiated for the TID: %1 with the amount %2. New TID:%3","Refund has been initiated for the TID: %1 with the amount %2. New TID:%3"
+"Customer was redirected to Novalnet","Customer was redirected to Novalnet"
+"Customer successfully returned from Novalnet","Customer successfully returned from Novalnet"
+"The transaction has been confirmed","The transaction has been confirmed"
+"The transaction has been canceled","The transaction has been canceled"
+"While redirecting some data has been changed. The hash check failed.","While redirecting some data has been changed. The hash check failed."
+"The transaction has been confirmed on %1","The transaction has been confirmed on %1"
+"The transaction has been canceled on %1","The transaction has been canceled on %1"
+"Refund/Bookback executed successfully for the TID: %1 amount: %2 on %3. The subsequent TID: %4","Refund/Bookback executed successfully for the TID: %1 amount: %2 on %3. The subsequent TID: %4"
+"The transaction status has been changed from pending to on hold for the TID: %1 on %2.","The transaction status has been changed from pending to on-hold for the TID: %1 on %2."
+"Credit has been successfully received for the TID: %1 with amount %2 on %3. Please refer PAID order details in our Novalnet Admin Portal for the TID: %4","Credit has been successfully received for the TID: %1 with amount %2 on %3. Please refer PAID order details in our Novalnet Admin Portal for the TID: %4"
+"NChargeback executed successfully for the TID: %1 amount: %2 on %3. The subsequent TID: %4","Chargeback executed successfully for the TID: %1 amount: %2 on %3. The subsequent TID: %4"
+"Transaction updated successfully for the TID: %1 with the amount %2 on %3","Transaction updated successfully for the TID: %1 with the amount %2 on %3"
+"The Transaction ID already existed","Novalnet Callback executed. The Transaction ID already existed"
+"Enter the number of days to transfer the payment amount to Novalnet (must be greater than 7 days). In case if the field is empty, 14 days will be set as due date by default","Number of days given to the buyer to transfer the amount to Novalnet (must be greater than 7 days). If this field is left blank, 14 days will be set as due date by default."
+"Slip expiry date (in days)","Slip expiry date (in days)"
+"Enter the number of days to pay the amount at store near you. If the field is empty, 14 days will be set as default.","Number of days given to the buyer to pay at a store. If this field is left blank, 14 days will be set as slip expiry date by default."
+"Recurring Period for the instalment cycles","Choose the recurring period for the instalment payment."
+"On choosing an appropriate recurring period, each instalment cycle will be processed based on that","On choosing an appropriate recurring period, each instalment cycle will be processed based on that"
+"Select the various instalment cycles that can be availed in the instalment plan","Select the available instalment cycles."
+"Choose your instalment plan","Choose your instalment plan"
+"<b>Basic requirements for payment guarantee</b><br>Allowed B2C countries: DE, AT, CH<br>Allowed B2B countries: European Union<br>Allowed currency: EUR<br>Minimum order amount: 9.99 EUR or more<br>Age limit: 18 years or more<br>The billing address must be the same as the shipping address<br><br>","<b>Basic requirements for payment guarantee</b><br>Allowed B2C countries: DE, AT, CH<br>Allowed B2B countries: European Union<br>Allowed currency: EUR<br>Minimum order amount: 9.99 EUR or more<br>Age limit: 18 years or more<br>The billing address must be the same as the shipping address<br><br>"
+"<b>Basic requirements for the instalment payment</b><br>Allowed B2C countries: DE, AT, CH<br>Allowed B2B countries: European Union<br>Allowed currency: EUR<br>Minimum order amount: 19.98 EUR or more<br>Please note that the instalment cycle amount has to be a minimum of 9.99 EUR and the instalment cycles which do not meet this criteria will not be displayed in the instalment plan<br>Age limit: 18 years or more<br>The billing address must be the same as the shipping address<br><br>","<b>Basic requirements for the instalment payment</b><br>Allowed B2C countries: DE, AT, CH<br>Allowed B2B countries: European Union<br>Allowed currency: EUR<br>Minimum order amount: 19.98 EUR or more<br>Please note that the instalment cycle amount has to be a minimum of 9.99 EUR and the instalment cycles which do not meet this criteria will not be displayed in the instalment plan<br>Age limit: 18 years or more<br>The billing address must be the same as the shipping address<br><br>"
+"Choose the financing option that best fits your needs and you will be charged based on that chosen plan","Choose the financing option that best fits your needs and you will be charged based on that chosen plan"
+"Net loan amount: ","Net loan amount: "
+"The payment cannot be processed, because the basic requirements for the %1 haven't been met (The shipping address must be the same as the billing address)","The payment cannot be processed, because the basic requirements for the %1 haven't been met (The shipping address must be the same as the billing address)"
+"The date should be in future","The date should be in future"
+"The transaction has been updated with due date %1","The transaction has been updated with a new due date %1"
+"The transaction has been updated with amount %1 and due date with %2","The transaction has been updated with amount %1 and due date with %2"
+"The transaction has been updated with amount %1","The transaction has been updated with amount %1"
+"The transaction has been updated with amount %1 and slip expiry date with %2","The transaction has been updated with amount %1 and slip expiry date with %2"
+"The transaction has been updated with slip expiry date %1","The transaction has been updated with a new slip expiry date %1"
+"Customer was redirected to Novalnet","Customer was redirected to Novalnet"
+"Customer successfully returned from Novalnet","Customer successfully returned from Novalnet"
+"While redirecting some data has been changed. The hash check failed.","While redirecting some data has been changed. The hash check failed."
+"Payment Failed","Payment Failed"
+"On successful checkout, you will receive a payment slip/SMS to pay your online purchase at one of our retail partners (e.g. supermarket)","On successful checkout, you will receive a payment slip/SMS to pay your online purchase at one of our retail partners (e.g. supermarket)"
+"The transaction has been confirmed successfully for the TID: %1","The transaction has been confirmed successfully for the TID: %1"
+"Please transfer the amount to the below mentioned account details of our payment processor Novalnet","Please transfer the amount to the below mentioned account details of our payment processor Novalnet"
+"Your order is being verified. Once confirmed, we will send you our bank details to which the order amount should be transferred. Please note that this may take up to 24 hours","Your order is being verified. Once confirmed, we will send you our bank details to which the order amount should be transferred. Please note that this may take up to 24 hours"
+"Your order is under verification and we will soon update you with the order status. Please note that this may take upto 24 hours.","Your order is under verification and we will soon update you with the order status. Please note that this may take upto 24 hours."
+"Slip expiry date: %1", "Slip expiry date: %1"
+"Store(s) near you:","Store(s) near to you:"
+"Please enter the refund amount","Please enter the refund amount"
+"(in minimum unit of currency. E.g. enter 100 which is equal to 1.00)","(in minimum unit of currency. E.g. enter 100 which is equal to 1.00)"
+"Change the slip expiry date","Change the slip expiry date"
+"Change the due date","Change the due date"
+"Slip expiry date","Slip expiry date"
+"Transaction due date","Transaction due date"
+"Amount","Amount"
+"Update","Update"
+"Refund","Refund"
+"Paid","Paid"
+"Pending","Pending"
+"Cancel","Cancel"
+"Reference","Reference"
+"Are you sure you want to change the slip expiry date?","Are you sure you want to change the slip expiry date?"
+"Are you sure you want to change the order due date?","Are you sure you want to change the order due date?"
+"Pay now with Barzahlen","Pay now with Barzahlen"
+" Cycles / "," Cycles / "
+"Every month","per month"
+"Every 2 months","per 2 months"
+"Every 3 months","per 3 months"
+"Every 4 months","per 4 months"
+"Every 6 months","per 6 months"
+"Your date of birth","Your date of birth"
+"Date of Birth","Date of Birth"
+"Instalment","Instalment"
+"Instalment Information","Instalment Information"
+"Processed Instalments","Processed Instalments"
+"Due Instalments","Due Instalments"
+"Next Instalment Date","Next Instalment Date"
+"Instalment Cycle Amount","Instalment Cycle Amount"
+"Total paid amount","Total paid amount"
+"Total due amount","Total due amount"
+"Paid Instalments","Paid Instalments"
+"Instalment Summary","Instalment Summary"
+"Paid Date","Paid date"
+"Instalment cycles","Instalment cycles"
+"Instalment Amount","Instalment Amount"
+"%s Instalment","%s Instalment"
+" per month"," per month"
+" Every %1 months"," per %1 months"
+"The next instalment cycle have arrived for the instalment order %orderNo placed at the %store_name, kindly refer further details below.","The next instalment cycle have arrived for the instalment order %orderNo placed at the %store_name, kindly refer further details below."
+"Day","Day"
+"Year","Year"
+"Month","Month"
+"January","January"
+"Feburary","Feburary"
+"March","March"
+"April","April"
+"May","May"
+"June","June"
+"July","July"
+"August","August"
+"September","September"
+"October","October"
+"November","November"
+"December","December"
+"Display inline credit card form","Display inline credit card form"
+"Inline form: The following fields will be shown in the checkout in two lines: card holder & credit card number / expiry date / CVC","Inline form: The following fields will be shown in the checkout in two lines: card holder & credit card number / expiry date / CVC"
+"InvoiceAmount","Amount"
+"On successful checkout, you will receive a payment reference. Using this payment reference, you can either pay in the Multibanco ATM or through your online bank account","On successful checkout, you will receive a payment reference. Using this payment reference, you can either pay in the Multibanco ATM or through your online bank account"
+"Payment References description","Please use any of the following payment references when transferring the amount. This is necessary to match it with your corresponding order"
+"Configure","Configure"
+"You will receive an e-mail with the Novalnet account details to complete the payment","You will receive an e-mail with the Novalnet account details to complete the payment"
+"Send e-mail to","Send e-mail to"
+"Notification / Webhook URL execution messages will be sent to this e-mail","Notification / Webhook URL execution messages will be sent to this e-mail"
+"Unauthorised access from the IP [ %1 ]","Unauthorised access from the IP [ %1 ]"
+"One-click shopping","One-click shopping"
+"Webhook order status","Callback / Webhook order status"
+"The Selected logos will be displayed on the checkout page","The Selected logos will be displayed on the checkout page"
+"Force non-guarantee payment","Force non-guarantee payment"
+"Even if payment guarantee is enabled, payments will still be processed as non-guarantee payments if the payment guarantee requirements are not met. Review the requirements under 'Enable Payment Guarantee' in the Installation Guide.","Even if payment guarantee is enabled, payments will still be processed as non-guarantee payments if the payment guarantee requirements are not met. Review the requirements under 'Enable Payment Guarantee' in the Installation Guide."
+"Minimum order amount: 9.99 EUR or more","Minimum order amount: 9.99 EUR or more"
+"You will be redirected to Sofort. Please don’t close or refresh the browser until the payment is completed","You will be redirected to Sofort. Please don’t close or refresh the browser until the payment is completed"
+"You will be redirected to banking page. Please don’t close or refresh the browser until the payment is completed","You will be redirected to banking page. Please don’t close or refresh the browser until the payment is completed"
+"You will be redirected to giropay. Please don’t close or refresh the browser until the payment is completed","You will be redirected to giropay. Please don’t close or refresh the browser until the payment is completed"
+"You will be redirected to Przelewy24. Please don’t close or refresh the browser until the payment is completed","You will be redirected to Przelewy24. Please don’t close or refresh the browser until the payment is completed"
+"You will be redirected to eps. Please don’t close or refresh the browser until the payment is completed","You will be redirected to eps. Please don’t close or refresh the browser until the payment is completed"
+"You will be redirected to PayPal. Please don’t close or refresh the browser until the payment is completed","You will be redirected to PayPal. Please don’t close or refresh the browser until the payment is completed"
+"You will be redirected to PostFinance. Please don’t close or refresh the browser until the payment is completed","You will be redirected to PostFinance. Please don’t close or refresh the browser until the payment is completed"
+"You will be redirected to Bancontact. Please don’t close or refresh the browser until the payment is completed","You will be redirected to Bancontact. Please don’t close or refresh the browser until the payment is completed"
+"You will be redirected to iDEAL. Please don’t close or refresh the browser until the payment is completed","You will be redirected to iDEAL. Please don’t close or refresh the browser until the payment is completed"
+"Are you sure you want to capture the payment?","Are you sure you want to capture the payment?"
+"Are you sure you want to cancel the payment?","Are you sure you want to cancel the payment?"
+"Payment reference 1","Payment Reference 1"
+"Payment reference 2","Payment Reference 2"
+"Payment Reference","Payment Reference"
+"Please read the Installation Guide before you start and login to the <a href='https://admin.novalnet.de/' target='_blank'> Novalnet Admin Portal </a> using your merchant account. To get a merchant account, mail to <a href='mailto:sales@novalnet.de'>sales@novalnet.de</a> or call +49 (089) 923068320","Please read the Installation Guide before you start and login to the <a href='https://admin.novalnet.de/' target='_blank'> Novalnet Admin Portal </a> using your merchant account. To get a merchant account, mail to <a href='mailto:sales@novalnet.de'>sales@novalnet.de</a> or call +49 (089) 923068320"
+"Allow manual testing of the Notification / Webhook URL","Allow manual testing of the Notification / Webhook URL"
+"ending in %1 (expires %2/%3)","ending in %1 (expires %2/%3)"
+"IBAN","IBAN"
+"Please enter a valid Product Activation Key and Payment Access key.","Please enter a valid Product Activation Key and Payment Access key."
+"Make sure the Direct Debit SEPA payment is enabled to use this option.","Make sure the Direct Debit SEPA payment is enabled to use this option."
+"Make sure the Invoice payment is enabled to use this option.","Make sure the Invoice payment is enabled to use this option."
+"Configure the valid Product Activation Key and Payment Access key to activate the payment types under <b>Configuration</b> settings.","Configure the valid Product Activation Key and Payment Access key to activate the payment types under <b>Configuration</b> settings."
+"Module version","Module version"
+"Display Credit/Debit card logos","Display Credit/Debit card logos"
+"The selected card logos will be displayed on the checkout page","The selected card logos will be displayed on the checkout page"
+"Allow B2B Customers","Allow B2B Customers"
+"Allow B2B customers to place order","Allow B2B customers to place order"
+"<div class='novalnet-payment-logo'></div><div class='novalnet-payment-text'>Secured and trusted means of accepting all payment methods supported worldwide. <br>Novalnet provides the most convenient way to increase your sales and deliver seamless checkout experience for your customers.</div>","<div class='novalnet-payment-logo'></div><div class='novalnet-payment-text'>Secured and trusted means of accepting all payment methods supported worldwide. <br>Novalnet provides the most convenient way to increase your sales and deliver seamless checkout experience for your customers.</div>"
+"Novalnet webhook added order status %1","Novalnet webhook added order status %1"
+"Novalnet webhook set status (%1) for Order ID = %2","Novalnet webhook set status (%1) for Order ID = %2"
+"Please transfer the amount of %1 to the following account on or before %2","Please transfer the amount of %1 to the following account on or before %2"
+"Please transfer the amount of %1 to the following account","Please transfer the amount of %1 to the following account"
+"Only EUR currency allowed %1","The payment cannot be processed, because the basic requirements for the %1 are not met (Only EUR currency allowed)"
+"Minimum order amount should be %1","The payment cannot be processed, because the basic requirements for the %1 are not met (Minimum order amount must be 9.99 EUR)"
+"Only DE, AT, CH countries allowed %1","The payment cannot be processed, because the basic requirements for the %1 are not met (Only Germany, Austria or Switzerland are allowed)"
+"Please use the following payment reference details to pay the amount of %1 at a Multibanco ATM or through your internet banking.","Please use the following payment reference details to pay the amount of %1 at a Multibanco ATM or through your internet banking."
+"Partner Payment Reference: %1","Partner Payment Reference: %1"
+"DD.MM.YYYY","DD.MM.YYYY"
+"Instalment cancel","Instalment cancel"
+"TestMode","TestMode"
+"Card type not accepted, try using another card type","Card type not accepted, try using another card type"
+"In order to use this option you must have billing agreement option enabled in your PayPal account. Please contact your account manager at PayPal.","In order to use this option you must have billing agreement option enabled in your PayPal account. Please contact your account manager at PayPal."
+"Payment details stored during the checkout process can be used for future payments","Payment details stored during the checkout process can be used for future payments"
+"Failed","Failed"
+"Completed","Completed"
+"Please enter valid URL","Please enter valid URL"
+"To setup your shop Notification / Webhook URL, you must add the following webhook endpoint in this format <b>{Shop_url/rest/V1/novalnet/callback}</b> in below <b>Notification / Webhook URL</b> field and click on <b>Configure</b> button to receive notification about transactions.","To setup your shop Notification / Webhook URL, you must add the following webhook endpoint in this format <b>{Shop_url/rest/V1/novalnet/callback}</b> in below <b>Notification / Webhook URL</b> field and click on <b>Configure</b> button to receive notification about transactions."
+"Save for future purchase","Save for future purchase"
+"More security with the new Payment Policy (PSD2) Info","More security with the new Payment Policy (PSD2) Info"
+"European card issuing banks often requires a password or some other form of authentication (EU Payment Services Directive 'PSD2') for secure payment. If the payment is not successful, you can try again. If you have any further questions, please contact your bank.","European card issuing banks often requires a password or some other form of authentication (EU Payment Services Directive 'PSD2') for secure payment. If the payment is not successful, you can try again. If you have any further questions, please contact your bank."
+"Enforce 3D secure payment outside EU","Enforce 3D secure payment outside EU"
+"By enabling this option, all payments from cards issued outside the EU will be authenticated via 3DS 2.0 SCA.","By enabling this option, all payments from cards issued outside the EU will be authenticated via 3DS 2.0 SCA."
+"Your customers can checkout using Apple Pay from any page in your web store","Your customers can checkout using Apple Pay from any page in your web store"
+"Your customers can checkout using Google Pay from any page in your web store","Your customers can checkout using Google Pay from any page in your web store"
+"Button Design","Button Design"
+"Button Type","Button Type"
+"Buy","Buy"
+"Donate","Donate"
+"Book","Book"
+"Contribute","Contribute"
+"Check out","Check out"
+"Order","Order"
+"Subscribe","Subscribe"
+"Tip","Tip"
+"Rent","Rent"
+"Reload","Reload"
+"Support","Support"
+"Button Theme","Button Theme"
+"Button Height","Button Height"
+"Range from 30 to 64 pixels","Range from 30 to 64 pixels"
+"Button Corner Radius","Button Corner Radius"
+"Range from 0 to 10 pixels","Range from 0 to 10 pixels"
+"Shopping cart page","Shopping cart page"
+"Mini cart page","Mini cart page"
+"Product page","Product page"
+"Guest checkout page","Guest checkout page"
+"Express Checkout","Express Checkout"
+"Amount will be booked from your card after successful authentication","Amount will be booked from your card after successful authentication"
+"Dark","Dark"
+"Light","Light"
+"Light-Outline","Light-Outline"
+"Instalment has been cancelled for the TID %1 on %2","Instalment has been cancelled for the TID %1 on %2"
+"Instalment confirmation %storeName Order no: %orderNo","Instalment confirmation %storeName Order no: %orderNo"
diff --git a/registration.php b/registration.php
new file mode 100755
index 0000000..b6ed345
--- /dev/null
+++ b/registration.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Novalnet_Payment',
+    __DIR__
+);
diff --git a/view/adminhtml/layout/adminhtml_system_config_edit.xml b/view/adminhtml/layout/adminhtml_system_config_edit.xml
new file mode 100755
index 0000000..0fb6301
--- /dev/null
+++ b/view/adminhtml/layout/adminhtml_system_config_edit.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <referenceBlock name="content">
+        <block name="novalnet_payment_script"
+               template="Novalnet_Payment::payment/vendorConfig.phtml"
+               class="Novalnet\Payment\Block\VendorAutoConfig"/>
+    </referenceBlock>
+    <head>
+        <css src="Novalnet_Payment::css/novalnet_payment.css"/>
+    </head>
+</page>
diff --git a/view/adminhtml/layout/sales_order_create_index.xml b/view/adminhtml/layout/sales_order_create_index.xml
new file mode 100755
index 0000000..146c712
--- /dev/null
+++ b/view/adminhtml/layout/sales_order_create_index.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <css src="Novalnet_Payment::css/novalnet_payment.css"/>
+    </head>
+</page>
diff --git a/view/adminhtml/layout/sales_order_view.xml b/view/adminhtml/layout/sales_order_view.xml
new file mode 100755
index 0000000..4a0c977
--- /dev/null
+++ b/view/adminhtml/layout/sales_order_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="left">
+            <referenceBlock name="sales_order_tabs">
+                <action method="addTab">
+                    <argument name="name" xsi:type="string">order_novalnet_instalment</argument>
+                    <argument name="block" xsi:type="string">Novalnet\Payment\Block\Adminhtml\Sales\Order\View\Tab\Instalment</argument>
+                </action>
+                <action method="addTab">
+                    <argument name="name" xsi:type="string">order_novalnet_zeroamountbooking</argument>
+                    <argument name="block" xsi:type="string">Novalnet\Payment\Block\Adminhtml\Sales\Order\View\Tab\ZeroAmountBooking</argument>
+                </action>
+            </referenceBlock>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/adminhtml/requirejs-config.js b/view/adminhtml/requirejs-config.js
new file mode 100755
index 0000000..c67bff9
--- /dev/null
+++ b/view/adminhtml/requirejs-config.js
@@ -0,0 +1,28 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+var config = {
+    map: {
+        '*': {
+            novalnetSepaFormJs: 'Novalnet_Payment/js/novalnetSepa',
+            novalnetInvoiceFormJs: 'Novalnet_Payment/js/novalnetInvoice',
+            novalnetCcFormJs:   'Novalnet_Payment/js/novalnetCc',
+            novalnetUtilityJs:   'https://cdn.novalnet.de/js/v2/NovalnetUtility.js'
+        }
+    }
+};
diff --git a/view/adminhtml/templates/config/webhooks_configuration.phtml b/view/adminhtml/templates/config/webhooks_configuration.phtml
new file mode 100755
index 0000000..372b5c6
--- /dev/null
+++ b/view/adminhtml/templates/config/webhooks_configuration.phtml
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+?>
+<script>
+    require([
+        'jquery',
+        'mage/translate',
+        'prototype',
+    ],
+    function($, $t)
+    {
+        var signature_id = 'input[id$="novalnet_global_novalnet_signature"]';
+        var payment_access_key_id = 'input[id$="novalnet_global_novalnet_payment_access_key"]';
+        var signature = $.trim($(signature_id).val());
+        var payment_access_key = $.trim($(payment_access_key_id).val());
+        $('#novalnet_configure_webhooks').css('margin-top','1em');
+        var webhookConfigUrl = '<?= /* @noEscape */ $block->getAjaxUrl() ?>' + signature + '/' + payment_access_key;
+        var progressSpan = $('#progress');
+        $('#novalnet_payments_configuration_errors').hide();
+        $('#novalnet_configure_webhooks').click(function ()
+        {
+            if ($(signature_id).val() != '' && $(payment_access_key_id).val() != '') {
+                var webhookUrl = $.trim($('#novalnet_merchant_script_vendor_script_url').val());
+                var webHook = $('#novalnet_merchant_script_vendor_script_url');
+                if (webHook.valid()) {
+                    $('#novalnet_payments_configuration_errors').hide();
+                    progressSpan.find('.processing').show();
+                    $.ajax({
+                        url: webhookConfigUrl,
+                        type: 'GET',
+                        data: {'webhookurl' : webhookUrl},
+                        dataType: 'json',
+                        success: function(response) {
+                            progressSpan.find('.processing').hide();
+                            var resultText = '';
+                            response = JSON.parse(response);
+                            response = response.result;
+                            if (response.status != 'SUCCESS') {
+                                resultText = $t(response.status_text);
+                                progressSpan.find('.configured').hide();
+                                progressSpan.find('.failed').show();
+                            } else {
+                                resultText = '<?= /* @noEscape */ __("Completed")?>';
+                                progressSpan.find('.failed').hide();
+                                progressSpan.find('.configured').show();
+                            }
+                            $('#novalnet_payments_configured_message').text(resultText);
+                        },
+                        error: function(response) {
+                           progressSpan.find('.processing').hide();
+                           resultText = '<?= /* @noEscape */ __("Failed")?>';
+                           $('#novalnet_payments_configured_message').text(resultText);
+                        }
+                    });
+                }
+            }
+        });
+    });
+</script>
+<input type="text" id="novalnet_merchant_script_vendor_script_url"
+   name="<?= /* @noEscape */ $block->getElement()->getName(); ?>"
+   value="<?= /* @noEscape */ $block->getWebHookUrl(); ?>" class="required-entry validate-url validate-no-html-tags" style="float:left;"/>
+<br>
+<?= /* @noEscape */ $block->getButtonHtml() ?>
+<span class="novalnet-webhooks-config-admin" id="progress">
+    <img class="processing" hidden="hidden" alt="Configuring" style="margin:0 5px" src="<?= /* @noEscape */ $block->getViewFileUrl('images/process_spinner.gif') ?>"/>
+    <img class="configured" hidden="hidden" alt="Configured" style="margin:-3px 5px" src="<?= /* @noEscape */ $block->getViewFileUrl('images/rule_component_apply.gif') ?>"/>
+    <img class="failed" hidden="hidden" alt="failed" style="margin:-3px 5px" src="<?= /* @noEscape */ $block->getViewFileUrl('images/rule_component_remove.gif') ?>"/>
+    <span id="novalnet_payments_configured_message"></span>
+    <div id="novalnet_payments_configuration_errors" class="message-system-inner">
+        <div class="message message-warning"></div>
+    </div>
+</span>
diff --git a/view/adminhtml/templates/form/Cashpayment.phtml b/view/adminhtml/templates/form/Cashpayment.phtml
new file mode 100755
index 0000000..52fa25a
--- /dev/null
+++ b/view/adminhtml/templates/form/Cashpayment.phtml
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payment\Block\Method\Form\Cashpayment
+ */
+$paymentMethodcode = $block->escapeHtml($block->getMethodCode());
+?>
+<fieldset class="admin__fieldset payment-method"
+    id="payment_form_<?= /* @noEscape */ $paymentMethodcode; ?>"
+    style="display:none">
+    <div class="admin__field">
+        <!-- Payment logo -->
+        <?php if ($block->getPaymentLogo($paymentMethodcode)): ?>
+            <img src="<?= /* @noEscape */ $block->getPaymentLogo($paymentMethodcode); ?>"
+                alt="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+                title="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+                style="max-height:75px;" />
+        <?php endif; ?>
+        <!-- Test mode notification -->
+        <?php if ($block->getTestMode($paymentMethodcode)): ?>
+            <div class="nn-mode">
+                <div class="nn-test-drive"><?= $block->escapeHtml(__('TestMode')); ?></div>
+            </div>
+        <?php endif; ?>
+    </div>
+    <div class="admin__field">
+        <!-- Payment description -->
+        <p>
+            <?= $block->escapeHtml(__('On successful checkout, you will receive a payment slip/SMS to pay your online purchase at one of our retail partners (e.g. supermarket)')); ?><br>
+        </p>
+    </div>
+</fieldset>
diff --git a/view/adminhtml/templates/form/Cc.phtml b/view/adminhtml/templates/form/Cc.phtml
new file mode 100755
index 0000000..488aba8
--- /dev/null
+++ b/view/adminhtml/templates/form/Cc.phtml
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payment\Block\Method\Form\Cc
+ */
+$paymentMethodcode = $block->escapeHtml($block->getMethodCode());
+$formData = [
+    'code' => $paymentMethodcode,
+    'inlineForm' => $block->isInlineForm(),
+    'iframeParams' => $block->getCcIframeParams(),
+    'config' => $block->getConfig($paymentMethodcode),
+    'billing' =>$block->novalnetHelper()->getBillingAddress(),
+    'shipping' =>$block->novalnetHelper()->getShippingAddress(),
+    'amount' => $block->novalnetHelper()->getAmount()
+];
+$serializedFormData = $block->jsonHelper()->jsonEncode($formData);
+?>
+<fieldset class="admin__fieldset payment-method"
+          id="payment_form_<?= /* @noEscape */ $paymentMethodcode; ?>"
+          style="display:none"
+          data-mage-init='{"novalnetCcFormJs":<?= /* @noEscape */ $serializedFormData; ?>}'>
+    <div class="admin__field">
+        <!-- Payment logo -->
+        <?php if (!empty($block->getCreditCardLogos($paymentMethodcode))): ?>
+            <?php foreach ($block->getCreditCardLogos($paymentMethodcode) as $key => $value): ?>
+                    <img src="<?= /* @noEscape */ $value['src']; ?>"
+                         alt="<?= /* @noEscape */ $value['title']; ?>"
+                         title="<?= /* @noEscape */ $value['title']; ?>" />
+            <?php endforeach; ?>
+        <?php endif; ?>
+        <!-- PSD2 description -->
+        <ul class="row" style="list-style-type: none;">
+            <li style="float:left"><?= $block->escapeHtml(__('More security with the new Payment Policy (PSD2) Info')); ?></li>
+            <li style="float:left">
+                <div class="tooltip">
+                    <span class="help">
+                        <span></span>
+                    </span>
+                    <div class="tooltip-content">
+                        <?= $block->escapeHtml(__("European card issuing banks often requires a password or some other form of authentication (EU Payment Services Directive 'PSD2') for secure payment. If the payment is not successful, you can try again. If you have any further questions, please contact your bank.")); ?>
+                    </div>
+                </div>
+            </li>
+        </ul>
+        <!-- Test mode notification -->
+        <?php if ($block->getTestMode($paymentMethodcode)): ?>
+            <div class="nn-mode">
+                <div class="nn-test-drive"><?= $block->escapeHtml(__('TestMode')); ?></div>
+            </div>
+        <?php endif; ?>
+        <iframe width="100%"
+                frameborder="0"
+                border="0"
+                id="novalnet_iframe">
+        </iframe>
+        <!-- Payment description -->
+        <p>
+            <?= $block->escapeHtml(__('Your credit/debit card will be charged immediately after the order is completed')); ?><br>
+        </p>
+        <?php if ($block->isZeroAmountBooking()): ?>
+            <p style="color:red" >
+                <?= $block->escapeHtml(__('This order will be processed as zero amount booking which store your payment data for further online purchases.')); ?><br>
+            </p>
+        <?php endif; ?>
+    </div>
+    <!-- Form hidden elements -->
+    <div class="no-display">
+        <input type="hidden"
+               id="novalnetCc_pan_hash"
+               name="payment[novalnetCc_pan_hash]"/>
+        <input type="hidden"
+               id="novalnetCc_unique_id"
+               name="payment[novalnetCc_unique_id]"/>
+        <input type="hidden"
+               id="nn_chk_button"
+               name="nn_chk_button"/>
+        <input type="hidden"
+               id="nn_cc_standard_style_label"
+               value="<?= /* @noEscape */($block->getStyleConfig('standard_style_label')); ?>" />
+        <input type="hidden"
+               id="nn_cc_standard_style_input"
+               value="<?= /* @noEscape */($block->getStyleConfig('standard_style_input')); ?>" />
+        <input type="hidden"
+               id="nn_cc_standard_style_css"
+               value="<?= /* @noEscape */($block->getStyleConfig('standard_style_css')); ?>" />
+        <input type="hidden"
+               id="nn_cc_validate_text"
+               value="<?= $block->escapeHtml(__('Your credit card details are invalid')); ?>" />
+        <input type="hidden"
+               id="nn_cc_holder_label"
+               value="<?= $block->escapeHtml(__('Card holder name')); ?>" />
+        <input type="hidden"
+               id="nn_cc_holder_field"
+               value="<?= $block->escapeHtml(__('Name on card')); ?>" />
+        <input type="hidden"
+               id="nn_cc_number_label"
+               value="<?= $block->escapeHtml(__('Card number')); ?>" />
+        <input type="hidden"
+               id="nn_cc_number_field"
+               value="<?= $block->escapeHtml(__('XXXX XXXX XXXX XXXX')); ?>" />
+        <input type="hidden"
+               id="nn_cc_date_label"
+               value="<?= $block->escapeHtml(__('Expiry date')); ?>" />
+        <input type="hidden"
+               id="nn_cc_date_field"
+               value="<?= $block->escapeHtml(__('MM / YYYY')); ?>" />
+        <input type="hidden"
+               id="nn_cc_cvc_label"
+               value="<?= $block->escapeHtml(__('CVC/CVV/CID')); ?>" />
+        <input type="hidden"
+               id="nn_cc_cvc_field"
+               value="<?= $block->escapeHtml(__('XXX')); ?>" />
+        <input type="hidden"
+               id="nn_cc_cvc_hint"
+               value="<?= $block->escapeHtml(__('what is this?')); ?>" />
+    </div>
+</fieldset>
diff --git a/view/adminhtml/templates/form/Invoice.phtml b/view/adminhtml/templates/form/Invoice.phtml
new file mode 100755
index 0000000..af4592f
--- /dev/null
+++ b/view/adminhtml/templates/form/Invoice.phtml
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payment\Block\Method\Form\Invoice
+ */
+$paymentMethodcode = $block->escapeHtml($block->getMethodCode());
+$formData = [
+    'code' => $paymentMethodcode
+];
+?>
+<fieldset class="admin__fieldset payment-method"
+    id="payment_form_<?= /* @noEscape */ $paymentMethodcode; ?>"
+    style="display:none">
+    <div class="admin__field">
+        <!-- Payment logo -->
+        <?php if ($block->getPaymentLogo($paymentMethodcode)): ?>
+            <img src="<?= /* @noEscape */ $block->getPaymentLogo($paymentMethodcode); ?>"
+                alt="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+                title="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+                style="max-height:75px;" />
+        <?php endif; ?>
+        <!-- Test mode notification -->
+        <?php if ($block->getTestMode($paymentMethodcode)): ?>
+            <div class="nn-mode">
+                <div class="nn-test-drive"><?= $block->escapeHtml(__('TestMode')); ?></div>
+            </div>
+        <?php endif; ?>
+        <div class="admin__field">
+            <!-- Payment description -->
+            <p>
+                <?= $block->escapeHtml(__('You will receive an e-mail with the Novalnet account details to complete the payment')); ?><br>
+            </p>
+        </div>
+    </div>
+</fieldset>
diff --git a/view/adminhtml/templates/form/InvoiceGuarantee.phtml b/view/adminhtml/templates/form/InvoiceGuarantee.phtml
new file mode 100755
index 0000000..864db37
--- /dev/null
+++ b/view/adminhtml/templates/form/InvoiceGuarantee.phtml
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payment\Block\Method\Form\InvoiceGuarantee
+ */
+$paymentMethodcode = $block->escapeHtml($block->getMethodCode());
+$formData = [
+    'code' => $paymentMethodcode
+];
+$serializedFormData = $block->jsonHelper()->jsonEncode($formData);
+?>
+<fieldset class="admin__fieldset payment-method"
+          id="payment_form_<?= /* @noEscape */ $paymentMethodcode; ?>"
+          style="display:none"
+          data-mage-init='{"novalnetInvoiceFormJs":<?= /* @noEscape */ $serializedFormData; ?>}'>
+    <div class="admin__field">
+        <!-- Payment logo -->
+        <?php if ($block->getPaymentLogo($paymentMethodcode)): ?>
+            <img src="<?= /* @noEscape */ $block->getPaymentLogo($paymentMethodcode); ?>"
+               alt="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+               title="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+               style="max-height:75px;" />
+        <?php endif; ?>
+        <!-- Test mode notification -->
+        <?php if ($block->getTestMode($paymentMethodcode)): ?>
+            <div class="nn-mode">
+                <div class="nn-test-drive"><?= $block->escapeHtml(__('TestMode')); ?></div>
+            </div>
+        <?php endif; ?>
+        <!-- Guarantee Payment -->
+        <?php if ($block->novalnetHelper()->validateCompany($paymentMethodcode)): ?>
+            <div class="field-type admin__field nn-payment-guarantee">
+                <label class="admin__field-label" for="<?= /* @noEscape */ $paymentMethodcode; ?>_dob">
+                    <?= $block->escapeHtml(__('Your date of birth')); ?><span class="required">*</span>
+                </label>
+                <div class="admin__field-control control">
+                    <input type="text"
+                           class="admin__control-text required-entry"
+                           name="payment[novalnetInvoiceGuarantee_dob]"
+                           maxlength="10"
+                           id="<?= /* @noEscape */ $paymentMethodcode; ?>_dob"
+                           title="<?= $block->escapeHtml(__('Date of Birth')); ?>"
+                           autocomplete="off"
+                           placeholder="<?= $block->escapeHtml(__('DD.MM.YYYY')); ?>"
+                           onkeydown = "return NovalnetUtility.isNumericBirthdate(this, event)"
+                           onblur  = "NovalnetUtility.validateDateFormat(this.value)" />
+                </div>
+            </div>
+        <?php endif; ?>
+        <div class="field-type admin__field">
+            <div class="admin__field-control">
+                <!-- Payment description -->
+                <p>
+                    <?= $block->escapeHtml(__('You will receive an e-mail with the Novalnet account details to complete the payment')); ?><br>
+                </p>
+            </div>
+        </div>
+    </div>
+</fieldset>
diff --git a/view/adminhtml/templates/form/InvoiceInstalment.phtml b/view/adminhtml/templates/form/InvoiceInstalment.phtml
new file mode 100755
index 0000000..e791960
--- /dev/null
+++ b/view/adminhtml/templates/form/InvoiceInstalment.phtml
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payment\Block\Method\Form\InvoiceInstalment
+ */
+$paymentMethodcode = $block->escapeHtml($block->getMethodCode());
+$formData = [
+    'code' => $paymentMethodcode
+];
+$serializedFormData = $block->jsonHelper()->jsonEncode($formData);
+$orderTotal = $block->novalnetHelper()->getAdminCheckoutSession()->getQuote()->getGrandTotal();
+$instalmentPeriods = [];
+$allcycles = (!empty($block->getInstalmentCycles())) ? explode(',', $block->getInstalmentCycles()) : [];
+foreach ($allcycles as $allcycle) {
+    if (($orderTotal / $allcycle) >= 9.99) {
+        $instalmentPeriods[$allcycle] = $allcycle .' X '. $block->updateCurrency(sprintf('%0.2f', $orderTotal/$allcycle), true, false) . '('. __(' per month').')';
+    }
+}
+?>
+<fieldset class="admin__fieldset payment-method"
+          id="payment_form_<?= /* @noEscape */ $paymentMethodcode; ?>"
+          style="display:none"
+          data-mage-init='{"novalnetInvoiceFormJs":<?= /* @noEscape */ $serializedFormData; ?>}'>
+    <div class="admin__field">
+        <!-- Payment logo -->
+        <?php if ($block->getPaymentLogo($paymentMethodcode)): ?>
+            <img src="<?= /* @noEscape */ $block->getPaymentLogo($paymentMethodcode); ?>"
+               alt="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+               title="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+               style="max-height:75px;" />
+        <?php endif; ?>
+        <!-- Test mode notification -->
+        <?php if ($block->getTestMode($paymentMethodcode)): ?>
+            <div class="nn-mode">
+                <div class="nn-test-drive"><?= $block->escapeHtml(__('TestMode')); ?></div>
+            </div>
+        <?php endif; ?>
+        <!-- Instalment Payment -->
+        <?php if ($block->novalnetHelper()->validateCompany($paymentMethodcode)): ?>
+            <div class="field-type admin__field nn-payment-instalment">
+                <label class="admin__field-label" for="<?= /* @noEscape */ $paymentMethodcode; ?>_dob">
+                    <?= $block->escapeHtml(__('Your date of birth')); ?><span class="required">*</span>
+                </label>
+                <div class="admin__field-control control">
+                    <input type="text"
+                           class="admin__control-text required-entry"
+                           name="payment[novalnetInvoiceInstalment_dob]"
+                           maxlength="10"
+                           id="<?= /* @noEscape */ $paymentMethodcode; ?>_dob"
+                           title="<?= $block->escapeHtml(__('Date of Birth')); ?>"
+                           autocomplete="off"
+                           placeholder="<?= $block->escapeHtml(__('DD.MM.YYYY')); ?>"
+                           onkeydown = "return NovalnetUtility.isNumericBirthdate(this, event)"
+                           onblur  = "NovalnetUtility.validateDateFormat(this.value)" />
+                </div>
+            </div>
+        <?php endif; ?>
+        <div class="field-type admin__field">
+            <label class="admin__field-label" for="<?= /* @noEscape */ $paymentMethodcode; ?>_cycle">
+                <h3><?= $block->escapeHtml(__('Choose your instalment plan')); ?></h3>
+                <div class="admin__field-control">
+                    <select id="<?= /* @noEscape */ $paymentMethodcode; ?>_cycle" name="payment[novalnetInvoiceInstalment_cycle]"
+                            class="select required-entry admin__control-select validate-select">
+                    <?php foreach ($instalmentPeriods as $instalmentKey => $instalmentValue): ?>
+                        <option value="<?= /* @noEscape */ $instalmentKey; ?>">
+                            <?= /* @noEscape */ $instalmentValue; ?>
+                        </option>
+                    <?php endforeach; ?>
+                </select>
+                </div>
+            </label>
+        </div>
+        <div class="field-type admin__field">
+            <div class="admin__field-control">
+                <div class="novalnetInvoiceInstalment-details"></div>
+                <!-- Payment description -->
+                <p>
+                    <?= $block->escapeHtml(__('You will receive an e-mail with the Novalnet account details to complete the payment')); ?><br>
+                </p>
+            </div>
+        </div>
+    </div>
+    <input type="hidden" id="invoiceinstalment_total" value="<?= /* @noEscape */ $orderTotal ?>">
+    <input type="hidden" id="invoiceinstalment_currency" value="<?= /* @noEscape */ $block->getCurrentCurrencySymbol(); ?>">
+    <input type="hidden" name="invoiceinstalment_cycle_detail_url"
+        id="invoiceinstalment_cycle_detail_url"
+        value="<?= /* @noEscape */ $block->getInstalmentCycleDetailUrl(); ?>" />
+</fieldset>
diff --git a/view/adminhtml/templates/form/Multibanco.phtml b/view/adminhtml/templates/form/Multibanco.phtml
new file mode 100755
index 0000000..578b4de
--- /dev/null
+++ b/view/adminhtml/templates/form/Multibanco.phtml
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payment\Block\Method\Form\Multibanco
+ */
+$paymentMethodcode = $block->escapeHtml($block->getMethodCode());
+?>
+<fieldset class="admin__fieldset payment-method"
+    id="payment_form_<?= /* @noEscape */ $paymentMethodcode; ?>"
+    style="display:none">
+    <div class="admin__field">
+        <!-- Payment logo -->
+        <?php if ($block->getPaymentLogo($paymentMethodcode)): ?>
+            <img src="<?= /* @noEscape */ $block->getPaymentLogo($paymentMethodcode); ?>"
+                alt="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+                title="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+                style="max-height:75px;" />
+        <?php endif; ?>
+        <!-- Test mode notification -->
+        <?php if ($block->getTestMode($paymentMethodcode)): ?>
+            <div class="nn-mode">
+                <div class="nn-test-drive"><?= $block->escapeHtml(__('TestMode')); ?></div>
+            </div>
+        <?php endif; ?>
+    </div>
+    <div class="admin__field">
+        <!-- Payment description -->
+        <p>
+            <?= $block->escapeHtml(__('On successful checkout, you will receive a payment reference. Using this payment reference, you can either pay in the Multibanco ATM or through your online bank account')); ?><br>
+        </p>
+    </div>
+</fieldset>
diff --git a/view/adminhtml/templates/form/Prepayment.phtml b/view/adminhtml/templates/form/Prepayment.phtml
new file mode 100755
index 0000000..020c8b3
--- /dev/null
+++ b/view/adminhtml/templates/form/Prepayment.phtml
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payment\Block\Method\Form\Prepayment
+ */
+$paymentMethodcode = $block->escapeHtml($block->getMethodCode());
+$formData = [
+    'code' => $paymentMethodcode
+];
+?>
+<fieldset class="admin__fieldset payment-method"
+          id="payment_form_<?= /* @noEscape */ $paymentMethodcode; ?>"
+          style="display:none">
+    <div class="admin__field">
+        <!-- Payment logo -->
+        <?php if ($block->getPaymentLogo($paymentMethodcode)): ?>
+            <img src="<?= /* @noEscape */ $block->getPaymentLogo($paymentMethodcode); ?>"
+                alt="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+                title="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+                style="max-height:75px;" />
+        <?php endif; ?>
+         <!-- Test mode notification -->
+        <?php if ($block->getTestMode($paymentMethodcode)): ?>
+            <div class="nn-mode">
+                <div class="nn-test-drive"><?= $block->escapeHtml(__('TestMode')); ?></div>
+            </div>
+        <?php endif; ?>
+    </div>
+    <div class="admin__field">
+        <!-- Payment description -->
+        <p>
+            <?= $block->escapeHtml(__('You will receive an e-mail with the Novalnet account details to complete the payment')); ?><br>
+        </p>
+    </div>
+</fieldset>
diff --git a/view/adminhtml/templates/form/Sepa.phtml b/view/adminhtml/templates/form/Sepa.phtml
new file mode 100755
index 0000000..5e938fa
--- /dev/null
+++ b/view/adminhtml/templates/form/Sepa.phtml
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payment\Block\Method\Form\Sepa
+ */
+$paymentMethodcode = $block->escapeHtml($block->getMethodCode());
+$formData = [
+    'code' => $paymentMethodcode
+];
+$serializedFormData = $block->jsonHelper()->jsonEncode($formData);
+?>
+<fieldset class="admin__fieldset payment-method"
+          id="payment_form_<?= /* @noEscape */ $paymentMethodcode; ?>"
+          style="display:none"
+          data-mage-init='{"novalnetSepaFormJs":<?= /* @noEscape */ $serializedFormData; ?>}'>
+    <div class="admin__field">
+        <!-- Payment logo -->
+        <?php if ($block->getPaymentLogo($paymentMethodcode)): ?>
+            <img src="<?= /* @noEscape */ $block->getPaymentLogo($paymentMethodcode); ?>"
+                 alt="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+                 title="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+                 style="max-height:75px;" />
+        <?php endif; ?>
+        <!-- Test mode notification -->
+        <?php if ($block->getTestMode($paymentMethodcode)): ?>
+            <div class="nn-mode">
+                <div class="nn-test-drive"><?= $block->escapeHtml(__('TestMode')); ?></div>
+            </div>
+        <?php endif; ?>
+    </div>
+    <div class="field-type admin__field">
+        <label class="admin__field-label" for="<?= /* @noEscape */ $paymentMethodcode; ?>_account_number">
+            <?= $block->escapeHtml(__('IBAN')); ?><span class="required">*</span>
+        </label>
+        <div class="admin__field-control">
+            <input type="text"
+                   id="<?= /* @noEscape */ $paymentMethodcode; ?>_account_number"
+                   title="<?= $block->escapeHtml(__('IBAN')); ?>"
+                   name="payment[novalnetSepa_iban]"
+                   class="admin__control-text required-entry"
+                   placeholder="<?= $block->escapeHtml('DE00 0000 0000 0000 0000 00'); ?>"
+                   style="text-transform:uppercase;" value="" autocomplete="off"/>
+        </div>
+    </div>
+    <div class="field-type admin__field" id="<?= /* @noEscape */ $paymentMethodcode; ?>_bic_code_div" style="display:none" >
+        <label class="admin__field-label" for="<?= /* @noEscape */ $paymentMethodcode; ?>_bic_code">
+            <?= $block->escapeHtml(__('BIC')); ?><span class="required">*</span>
+        </label>
+        <div class="admin__field-control">
+            <input type="text"
+                   id="<?= /* @noEscape */ $paymentMethodcode; ?>_bic_code"
+                   title="<?= $block->escapeHtml(__('BIC')); ?>"
+                   name="payment[novalnetSepa_bic]"
+                   class="admin__control-text"
+                   placeholder="<?= $block->escapeHtml('XXXX XX XX XXX'); ?>"
+                   style="text-transform:uppercase;" value="" autocomplete="off"/>
+        </div>
+    </div>
+    <div class="field-type admin__field">
+        <div class="admin__field-control">
+            <!-- Payment description -->
+            <p>
+                <?= $block->escapeHtml(__('The amount will be debited from your account by Novalnet')); ?><br>
+            </p>
+            <?php if ($block->isZeroAmountBooking()): ?>
+                <p style="color:red" >
+                    <?= $block->escapeHtml(__('This order will be processed as zero amount booking which store your payment data for further online purchases.')); ?><br>
+                </p>
+            <?php endif; ?>
+            <a id = "sepa_mandate_toggle" style = "cursor:pointer;" class="resp-accordion"><strong><strong><?= $block->escapeHtml(__('I hereby grant the mandate for the SEPA direct debit')) ?>
+            </strong> <?= $block->escapeHtml(__('(electronic transmission)')) ?>
+            <strong><?= $block->escapeHtml(__('and confirm that the given bank details are correct!')) ?></strong></strong></a>
+            <div class="resp-accordion" id="sepa_mandate_details" style="display:none; padding:5px; border: 1px solid; border-color: #ddd;">
+                <?= $block->escapeHtml(__('I authorise (A) Novalnet AG to send instructions to my bank to debit my account and (B) my bank to debit my account in accordance with the instructions from Novalnet AG.')) ?>
+                <br>
+                <br>
+                <strong><?= $block->escapeHtml(__('Creditor identifier: DE53ZZZ00000004253')) ?></strong>
+                <br>
+                <br>
+                <strong><?= $block->escapeHtml(__('Note:')) ?></strong>
+                <?= $block->escapeHtml(__('You are entitled to a refund from your bank under the terms and conditions of your agreement with bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.')) ?>
+            </div>
+        </div>
+    </div>
+</fieldset>
diff --git a/view/adminhtml/templates/form/SepaGuarantee.phtml b/view/adminhtml/templates/form/SepaGuarantee.phtml
new file mode 100755
index 0000000..9d108bc
--- /dev/null
+++ b/view/adminhtml/templates/form/SepaGuarantee.phtml
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payment\Block\Method\Form\SepaGuarantee
+ */
+$paymentMethodcode = $block->escapeHtml($block->getMethodCode());
+$formData = [
+    'code' => $paymentMethodcode
+];
+$serializedFormData = $block->jsonHelper()->jsonEncode($formData);
+?>
+<fieldset class="admin__fieldset payment-method"
+          id="payment_form_<?= /* @noEscape */ $paymentMethodcode; ?>"
+          style="display:none"
+          data-mage-init='{"novalnetSepaFormJs":<?= /* @noEscape */ $serializedFormData; ?>}'>
+    <div class="admin__field">
+        <!-- Payment logo -->
+        <?php if ($block->getPaymentLogo($paymentMethodcode)): ?>
+            <img src="<?= /* @noEscape */ $block->getPaymentLogo($paymentMethodcode); ?>"
+                 alt="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+                 title="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+                 style="max-height:75px;" />
+        <?php endif; ?>
+        <!-- Test mode notification -->
+        <?php if ($block->getTestMode($paymentMethodcode)): ?>
+            <div class="nn-mode">
+                <div class="nn-test-drive"><?= $block->escapeHtml(__('TestMode')); ?></div>
+            </div>
+        <?php endif; ?>
+        <div class="field-type admin__field">
+            <label class="admin__field-label" for="<?= /* @noEscape */ $paymentMethodcode; ?>_account_number">
+                <?= $block->escapeHtml(__('IBAN')); ?><span class="required">*</span>
+            </label>
+            <div class="admin__field-control">
+                <input type="text"
+                       id="<?= /* @noEscape */ $paymentMethodcode; ?>_account_number"
+                       title="<?= $block->escapeHtml(__('IBAN')); ?>"
+                       name="payment[novalnetSepaGuarantee_iban]"
+                       class="admin__control-text required-entry"
+                       placeholder="<?= $block->escapeHtml('DE00 0000 0000 0000 0000 00'); ?>"
+                       style="text-transform:uppercase;" value="" autocomplete="off"/>
+            </div>
+        </div>
+        <div class="field-type admin__field" id="<?= /* @noEscape */ $paymentMethodcode; ?>_bic_code_div" style="display:none" >
+            <label class="admin__field-label" for="<?= /* @noEscape */ $paymentMethodcode; ?>_bic_code">
+                <?= $block->escapeHtml(__('BIC')); ?><span class="required">*</span>
+            </label>
+            <div class="admin__field-control">
+                <input type="text"
+                       id="<?= /* @noEscape */ $paymentMethodcode; ?>_bic_code"
+                       title="<?= $block->escapeHtml(__('BIC')); ?>"
+                       name="payment[novalnetSepaGuarantee_bic]"
+                       class="admin__control-text"
+                       placeholder="<?= $block->escapeHtml('XXXX XX XX XXX'); ?>"
+                       style="text-transform:uppercase;" value="" autocomplete="off"/>
+            </div>
+        </div>
+        <?php if ($block->novalnetHelper()->validateCompany($paymentMethodcode)): ?>
+            <div class="field-type admin__field nn-payment-guarantee">
+                <label class="admin__field-label" for="<?= /* @noEscape */ $paymentMethodcode; ?>_dob">
+                    <?= $block->escapeHtml(__('Your date of birth')); ?><span class="required">*</span>
+                </label>
+                <div class="admin__field-control control">
+                    <input type="text"
+                           class="admin__control-text required-entry"
+                           name="payment[novalnetSepaGuarantee_dob]"
+                           maxlength="10"
+                           id="<?= /* @noEscape */ $paymentMethodcode; ?>_dob"
+                           title="<?= $block->escapeHtml(__('Date of Birth')); ?>"
+                           autocomplete="off"
+                           placeholder="<?= $block->escapeHtml(__('DD.MM.YYYY')); ?>"
+                           onkeydown = "return NovalnetUtility.isNumericBirthdate(this, event)"
+                           onblur  = "NovalnetUtility.validateDateFormat(this.value)" />
+                </div>
+            </div>
+        <?php endif; ?>
+        <div class="field-type admin__field">
+            <div class="admin__field-control">
+                <!-- Payment description -->
+                <p>
+                    <?= $block->escapeHtml(__('The amount will be debited from your account by Novalnet')); ?><br>
+                </p>
+                <a id = "sepa_guarantee_mandate_toggle" style = "cursor:pointer;" class="resp-accordion"><strong><strong><?= $block->escapeHtml(__('I hereby grant the mandate for the SEPA direct debit')) ?>
+                </strong> <?= $block->escapeHtml(__('(electronic transmission)')) ?>
+                <strong><?= $block->escapeHtml(__('and confirm that the given bank details are correct!')) ?></strong></strong></a>
+                <div class="resp-accordion" id="sepa_guarantee_mandate_details" style="display:none; padding:5px; border: 1px solid; border-color: #ddd;">
+                    <?= $block->escapeHtml(__('I authorise (A) Novalnet AG to send instructions to my bank to debit my account and (B) my bank to debit my account in accordance with the instructions from Novalnet AG.')) ?>
+                    <br>
+                    <br>
+                    <strong><?= $block->escapeHtml(__('Creditor identifier: DE53ZZZ00000004253')) ?></strong>
+                    <br>
+                    <br>
+                    <strong><?= $block->escapeHtml(__('Note:')) ?></strong>
+                    <?= $block->escapeHtml(__('You are entitled to a refund from your bank under the terms and conditions of your agreement with bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.')) ?>
+                </div>
+            </div>
+        </div>
+    </div>
+</fieldset>
diff --git a/view/adminhtml/templates/form/SepaInstalment.phtml b/view/adminhtml/templates/form/SepaInstalment.phtml
new file mode 100755
index 0000000..a55cf1c
--- /dev/null
+++ b/view/adminhtml/templates/form/SepaInstalment.phtml
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payment\Block\Method\Form\SepaInstalment
+ */
+$paymentMethodcode = $block->escapeHtml($block->getMethodCode());
+$formData = [
+    'code' => $paymentMethodcode
+];
+$serializedFormData = $block->jsonHelper()->jsonEncode($formData);
+$orderTotal = $block->novalnetHelper()->getAdminCheckoutSession()->getQuote()->getGrandTotal();
+$instalmentPeriods = [];
+$allcycles = (!empty($block->getInstalmentCycles())) ? explode(',', $block->getInstalmentCycles()) : [];
+foreach ($allcycles as $allcycle) {
+    if (($orderTotal / $allcycle) >= 9.99) {
+        $instalmentPeriods[$allcycle] = $allcycle . __(' Cycles / ') . $block->updateCurrency($orderTotal / $allcycle, true, false) . __(' Every month');
+    }
+}
+?>
+<fieldset class="admin__fieldset payment-method"
+          id="payment_form_<?= /* @noEscape */ $paymentMethodcode; ?>"
+          style="display:none"
+          data-mage-init='{"novalnetSepaFormJs":<?= /* @noEscape */ $serializedFormData; ?>}'>
+    <div class="admin__field">
+        <!-- Payment logo -->
+        <?php if ($block->getPaymentLogo($paymentMethodcode)): ?>
+            <img src="<?= /* @noEscape */ $block->getPaymentLogo($paymentMethodcode); ?>"
+                 alt="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+                 title="<?= /* @noEscape */ $block->getMethod()->getConfigData('title'); ?>"
+                 style="max-height:75px;" />
+        <?php endif; ?>
+        <!-- Test mode notification -->
+        <?php if ($block->getTestMode($paymentMethodcode)): ?>
+            <div class="nn-mode">
+                <div class="nn-test-drive"><?= $block->escapeHtml(__('TestMode')); ?></div>
+            </div>
+        <?php endif; ?>
+        <div class="field-type admin__field">
+            <label class="admin__field-label" for="<?= /* @noEscape */ $paymentMethodcode; ?>_account_number">
+                <?= $block->escapeHtml(__('IBAN')); ?><span class="required">*</span>
+            </label>
+            <div class="admin__field-control">
+                <input type="text"
+                       id="<?= /* @noEscape */ $paymentMethodcode; ?>_account_number"
+                       title="<?= $block->escapeHtml(__('IBAN')); ?>"
+                       name="payment[novalnetSepaInstalment_iban]"
+                       class="admin__control-text required-entry"
+                       placeholder="<?= $block->escapeHtml('DE00 0000 0000 0000 0000 00'); ?>"
+                       style="text-transform:uppercase;" value="" autocomplete="off"/>
+            </div>
+        </div>
+        <div class="field-type admin__field" id="<?= /* @noEscape */ $paymentMethodcode; ?>_bic_code_div" style="display:none" >
+            <label class="admin__field-label" for="<?= /* @noEscape */ $paymentMethodcode; ?>_bic_code">
+                <?= $block->escapeHtml(__('BIC')); ?><span class="required">*</span>
+            </label>
+            <div class="admin__field-control">
+                <input type="text"
+                       id="<?= /* @noEscape */ $paymentMethodcode; ?>_bic_code"
+                       title="<?= $block->escapeHtml(__('BIC')); ?>"
+                       name="payment[novalnetSepaInstalment_bic]"
+                       class="admin__control-text"
+                       placeholder="<?= $block->escapeHtml('XXXX XX XX XXX'); ?>"
+                       style="text-transform:uppercase;" value="" autocomplete="off"/>
+            </div>
+        </div>
+        <?php if ($block->novalnetHelper()->validateCompany($paymentMethodcode)): ?>
+            <div class="field-type admin__field nn-payment-instalment">
+                <label class="admin__field-label" for="<?= /* @noEscape */ $paymentMethodcode; ?>_dob">
+                    <?= $block->escapeHtml(__('Your date of birth')); ?><span class="required">*</span>
+                </label>
+                <div class="admin__field-control control">
+                    <input type="text"
+                           class="admin__control-text required-entry"
+                           name="payment[novalnetSepaInstalment_dob]"
+                           maxlength="10"
+                           id="<?= /* @noEscape */ $paymentMethodcode; ?>_dob"
+                           title="<?= $block->escapeHtml(__('Date of Birth')); ?>"
+                           autocomplete="off"
+                           placeholder="<?= $block->escapeHtml(__('DD.MM.YYYY')); ?>"
+                           onkeydown = "return NovalnetUtility.isNumericBirthdate(this, event)"
+                           onblur  = "NovalnetUtility.validateDateFormat(this.value)" />
+                </div>
+            </div>
+        <?php endif; ?>
+        <div class="field-type admin__field">
+            <label class="admin__field-label" for="<?= /* @noEscape */ $paymentMethodcode; ?>_cycle">
+                <h3><?= $block->escapeHtml(__('Choose your instalment plan')); ?></h3>
+                <div class="admin__field-control">
+                    <select id="<?= /* @noEscape */ $paymentMethodcode; ?>_cycle" name="payment[novalnetSepaInstalment_cycle]"
+                            class="select required-entry admin__control-select validate-select">
+                    <?php foreach ($instalmentPeriods as $instalmentKey => $instalmentValue): ?>
+                        <option value="<?= /* @noEscape */ $instalmentKey; ?>">
+                            <?= /* @noEscape */ $instalmentValue; ?>
+                        </option>
+                    <?php endforeach; ?>
+                </select>
+                </div>
+            </label>
+        </div>
+        <input type="hidden" id="sepainstalment_total" value="<?= /* @noEscape */ $orderTotal ?>">
+        <input type="hidden" id="sepainstalment_currency" value="<?= /* @noEscape */ $block->getCurrentCurrencySymbol(); ?>">
+        <div class="field-type admin__field">
+            <div class="admin__field-control">
+                <div class="novalnetSepaInstalment-details"></div>
+                <!-- Payment description -->
+                <p>
+                    <?= $block->escapeHtml(__('The amount will be debited from your account by Novalnet')); ?><br>
+                </p>
+                <a id = "sepa_instalment_mandate_toggle" style = "cursor:pointer;" class="resp-accordion"><strong><strong><?= $block->escapeHtml(__('I hereby grant the mandate for the SEPA direct debit')) ?>
+                </strong> <?= $block->escapeHtml(__('(electronic transmission)')) ?>
+                <strong><?= $block->escapeHtml(__('and confirm that the given bank details are correct!')) ?></strong></strong></a>
+                <div class="resp-accordion" id="sepa_instalment_mandate_details" style="display:none; padding:5px; border: 1px solid; border-color: #ddd;">
+                    <?= $block->escapeHtml(__('I authorise (A) Novalnet AG to send instructions to my bank to debit my account and (B) my bank to debit my account in accordance with the instructions from Novalnet AG.')) ?>
+                    <br>
+                    <br>
+                    <strong><?= $block->escapeHtml(__('Creditor identifier: DE53ZZZ00000004253')) ?></strong>
+                    <br>
+                    <br>
+                    <strong><?= $block->escapeHtml(__('Note:')) ?></strong>
+                    <?= $block->escapeHtml(__('You are entitled to a refund from your bank under the terms and conditions of your agreement with bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.')) ?>
+                </div>
+            </div>
+        </div>
+    </div>
+    <input type="hidden" name="sepaInstalment_cycle_detail_url"
+        id="sepaInstalment_cycle_detail_url"
+        value="<?= /* @noEscape */ $block->getInstalmentCycleDetailUrl(); ?>" />
+</fieldset>
diff --git a/view/adminhtml/templates/info/Alipay.phtml b/view/adminhtml/templates/info/Alipay.phtml
new file mode 100755
index 0000000..2a1d3e3
--- /dev/null
+++ b/view/adminhtml/templates/info/Alipay.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Alipay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Applepay.phtml b/view/adminhtml/templates/info/Applepay.phtml
new file mode 100755
index 0000000..34cda0f
--- /dev/null
+++ b/view/adminhtml/templates/info/Applepay.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Applepay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Bancontact.phtml b/view/adminhtml/templates/info/Bancontact.phtml
new file mode 100755
index 0000000..374a42f
--- /dev/null
+++ b/view/adminhtml/templates/info/Bancontact.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Bancontact
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Banktransfer.phtml b/view/adminhtml/templates/info/Banktransfer.phtml
new file mode 100755
index 0000000..9cd6222
--- /dev/null
+++ b/view/adminhtml/templates/info/Banktransfer.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Banktransfer
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Blik.phtml b/view/adminhtml/templates/info/Blik.phtml
new file mode 100755
index 0000000..86939d4
--- /dev/null
+++ b/view/adminhtml/templates/info/Blik.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Blik
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Cashpayment.phtml b/view/adminhtml/templates/info/Cashpayment.phtml
new file mode 100755
index 0000000..97c73d8
--- /dev/null
+++ b/view/adminhtml/templates/info/Cashpayment.phtml
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Cashpayment
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('CpDueDate') && (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1)): ?>
+        <?= /* @noEscape */ __('Slip expiry date: %1', $block->getAdditionalData('CpDueDate')) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('dueDateUpdateAt')): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been updated with amount %1 and slip expiry date with %2',
+            $totalAmount,
+            $block->getAdditionalData('CpDueDate')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/invoice|creditmemo|shipment|callback/i', $block->getUrl('*/*/*', ['_current' => true])) &&
+        (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1)): ?>
+        <?php if ($block->getAdditionalData('CashpaymentStores')): ?>
+            <?= /* @noEscape */ __('Store(s) near you:') ?><br><br>
+            <?php foreach ($block->getAdditionalData('CashpaymentStores') as $key => $value): ?>
+                <?= /* @noEscape */ $value['title'] ?><br>
+                <?= /* @noEscape */ $value['street'] ?><br>
+                <?= /* @noEscape */ $value['city'] ?><br>
+                <?= /* @noEscape */ $value['country'] ?><br>
+                <?= /* @noEscape */ $value['zipcode'] ?><br><br>
+            <?php endforeach; ?>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Cc.phtml b/view/adminhtml/templates/info/Cc.phtml
new file mode 100755
index 0000000..6daaa5e
--- /dev/null
+++ b/view/adminhtml/templates/info/Cc.phtml
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Cc
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnZeroAmountBooking')): ?>
+        <?= /* @noEscape */ __('This order processed as a zero amount booking') ?>
+        <br><br>
+        <?php if ($block->getAdditionalData('NnUpdatedZeroAmount') && $block->getAdditionalData('NnZeroAmountRefTid')): ?>
+            <?= /* @noEscape */ __(
+                'Your order has been booked with the amount of %1. Your new TID for the booked amount: %2',
+                $block->getAdditionalData('NnUpdatedZeroAmount'),
+                $block->getAdditionalData('NnZeroAmountRefTid')
+            ) ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Eps.phtml b/view/adminhtml/templates/info/Eps.phtml
new file mode 100755
index 0000000..cc52423
--- /dev/null
+++ b/view/adminhtml/templates/info/Eps.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Eps
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Giropay.phtml b/view/adminhtml/templates/info/Giropay.phtml
new file mode 100755
index 0000000..04d4237
--- /dev/null
+++ b/view/adminhtml/templates/info/Giropay.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Giropay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Googlepay.phtml b/view/adminhtml/templates/info/Googlepay.phtml
new file mode 100755
index 0000000..9742c29
--- /dev/null
+++ b/view/adminhtml/templates/info/Googlepay.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Googlepay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Ideal.phtml b/view/adminhtml/templates/info/Ideal.phtml
new file mode 100755
index 0000000..362d902
--- /dev/null
+++ b/view/adminhtml/templates/info/Ideal.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Ideal
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Invoice.phtml b/view/adminhtml/templates/info/Invoice.phtml
new file mode 100755
index 0000000..9e12334
--- /dev/null
+++ b/view/adminhtml/templates/info/Invoice.phtml
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Invoice
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php
+    if ($block->getAdditionalData('NnGuarantee')) {
+        /* @noEscape */ echo __('This is processed as a guarantee payment') . '<br /><br />';
+        if (($paymentStatus == 'PENDING')): ?>
+            <?= /* @noEscape */ __('Your order is being verified. Once confirmed, we will send you our bank details to which the order amount should be transferred. Please note that this may take up to 24 hours') ?><br><br>
+        <?php endif;
+    } ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed successfully for the TID: %1',
+            $transactionId
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('dueDateUpdateAt') && $paymentStatus != 'ON_HOLD'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been updated with amount %1 and due date with %2',
+            $totalAmount,
+            $block->getAdditionalData('NnDueDate')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/creditmemo/i', $block->getUrl('*/*/*', ['_current' => true])) && in_array($paymentStatus, ['PENDING', 'ON_HOLD', 'CONFIRMED']) &&
+        (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1) &&
+        (empty($block->getAdditionalData('NnGuarantee')) ||
+        (!empty($block->getAdditionalData('NnGuarantee')) && $paymentStatus != 'PENDING'))): ?>
+        <?php if (!empty($block->getAdditionalData('NnInvoiceComments')) && strlen($block->getAdditionalData('NnInvoiceComments'))): ?>
+            <?php if ($paymentStatus != 'ON_HOLD'): ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account on or before %2', $totalAmount, $block->getAdditionalData('NnDueDate')) ?>
+            <?php else: ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account', $totalAmount) ?>
+            <?php endif; ?>
+            <?php $invoiceComments = (!empty($block->getAdditionalData('NnInvoiceComments'))) ? explode('|', $block->getAdditionalData('NnInvoiceComments')) : []; ?>
+            <?php foreach ($invoiceComments as $noteValue): ?>
+                <?php list($text, $value) = (!empty($noteValue)) ? explode(':', $noteValue) : ['', '']; ?>
+                <?php if (!empty($value) && preg_match('/Order No&/i', $value)): ?>
+                    <?php list($referenceTxt, $value) = (!empty($value)) ? explode('&', $value) : ['', '']; ?>
+                    <?php str_replace('&', '', $referenceTxt); ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . __($referenceTxt) . ' ' . $value ?>
+                <?php elseif ($text != 'Due Date' || ($text == 'Due Date' && $paymentStatus != 'ON_HOLD')): ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . $value ?>
+                <?php endif; ?>
+            <?php endforeach; ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/InvoiceGuarantee.phtml b/view/adminhtml/templates/info/InvoiceGuarantee.phtml
new file mode 100755
index 0000000..c6d5ca7
--- /dev/null
+++ b/view/adminhtml/templates/info/InvoiceGuarantee.phtml
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\InvoiceGuarantee
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($paymentStatus == 'PENDING'): ?>
+        <?= /* @noEscape */ __('Your order is being verified. Once confirmed, we will send you our bank details to which the order amount should be transferred. Please note that this may take up to 24 hours') ?><br>
+    <?php endif; ?>
+
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed successfully for the TID: %1',
+            $transactionId
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/creditmemo/i', $block->getUrl('*/*/*', ['_current' => true])) && in_array($paymentStatus, ['ON_HOLD', 'CONFIRMED'])): ?>
+        <?php if (!empty($block->getAdditionalData('NnInvoiceComments')) && strlen($block->getAdditionalData('NnInvoiceComments'))): ?>
+            <?php if ($paymentStatus != 'ON_HOLD'): ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account on or before %2', $totalAmount, $block->getAdditionalData('NnDueDate')) ?>
+            <?php else: ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account', $totalAmount) ?>
+            <?php endif; ?>
+            <?php $invoiceComments = (!empty($block->getAdditionalData('NnInvoiceComments'))) ? explode('|', $block->getAdditionalData('NnInvoiceComments')) : []; ?>
+            <?php foreach ($invoiceComments as $noteValue): ?>
+                <?php list($text, $value) = (!empty($noteValue)) ? explode(':', $noteValue) : ['', '']; ?>
+                <?php if (!empty($value) && preg_match('/Order No&/i', $value)): ?>
+                    <?php list($referenceTxt, $value) = (!empty($value)) ? explode('&', $value) : ['', '']; ?>
+                    <?php str_replace('&', '', $referenceTxt); ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . __($referenceTxt) . ' ' . $value ?>
+                <?php elseif ($text != 'Due Date' || ($text == 'Due Date' && $paymentStatus != 'ON_HOLD')): ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . $value ?>
+                <?php endif; ?>
+            <?php endforeach; ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/InvoiceInstalment.phtml b/view/adminhtml/templates/info/InvoiceInstalment.phtml
new file mode 100755
index 0000000..d6bc46c
--- /dev/null
+++ b/view/adminhtml/templates/info/InvoiceInstalment.phtml
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\InvoiceInstalment
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($paymentStatus == 'PENDING'): ?>
+        <?= /* @noEscape */ __('Your order is being verified. Once confirmed, we will send you our bank details to which the order amount should be transferred. Please note that this may take up to 24 hours') ?><br><br>
+    <?php endif; ?>
+
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed successfully for the TID: %1',
+            $transactionId
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('InstalmentCancel')): ?>
+        <?= /* @noEscape */ __(
+            'Instalment has been cancelled.'
+        ) ?><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/creditmemo/i', $block->getUrl('*/*/*', ['_current' => true])) && in_array($paymentStatus, ['ON_HOLD', 'CONFIRMED'])): ?>
+        <?php if (!empty($block->getAdditionalData('NnInvoiceComments')) && strlen($block->getAdditionalData('NnInvoiceComments'))): ?>
+            <?php if ($paymentStatus != 'ON_HOLD'): ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account on or before %2', $totalAmount, $block->getAdditionalData('NnDueDate')) ?>
+            <?php else: ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account', $totalAmount) ?>
+            <?php endif; ?>
+            <?php $invoiceComments = (!empty($block->getAdditionalData('NnInvoiceComments'))) ? explode('|', $block->getAdditionalData('NnInvoiceComments')) : []; ?>
+            <?php $notesCount = count($invoiceComments); ?>
+            <?php foreach ($invoiceComments as $key => $noteValue): ?>
+                <?php list($text, $value) = (!empty($noteValue)) ? explode(':', $noteValue) : ['', '']; ?>
+                <?php if ($text == 'Payment Reference' && $notesCount == 8 && $key == 6): ?>
+                    <?php continue; ?>
+                <?php endif; ?>
+                <?php if (!empty($value) && preg_match('/Order No&/i', $value)): ?>
+                    <?php list($referenceTxt, $value) = (!empty($value)) ? explode('&', $value) : ['', '']; ?>
+                    <?php str_replace('&', '', $referenceTxt); ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . __($referenceTxt) . ' ' . $value ?>
+                <?php elseif ($text != 'Due Date' || ($text == 'Due Date' && $paymentStatus != 'ON_HOLD')): ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . $value ?>
+                <?php endif; ?>
+            <?php endforeach; ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Multibanco.phtml b/view/adminhtml/templates/info/Multibanco.phtml
new file mode 100755
index 0000000..8b47289
--- /dev/null
+++ b/view/adminhtml/templates/info/Multibanco.phtml
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Multibanco
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnPartnerPaymentReference') && (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1)): ?>
+        <?= /* @noEscape */ __('Please use the following payment reference details to pay the amount of %1 at a Multibanco ATM or through your internet banking.', $block->getGrandTotal()) ?><br><br>
+        <?= /* @noEscape */ __('Partner Payment Reference: %1', $block->getAdditionalData('NnPartnerPaymentReference')) ?><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/OnlineBanktransfer.phtml b/view/adminhtml/templates/info/OnlineBanktransfer.phtml
new file mode 100755
index 0000000..4b5ebe2
--- /dev/null
+++ b/view/adminhtml/templates/info/OnlineBanktransfer.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\OnlineBanktransfer
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Paypal.phtml b/view/adminhtml/templates/info/Paypal.phtml
new file mode 100755
index 0000000..0e69501
--- /dev/null
+++ b/view/adminhtml/templates/info/Paypal.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Paypal
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/PostFinance.phtml b/view/adminhtml/templates/info/PostFinance.phtml
new file mode 100755
index 0000000..e7f2ec4
--- /dev/null
+++ b/view/adminhtml/templates/info/PostFinance.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\PostFinance
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/PostFinanceCard.phtml b/view/adminhtml/templates/info/PostFinanceCard.phtml
new file mode 100755
index 0000000..2fcec35
--- /dev/null
+++ b/view/adminhtml/templates/info/PostFinanceCard.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\PostFinanceCard
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Prepayment.phtml b/view/adminhtml/templates/info/Prepayment.phtml
new file mode 100755
index 0000000..ce65a91
--- /dev/null
+++ b/view/adminhtml/templates/info/Prepayment.phtml
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Prepayment
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed successfully for the TID: %1',
+            $transactionId
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('dueDateUpdateAt') && $paymentStatus != 'ON_HOLD'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been updated with amount %1 and due date with %2',
+            $totalAmount,
+            $block->getAdditionalData('NnDueDate')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/invoice|creditmemo|shipment|callback/i', $block->getUrl('*/*/*', ['_current' => true])) &&
+        (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1)): ?>
+        <?php if (!empty($block->getAdditionalData('NnInvoiceComments')) && strlen($block->getAdditionalData('NnInvoiceComments'))): ?>
+            <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account on or before %2', $totalAmount, $block->getAdditionalData('NnDueDate')) ?>
+            <?php $invoiceComments = (!empty($block->getAdditionalData('NnInvoiceComments'))) ? explode('|', $block->getAdditionalData('NnInvoiceComments')) : []; ?>
+            <?php foreach ($invoiceComments as $noteValue): ?>
+                <?php list($text, $value) = (!empty($noteValue)) ? explode(':', $noteValue) : ['', '']; ?>
+                <?php if (!empty($value) && preg_match('/Order No&/i', $value)): ?>
+                    <?php list($referenceTxt, $value) = (!empty($value)) ? explode('&', $value) : ['', '']; ?>
+                    <?php str_replace('&', '', $referenceTxt); ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . __($referenceTxt) . ' ' . $value ?>
+                <?php else: ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . $value ?>
+                <?php endif; ?>
+            <?php endforeach; ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Przelewy.phtml b/view/adminhtml/templates/info/Przelewy.phtml
new file mode 100755
index 0000000..114ecaf
--- /dev/null
+++ b/view/adminhtml/templates/info/Przelewy.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Przelewy
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Sepa.phtml b/view/adminhtml/templates/info/Sepa.phtml
new file mode 100755
index 0000000..64c8ca4
--- /dev/null
+++ b/view/adminhtml/templates/info/Sepa.phtml
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Sepa
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $info->getOrder());
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php
+    if ($block->getAdditionalData('NnGuarantee')) {
+        /* @noEscape */ echo __('This is processed as a guarantee payment') . '<br /><br />';
+        if ($paymentStatus == 'PENDING') {
+            /* @noEscape */ echo __('Your order is under verification and we will soon update you with the order status. Please note that this may take upto 24 hours.') . '<br /><br />';
+        }
+    }
+    ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnZeroAmountBooking')): ?>
+        <?= /* @noEscape */ __('This order processed as a zero amount booking') ?>
+        <br><br>
+        <?php if ($block->getAdditionalData('NnUpdatedZeroAmount') && $block->getAdditionalData('NnZeroAmountRefTid')): ?>
+            <?= /* @noEscape */ __(
+                'Your order has been booked with the amount of %1. Your new TID for the booked amount: %2',
+                $block->getAdditionalData('NnUpdatedZeroAmount'),
+                $block->getAdditionalData('NnZeroAmountRefTid')
+            ) ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/SepaGuarantee.phtml b/view/adminhtml/templates/info/SepaGuarantee.phtml
new file mode 100755
index 0000000..7489317
--- /dev/null
+++ b/view/adminhtml/templates/info/SepaGuarantee.phtml
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\SepaGuarantee
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($paymentStatus == 'PENDING'): ?>
+        <?= /* @noEscape */ __('Your order is under verification and we will soon update you with the order status. Please note that this may take upto 24 hours.') ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/SepaInstalment.phtml b/view/adminhtml/templates/info/SepaInstalment.phtml
new file mode 100755
index 0000000..6d28f4d
--- /dev/null
+++ b/view/adminhtml/templates/info/SepaInstalment.phtml
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\SepaInstalment
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($paymentStatus == 'PENDING'): ?>
+        <?= /* @noEscape */ __('Your order is under verification and we will soon update you with the order status. Please note that this may take upto 24 hours.') ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('InstalmentCancel')): ?>
+        <?= /* @noEscape */ __(
+            'Instalment has been cancelled.'
+        ) ?><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Trustly.phtml b/view/adminhtml/templates/info/Trustly.phtml
new file mode 100755
index 0000000..75196d9
--- /dev/null
+++ b/view/adminhtml/templates/info/Trustly.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Trustly
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/info/Wechatpay.phtml b/view/adminhtml/templates/info/Wechatpay.phtml
new file mode 100755
index 0000000..1b037f8
--- /dev/null
+++ b/view/adminhtml/templates/info/Wechatpay.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Wechatpay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/payment/vendorConfig.phtml b/view/adminhtml/templates/payment/vendorConfig.phtml
new file mode 100755
index 0000000..ce50e27
--- /dev/null
+++ b/view/adminhtml/templates/payment/vendorConfig.phtml
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+?>
+<?php if ($block->getSectionParam() == 'payment'): ?>
+<div>
+    <input type="hidden"
+           name="nn_vendor_auto_config_url"
+           id="nn_vendor_auto_config_url"
+           value="<?= /* @noEscape */ $block->getVendorAutoConfigUrl(); ?>" />
+    <input type="hidden"
+           name="nn_tariff_id"
+           id="nn_tariff_id"
+           value="<?= /* @noEscape */ $block->getConfigValue('payment/novalnet/tariff_id'); ?>" />
+    <input type="hidden"
+           name="nn_shophost_url"
+           id="nn_shophost_url"
+           value="<?= /* @noEscape */ $block->getShopHostName(); ?>" />
+</div>
+<script>
+    require([
+        "jquery",
+        "mage/translate",
+        "jquery/validate",
+        "jquery/ui"
+    ], function ($, $t) {
+        'use strict';
+
+        $.validator.addMethod('validate-novalnet-guarantee-order-total', function (v) {
+            return validateMinAmount(v, 9.99);
+        }, $.mage.__('The minimum amount should be at least 9.99 EUR'));
+
+        $.validator.addMethod('validate-novalnet-instalment-order-total', function (v) {
+            return validateMinAmount(v, 19.98);
+        }, $.mage.__('The minimum amount should be at least 19.98 EUR'));
+
+        function validateMinAmount(v, min_amount) {
+            if ((parseNumber(v) && v >= min_amount)) {
+                return true;
+            }
+            return false;
+        }
+    });
+</script>
+<?php endif;?>
diff --git a/view/adminhtml/templates/pdf/Alipay.phtml b/view/adminhtml/templates/pdf/Alipay.phtml
new file mode 100755
index 0000000..03a8c78
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Alipay.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Alipay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Applepay.phtml b/view/adminhtml/templates/pdf/Applepay.phtml
new file mode 100755
index 0000000..f1dcb40
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Applepay.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Applepay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Bancontact.phtml b/view/adminhtml/templates/pdf/Bancontact.phtml
new file mode 100755
index 0000000..f7650e1
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Bancontact.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Bancontact
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Banktransfer.phtml b/view/adminhtml/templates/pdf/Banktransfer.phtml
new file mode 100755
index 0000000..4dab0e7
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Banktransfer.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Banktransfer
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Blik.phtml b/view/adminhtml/templates/pdf/Blik.phtml
new file mode 100755
index 0000000..85e22a5
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Blik.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Blik
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Cashpayment.phtml b/view/adminhtml/templates/pdf/Cashpayment.phtml
new file mode 100755
index 0000000..73e5df6
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Cashpayment.phtml
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Cashpayment
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('CpDueDate') && (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1)): ?>
+        <?= /* @noEscape */ __('Slip expiry date: %1', $block->getAdditionalData('CpDueDate')) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('dueDateUpdateAt')): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been updated with amount %1 and slip expiry date with %2',
+            $totalAmount,
+            $block->getAdditionalData('CpDueDate')
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/invoice|creditmemo|shipment|callback/i', $block->getUrl('*/*/*', ['_current' => true])) &&
+        (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1)): ?>
+        <?php if ($block->getAdditionalData('CashpaymentStores')): ?>
+            <?= /* @noEscape */ __('Store(s) near you:') ?><br><br>
+            <?php foreach ($block->getAdditionalData('CashpaymentStores') as $key => $value): ?>
+                <?= /* @noEscape */ $value['title'] ?><br>
+                <?= /* @noEscape */ $value['street'] ?><br>
+                <?= /* @noEscape */ $value['city'] ?><br>
+                <?= /* @noEscape */ $value['country'] ?><br>
+                <?= /* @noEscape */ $value['zipcode'] ?><br><br>
+            <?php endforeach; ?>
+        <?php endif; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Cc.phtml b/view/adminhtml/templates/pdf/Cc.phtml
new file mode 100755
index 0000000..55a1eba
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Cc.phtml
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Cc
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnZeroAmountBooking')): ?>
+        <?= /* @noEscape */ __('This order processed as a zero amount booking') ?>
+        <br><br>
+        <?php if ($block->getAdditionalData('NnUpdatedZeroAmount') && $block->getAdditionalData('NnZeroAmountRefTid')): ?>
+            <?= /* @noEscape */ __(
+                'Your order has been booked with the amount of %1. Your new TID for the booked amount: %2',
+                $block->getAdditionalData('NnUpdatedZeroAmount'),
+                $block->getAdditionalData('NnZeroAmountRefTid')
+            ) ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Eps.phtml b/view/adminhtml/templates/pdf/Eps.phtml
new file mode 100755
index 0000000..2022878
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Eps.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Eps
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Giropay.phtml b/view/adminhtml/templates/pdf/Giropay.phtml
new file mode 100755
index 0000000..49ba81d
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Giropay.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Giropay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Googlepay.phtml b/view/adminhtml/templates/pdf/Googlepay.phtml
new file mode 100755
index 0000000..3b7d0b1
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Googlepay.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Googlepay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Ideal.phtml b/view/adminhtml/templates/pdf/Ideal.phtml
new file mode 100755
index 0000000..fc3b9c2
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Ideal.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Ideal
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Invoice.phtml b/view/adminhtml/templates/pdf/Invoice.phtml
new file mode 100755
index 0000000..a14e165
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Invoice.phtml
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Invoice
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php
+    if ($block->getAdditionalData('NnGuarantee')) {
+        /* @noEscape */ echo __('This is processed as a guarantee payment') . '<br /><br />';
+        if (($paymentStatus == 'PENDING')): ?>
+            <?= /* @noEscape */ __('Your order is under verification and once confirmed,
+            we will send you our bank details to where the order amount should be transferred.
+            Please note that this may take upto 24 hours.') ?><br><br>
+        <?php endif;
+    } ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed successfully for the TID: %1',
+            $transactionId
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('dueDateUpdateAt') && $paymentStatus != 'ON_HOLD'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been updated with amount %1 and due date with %2',
+            $totalAmount,
+            $block->getAdditionalData('NnDueDate')
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/creditmemo/i', $block->getUrl('*/*/*', ['_current' => true])) && in_array($paymentStatus, ['PENDING', 'ON_HOLD', 'CONFIRMED']) &&
+        (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1) &&
+        (empty($block->getAdditionalData('NnGuarantee')) ||
+        (!empty($block->getAdditionalData('NnGuarantee')) && $paymentStatus != 'PENDING'))): ?>
+        <?php if (!empty($block->getAdditionalData('NnInvoiceComments')) && strlen($block->getAdditionalData('NnInvoiceComments'))): ?>
+            <?php if ($paymentStatus != 'ON_HOLD'): ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account on or before %2', $totalAmount, $block->getAdditionalData('NnDueDate')) ?>
+            <?php else: ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account', $totalAmount) ?>
+            <?php endif; ?>
+            <?php $invoiceComments = (!empty($block->getAdditionalData('NnInvoiceComments'))) ? explode('|', $block->getAdditionalData('NnInvoiceComments')) : []; ?>
+            <?php foreach ($invoiceComments as $noteValue): ?>
+                <?php list($text, $value) = (!empty($noteValue)) ? explode(':', $noteValue) : ['', '']; ?>
+                <?php if (!empty($value) && preg_match('/Order No&/i', $value)): ?>
+                    <?php list($referenceTxt, $value) = (!empty($value)) ? explode('&', $value) : ['', '']; ?>
+                    <?php str_replace('&', '', $referenceTxt); ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . __($referenceTxt) . ' ' . $value ?>
+                <?php elseif ($text != 'Due Date' || ($text == 'Due Date' && $paymentStatus != 'ON_HOLD')): ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . $value ?>
+                <?php endif; ?>
+            <?php endforeach; ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/InvoiceGuarantee.phtml b/view/adminhtml/templates/pdf/InvoiceGuarantee.phtml
new file mode 100755
index 0000000..62d1274
--- /dev/null
+++ b/view/adminhtml/templates/pdf/InvoiceGuarantee.phtml
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\InvoiceGuarantee
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($paymentStatus == 'PENDING'): ?>
+        <?= /* @noEscape */ __('Your order is being verified. Once confirmed, we will send you our bank details to which the order amount should be transferred. Please note that this may take up to 24 hours') ?><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed successfully for the TID: %1',
+            $transactionId
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/creditmemo/i', $block->getUrl('*/*/*', ['_current' => true])) && in_array($paymentStatus, ['ON_HOLD', 'CONFIRMED'])): ?>
+        <?php if (!empty($block->getAdditionalData('NnInvoiceComments')) && strlen($block->getAdditionalData('NnInvoiceComments'))): ?>
+            <?php if ($paymentStatus != 'ON_HOLD'): ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account on or before %2', $totalAmount, $block->getAdditionalData('NnDueDate')) ?>
+            <?php else: ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account', $totalAmount) ?>
+            <?php endif; ?>
+            <?php $invoiceComments = (!empty($block->getAdditionalData('NnInvoiceComments'))) ? explode('|', $block->getAdditionalData('NnInvoiceComments')) : []; ?>
+            <?php foreach ($invoiceComments as $noteValue): ?>
+                <?php list($text, $value) = (!empty($noteValue)) ? explode(':', $noteValue) : ['', '']; ?>
+                <?php if (!empty($value) && preg_match('/Order No&/i', $value)): ?>
+                    <?php list($referenceTxt, $value) = (!empty($value)) ? explode('&', $value) : ['', '']; ?>
+                    <?php str_replace('&', '', $referenceTxt); ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . __($referenceTxt) . ' ' . $value ?>
+                <?php elseif ($text != 'Due Date' || ($text == 'Due Date' && $paymentStatus != 'ON_HOLD')): ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . $value ?>
+                <?php endif; ?>
+            <?php endforeach; ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/InvoiceInstalment.phtml b/view/adminhtml/templates/pdf/InvoiceInstalment.phtml
new file mode 100755
index 0000000..ac84a4d
--- /dev/null
+++ b/view/adminhtml/templates/pdf/InvoiceInstalment.phtml
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\InvoiceInstalment
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($paymentStatus == 'PENDING'): ?>
+        <?= /* @noEscape */ __('Your order is being verified. Once confirmed, we will send you our bank details to which the order amount should be transferred. Please note that this may take up to 24 hours') ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed successfully for the TID: %1',
+            $transactionId
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+     <?php if ($block->getAdditionalData('InstalmentCancel')): ?>
+            <?= /* @noEscape */ __(
+                'Instalment has been cancelled.'
+            ) ?><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/creditmemo/i', $block->getUrl('*/*/*', ['_current' => true])) && in_array($paymentStatus, ['ON_HOLD', 'CONFIRMED'])): ?>
+        <?php if (!empty($block->getAdditionalData('NnInvoiceComments')) && strlen($block->getAdditionalData('NnInvoiceComments'))): ?>
+            <?php if ($paymentStatus != 'ON_HOLD'): ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account on or before %2', $totalAmount, $block->getAdditionalData('NnDueDate')) ?>
+            <?php else: ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account', $totalAmount) ?>
+            <?php endif; ?>
+            <?php $invoiceComments = (!empty($block->getAdditionalData('NnInvoiceComments'))) ? explode('|', $block->getAdditionalData('NnInvoiceComments')) : []; ?>
+            <?php $notesCount = count($invoiceComments); ?>
+            <?php foreach ($invoiceComments as $noteValue): ?>
+                <?php list($text, $value) = (!empty($noteValue)) ? explode(':', $noteValue) : ['', '']; ?>
+                <?php if ($text == 'Payment Reference' && $notesCount == 8 && $key == 6): ?>
+                    <?php continue; ?>
+                <?php endif; ?>
+                <?php if (!empty($value) && preg_match('/Order No&/i', $value)): ?>
+                    <?php list($referenceTxt, $value) = (!empty($value)) ? explode('&', $value) : ['', '']; ?>
+                    <?php str_replace('&', '', $referenceTxt); ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . __($referenceTxt) . ' ' . $value ?>
+                <?php elseif ($text != 'Due Date' || ($text == 'Due Date' && $paymentStatus != 'ON_HOLD')): ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . $value ?>
+                <?php endif; ?>
+            <?php endforeach; ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Multibanco.phtml b/view/adminhtml/templates/pdf/Multibanco.phtml
new file mode 100755
index 0000000..1c49276
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Multibanco.phtml
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Multibanco
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnPartnerPaymentReference') && (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1)): ?>
+        <?= /* @noEscape */ __('Please use the following payment reference details to pay the amount of %1 at a Multibanco ATM or through your internet banking.', $block->getGrandTotal()) ?><br><br>
+        <?= /* @noEscape */ __('Partner Payment Reference: %1', $block->getAdditionalData('NnPartnerPaymentReference')) ?><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/OnlineBanktransfer.phtml b/view/adminhtml/templates/pdf/OnlineBanktransfer.phtml
new file mode 100755
index 0000000..500fbea
--- /dev/null
+++ b/view/adminhtml/templates/pdf/OnlineBanktransfer.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\OnlineBanktransfer
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Paypal.phtml b/view/adminhtml/templates/pdf/Paypal.phtml
new file mode 100755
index 0000000..f23c3ef
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Paypal.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Paypal
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/PostFinance.phtml b/view/adminhtml/templates/pdf/PostFinance.phtml
new file mode 100755
index 0000000..0fd49ae
--- /dev/null
+++ b/view/adminhtml/templates/pdf/PostFinance.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\PostFinance
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/PostFinanceCard.phtml b/view/adminhtml/templates/pdf/PostFinanceCard.phtml
new file mode 100755
index 0000000..ee50112
--- /dev/null
+++ b/view/adminhtml/templates/pdf/PostFinanceCard.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\PostFinanceCard
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Prepayment.phtml b/view/adminhtml/templates/pdf/Prepayment.phtml
new file mode 100755
index 0000000..49a54b4
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Prepayment.phtml
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Prepayment
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed successfully for the TID: %1',
+            $transactionId
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('dueDateUpdateAt') && $paymentStatus != 'ON_HOLD'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been updated with amount %1 and due date with %2',
+            $totalAmount,
+            $block->getAdditionalData('NnDueDate')
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/invoice|creditmemo|shipment|callback/i', $block->getUrl('*/*/*', ['_current' => true])) &&
+        (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1)): ?>
+        <?php if (!empty($block->getAdditionalData('NnInvoiceComments')) && strlen($block->getAdditionalData('NnInvoiceComments'))):?>
+            <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account on or before %2', $totalAmount, $block->getAdditionalData('NnDueDate')) ?>
+            <?php $invoiceComments = (!empty($block->getAdditionalData('NnInvoiceComments'))) ? explode('|', $block->getAdditionalData('NnInvoiceComments')) : []; ?>
+            <?php foreach ($invoiceComments as $noteValue): ?>
+                <?php list($text, $value) = (!empty($noteValue)) ? explode(':', $noteValue) : ['', '']; ?>
+                <?php if (!empty($value) && preg_match('/Order No&/i', $value)): ?>
+                    <?php list($referenceTxt, $value) = (!empty($value)) ? explode('&', $value) : ['', '']; ?>
+                    <?php str_replace('&', '', $referenceTxt); ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . __($referenceTxt) . ' ' . $value ?>
+                <?php else: ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . $value ?>
+                <?php endif; ?>
+            <?php endforeach; ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Przelewy.phtml b/view/adminhtml/templates/pdf/Przelewy.phtml
new file mode 100755
index 0000000..bfeb264
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Przelewy.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Przelewy
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Sepa.phtml b/view/adminhtml/templates/pdf/Sepa.phtml
new file mode 100755
index 0000000..d9ddb1d
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Sepa.phtml
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Sepa
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $info->getOrder());
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php
+    if ($block->getAdditionalData('NnGuarantee')) {
+        /* @noEscape */ echo __('This is processed as a guarantee payment') . '<br /><br />';
+
+        if ($paymentStatus == 'PENDING') {
+            /* @noEscape */ echo __('Your order is under verification and we will soon update you
+            with the order status. Please note that this may take upto 24 hours.') . '<br /><br />';
+        }
+    }
+    ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnZeroAmountBooking')): ?>
+        <?= /* @noEscape */ __('This order processed as a zero amount booking') ?>
+        <br><br>
+        <?php if ($block->getAdditionalData('NnUpdatedZeroAmount') && $block->getAdditionalData('NnZeroAmountRefTid')): ?>
+            <?= /* @noEscape */ __(
+                'Your order has been booked with the amount of %1. Your new TID for the booked amount: %2',
+                $block->getAdditionalData('NnUpdatedZeroAmount'),
+                $block->getAdditionalData('NnZeroAmountRefTid')
+            ) ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/SepaGuarantee.phtml b/view/adminhtml/templates/pdf/SepaGuarantee.phtml
new file mode 100755
index 0000000..7316e98
--- /dev/null
+++ b/view/adminhtml/templates/pdf/SepaGuarantee.phtml
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\SepaGuarantee
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($paymentStatus == 'PENDING'): ?>
+        <?= /* @noEscape */ __('Your order is under verification and we will soon update you with the order status. Please note that this may take upto 24 hours.') ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/SepaInstalment.phtml b/view/adminhtml/templates/pdf/SepaInstalment.phtml
new file mode 100755
index 0000000..4790d21
--- /dev/null
+++ b/view/adminhtml/templates/pdf/SepaInstalment.phtml
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\SepaInstalment
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($paymentStatus == 'PENDING'): ?>
+        <?= /* @noEscape */ __('Your order is under verification and we will soon update you with the order status. Please note that this may take upto 24 hours.') ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('InstalmentCancel')): ?>
+        <?= /* @noEscape */ __(
+            'Instalment has been cancelled.'
+        ) ?><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Trustly.phtml b/view/adminhtml/templates/pdf/Trustly.phtml
new file mode 100755
index 0000000..7b7ddb6
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Trustly.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Trustly
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/pdf/Wechatpay.phtml b/view/adminhtml/templates/pdf/Wechatpay.phtml
new file mode 100755
index 0000000..fe7adb4
--- /dev/null
+++ b/view/adminhtml/templates/pdf/Wechatpay.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Wechatpay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div>
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>{{pdf_row_separator}}
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+{{pdf_row_separator}}
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+{{pdf_row_separator}}
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/adminhtml/templates/sales/order/view/tab/instalment.phtml b/view/adminhtml/templates/sales/order/view/tab/instalment.phtml
new file mode 100755
index 0000000..85e624f
--- /dev/null
+++ b/view/adminhtml/templates/sales/order/view/tab/instalment.phtml
@@ -0,0 +1,194 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+$order = $block->getOrder();
+$customerUrl = $block->getCustomerViewUrl();
+?>
+
+<section class="admin__page-section order-view-account-information">
+    <div class="admin__page-section-title">
+        <span class="title"><?= $block->escapeHtml(__('Instalment')) ?></span>
+    </div>
+    <div class="admin__page-section-content">
+        <div class="admin__page-section-item order-information">
+            <div class="admin__page-section-item-title">
+                <span class="title">
+                    <span><?= $block->escapeHtml(__('Customer details')) ?></span>
+                </span>
+            </div>
+            <div class="admin__page-section-item-content">
+                <table class="admin__table-secondary order-information-table">
+                     <tr>
+                        <th><?= $block->escapeHtml(__('Customer Name')) ?></th>
+                        <td>
+                            <?php if ($customerUrl): ?>
+                                <a href="<?= $block->escapeUrl($customerUrl) ?>" target="_blank">
+                                    <span><?= $block->escapeHtml($order->getCustomerName()) ?></span>
+                                </a>
+                            <?php else: ?>
+                                <?= $block->escapeHtml($order->getCustomerName()) ?>
+                            <?php endif; ?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th><?= $block->escapeHtml(__('Email')) ?></th>
+                        <td><a href="mailto:<?= $block->escapeHtml($order->getCustomerEmail()) ?>"><?= $block->escapeHtml($order->getCustomerEmail()) ?></a></td>
+                    </tr>
+                    <?php if ($block->isSingleStoreMode() == false):?>
+                        <tr>
+                            <th><?= $block->escapeHtml(__('Purchased From')) ?></th>
+                            <td><?= $block->escapeHtml($block->getOrderStoreName(), ['br']) ?></td>
+                        </tr>
+                    <?php endif; ?>
+                </table>
+            </div>
+        </div>
+
+        <div class="admin__page-section-item order-account-information">
+            <div class="admin__page-section-item-title">
+                <span class="title">
+                    <span><?= $block->escapeHtml(__('Instalment Information')) ?></span>
+                </span>
+            </div>
+            <div class="admin__page-section-item-content">
+                <table class="admin__table-secondary order-account-information-table">
+                    <tbody>
+                        <tr>
+                            <th><?= /* @noEscape */ __('Total paid amount') ?></th>
+                            <td><b><?= /* @noEscape */ $block->updateCurrency($block->getAdditionalData('InstallPaidAmount'), true, false);  ?></b></td>
+                        </tr>
+                        <tr>
+                            <th><?= /* @noEscape */ __('Instalment Cycle Amount') ?></th>
+                            <td><b><?= /* @noEscape */ $block->getAdditionalData('InstallCycleAmount') ? $block->updateCurrency($block->getAdditionalData('InstallCycleAmount')) : '-' ?></b></td>
+                        </tr>
+                        <tr>
+                            <th><?= /* @noEscape */ __('Paid Instalments') ?></th>
+                            <td><b><?= /* @noEscape */ $block->getAdditionalData('PaidInstall') ?></b></td>
+                        </tr>
+                        <tr>
+                            <th><?= /* @noEscape */ __('Due Instalments') ?></th>
+                            <td><b><?= /* @noEscape */ $block->getAdditionalData('DueInstall') ? $block->getAdditionalData('DueInstall') : 0?></b></td>
+                        </tr>
+                        <tr>
+                            <th><?= /* @noEscape */ __('Next Instalment Date') ?></th>
+                            <td><b><?= /* @noEscape */ $block->getAdditionalData('NextCycle') ? $block->getFormatedDate($block->getAdditionalData('NextCycle')) : '-' ?></b></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="admin__page-section order-paymnet-summary-information">
+    <div class="admin__page-section-title">
+        <span class="title"><?= $block->escapeHtml(__('Instalment Summary')) ?></span>
+    </div>
+    <div class="admin__page-section-item-content">
+        <?php
+            $payment = $order->getPayment();
+            $tid = $payment->getLastTransId();
+        ?>
+        <?php if ($tid && !$block->getAdditionalData('InstalmentCancel')): ?>
+            <form method="get" action="<?= /* @noEscape */ $block->getUrl('novalnetpayment/sales/refund', ['order_id' => $block->getOrder()->getId()]) ?>" onsubmit="return confirm(<?= /* @noEscape */ __('Do you really want to cancel the instalment?') ?>);">
+                <input type="hidden" class="admin__control-text" name="nn-refund-key" value="1">
+                <input type="hidden" class="admin__control-text" name="nn-instalment-cancel" value="1">
+                <input type="hidden" class="admin__control-text" name="nn-refund-tid" value="<?= /* @noEscape */ $tid ?>">
+                <input type="submit" value="<?= /* @noEscape */ __('Instalment cancel') ?>">
+            </form>
+            <br>
+        <?php endif; ?>
+        <table class="admin__table-secondary paymnet-summary-information-table">
+            <tbody>
+                <tr>
+                    <td><b><?= /* @noEscape */ __('S.No') ?></b></td>
+                    <td><b><?= /* @noEscape */ __('Amount') ?></b></td>
+                    <td><b><?= /* @noEscape */ __('Paid Date') ?></b></td>
+                    <td><b><?= /* @noEscape */ __('Next Instalment Date') ?></b></td>
+                    <td><b><?= /* @noEscape */ __('Status') ?></b></td>
+                    <td><b><?= /* @noEscape */ __('Reference') ?></b></td>
+                </tr>
+                <?php
+                    $InstalmentDetails = $block->getAdditionalData('InstalmentDetails');
+                    ksort($InstalmentDetails);
+                    $last = count($InstalmentDetails);
+                    $amountWithoutLastCycle = 0;
+                ?>
+                <?php foreach ($InstalmentDetails as $key => $value): ?>
+                    <tr>
+                        <td><?= /* @noEscape */ $key ?></td>
+                        <td>
+                            <div id="nn-amount-<?= /* @noEscape */ $key ?>">
+                                <?php
+                                if ($last == $key) {
+                                    $total = $order->getBaseGrandTotal();
+                                    $cycleAmount = $total- $amountWithoutLastCycle;
+                                } else {
+                                    $amountWithoutLastCycle += $value['amount'];
+                                    $cycleAmount = $value['amount'];
+                                }
+                                ?>
+                                <?= /* @noEscape */ $block->updateCurrency($cycleAmount, true, false) ?>
+                                <?php if (!empty($value['reference'])): ?>
+                                    <a id="nn-refund-<?= /* @noEscape */ $key ?>"><?= /* @noEscape */ __('Refund') ?></a>
+                                <?php endif; ?>
+                            </div>
+                            <div id="nn-refund-details-<?= /* @noEscape */ $key ?>" style="display: none">
+                            <p><?= /* @noEscape */ __('Please enter the refund amount') ?></p>
+                            <form method="get" action="<?= /* @noEscape */ $block->getUrl('novalnetpayment/sales/refund', ['order_id' => $block->getOrder()->getId()]) ?>">
+                                <input type="text" class="admin__control-text" name="nn-refund-amount" value ="<?= /* @noEscape */ round($value['amount'], 2) * 100 ?>">
+                                <input type="hidden" class="admin__control-text" name="nn-refund-key" value="<?= /* @noEscape */ $key ?>">
+                                <input type="hidden" class="admin__control-text" name="nn-refund-tid" value="<?= /* @noEscape */ $value['reference'] ?>">
+                                <input type="submit" value="<?= /* @noEscape */ __('Refund') ?>">
+                                <input type="button" value="<?= /* @noEscape */ __('Cancel') ?>" id="nn-cancel-<?= /* @noEscape */ $key ?>">
+                            </form>
+                            <i><?= /* @noEscape */ __('(in minimum unit of currency. E.g. enter 100 which is equal to 1.00)') ?></i>
+                            <script>
+                            require([
+                                "jquery",
+                                "mage/calendar"
+                                ], function($){
+                                    var key = '<?= /* @noEscape */ $key; ?>';
+                                    $('#nn-refund-' + key).click(function(){
+                                        $('#nn-refund-details-' + key).attr("style", "display:block");
+                                        $('#nn-amount-' + key).attr("style", "display:none");
+                                    });
+                                    $('#nn-cancel-' + key).click(function(){
+                                        $('#nn-refund-details-' + key).attr("style", "display:none");
+                                        $('#nn-amount-' + key).removeAttr("style");
+                                    });
+                                });
+                            </script>
+                            </div>
+                        </td>
+                        <td><?= /* @noEscape */ !empty($value['paidDate']) ? $block->getFormatedDate($value['paidDate']) : '-' ?></td>
+                        <td><?= /* @noEscape */ !empty($value['nextCycle']) ? $block->getFormatedDate($value['nextCycle']) : '-' ?></td>
+                        <?php if ($value['status'] == 'Paid'): ?>
+                            <td><p style="color: green"><b><?= /* @noEscape */ __($value['status']) ?></b></p></td>
+                        <?php else: ?>
+                            <td><p style="color: #eb5202"><b><?= /* @noEscape */ __($value['status']) ?></b></p></td>
+                        <?php endif; ?>
+                        <td><?= /* @noEscape */ !empty($value['reference']) ? $value['reference'] : '-' ?></td>
+                    </tr>
+                <?php endforeach ?>
+            </tbody>
+        </table>
+    </div>
+</section>
diff --git a/view/adminhtml/templates/sales/order/view/tab/zeroamountbooking.phtml b/view/adminhtml/templates/sales/order/view/tab/zeroamountbooking.phtml
new file mode 100755
index 0000000..e7610ca
--- /dev/null
+++ b/view/adminhtml/templates/sales/order/view/tab/zeroamountbooking.phtml
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+$order = $block->getOrder();
+?>
+
+<section class="admin__page-section order-view-zeroamountbooking-information">
+    <fieldset class="fieldset admin__fieldset-wrapper" >
+        <div class="admin__page-section-title">
+            <span class="title"><?= $block->escapeHtml(__('Zero amount booking')) ?></span>
+        </div>
+        <div class="form-inline" >
+            <form method="get" action="<?= /* @noEscape */ $block->getUrl('novalnetpayment/sales/zeroamountupdate', ['order_id' => $block->getOrder()->getId()]) ?>" data-hasrequired="* Required Fields" autocomplete="off"  data-mage-init='{"validation":{}}' >
+                <input type="hidden" name="form_key" value="<?=  /* @noEscape */ $block->getFormKey() ?>" />
+                <div class="box-left" style="width:100%" >
+                    <div class="entry-edit" >
+                        <div class="fieldset" >
+                            <table style="width:100%" >
+                                <tbody>
+                                    <tr>
+                                        <td class="label" style="padding:10px" ><?=  /* @noEscape */ __('Transaction booking amount') ?><br><?= /* @noEscape */ __('(in minimum unit of currency. E.g. enter 100 which is equal to 1.00)') ?></br></td>
+                                        <td class="value" style="padding:10px" >
+                                            <input type="text" name="nn-amount-to-update" value="<?=  /* @noEscape */ $block->getFormattedAmount($order->getBaseGrandTotal()) ?>" class="input-text admin__control-text validate-digits" data-validate='{"required":true}' autocomplete="off" >
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="label" style="padding:10px" ></td>
+                                        <td class="value" style="padding:10px" >
+                                            <button style="background-color: #514943; color: #ffffff;" type="submit" onclick="return confirm('<?=  /* @noEscape */ __('Are you sure you want to book the order amount?') ?>')" ><?= /* @noEscape */ __('Book transaction') ?></button>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </fieldset>
+</section>
diff --git a/view/adminhtml/templates/system/config/form/field/AvailablePayments.phtml b/view/adminhtml/templates/system/config/form/field/AvailablePayments.phtml
new file mode 100755
index 0000000..d3aacab
--- /dev/null
+++ b/view/adminhtml/templates/system/config/form/field/AvailablePayments.phtml
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+?>
+<?php if ($block->activateGlobalConfiguration()): ?>
+    <style type="text/css">div.novalnet-payment-section .section-config{display:none;}</style>
+    <div class="novalnet_payment-active-notice deprecated-message">
+        <div class="comment">
+            <?= /* @noEscape */ __('Configure the valid Product Activation Key and Payment Access key to activate the payment types under <b>Configuration</b> settings.') ?>
+        </div>
+    </div>
+<?php else: ?>
+    <style type="text/css">tr[id$="novalnet_global_nn_payment_methods_activate_novalnet_payment_notice"]{display:none;}</style>
+<?php endif;?>
diff --git a/view/adminhtml/templates/system/config/form/field/Guaranteeforce.phtml b/view/adminhtml/templates/system/config/form/field/Guaranteeforce.phtml
new file mode 100755
index 0000000..3e55c71
--- /dev/null
+++ b/view/adminhtml/templates/system/config/form/field/Guaranteeforce.phtml
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+?>
+<script>
+require([
+    "jquery",
+    "Magento_Ui/js/modal/alert",
+    "mage/translate",
+    "mage/validation",
+    "jquery/validate",
+    "jquery/ui"
+], function ($, alert, $t) {
+    'use strict';
+
+    $.validator.addMethod(
+        "validate-sepaguarantee-force", 
+        function (i, e) {
+            if (i == 1) {
+                if(((e.id).indexOf("Sepa") != -1) && ($('select[id$="novalnet_global_nn_payment_methods_novalnetSepa_active"]').val() == 0)) {
+                    return false;
+                }
+            }
+            return true;
+         },
+        "<?= /* @noEscapes */__('Make sure the Direct Debit SEPA payment is enabled to use this option.') ?>"
+    );
+    $.validator.addMethod(
+        "validate-invoiceguarantee-force", 
+        function (i, e) {
+            if (i == 1) {
+                if(((e.id).indexOf("Invoice") != -1) && ($('select[id$="novalnet_global_nn_payment_methods_novalnetInvoice_active"]').val() == 0)) {
+                    return false;
+                }
+            }
+            return true;
+         },
+        "<?= /* @noEscapes */__('Make sure the Invoice payment is enabled to use this option.') ?>"
+    );
+});
+</script>
diff --git a/view/adminhtml/templates/system/config/form/field/VendorAutoConfig.phtml b/view/adminhtml/templates/system/config/form/field/VendorAutoConfig.phtml
new file mode 100755
index 0000000..d8b778e
--- /dev/null
+++ b/view/adminhtml/templates/system/config/form/field/VendorAutoConfig.phtml
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+?>
+<style type="text/css">
+    tr[id$='novalnet_global_novalnet_client_key'] {
+        display: none;
+    }
+    tr[id$='novalnet_global_nn_payment_methods_novalnetInvoiceGuarantee_guarantee_force_js'] {
+        display: none;
+    }
+    .nn_activat_btn {
+        display: block;
+        position: relative;
+        width: 55%;
+        margin: auto;
+    }
+</style>
+
+<div class="get-vendor-config">
+    <button type="button" class="button action-configure nn_activat_btn" id=<?= $block->getHtmlId() ?>>
+        <?= $block->escapeHtml($block->getButtonLabel()) ?>
+    </button>
+</div>
+
+<script>
+require([
+    "jquery",
+    "Magento_Ui/js/modal/alert",
+    "mage/translate",
+    "mage/validation",
+    "jquery/validate",
+    "jquery/ui"
+], function ($, alert, $t) {
+    'use strict';
+    var state, signature_id = 'input[id$="novalnet_global_novalnet_signature"]';
+    var payment_access_key_id = 'input[id$="novalnet_global_novalnet_payment_access_key"]';
+
+    function checkVendorConfig() {
+        var signature = $.trim($(signature_id).val());
+        var payment_access_key = $.trim($(payment_access_key_id).val());
+
+        if ($.validator.validateElement($(signature_id)) && $.validator.validateElement($(payment_access_key_id))) {
+                        if ($(signature_id).val() != '' || $(payment_access_key_id).val() != '') {
+                                $('body').trigger('processStart');
+                                vendorAutoConfig(signature, payment_access_key);
+                        }
+        }
+    }
+
+    function vendorAutoConfig(signature, payment_access_key) {
+        $('#save').attr('disabled','disabled');
+        var requestURL = $('#nn_vendor_auto_config_url').val() + signature + '/' + payment_access_key;
+
+        $.ajax({
+            url: requestURL,
+            type: 'GET',
+            dataType: 'json',
+            success: function(response) {
+                $('body').trigger('processStop');
+                getResponseValues(JSON.parse(response));
+                $('#save').removeAttr('disabled');
+            },
+            error: function(response) {
+                $('body').trigger('processStop');
+                $('#save').removeAttr('disabled');
+                alert({
+                    content: "<?= /* @noEscapes */__('Please enter a valid Product Activation Key and Payment Access key.') ?>"
+                });
+            }
+        });
+    }
+
+    function getResponseValues(response) {
+
+        if (response.result.status == 'SUCCESS') {
+            var savedTariffId = $('#nn_tariff_id').val();
+
+            if (state == 'change'){
+                $('input[id$="novalnet_global_novalnet_client_key"]').val(response.merchant.client_key);
+                alert({
+                    content: "<?= /* @noEscapes */__('Merchant details are configured successfully. Please select the Tariff ID and click') . ' ' . __('Save Config') . ' ' . __('button to save the configuration.') ?>"
+                });
+            }
+
+            var tariffs = response.merchant.tariff;
+            var tariffField = $('select[id$="novalnet_global_novalnet_tariff_id"]');
+
+            tariffField.find('option').remove();
+            tariffField.append(
+                $('<option></option>').attr('value', '').text('-- Please Select --')
+            );
+
+            $.each(tariffs, function(id, value) {
+                tariffField.append(
+                    $('<option></option>').attr('value', id).text(value.name)
+                );
+            });
+
+            if (savedTariffId && tariffs.hasOwnProperty(savedTariffId)) {
+                $('select[id$="novalnet_global_novalnet_tariff_id"] option[value=' + savedTariffId + ']').prop("selected", "selected");
+            }
+        } else {
+            alert({content: response.result.status_text});
+            return false;
+        }
+    }
+
+    $(document).ready(function($) {
+        $('#save').click(function () {
+            setTimeout(
+            function() {
+                $( "label.mage-error" ).each(function() {
+                    var label_id = $(this).attr('id');
+                    if (label_id) {
+                        var novalnet_payment = label_id.match(/novalnet/);
+                        if (novalnet_payment) {
+                            $('.novalnet-section').addClass('active');
+                            $('.novalnet-section').find('[id$=novalnet_global]').attr("style", "display:block");
+                            var novalnet_global = label_id.match(/novalnet_merchant_script/);
+                            if (novalnet_global)
+                            {
+                                $('.novalnet-section').find('.section-config').find('[id$=novalnet_global_novalnet]').attr("style", "display:block");
+                            } else {
+                                $('.novalnet-payment-section').addClass('active');
+                                $('.novalnet-payment-section').find('[id$=novalnet_global_nn_payment_methods]').attr("style", "display:block");
+                            }
+                            $("#"+label_id).closest('fieldset').attr("style", "display:block");
+                            $('html,body').animate({scrollTop: $("#"+label_id).offset().top - 200},'slow');
+                        }
+                    }
+                });
+            },
+            1200);
+        });
+
+        state = '';
+        checkVendorConfig();
+
+        $(signature_id + ',' + payment_access_key_id).keyup(function(){
+            $('input[id$="novalnet_global_novalnet_client_key"]').val('');
+            $('select[id$="novalnet_global_novalnet_tariff_id"]').html('<option value="">-- Please Select --</option>');
+            if ($(signature_id).val() == '' || $(payment_access_key_id).val() == '') {
+                $('.nn_activat_btn').attr('disabled','disabled');
+            } else {
+                $('.nn_activat_btn').removeAttr('disabled');
+            }
+        });
+
+        $('.nn_activat_btn').click(function () {
+            $.validator.validateElement($(payment_access_key_id));
+            if ($.validator.validateElement($(signature_id)) && $.validator.validateElement($(payment_access_key_id))) {
+                state = 'change';
+                checkVendorConfig();
+            }
+        });
+
+        if ($('input[id$="novalnet_global_nn_payment_methods_novalnetGooglepay_seller_name"]')) {
+            var shopHostURL = $('#nn_shophost_url').val();
+            $('input[id$="novalnet_global_nn_payment_methods_novalnetGooglepay_seller_name"]').attr('placeholder', shopHostURL);
+        }
+
+        if ($('input[id$="novalnet_global_nn_payment_methods_novalnetApplepay_seller_name"]')) {
+            var shopHostURL = $('#nn_shophost_url').val();
+            $('input[id$="novalnet_global_nn_payment_methods_novalnetApplepay_seller_name"]').attr('placeholder', shopHostURL);
+        }
+    });
+});
+</script>
diff --git a/view/adminhtml/templates/system/config/form/field/creditcardStyle.phtml b/view/adminhtml/templates/system/config/form/field/creditcardStyle.phtml
new file mode 100755
index 0000000..06db81c
--- /dev/null
+++ b/view/adminhtml/templates/system/config/form/field/creditcardStyle.phtml
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+?>
+<script>
+    function displayIframeConfiguration() {
+        if (document.getElementById('iframeStyleSetting').style.display != "") {
+            document.getElementById('iframeStyleSetting').style.display = "";
+        } else {
+            document.getElementById('iframeStyleSetting').style.display = "none";
+        }
+    }
+</script>
+<style>
+    table#cc_css_setting th{
+        text-align: center;
+    }
+    table#cc_css_setting td input, table#cc_iframe_css_setting td input{
+        padding: 2px;
+        background: none repeat scroll 0 0 #fff;
+        border-color: #aaa #c8c8c8 #c8c8c8 #aaa;
+        border-style: solid;
+        border-width: 1px;
+        font: 12px arial,helvetica,sans-serif;
+        vertical-align: middle;
+    }
+    table#cc_css_setting td input{
+        width: 100px;
+    }
+    table#cc_iframe_css_setting td input{
+        width: 210px;
+    }
+    table#cc_css_setting td, table#cc_iframe_css_setting td{
+        padding-bottom: 0.5em;
+        padding-left: 0.5em;
+    }
+</style>
+
+<a href="#" onclick="displayIframeConfiguration();return false;" style="text-decoration: underline;">
+    <?= $block->escapeHtml(__('Custom CSS Settings')) ?>
+</a>
+
+<div id="iframeStyleSetting" style="display:none;padding-top:10px;">
+    <h4><?= $block->escapeHtml(__('CSS settings for iframe form')) ?></h4>
+    <table id="cc_iframe_css_setting" width="100%">
+        <tr>
+            <td><?= $block->escapeHtml(__('NN CC Label Style')) ?></td>
+            <td>
+                <?php $fieldName = 'standard_style_label' ?>
+                <input type="text"
+                       class="validate-no-html-tags"
+                       name="<?= /* @noEscape */ $block->getElement()->getName() . '[' . $fieldName . ']'; ?>"
+                       value="<?= /* @noEscape */ $block->getElementValue($fieldName); ?>"/>
+            </td>
+        </tr>
+        <tr>
+            <td><?= $block->escapeHtml(__('NN CC Input Style')) ?></td>
+            <td>
+                <?php $fieldName = 'standard_style_input' ?>
+                <input type="text"
+                       class="validate-no-html-tags"
+                       name="<?= /* @noEscape */ $block->getElement()->getName() . '[' . $fieldName . ']'; ?>"
+                       value="<?= /* @noEscape */ $block->getElementValue($fieldName); ?>"/>
+            </td>
+        </tr>
+        <tr>
+            <td><?= $block->escapeHtml(__('NN CC CSS text')) ?></td>
+            <td>
+                <?php $fieldName = 'standard_style_css' ?>
+                <input type="text"
+                       class="validate-no-html-tags"
+                       name="<?= /* @noEscape */ $block->getElement()->getName() . '[' . $fieldName . ']'; ?>"
+                       value="<?= /* @noEscape */ $block->getElementValue($fieldName); ?>"/>
+            </td>
+        </tr>
+    </table>
+</div>
diff --git a/view/adminhtml/web/css/novalnet_payment.css b/view/adminhtml/web/css/novalnet_payment.css
new file mode 100755
index 0000000..af905ce
--- /dev/null
+++ b/view/adminhtml/web/css/novalnet_payment.css
@@ -0,0 +1,145 @@
+.nn-payment-guarantee, .nn-payment-instalment {
+    display: block;
+    position: relative;
+    width: 100%;
+}
+.nn-payment-guarantee .control, .nn-payment-instalment .control {
+    display: block;
+    position: relative;
+    width: 100%;
+}
+.nn-payment-guarantee .control input, .nn-payment-instalment .control input {
+    width: 125px;
+    max-width: 125px;
+}
+.nn-payment-guarantee .control .nn-customer_dob_mm, .nn-payment-instalment .control .nn-customer_dob_mm {
+    width: 125px;
+    max-width: 125px;
+}
+.nn-payment-guarantee .control .autocomplete, .nn-payment-instalment .control .autocomplete {
+    display: inline-block;
+    position: relative;
+    width: 80px;
+    max-width: 80px;
+}
+.nn-payment-guarantee .control .autocomplete-items, .nn-payment-instalment .control .autocomplete-items {
+    display: block;
+    position: absolute;
+    border: 1px solid #d4d4d4;
+    border-bottom: none;
+    border-top: none;
+    z-index: 99;
+    width: 55px;
+}
+.nn-payment-guarantee .control .autocomplete-items div, .nn-payment-instalment .control .autocomplete-items div {
+    padding: 10px;
+    cursor: pointer;
+    background-color: #fff;
+    border-bottom: 1px solid #d4d4d4;
+}
+.admin__payment-method-wrapper {
+    width:100%;
+}
+.novalnet-payment-logo {
+    background: url("../images/novalnet-logo.svg")  no-repeat 0 0% / 18rem auto;
+    height: 100px;
+    width: auto;
+    padding-left: 20rem;
+    display:inline-block;
+    vertical-align: middle;
+ }
+.novalnet-section .button-container {
+    float: right;
+}
+.nn-test-drive{
+    position: relative;
+    background-color: #0080c9;
+    color: #fff;
+    padding: 10px 20px;
+    margin-bottom: 8px;
+    font-size: 10px;
+    text-align: center;
+    text-transform: uppercase;
+    letter-spacing: 1px;
+    line-height: 0.8px;
+    border-radius: 0px 0px 5px 5px;
+    transition: transform 0.5s ease 0.5s;
+    animation: novalnet-blinker 4s linear infinite;
+    font-weight: bold;
+    float:right;
+}
+@keyframes novalnet-blinker {
+    100% {
+    opacity: 0;
+    }
+}
+
+.info-box{
+    position:relative;
+    width: auto;
+    height: auto;
+    background: content-box;
+    font-size: 14px;
+    color: #333;
+    margin: 20px 0px;
+    padding:1em;
+    letter-spacing:1px;
+    border-left: 5px solid #0080c9;
+    box-shadow: 0 0 8px 0px rgba(0,0,0,.4);
+}
+.info-box ul{
+    margin: 0 20px 0px 20px;
+    padding: 0;
+}
+.info-box li{
+    list-style: disc !important;
+}
+.info-box li:before{
+    display:block !important;
+}
+.instalment-details-table tbody tr th, .instalment-details-table tbody tr td {
+    border-top: 1px solid #ccc;
+    border-left: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    border-right: 1px solid #ccc;
+    border: .1rem solid #8a837f;
+    padding: 5px 10px;
+}
+.instalment-details-table thead th {
+    background-color: #514943;
+    border: .1rem solid #8a837f;
+    border-left-color: transparent;
+    color: #fff;
+    font-weight: 600;
+    padding: 5px 10px;
+    text-align: left;
+}
+.instalment-details-table tr {
+    transition: background 0.2s ease-in;
+}
+.instalment-details-table tr:nth-child(even) {
+    background: #f5f5f5;
+}
+.instalment-details-table {
+    margin-bottom: 30px;
+}
+.novalnet-challenge-window-overlay {
+    position: fixed;
+    width: 100%;
+    height: 100% ! important;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0,0,0,0.5);
+    z-index: 999;
+    cursor: pointer;
+}
+.novalnet-section.section-config.active > .admin__collapsible-block + input + fieldset {
+    margin-left: 50px;
+}
+.novalnet-section .novalnet-payment-text {
+    display: inline-block;
+    vertical-align: middle;
+    width: 50%;
+}
diff --git a/view/adminhtml/web/js/novalnetCc.js b/view/adminhtml/web/js/novalnetCc.js
new file mode 100755
index 0000000..2390220
--- /dev/null
+++ b/view/adminhtml/web/js/novalnetCc.js
@@ -0,0 +1,222 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+    "jquery",
+    "Magento_Ui/js/modal/alert",
+    "mage/translate",
+    "jquery/ui",
+    "novalnetUtilityJs"
+    ],
+    function ($, alert, $t) {
+        'use strict';
+        var nnButton = false;
+
+        $.widget('mage.novalnetCcFormJs', {
+            /**
+             * Returns payment method signature key
+             */
+            initIframe: function () {
+                var paymentCode = this.options.code;
+                var iframeParams = this.options.iframeParams;
+                NovalnetUtility.setClientKey(iframeParams.client_key);
+                var request = {
+                    callback: {
+                        on_success: function (result) {
+                            if (result) {
+                                if (result['do_redirect'] != 0) {
+                                    alert({
+                                        content: $t('Card type not accepted, try using another card type')
+                                    });
+                                } else {
+                                    $('#' + paymentCode + '_pan_hash').val(result['hash']);
+                                    $('#' + paymentCode + '_unique_id').val(result['unique_id']);
+                                    eval($('#nn_chk_button').val());
+                                    $('button[onclick="getHash()"]').each(function () {
+                                        var nnButtonContent = $(this).attr('onclick');
+                                        $('#nn_chk_button').val(nnButtonContent);
+                                        this.removeAttribute('onclick');
+                                        $(this).attr('onclick', 'order.submit()');
+                                        $(this).trigger('onclick');
+                                    });
+                                }
+                            }
+                        },
+                        on_error: function (result) {
+                            alert({
+                                content: result['error_message']
+                            });
+                        },
+                        on_show_overlay:  function () {
+                            $('#novalnet_iframe').addClass("novalnet-challenge-window-overlay");
+                        },
+                        on_hide_overlay:  function () {
+                            $('#novalnet_iframe').removeClass("novalnet-challenge-window-overlay");
+                        },
+                    },
+                    iframe: {
+                        id: "novalnet_iframe",
+                        inline: this.options.inlineForm,
+                        style: {
+                            container: $('#nn_cc_standard_style_css').val(),
+                            input: $('#nn_cc_standard_style_input').val(),
+                            label: $('#nn_cc_standard_style_label').val()
+                        },
+                        text: {
+                            lang : iframeParams.lang,
+                            error: $t("Your credit card details are invalid"),
+                            card_holder : {
+                                label: $t("Card holder name"),
+                                place_holder: $t("Name on card"),
+                                error: $t("Please enter the valid card holder name")
+                            },
+                            card_number : {
+                                label: $t("Card number"),
+                                place_holder: $t("XXXX XXXX XXXX XXXX"),
+                                error: $t("Please enter the valid card number")
+                            },
+                            expiry_date : {
+                                label: $t("Expiry date"),
+                                error: $t("Please enter the valid expiry month / year in the given format")
+                            },
+                            cvc : {
+                                label: $t("CVC/CVV/CID"),
+                                place_holder: $t("XXX"),
+                                error: $t("Please enter the valid CVC/CVV/CID")
+                            }
+                        }
+                    },
+                    customer: {
+                        first_name: this.options.billing.firstname,
+                        last_name: this.options.billing.lastname,
+                        email: this.options.billing.email,
+                        billing: {
+                            street: this.getStreet(this.options.billing.street),
+                            city: this.options.billing.city,
+                            zip: this.options.billing.postcode,
+                            country_code: this.options.billing.country_id
+                        },
+                        shipping: this.getShipping(this.options)
+                    },
+                    transaction: {
+                        amount: this.options.amount,
+                        currency: this.options.config.currencyCode,
+                        test_mode: this.options.config.testmode,
+                        enforce_3d: this.options.config.enforce_3d
+                    },
+                    custom: {
+                        lang : iframeParams.lang
+                    }
+                };
+                if ($('#novalnet_iframe').length) {
+                    NovalnetUtility.createCreditCardForm(request);
+                }
+
+                this.setButtonAttr();
+            },
+
+            setButtonAttr:function () {
+                $('#submit_order_top_button').attr('onclick', 'getHash()');
+                $('.order-totals .actions button').attr('onclick', 'getHash()');
+                if ($('input[name="payment[method]"]:checked').val() === 'novalnetCc') {
+                    $('button[onclick="order.submit()"]').each(function () {
+                        var nnButtonContent = $(this).attr('onclick');
+                        $('#nn_chk_button').val(nnButtonContent);
+                        this.removeAttribute('onclick');
+                        this.stopObserving('click');
+                        $(this).attr('onclick', 'getHash()');
+                    });
+                }
+            },
+
+            getShipping:function(options) {
+                if (options.billing.country_id == options.shipping.country_id &&
+                    this.getStreet(options.billing.street) == this.getStreet(options.shipping.street) &&
+                    options.billing.city == options.shipping.city &&
+                    options.billing.postcode == options.shipping.postcode) {
+                        var shipping = {same_as_billing: 1};
+                } else {
+                    var shipping = {
+                        first_name: options.shipping.firstname,
+                        last_name: options.shipping.lastname,
+                        street: this.getStreet(options.shipping.street),
+                        city: options.shipping.city,
+                        zip: options.shipping.postcode,
+                        country_code: options.shipping.country_id
+                    };
+                }
+                return shipping;
+            },
+
+            getStreet: function(streetArray) {
+                var i, street = '';
+                for(i=0; i<streetArray.length; i++) {
+                    if(streetArray[i] != '') {
+                        street += streetArray[i] + ' ';
+                    }
+                }
+                return street.trim();
+            },
+
+            _create:function () {
+                var self = this;
+                $('#nniframe').ready(function () {
+                    setTimeout(function () {
+                        self.initIframe();
+                    }, 500);
+                });
+            }
+        });
+
+        function getHash()
+        {
+            if ($('input[name="payment[method]"]:checked').val() === 'novalnetCc') {
+                if ($('#novalnetCc_pan_hash').val() == '') {
+                    NovalnetUtility.getPanHash();
+                }
+            } else {
+                eval($('#nn_chk_button').val());
+                $('button[onclick="getHash()"]').each(function () {
+                    var nnButtonContent = $(this).attr('onclick');
+                    $('#nn_chk_button').val(nnButtonContent);
+                    this.removeAttribute('onclick');
+                    $(this).attr('onclick', 'order.submit()');
+                    $(this).trigger('onclick');
+                });
+            }
+        }
+
+        window.getHash = getHash;
+        $('input[name="payment[method]"], #p_method_novalnetCc').on('change', function () {
+            if (this.value === 'novalnetCc') {
+                $('#submit_order_top_button').attr('onclick', 'getHash()');
+                $('.order-totals .actions button').attr('onclick', 'getHash()');
+                $('button[onclick="order.submit()"]').each(function () {
+                    var nnButtonContent = $(this).attr('onclick');
+                    $('#nn_chk_button').val(nnButtonContent);
+                    this.removeAttribute('onclick');
+                    this.stopObserving('click');
+                    $(this).attr('onclick', 'getHash()');
+                });
+            }
+        });
+
+        return $.mage.novalnetCcFormJs;
+    }
+);
diff --git a/view/adminhtml/web/js/novalnetInvoice.js b/view/adminhtml/web/js/novalnetInvoice.js
new file mode 100755
index 0000000..e781e9c
--- /dev/null
+++ b/view/adminhtml/web/js/novalnetInvoice.js
@@ -0,0 +1,183 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+    "jquery",
+    'Magento_Catalog/js/price-utils',
+    'mage/storage',
+    'mage/url',
+    "jquery/ui"
+    ],
+    function ($, priceUtils, storage, urlBuilder) {
+        'use strict';
+
+        $.widget('mage.novalnetInvoiceFormJs', {
+            _create:function () {
+                var self = this;
+
+                $(document).on('keypress', '#novalnetInvoiceGuarantee_dd, #novalnetInvoiceInstalment_dd, #novalnetInvoiceGuarantee_yyyy, #novalnetInvoiceInstalment_yyyy', function (e) {
+                    if(e.charCode < 48 || e.charCode > 57) return false;
+                });
+
+                $(document).on('input', '#novalnetInvoiceGuarantee_dd, #novalnetInvoiceInstalment_dd', function (e) {
+                    if (e.keyCode != 8 ) {
+                        var min_date = 1;
+                        var max_date = 31;
+                        var date_val = $(this).val();
+                        if (isNaN(date_val) || date_val.length > 1 && date_val < min_date || date_val > max_date) {
+                            $(this).val(date_val.substring(0, date_val.length - 1));
+                            return false;
+                        }
+                    }
+                });
+
+                $(document).on('focusout', '#novalnetInvoiceGuarantee_dd, #novalnetInvoiceInstalment_dd', function (e) {
+                    var date_val = $(this).val();
+                    if (date_val && date_val.length < 2 && date_val < 10) {
+                        if (date_val == 0) {
+                            date_val = 1;
+                        }
+                        $(this).val('0' + date_val);
+                    }
+                });
+
+                $('#novalnetInvoiceInstalment_cycle').off('change').on('change', function() {
+                    var orderTotal = $('#invoiceinstalment_total').val();
+                    var currency = $('#invoiceinstalment_currency').val();
+                    var cycle = $(this).val();
+                    if (cycle == null) {
+                        return;
+                    }
+                    var cycleAmount;
+                    var lastCycleAmount;
+                    storage.get(
+                        $('#invoiceinstalment_cycle_detail_url').val() + orderTotal + '/' + cycle
+                    ).done(function (response) {
+                        response = $.parseJSON(response);
+                        cycleAmount = response.cycle_amount;
+                        lastCycleAmount = response.last_cycle;
+                        var html = '<table class="instalment-details-table"><thead><tr><th>' + $.mage.__("Instalment cycles") + '</th><th>' + $.mage.__("Instalment Amount") + '</th></thead><tbody>';
+                        var j = 0;
+                        for (var i = 1; i <= cycle; i++) {
+                            if (i != cycle) {
+                                html += '<tr><td>'+ i + '</td><td>' + currency + priceUtils.formatPrice(cycleAmount ) + '</td></tr>';
+                            } else if (i == cycle) {
+                                html += '<tr><td>'+ i + '</td><td>' + currency + priceUtils.formatPrice(lastCycleAmount ) + '</td></tr>';
+                            }
+                            j++;
+                        }
+                        $('.novalnetInvoiceInstalment-details').html(html);
+                    });
+                });
+
+                $('#p_method_novalnetInvoiceInstalment').click(function(){
+                    $( "#novalnetInvoiceInstalment_cycle" ).trigger('change');
+                });
+                $(document).ready(function(){
+                    $( "#novalnetInvoiceInstalment_cycle" ).trigger('change');
+                });
+
+                function getNumberWithOrdinal(n) {
+                    var s=["th","st","nd","rd"],
+                    v=n%100;
+                    return n+(s[(v-20)%10]||s[v]||s[0]);
+                }
+
+                // Year input listener
+                var current_date = new Date();
+                var max_year = current_date.getFullYear() - 18;
+                var min_year = current_date.getFullYear() - 91;
+                var years_range = [];
+                var yearElement;
+                for(var year = max_year; year >= min_year; year--) {
+                    years_range.push(String(year));
+                }
+
+                $(document).on('input', '#novalnetInvoiceGuarantee_yyyy, #novalnetInvoiceInstalment_yyyy', function (e) {
+                    yearElement = document.getElementById(e.target.id);
+                    var a, b, i, year_val = this.value;
+                    closeAllLists();
+                    if (!year_val || isNaN(year_val) || year_val.length < 1) {return false;}
+                    if (year_val.length == 1) {
+                        if (year_val != String(max_year).charAt(0) && year_val != String(min_year).charAt(0)) {
+                            $(this).val(year_val.substring(0, year_val.length - 1));
+                        }
+                    } else if (year_val.length > 1) {
+                        var years_string = years_range.join("|");
+                        years_string = years_string.slice(0, -(4 - year_val.length));
+                        var dots = '.'.repeat((4 - year_val.length));
+                        years_string = years_string.replace(new RegExp(dots + '\\|', 'g'), '|');
+                        if (!new RegExp(years_string).test(year_val)) {
+                            $(this).val(year_val.substring(0, year_val.length - 1));
+                            year_val = $(this).val()
+                        }
+                    }
+
+                    if (year_val.length > 1) {
+                        a = document.createElement("div");
+                        a.setAttribute("id", this.id + "autocomplete-list");
+                        a.setAttribute("class", "autocomplete-items");
+                        this.parentNode.appendChild(a);
+                        for (i = 0; i < years_range.length; i++) {
+                            if (years_range[i].substr(0, year_val.length).toUpperCase() == year_val.toUpperCase()) {
+                                b = document.createElement("div");
+                                b.innerHTML = "<strong>" + years_range[i].substr(0, year_val.length) + "</strong>";
+                                b.innerHTML += years_range[i].substr(year_val.length);
+                                b.innerHTML += "<input type='hidden' value='" + years_range[i] + "'>";
+                                b.addEventListener("click", function(e) {
+                                    yearElement.value = this.getElementsByTagName("input")[0].value;
+                                    closeAllLists();
+                                });
+                                a.appendChild(b);
+                            }
+                        }
+
+                        if (!new RegExp(years_string).test(year_val)) {
+                            e.preventDefault();
+                            e.stopImmediatePropagation();
+                            return false;
+                        }
+                    }
+                });
+
+                function closeAllLists(elmnt) {
+                    var x = document.getElementsByClassName("autocomplete-items");
+                    for (var i = 0; i < x.length; i++) {
+                        if (elmnt != x[i] && elmnt != yearElement) {
+                            x[i].parentNode.removeChild(x[i]);
+                        }
+                    }
+                }
+
+                $(document).on('click', function (e) {
+                    closeAllLists(e.target);
+                });
+
+                $('#p_method_novalnetInvoiceGuarantee').ready(function () {
+                    if ($('#p_method_novalnetInvoice:visible').length && $('#p_method_novalnetInvoiceGuarantee').length) {
+                        $('#p_method_novalnetInvoice').closest('dt').hide();
+                        $('#payment_form_novalnetInvoice').hide();
+                    }
+                });
+            }
+        });
+
+        return $.mage.novalnetInvoiceFormJs;
+    }
+);
diff --git a/view/adminhtml/web/js/novalnetSepa.js b/view/adminhtml/web/js/novalnetSepa.js
new file mode 100755
index 0000000..bb24818
--- /dev/null
+++ b/view/adminhtml/web/js/novalnetSepa.js
@@ -0,0 +1,237 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+    "jquery",
+    'Magento_Catalog/js/price-utils',
+    'mage/storage',
+    'mage/url',
+    "jquery/ui",
+    "novalnetUtilityJs"
+    ],
+    function ($, priceUtils, storage, urlBuilder) {
+        'use strict';
+
+        $.widget('mage.novalnetSepaFormJs', {
+            _create:function () {
+                var self = this;
+
+                $(document).on('keypress', '#novalnetSepaGuarantee_dd, #novalnetSepaInstalment_dd, #novalnetSepaGuarantee_yyyy, #novalnetSepaInstalment_yyyy', function (e) {
+                    if(e.charCode < 48 || e.charCode > 57) return false;
+                });
+
+                $(document).on('input', '#novalnetSepaGuarantee_dd, #novalnetSepaInstalment_dd', function (e) {
+                    if (e.keyCode != 8 ) {
+                        var min_date = 1;
+                        var max_date = 31;
+                        var date_val = $(this).val();
+                        if (isNaN(date_val) || date_val.length > 1 && date_val < min_date || date_val > max_date) {
+                            $(this).val(date_val.substring(0, date_val.length - 1));
+                            return false;
+                        }
+                    }
+                });
+
+                $(document).on('focusout', '#novalnetSepaGuarantee_dd, #novalnetSepaInstalment_dd', function (e) {
+                    var date_val = $(this).val();
+                    if (date_val && date_val.length < 2 && date_val < 10) {
+                        if (date_val == 0) {
+                            date_val = 1;
+                        }
+                        $(this).val('0' + date_val);
+                    }
+                });
+
+                $('#novalnetSepaInstalment_cycle').off('change').on('change', function() {
+                    var orderTotal = $('#sepainstalment_total').val();
+                    var currency = $('#sepainstalment_currency').val();
+                    var cycle = $(this).val();
+                    if (cycle == null) {
+                        return;
+                    }
+                    var cycleAmount;
+                    var lastCycleAmount;
+                    storage.get(
+                        $('#sepaInstalment_cycle_detail_url').val() + orderTotal + '/' + cycle
+                    ).done(function (response) {
+                        response = $.parseJSON(response);
+                        cycleAmount = response.cycle_amount;
+                        lastCycleAmount = response.last_cycle;
+                        var html = '<table class="instalment-details-table"><thead><tr><th>' + $.mage.__("Instalment cycles") + '</th><th>' + $.mage.__("Instalment Amount") + '</th></thead><tbody>';
+                        var j = 0;
+                        for (var i = 1; i <= cycle; i++) {
+                            if (i != cycle) {
+                                html += '<tr><td>'+ i + '</td><td>' + currency + priceUtils.formatPrice(cycleAmount ) + '</td></tr>';
+                            } else if (i == cycle) {
+                                html += '<tr><td>'+ i + '</td><td>' + currency + priceUtils.formatPrice(lastCycleAmount) + '</td></tr>';
+                            }
+                            j++;
+                        }
+                        $('.novalnetSepaInstalment-details').html(html);
+                    });
+                });
+
+                $('#p_method_novalnetSepaInstalment').click(function(){
+                    $( "#novalnetSepaInstalment_cycle" ).trigger('change');
+                });
+                $(document).ready(function(){
+                    $( "#novalnetSepaInstalment_cycle" ).trigger('change');
+                });
+
+                function getNumberWithOrdinal(n) {
+                    var s=["th","st","nd","rd"],
+                    v=n%100;
+                    return n+(s[(v-20)%10]||s[v]||s[0]);
+                }
+
+                // Year input listener
+                var current_date = new Date();
+                var max_year = current_date.getFullYear() - 18;
+                var min_year = current_date.getFullYear() - 91;
+                var years_range = [];
+                var yearElement;
+                for(var year = max_year; year >= min_year; year--) {
+                    years_range.push(String(year));
+                }
+
+                $(document).on('input', '#novalnetSepaGuarantee_yyyy, #novalnetSepaInstalment_yyyy', function (e) {
+                    yearElement = document.getElementById(e.target.id);
+                    var a, b, i, year_val = this.value;
+                    closeAllLists();
+                    if (!year_val || isNaN(year_val) || year_val.length < 1) {return false;}
+                    if (year_val.length == 1) {
+                        if (year_val != String(max_year).charAt(0) && year_val != String(min_year).charAt(0)) {
+                            $(this).val(year_val.substring(0, year_val.length - 1));
+                        }
+                    } else if (year_val.length > 1) {
+                        var years_string = years_range.join("|");
+                        years_string = years_string.slice(0, -(4 - year_val.length));
+                        var dots = '.'.repeat((4 - year_val.length));
+                        years_string = years_string.replace(new RegExp(dots + '\\|', 'g'), '|');
+                        if (!new RegExp(years_string).test(year_val)) {
+                            $(this).val(year_val.substring(0, year_val.length - 1));
+                            year_val = $(this).val()
+                        }
+                    }
+
+                    if (year_val.length > 1) {
+                        a = document.createElement("div");
+                        a.setAttribute("id", this.id + "autocomplete-list");
+                        a.setAttribute("class", "autocomplete-items");
+                        this.parentNode.appendChild(a);
+                        for (i = 0; i < years_range.length; i++) {
+                            if (years_range[i].substr(0, year_val.length).toUpperCase() == year_val.toUpperCase()) {
+                                b = document.createElement("div");
+                                b.innerHTML = "<strong>" + years_range[i].substr(0, year_val.length) + "</strong>";
+                                b.innerHTML += years_range[i].substr(year_val.length);
+                                b.innerHTML += "<input type='hidden' value='" + years_range[i] + "'>";
+                                b.addEventListener("click", function(e) {
+                                    yearElement.value = this.getElementsByTagName("input")[0].value;
+                                    closeAllLists();
+                                });
+                                a.appendChild(b);
+                            }
+                        }
+
+                        if (!new RegExp(years_string).test(year_val)) {
+                            e.preventDefault();
+                            e.stopImmediatePropagation();
+                            return false;
+                        }
+                    }
+                });
+
+                function closeAllLists(elmnt) {
+                    var x = document.getElementsByClassName("autocomplete-items");
+                    for (var i = 0; i < x.length; i++) {
+                        if (elmnt != x[i] && elmnt != yearElement) {
+                            x[i].parentNode.removeChild(x[i]);
+                        }
+                    }
+                }
+
+                $(document).on('click', function (e) {
+                    closeAllLists(e.target);
+                });
+
+                $('#p_method_novalnetSepaGuarantee').ready(function () {
+                    if ($('#p_method_novalnetSepa:visible').length && $('#p_method_novalnetSepaGuarantee').length) {
+                        $('#p_method_novalnetSepa').closest('dt').hide();
+                        $('#payment_form_novalnetSepa').hide();
+                    }
+                });
+
+                // check is BIC field required
+                $(document).on(
+                    'keypress onchange keyup',
+                    '#novalnetSepa_account_number, #novalnetSepaGuarantee_account_number, #novalnetSepaInstalment_account_number',
+                    function(event)
+                {
+                    if (this.id == 'novalnetSepa_account_number') {
+                        return NovalnetUtility.formatIban(event, 'novalnetSepa_bic_code_div');
+                    } else if (this.id == 'novalnetSepaGuarantee_account_number') {
+                        return NovalnetUtility.formatIban(event, 'novalnetSepaGuarantee_bic_code_div');
+                    } else if (this.id == 'novalnetSepaInstalment_account_number') {
+                        return NovalnetUtility.formatIban(event, 'novalnetSepaInstalment_bic_code_div');
+                    }
+                });
+
+                // check iban
+                $(document).on(
+                    'keyup',
+                    '#novalnetSepa_account_number, #novalnetSepaGuarantee_account_number, #novalnetSepaInstalment_account_number',
+                    function(event)
+                {
+                    if (this.id == 'novalnetSepa_account_number' || this.id == 'novalnetSepaGuarantee_account_number' || this.id == 'novalnetSepaInstalment_account_number') {
+                        var iban = $(this).val(),
+                            iban = iban.substring(0,2),
+                            iban = iban.toUpperCase(),
+                            allowedCountries = NovalnetUtility.bicAllowedCountries;
+
+                            if (allowedCountries.includes(iban)) {
+                                $('#novalnetSepa_bic_code, #novalnetSepaGuarantee_bic_code, #novalnetSepaInstalment_bic_code').addClass('required-entry');
+                            } else {
+                                $('#novalnetSepa_bic_code, #novalnetSepaGuarantee_bic_code, #novalnetSepaInstalment_bic_code').removeClass('required-entry');
+                            }
+
+                        return NovalnetUtility.checkIban(event);
+                    }
+                });
+
+                // Format bic code
+                $(document).on(
+                    'keypress change',
+                    '#novalnetSepa_bic_code, #novalnetSepaGuarantee_bic_code, #novalnetSepaInstalment_bic_code',
+                    function(event)
+                {
+                    if (this.id == 'novalnetSepa_bic_code' || this.id == 'novalnetSepaGuarantee_bic_code' || this.id == 'novalnetSepaInstalment_bic_code') {
+                        return NovalnetUtility.formatBic(event);
+                    }
+                });
+            }
+        });
+
+        $('#sepa_mandate_toggle, #sepa_guarantee_mandate_toggle, #sepa_instalment_mandate_toggle').on('click', function () {
+            var toggleId = this.id.replace('toggle', 'details');
+            $('#' + toggleId).toggle();
+        });
+
+        return $.mage.novalnetSepaFormJs;
+    }
+);
diff --git a/view/base/web/images/novalnet-logo.svg b/view/base/web/images/novalnet-logo.svg
new file mode 100755
index 0000000..55914cd
--- /dev/null
+++ b/view/base/web/images/novalnet-logo.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 219.55 68.55"><defs><style>.cls-1{fill:#ececed;}.cls-2{fill:#0082c8;}.cls-3{fill:#878787;}</style></defs><title>140716_Novalnet_Logos_Corporate - scaled-3</title><path class="cls-1" d="M309.9,42.9a2.15,2.15,0,0,1-.2,1.9,7.56,7.56,0,0,1-2.1,1.9,32.18,32.18,0,0,1-5,2.3A111.19,111.19,0,0,1,290,52.3c-2.8.6-5.7,1.1-8.5,1.5a3.81,3.81,0,0,1-1.5.1c4.5-.8,9-1.7,13.4-2.8a86.7,86.7,0,0,0,11-3.3,17.92,17.92,0,0,0,4.5-2.5,3.49,3.49,0,0,0,1-2.4" transform="translate(-90.5 -32.4)"/><path class="cls-2" d="M123.1,47.2a10.87,10.87,0,0,1,6.6,1.4,6.7,6.7,0,0,1,2.9,3.3,8.68,8.68,0,0,1,.9,4.5V74.5a9.78,9.78,0,0,1-.6,3.8,8.55,8.55,0,0,1-2.9,3.9,9.78,9.78,0,0,1-4.6,1.6,11.33,11.33,0,0,1-6-.9,7.42,7.42,0,0,1-3.8-4,12.06,12.06,0,0,1-.8-4.6V58.9c0-1.9-.2-3.9.5-5.8a8.11,8.11,0,0,1,3.5-4.6,9,9,0,0,1,4.3-1.3m.1,5.3a2.33,2.33,0,0,0-1.7,1,4.56,4.56,0,0,0-.6,2.6V74.8a4.39,4.39,0,0,0,.7,2.7,2.8,2.8,0,0,0,2.4,1,3.05,3.05,0,0,0,2.6-.8,4.41,4.41,0,0,0,.8-2.8V56.6c0-.5-.1-1-.1-1.5a2.84,2.84,0,0,0-1.2-2.1,4.22,4.22,0,0,0-2.9-.5" transform="translate(-90.5 -32.4)"/><path class="cls-2" d="M90.5,47.7c1.9-.1,3.8,0,5.7,0,.8,2.3,1.6,4.5,2.5,6.8,1.6,4.5,3.4,8.9,5.1,13.5V47.7h5.5V83.3H104c-2.5-7.2-7.7-22.1-7.9-22.2V83.3H90.6V52.2c-.1-1.5-.1-3-.1-4.5" transform="translate(-90.5 -32.4)"/><path class="cls-2" d="M137.5,47.7h6c1.5,8.3,2.9,16.5,4.5,24.8.1-.1,2.7-14.5,4-21.6.2-1,.4-2.1.6-3.1h6c-1,4.5-1.9,9.1-2.9,13.6-1.5,7.3-3.1,14.7-4.6,22h-6.2c-2-9.5-4-19-5.9-28.5-.2-.9-1.3-5.5-1.5-7.2" transform="translate(-90.5 -32.4)"/><path class="cls-2" d="M165.7,47.7h7.6c1.8,9.6,3.5,19.2,5.3,28.8l1.2,6.9h-5.9c-.3-1.6-.5-3.3-.7-5-.1-1-.3-1.9-.4-2.9H166c-.3,2.7-.7,5.3-1.1,7.9H159l5.7-30.9a39.92,39.92,0,0,0,1-4.8m1.4,22.4h5c-.7-4.6-2.3-14.9-2.5-15.3-.2.3-1.8,10.6-2.5,15.3" transform="translate(-90.5 -32.4)"/><path class="cls-2" d="M184.7,47.7h6.1V77.9h9.7v5.4H184.7V47.7" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M295.8,63.6a4.59,4.59,0,0,1,2.8-.8,5,5,0,0,1,3.3,1.2,8.58,8.58,0,0,1,2.1,5.3h-2.2a9.22,9.22,0,0,0-.7-3.2,2.73,2.73,0,0,0-1.8-1.5,3.38,3.38,0,0,0-2,.2,3.76,3.76,0,0,0-1.5,1.8,12.1,12.1,0,0,0-.7,3.7c0,1.4-.1,2.8-.1,4.3a25.82,25.82,0,0,0,.3,2.9,7.26,7.26,0,0,0,1,2.8,2.59,2.59,0,0,0,1.7,1.2,3.47,3.47,0,0,0,2.8-.6,3.1,3.1,0,0,0,1-2.4v-3h-2.7V73.6H304V83h-1.4l-.3-1.5a4.19,4.19,0,0,1-1.5,1.2,5.78,5.78,0,0,1-4.1.2,5.27,5.27,0,0,1-2.9-3.3c-1-2.7-.9-5.7-.8-8.5a17,17,0,0,1,.9-5,6.18,6.18,0,0,1,1.9-2.5" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M282.4,63.1h3c1,4.5,2,9,3,13.6.5,2.2,1,4.4,1.4,6.6h-2.2c-.2-1-.4-2.1-.6-3.2s-.3-1.9-.6-2.9h-5.1c-.3,1-.4,2-.6,2.9a28.37,28.37,0,0,0-.6,3.1h-2.2c1.6-6.6,3-13.4,4.5-20.1m.8,4.6c-.5,2.6-1.1,5.2-1.6,7.8h4.5c-.2-1.3-.5-2.5-.8-3.8-.5-2.4-1-4.7-1.5-7.1-.2,1-.3,2-.6,3.1" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M209.4,32.7c11.2-.3,22.4-.4,33.6-.2q16.5.3,33,1.8c5.1.5,10.3,1.1,15.4,1.9a80.4,80.4,0,0,1,12.7,2.9,13.09,13.09,0,0,1,4.7,2.4,3.07,3.07,0,0,1,1,1.5,2.77,2.77,0,0,1-1.1,2.4,17.92,17.92,0,0,1-4.5,2.5,82.06,82.06,0,0,1-11,3.3c-4.4,1.1-8.9,1.9-13.4,2.8-.9.2-1.8.3-2.7.5,4.2-1,8.5-2,12.6-3.4a28.13,28.13,0,0,0,4.7-2.1,7.57,7.57,0,0,0,2.2-1.8,2.1,2.1,0,0,0,.4-2,3.9,3.9,0,0,0-1.9-1.9,22.58,22.58,0,0,0-4.8-2.1,105.77,105.77,0,0,0-12.4-2.8c-5.3-.8-10.6-1.5-15.9-1.9-10.9-1-21.9-1.5-32.8-1.7-1.1,0-2.1-.1-3.2-.1q-8.85-.15-17.7,0c-2.1.1-4.2,0-6.3.2-1.9,0-3.8.1-5.8.2-1.1.1-2.1.1-3.2.1q-10.35.45-20.7,1.2c-10.2.8-20.3,1.9-30.5,3.5q-6.75,1.05-13.5,2.4a9.66,9.66,0,0,1-1.8.3,260,260,0,0,1,31.7-5.8,445,445,0,0,1,51.2-4.1" transform="translate(-90.5 -32.4)"/><path class="cls-2" d="M205.6,47.7h5.9c.3,1.1.7,2.1,1.1,3.2,1.9,5.1,6.3,17.1,6.3,17.1V47.7h5.5V83.3H219c-.2-.9-6.6-18.9-7.7-22-.1,1.1,0,15.8,0,22h-5.7V47.7" transform="translate(-90.5 -32.4)"/><path class="cls-2" d="M231,47.7h17.1V53c-1.1.1-2.9,0-4.1.1h-6.8v9.1h7.9v5.4h-7.9V78h10.9v5.4h-17c-.1-12-.1-23.8-.1-35.7" transform="translate(-90.5 -32.4)"/><path class="cls-2" d="M251.9,47.7H270V53c-2,.1-4,0-6,.1V83.4h-6.2V53.1c-2-.1-4,.1-6-.1.1-1.8.1-3.6.1-5.3" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M95.57,93.54H92v3.35h4v1H90.75V88.61h5v1H92v2.93h3.61Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M102.65,93c0-.68,0-1.25-.06-1.8h1.06l.06,1.07h0a2.3,2.3,0,0,1,2.1-1.22,2,2,0,0,1,1.89,1.33h0a2.64,2.64,0,0,1,.74-.86,2.26,2.26,0,0,1,1.48-.47c.88,0,2.2.58,2.2,2.89V97.9H111V94.12c0-1.28-.47-2.05-1.45-2.05a1.58,1.58,0,0,0-1.44,1.1,2.24,2.24,0,0,0-.09.61V97.9h-1.19v-4c0-1.06-.47-1.83-1.4-1.83a1.65,1.65,0,0,0-1.5,1.21,1.68,1.68,0,0,0-.1.6v4h-1.18Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M119.29,93.41c0-.86,0-1.55-.06-2.18h1.09l.06,1.14h0a2.62,2.62,0,0,1,2.37-1.29c1.62,0,2.83,1.36,2.83,3.39,0,2.39-1.46,3.58-3,3.58a2.34,2.34,0,0,1-2-1h0v3.63h-1.2Zm1.2,1.77a3.68,3.68,0,0,0,.05.5,1.88,1.88,0,0,0,1.83,1.42c1.28,0,2-1,2-2.58,0-1.33-.71-2.48-2-2.48a2,2,0,0,0-1.84,1.5,2.17,2.17,0,0,0-.08.5Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M138.33,94.51A3.26,3.26,0,0,1,135,98.05a3.17,3.17,0,0,1-3.2-3.43,3.26,3.26,0,0,1,3.31-3.54A3.16,3.16,0,0,1,138.33,94.51Zm-5.3.07c0,1.46.84,2.56,2,2.56s2-1.09,2-2.59c0-1.13-.57-2.56-2-2.56S133,93.31,133,94.58Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M145.37,91.23l.89,3.39c.19.74.37,1.43.5,2.12h0c.15-.67.37-1.39.59-2.11l1.09-3.4h1l1,3.33c.25.8.44,1.51.59,2.18h0a20.05,20.05,0,0,1,.51-2.16l1-3.35h1.2l-2.16,6.67h-1.1l-1-3.18a22.22,22.22,0,0,1-.6-2.2h0a22.15,22.15,0,0,1-.61,2.21l-1.08,3.17h-1.1l-2-6.67Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M160.73,94.78A2.14,2.14,0,0,0,163,97.1a4.26,4.26,0,0,0,1.85-.35l.21.87a5.45,5.45,0,0,1-2.22.42,3.1,3.1,0,0,1-3.29-3.37c0-2,1.19-3.59,3.14-3.59,2.18,0,2.76,1.91,2.76,3.14a5.3,5.3,0,0,1,0,.56Zm3.56-.86a1.71,1.71,0,0,0-1.68-2,2,2,0,0,0-1.86,2Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M172.11,93.31c0-.79,0-1.46-.05-2.08h1.06l0,1.31h.06a2,2,0,0,1,1.85-1.46,1.22,1.22,0,0,1,.34,0v1.14a2.37,2.37,0,0,0-.41,0,1.7,1.7,0,0,0-1.63,1.56,3.1,3.1,0,0,0-.06.56V97.9h-1.2Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M183.17,89.36a.75.75,0,0,1-1.5,0,.74.74,0,0,1,.76-.76A.72.72,0,0,1,183.17,89.36Zm-1.35,8.54V91.23H183V97.9Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M190.19,93c0-.68,0-1.25-.06-1.8h1.08l.07,1.1h0a2.46,2.46,0,0,1,2.21-1.25c.92,0,2.36.55,2.36,2.84v4h-1.22V94.05c0-1.07-.4-2-1.54-2a1.73,1.73,0,0,0-1.63,1.24,1.66,1.66,0,0,0-.09.57v4h-1.21Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M208.75,91.23c0,.48-.06,1-.06,1.83v3.87c0,1.53-.3,2.47-.95,3a3.58,3.58,0,0,1-2.43.8,4.4,4.4,0,0,1-2.22-.55l.3-.93a3.72,3.72,0,0,0,2,.53c1.24,0,2.16-.65,2.16-2.33v-.75h0a2.39,2.39,0,0,1-2.13,1.12,3,3,0,0,1-2.84-3.25c0-2.26,1.48-3.54,3-3.54a2.2,2.2,0,0,1,2.08,1.16h0l.06-1Zm-1.26,2.63a1.6,1.6,0,0,0-.07-.55A1.74,1.74,0,0,0,205.73,92c-1.16,0-2,1-2,2.52,0,1.31.66,2.4,2,2.4a1.79,1.79,0,0,0,1.69-1.24,2.08,2.08,0,0,0,.09-.65Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M224,88.72a14.67,14.67,0,0,1,2.3-.18,3.8,3.8,0,0,1,2.61.78,2.49,2.49,0,0,1,.82,1.94,2.72,2.72,0,0,1-.72,2,3.85,3.85,0,0,1-2.85,1,4,4,0,0,1-1-.08V97.9H224Zm1.2,4.48a3.92,3.92,0,0,0,1,.1c1.45,0,2.33-.71,2.33-2s-.87-1.82-2.19-1.82a5.2,5.2,0,0,0-1.13.1Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M239.74,97.9l-.1-.84h0a2.49,2.49,0,0,1-2,1,1.9,1.9,0,0,1-2-1.92c0-1.61,1.43-2.49,4-2.48v-.13A1.38,1.38,0,0,0,238,92a3.37,3.37,0,0,0-1.74.5l-.27-.8a4.12,4.12,0,0,1,2.19-.59c2.05,0,2.54,1.39,2.54,2.73V96.3a9.73,9.73,0,0,0,.11,1.6Zm-.18-3.41c-1.32,0-2.83.21-2.83,1.51a1.07,1.07,0,0,0,1.15,1.15A1.65,1.65,0,0,0,239.49,96a1.34,1.34,0,0,0,.07-.39Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M248.15,91.23l1.46,3.94c.16.44.32,1,.43,1.36h0c.12-.4.26-.91.43-1.39l1.32-3.91h1.29L251.29,96c-.87,2.29-1.47,3.46-2.3,4.18a3.21,3.21,0,0,1-1.49.78l-.3-1a3.18,3.18,0,0,0,1.06-.59,3.61,3.61,0,0,0,1-1.35.76.76,0,0,0,.1-.29,1.3,1.3,0,0,0-.08-.32l-2.47-6.14Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M259.35,93c0-.68,0-1.25-.05-1.8h1.06l.05,1.07h0a2.29,2.29,0,0,1,2.09-1.22,2,2,0,0,1,1.9,1.33h0a2.66,2.66,0,0,1,.75-.86,2.24,2.24,0,0,1,1.48-.47c.88,0,2.19.58,2.19,2.89V97.9h-1.18V94.12c0-1.28-.47-2.05-1.45-2.05a1.58,1.58,0,0,0-1.44,1.1,1.9,1.9,0,0,0-.1.61V97.9h-1.18v-4c0-1.06-.47-1.83-1.4-1.83a1.65,1.65,0,0,0-1.5,1.21,1.68,1.68,0,0,0-.1.6v4h-1.19Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M276.68,94.78A2.15,2.15,0,0,0,279,97.1a4.29,4.29,0,0,0,1.85-.35l.2.87a5.41,5.41,0,0,1-2.22.42,3.1,3.1,0,0,1-3.29-3.37c0-2,1.19-3.59,3.14-3.59,2.18,0,2.76,1.91,2.76,3.14a5.3,5.3,0,0,1,0,.56Zm3.57-.86a1.73,1.73,0,0,0-1.69-2,2,2,0,0,0-1.86,2Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M288.06,93c0-.68,0-1.25-.05-1.8h1.08l.06,1.1h0a2.47,2.47,0,0,1,2.21-1.25c.93,0,2.36.55,2.36,2.84v4h-1.21V94.05c0-1.07-.4-2-1.55-2a1.74,1.74,0,0,0-1.63,1.24,2,2,0,0,0-.08.57v4h-1.22Z" transform="translate(-90.5 -32.4)"/><path class="cls-3" d="M302.26,89.32v1.91H304v.92h-1.74v3.6c0,.83.23,1.29.91,1.29a2.88,2.88,0,0,0,.71-.08l.05.91a2.89,2.89,0,0,1-1.08.17,1.69,1.69,0,0,1-1.31-.51,2.5,2.5,0,0,1-.47-1.74V92.15h-1v-.92h1v-1.6Z" transform="translate(-90.5 -32.4)"/></svg>
\ No newline at end of file
diff --git a/view/base/web/images/novalnetalipay.png b/view/base/web/images/novalnetalipay.png
new file mode 100755
index 0000000..4df62d2
Binary files /dev/null and b/view/base/web/images/novalnetalipay.png differ
diff --git a/view/base/web/images/novalnetamex.png b/view/base/web/images/novalnetamex.png
new file mode 100755
index 0000000..cfbbba5
Binary files /dev/null and b/view/base/web/images/novalnetamex.png differ
diff --git a/view/base/web/images/novalnetapplepay.png b/view/base/web/images/novalnetapplepay.png
new file mode 100755
index 0000000..1fadf23
Binary files /dev/null and b/view/base/web/images/novalnetapplepay.png differ
diff --git a/view/base/web/images/novalnetbancontact.png b/view/base/web/images/novalnetbancontact.png
new file mode 100755
index 0000000..7d959db
Binary files /dev/null and b/view/base/web/images/novalnetbancontact.png differ
diff --git a/view/base/web/images/novalnetbanktransfer.png b/view/base/web/images/novalnetbanktransfer.png
new file mode 100755
index 0000000..3804437
Binary files /dev/null and b/view/base/web/images/novalnetbanktransfer.png differ
diff --git a/view/base/web/images/novalnetblik.png b/view/base/web/images/novalnetblik.png
new file mode 100644
index 0000000..859b904
Binary files /dev/null and b/view/base/web/images/novalnetblik.png differ
diff --git a/view/base/web/images/novalnetcartasi.png b/view/base/web/images/novalnetcartasi.png
new file mode 100755
index 0000000..8b2cc12
Binary files /dev/null and b/view/base/web/images/novalnetcartasi.png differ
diff --git a/view/base/web/images/novalnetcartebleue.png b/view/base/web/images/novalnetcartebleue.png
new file mode 100755
index 0000000..ffe67f4
Binary files /dev/null and b/view/base/web/images/novalnetcartebleue.png differ
diff --git a/view/base/web/images/novalnetcashpayment.png b/view/base/web/images/novalnetcashpayment.png
new file mode 100755
index 0000000..6319569
Binary files /dev/null and b/view/base/web/images/novalnetcashpayment.png differ
diff --git a/view/base/web/images/novalnetcb.png b/view/base/web/images/novalnetcb.png
new file mode 100755
index 0000000..99bdc09
Binary files /dev/null and b/view/base/web/images/novalnetcb.png differ
diff --git a/view/base/web/images/novalnetdiners.png b/view/base/web/images/novalnetdiners.png
new file mode 100755
index 0000000..d9d4810
Binary files /dev/null and b/view/base/web/images/novalnetdiners.png differ
diff --git a/view/base/web/images/novalnetdiscover.png b/view/base/web/images/novalnetdiscover.png
new file mode 100755
index 0000000..6db9e3c
Binary files /dev/null and b/view/base/web/images/novalnetdiscover.png differ
diff --git a/view/base/web/images/novalneteps.png b/view/base/web/images/novalneteps.png
new file mode 100755
index 0000000..02875ae
Binary files /dev/null and b/view/base/web/images/novalneteps.png differ
diff --git a/view/base/web/images/novalnetgiropay.png b/view/base/web/images/novalnetgiropay.png
new file mode 100755
index 0000000..5bcd509
Binary files /dev/null and b/view/base/web/images/novalnetgiropay.png differ
diff --git a/view/base/web/images/novalnetgooglepay.png b/view/base/web/images/novalnetgooglepay.png
new file mode 100755
index 0000000..7904f33
Binary files /dev/null and b/view/base/web/images/novalnetgooglepay.png differ
diff --git a/view/base/web/images/novalnetideal.png b/view/base/web/images/novalnetideal.png
new file mode 100755
index 0000000..9d08251
Binary files /dev/null and b/view/base/web/images/novalnetideal.png differ
diff --git a/view/base/web/images/novalnetinvoice.png b/view/base/web/images/novalnetinvoice.png
new file mode 100755
index 0000000..e9a4a36
Binary files /dev/null and b/view/base/web/images/novalnetinvoice.png differ
diff --git a/view/base/web/images/novalnetinvoiceguarantee.png b/view/base/web/images/novalnetinvoiceguarantee.png
new file mode 100755
index 0000000..e9a4a36
Binary files /dev/null and b/view/base/web/images/novalnetinvoiceguarantee.png differ
diff --git a/view/base/web/images/novalnetinvoiceinstalment.png b/view/base/web/images/novalnetinvoiceinstalment.png
new file mode 100755
index 0000000..e9a4a36
Binary files /dev/null and b/view/base/web/images/novalnetinvoiceinstalment.png differ
diff --git a/view/base/web/images/novalnetjcb.png b/view/base/web/images/novalnetjcb.png
new file mode 100755
index 0000000..0064100
Binary files /dev/null and b/view/base/web/images/novalnetjcb.png differ
diff --git a/view/base/web/images/novalnetmaestro.png b/view/base/web/images/novalnetmaestro.png
new file mode 100755
index 0000000..26c6386
Binary files /dev/null and b/view/base/web/images/novalnetmaestro.png differ
diff --git a/view/base/web/images/novalnetmastercard.png b/view/base/web/images/novalnetmastercard.png
new file mode 100755
index 0000000..fed2b8e
Binary files /dev/null and b/view/base/web/images/novalnetmastercard.png differ
diff --git a/view/base/web/images/novalnetmultibanco.png b/view/base/web/images/novalnetmultibanco.png
new file mode 100755
index 0000000..f652230
Binary files /dev/null and b/view/base/web/images/novalnetmultibanco.png differ
diff --git a/view/base/web/images/novalnetonlinebanktransfer.png b/view/base/web/images/novalnetonlinebanktransfer.png
new file mode 100755
index 0000000..2856393
Binary files /dev/null and b/view/base/web/images/novalnetonlinebanktransfer.png differ
diff --git a/view/base/web/images/novalnetpaypal.png b/view/base/web/images/novalnetpaypal.png
new file mode 100755
index 0000000..9defac5
Binary files /dev/null and b/view/base/web/images/novalnetpaypal.png differ
diff --git a/view/base/web/images/novalnetpostfinance.png b/view/base/web/images/novalnetpostfinance.png
new file mode 100755
index 0000000..0b34416
Binary files /dev/null and b/view/base/web/images/novalnetpostfinance.png differ
diff --git a/view/base/web/images/novalnetpostfinancecard.png b/view/base/web/images/novalnetpostfinancecard.png
new file mode 100755
index 0000000..e704b07
Binary files /dev/null and b/view/base/web/images/novalnetpostfinancecard.png differ
diff --git a/view/base/web/images/novalnetprepayment.png b/view/base/web/images/novalnetprepayment.png
new file mode 100755
index 0000000..9104281
Binary files /dev/null and b/view/base/web/images/novalnetprepayment.png differ
diff --git a/view/base/web/images/novalnetprzelewy.png b/view/base/web/images/novalnetprzelewy.png
new file mode 100755
index 0000000..331d7b3
Binary files /dev/null and b/view/base/web/images/novalnetprzelewy.png differ
diff --git a/view/base/web/images/novalnetsepa.png b/view/base/web/images/novalnetsepa.png
new file mode 100755
index 0000000..7daf3ca
Binary files /dev/null and b/view/base/web/images/novalnetsepa.png differ
diff --git a/view/base/web/images/novalnetsepaguarantee.png b/view/base/web/images/novalnetsepaguarantee.png
new file mode 100755
index 0000000..7daf3ca
Binary files /dev/null and b/view/base/web/images/novalnetsepaguarantee.png differ
diff --git a/view/base/web/images/novalnetsepainstalment.png b/view/base/web/images/novalnetsepainstalment.png
new file mode 100755
index 0000000..7daf3ca
Binary files /dev/null and b/view/base/web/images/novalnetsepainstalment.png differ
diff --git a/view/base/web/images/novalnettrustly.png b/view/base/web/images/novalnettrustly.png
new file mode 100755
index 0000000..6952d79
Binary files /dev/null and b/view/base/web/images/novalnettrustly.png differ
diff --git a/view/base/web/images/novalnetunionpay.png b/view/base/web/images/novalnetunionpay.png
new file mode 100755
index 0000000..5b8c37c
Binary files /dev/null and b/view/base/web/images/novalnetunionpay.png differ
diff --git a/view/base/web/images/novalnetvisa.png b/view/base/web/images/novalnetvisa.png
new file mode 100755
index 0000000..87b9709
Binary files /dev/null and b/view/base/web/images/novalnetvisa.png differ
diff --git a/view/base/web/images/novalnetwechatpay.png b/view/base/web/images/novalnetwechatpay.png
new file mode 100755
index 0000000..288c959
Binary files /dev/null and b/view/base/web/images/novalnetwechatpay.png differ
diff --git a/view/frontend/email/novalnet_callback_email.html b/view/frontend/email/novalnet_callback_email.html
new file mode 100755
index 0000000..04455d0
--- /dev/null
+++ b/view/frontend/email/novalnet_callback_email.html
@@ -0,0 +1,38 @@
+<!--@subject {{var subject}} @-->
+<!--@vars {
+"var formattedBillingAddress|raw":"Billing Address",
+"var order.getEmailCustomerNote()":"Email Order Note",
+"var order.increment_id":"Order Id",
+"layout handle=\"sales_email_order_items\" order=$order area=\"frontend\"":"Order Items Grid",
+"var payment_html|raw":"Payment Details",
+"var formattedShippingAddress|raw":"Shipping Address",
+"var order.getShippingDescription()":"Shipping Description"
+} @-->
+<body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:14px; margin:0; padding:0;">
+    <div style="width:55%;height:auto;margin: 0 auto;background:rgb(247, 247, 247);border: 2px solid rgb(223, 216, 216);border-radius: 5px;box-shadow: 1px 7px 10px -2px #ccc;">
+        <div style="min-height: 300px;padding:20px;">
+            <table cellspacing="0" cellpadding="0" border="0" width="100%">
+                <tr class="email-intro">
+                    <td>
+                        <p class="greeting">Dear Mr./Ms./Mrs. {{var toName}}</p>
+                        <p>
+                            This email is sent to you ({{var toEmail}}) by {{var fromName}} from {{var fromEmail}}
+                        </p>
+                    </td>
+                </tr>
+                <tr class="email-information">
+                    <td>
+                        <table class="message-info">
+                            <tr>
+                                <td>
+                                    <br>{{var body}}
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </div>
+        <div style='width:100%;height:20px;background:#00669D;'></div>
+    </div>
+</body>
diff --git a/view/frontend/email/novalnet_callback_instalment_email.html b/view/frontend/email/novalnet_callback_instalment_email.html
new file mode 100755
index 0000000..0985df0
--- /dev/null
+++ b/view/frontend/email/novalnet_callback_instalment_email.html
@@ -0,0 +1,40 @@
+<!--@subject {{trans "Instalment confirmation %storeName Order no: %orderNo" storeName=$storeName orderNo=$orderNo}} @-->
+<!--@vars {
+"var formattedBillingAddress|raw":"Billing Address",
+"var order.getEmailCustomerNote()":"Email Order Note",
+"var order.increment_id":"Order Id",
+"layout handle=\"sales_email_order_items\" order=$order area=\"frontend\"":"Order Items Grid",
+"var payment_html|raw":"Payment Details",
+"var formattedShippingAddress|raw":"Shipping Address",
+"var order.getShippingDescription()":"Shipping Description"
+} @-->
+
+{{template config_path="design/email/header_template"}}
+
+<table>
+    <tr class="email-intro">
+        <td>
+            <p class="greeting">{{trans "%customer_name," customer_name=$customer_name}}</p>
+            <p>{{trans "The next instalment cycle have arrived for the instalment order %orderNo placed at the %store_name, kindly refer further details below." orderNo=$orderNo store_name=$store.getFrontendName()}}</p>
+        </td>
+    </tr>
+    <tr class="email-information">
+        <td>
+            <table class="order-details">
+                <tr>
+                    <td class="method-info">
+                        <h3>{{trans "Payment Method"}}</h3>
+                        {{var payment_html|raw}}
+                        <br>
+                        {{depend sepaPayment}}
+                            <p>{{trans "The instalment amount for this cycle %cycleAmount %currency will be debited from your account in one - three business days." cycleAmount=$cycleAmount currency=$currency}}</p>
+                        {{/depend}}
+                    </td>
+                </tr>
+            </table>
+            {{layout handle="sales_email_order_items" order_id=$order_id area="frontend"}}
+        </td>
+    </tr>
+</table>
+
+{{template config_path="design/email/footer_template"}}
diff --git a/view/frontend/layout/catalog_product_view.xml b/view/frontend/layout/catalog_product_view.xml
new file mode 100755
index 0000000..442bc1f
--- /dev/null
+++ b/view/frontend/layout/catalog_product_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+ -->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <css src="Novalnet_Payment::css/novalnet_payment.css"/>
+    </head>
+    <body>
+        <referenceContainer name="product.info.addtocart">
+            <block class="Novalnet\Payment\Block\Checkout\Cart\ShortcutButtonsConfig" name="product.info.addtocart.novalnet_shortcut_buttons" template="Novalnet_Payment::checkout/ProductPageShortcut.phtml" before="-" />
+        </referenceContainer>
+        <referenceBlock name="product.info.addtocart.additional">
+            <block name="product.info.addtocart.novalnet_shortcut_buttons.additional" class="Novalnet\Payment\Block\Checkout\Cart\ShortcutButtonsConfig" template="Novalnet_Payment::checkout/ProductPageShortcut.phtml" before="-" />
+        </referenceBlock>
+    </body>
+</page>
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
new file mode 100755
index 0000000..45b0c5f
--- /dev/null
+++ b/view/frontend/layout/checkout_index_index.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="head.additional">
+            <block class="Magento\Framework\View\Element\Template" name="novalnet_remove_token" template="Novalnet_Payment::removeTokenPopup.phtml" after="-"/>
+        </referenceBlock>
+        <referenceBlock name="checkout.root">
+            <arguments>
+                <argument name="jsLayout" xsi:type="array">
+                    <item name="components" xsi:type="array">
+                        <item name="checkout" xsi:type="array">
+                            <item name="children" xsi:type="array">
+                                <item name="steps" xsi:type="array">
+                                    <item name="children" xsi:type="array">
+                                        <!--Apple Pay Guest checkout layout-->
+                                        <item name="shipping-step" xsi:type="array">
+                                            <item name="children" xsi:type="array">
+                                                <item name="novalnet-guest-checkout" xsi:type="array">
+                                                    <item name="component"  xsi:type="string">Novalnet_Payment/js/checkout/novalnetGuestCheckout</item>
+                                                    <item name="sortOrder" xsi:type="string">1</item>
+                                                    <item name="config" xsi:type="array">
+                                                        <item name="template" xsi:type="string">Novalnet_Payment/checkout/novalnetGuestCheckout</item>
+                                                    </item>
+                                                </item>
+                                            </item>
+                                        </item>
+                                        <item name="billing-step" xsi:type="array">
+                                            <item name="children" xsi:type="array">
+                                                <item name="payment" xsi:type="array">
+                                                    <item name="children" xsi:type="array">
+                                                        <item name="renders" xsi:type="array">
+                                                            <!-- merge payment method renders here -->
+                                                            <item name="children" xsi:type="array">
+                                                                <item name="novalnet-payment" xsi:type="array">
+                                                                    <item name="component" xsi:type="string">Novalnet_Payment/js/view/payment/novalnet-payment</item>
+                                                                    <item name="methods" xsi:type="array">
+                                                                        <item name="novalnetCc" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetApplepay" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">false</item>
+                                                                        </item>
+                                                                        <item name="novalnetGooglepay" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">false</item>
+                                                                        </item>
+                                                                        <item name="novalnetSepa" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetInvoice" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetPrepayment" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetInvoiceGuarantee" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetSepaGuarantee" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetCashpayment" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetMultibanco" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetPaypal" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetBanktransfer" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetOnlineBanktransfer" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetIdeal" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetBancontact" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetEps" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetGiropay" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetPrzelewy" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetPostFinanceCard" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetPostFinance" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetInvoiceInstalment" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetSepaInstalment" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetTrustly" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetAlipay" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetWechatpay" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="novalnetBlik" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                    </item>
+                                                                </item>
+                                                            </item>
+                                                        </item>
+                                                    </item>
+                                                </item>
+                                            </item>
+                                        </item>
+                                    </item>
+                                </item>
+                            </item>
+                        </item>
+                    </item>
+                </argument>
+            </arguments>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/view/frontend/layout/checkout_onepage_failure.xml b/view/frontend/layout/checkout_onepage_failure.xml
new file mode 100755
index 0000000..caf7e88
--- /dev/null
+++ b/view/frontend/layout/checkout_onepage_failure.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <link src="Novalnet_Payment::js/novalnetRefreshMinicart.js"/>
+    </head>
+</page>
diff --git a/view/frontend/layout/checkout_onepage_success.xml b/view/frontend/layout/checkout_onepage_success.xml
new file mode 100755
index 0000000..19720c3
--- /dev/null
+++ b/view/frontend/layout/checkout_onepage_success.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <link src="Novalnet_Payment::js/novalnetRefreshMinicart.js"/>
+    </head>
+    <body>
+        <referenceContainer name="content">
+            <block class="Novalnet\Payment\Block\Onepage\Success\Message" name="onepage.success.message" before="page.main.title" template="Novalnet_Payment::onepage/success/message.phtml"/>
+            <block class="Novalnet\Payment\Block\Onepage\Success\Message" name="onepage.expresscheckout.success.message" before="-" template="Novalnet_Payment::onepage/success/expresscheckoutmessage.phtml"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
new file mode 100755
index 0000000..146c712
--- /dev/null
+++ b/view/frontend/layout/default.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <css src="Novalnet_Payment::css/novalnet_payment.css"/>
+    </head>
+</page>
diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
new file mode 100755
index 0000000..1ee43b2
--- /dev/null
+++ b/view/frontend/requirejs-config.js
@@ -0,0 +1,27 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+var config = {
+    map: {
+        '*': {
+            'novalnetUtilityJs': 'https://cdn.novalnet.de/js/v2/NovalnetUtility.js',
+            'novalnetPaymentJs': 'https://cdn.novalnet.de/js/v3/payment.js'
+        }
+    }
+};
diff --git a/view/frontend/templates/checkout/CartPageShortcut.phtml b/view/frontend/templates/checkout/CartPageShortcut.phtml
new file mode 100755
index 0000000..47004eb
--- /dev/null
+++ b/view/frontend/templates/checkout/CartPageShortcut.phtml
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+$isEnabled = $block->isPageEnabledForExpressCheckout('shopping_cart_page');
+?>
+<?php if ($isEnabled['novalnetApplepay']): ?>
+    <div id="novalnet_applepay_cartdiv" style="display:none" >
+        <div id="nn_applepay_cart" ></div>
+        <br>
+    </div>
+<?php endif; ?>
+
+<?php if ($isEnabled['novalnetGooglepay']): ?>
+    <div id="novalnet_googlepay_cartdiv" style="display:none" >
+        <div id="nn_googlepay_cart"  ></div>
+        <br>
+    </div>
+<?php endif; ?>
+
+<?php if ($isEnabled['novalnetGooglepay'] || $isEnabled['novalnetApplepay']): ?>
+    <script>
+        require(['jquery', 'domReady!', 'Novalnet_Payment/js/novalnetCheckoutHelper'],
+             function($, domReady, nnCheckoutHelper) {
+                nnCheckoutHelper.getCartItems(function(cartPagequote) {
+                  nnCheckoutHelper.initCartPage(cartPagequote);
+                });
+            });
+    </script>
+<?php endif; ?>
+
diff --git a/view/frontend/templates/checkout/MinicartShortcut.phtml b/view/frontend/templates/checkout/MinicartShortcut.phtml
new file mode 100755
index 0000000..8c4e426
--- /dev/null
+++ b/view/frontend/templates/checkout/MinicartShortcut.phtml
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+$isEnabled = $block->isPageEnabledForExpressCheckout('mini_cart_page');
+?>
+<br>
+<?php if ($isEnabled['novalnetApplepay']): ?>
+    <div id="novalnet_applepay_minicartdiv" style="display:none" >
+        <div id="nn_applepay_minicart" ></div>
+    </div>
+<?php endif; ?>
+
+<?php if ($isEnabled['novalnetApplepay'] && $isEnabled['novalnetGooglepay']): ?>
+    <br>
+<?php endif; ?>
+
+<?php if ($isEnabled['novalnetGooglepay']): ?>
+    <div id="novalnet_googlepay_minicartdiv" style="display:none" >
+        <div id="nn_googlepay_minicart" ></div>
+    </div>
+<?php endif; ?>
+
+
+<?php if ($isEnabled['novalnetApplepay'] || $isEnabled['novalnetGooglepay']): ?>
+    <script>
+        require([
+            'jquery',
+            'domReady!',
+            'Magento_Customer/js/customer-data',
+            'Novalnet_Payment/js/novalnetCheckoutHelper'
+        ], function(
+            $,
+            domReady,
+            customerData,
+            nnCheckoutHelper
+        ) {
+            const cart = customerData.get('cart');
+
+            loadMinicartButton();
+
+            cart.subscribe(function() {
+                $('#novalnet_applepay_minicartdiv, #novalnet_googlepay_minicartdiv').css({'display' : 'none'});
+                setTimeout(function() {
+                    loadMinicartButton();
+                },500);
+            });
+
+            window.addEventListener('hashchange', function() {
+                loadMinicartButton();
+            }, false);
+
+            function loadMinicartButton() {
+                let currentURL = window.location.href,
+                    pattern1 = new RegExp('/onepage/success'),
+                    isSuccesspage = pattern1.test(currentURL),
+                    pattern2 = new RegExp('/checkout/#payment'),
+                    paymentPage = pattern2.test(currentURL);
+
+                if (isSuccesspage) {
+                    customerData.reload(['cart'], true);
+                    return false;
+                }
+
+                if (paymentPage) {
+                    $('#novalnet_googlepay_minicartdiv, #novalnet_applepay_minicartdiv').css({'display' : 'none'});
+                    return false;
+                }
+
+                nnCheckoutHelper.getCartItems(function(minicartQuote) {
+                    nnCheckoutHelper.initMiniCart(minicartQuote);
+                });
+            };
+        });
+    </script>
+<?php endif; ?>
diff --git a/view/frontend/templates/checkout/ProductPageShortcut.phtml b/view/frontend/templates/checkout/ProductPageShortcut.phtml
new file mode 100755
index 0000000..483f03b
--- /dev/null
+++ b/view/frontend/templates/checkout/ProductPageShortcut.phtml
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+$isEnabled = $block->isPageEnabledForExpressCheckout('product_page');
+?>
+
+<?php if ($isEnabled['novalnetApplepay']): ?>
+    <div id="novalnet_applepay_productdiv" style="display:none" >
+        <div id="nn_applepay_product" ></div>
+        <br>
+    </div>
+<?php endif; ?>
+
+<?php if ($isEnabled['novalnetGooglepay']): ?>
+    <div id="novalnet_googlepay_productdiv" style="display:none" >
+        <div id="nn_googlepay_product" ></div>
+        <br>
+    </div>
+<?php endif; ?>
+
+<?php if ($isEnabled['novalnetApplepay'] || $isEnabled['novalnetGooglepay']): ?>
+    <script>
+        require([
+            'jquery',
+            'domReady!',
+            'Magento_Customer/js/customer-data',
+            'Novalnet_Payment/js/novalnetCheckoutHelper'
+        ], function(
+            $,
+            domReady,
+            customerData,
+            nnCheckoutHelper
+        ) {
+            const cart = customerData.get('cart');
+
+            loadProductPageButton();
+
+            cart.subscribe(function() {
+                $('#novalnet_applepay_productdiv, #novalnet_googlepay_productdiv').css({'display' : 'none'});
+                setTimeout(function() {
+                    loadProductPageButton();
+                },600);
+            });
+
+            function loadProductPageButton() {
+                nnCheckoutHelper.getQuoteValues('<?= /* @noEscape */ $block->loadProductById()["productId"]; ?>', function(productPagequote) {
+                    nnCheckoutHelper.initProductPage(
+                      '<?= /* @noEscape */ (bool) $block->loadProductById()["isVirtual"]; ?>',
+                      productPagequote
+                    );
+                });
+            }
+        });
+    </script>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Alipay.phtml b/view/frontend/templates/info/Alipay.phtml
new file mode 100755
index 0000000..2a1d3e3
--- /dev/null
+++ b/view/frontend/templates/info/Alipay.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Alipay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Applepay.phtml b/view/frontend/templates/info/Applepay.phtml
new file mode 100755
index 0000000..e793e96
--- /dev/null
+++ b/view/frontend/templates/info/Applepay.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Applepay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Bancontact.phtml b/view/frontend/templates/info/Bancontact.phtml
new file mode 100755
index 0000000..374a42f
--- /dev/null
+++ b/view/frontend/templates/info/Bancontact.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Bancontact
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Banktransfer.phtml b/view/frontend/templates/info/Banktransfer.phtml
new file mode 100755
index 0000000..9cd6222
--- /dev/null
+++ b/view/frontend/templates/info/Banktransfer.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Banktransfer
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Blik.phtml b/view/frontend/templates/info/Blik.phtml
new file mode 100755
index 0000000..86939d4
--- /dev/null
+++ b/view/frontend/templates/info/Blik.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Blik
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Cashpayment.phtml b/view/frontend/templates/info/Cashpayment.phtml
new file mode 100755
index 0000000..97c73d8
--- /dev/null
+++ b/view/frontend/templates/info/Cashpayment.phtml
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Cashpayment
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('CpDueDate') && (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1)): ?>
+        <?= /* @noEscape */ __('Slip expiry date: %1', $block->getAdditionalData('CpDueDate')) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('dueDateUpdateAt')): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been updated with amount %1 and slip expiry date with %2',
+            $totalAmount,
+            $block->getAdditionalData('CpDueDate')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/invoice|creditmemo|shipment|callback/i', $block->getUrl('*/*/*', ['_current' => true])) &&
+        (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1)): ?>
+        <?php if ($block->getAdditionalData('CashpaymentStores')): ?>
+            <?= /* @noEscape */ __('Store(s) near you:') ?><br><br>
+            <?php foreach ($block->getAdditionalData('CashpaymentStores') as $key => $value): ?>
+                <?= /* @noEscape */ $value['title'] ?><br>
+                <?= /* @noEscape */ $value['street'] ?><br>
+                <?= /* @noEscape */ $value['city'] ?><br>
+                <?= /* @noEscape */ $value['country'] ?><br>
+                <?= /* @noEscape */ $value['zipcode'] ?><br><br>
+            <?php endforeach; ?>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Cc.phtml b/view/frontend/templates/info/Cc.phtml
new file mode 100755
index 0000000..e793b4f
--- /dev/null
+++ b/view/frontend/templates/info/Cc.phtml
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Cc
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnZeroAmountBooking')): ?>
+        <?= /* @noEscape */ __('This order processed as a zero amount booking') ?>
+        <br><br>
+        <?php if ($block->getAdditionalData('NnUpdatedZeroAmount') && $block->getAdditionalData('NnZeroAmountRefTid')): ?>
+            <?= /* @noEscape */ __(
+                'Your order has been booked with the amount of %1. Your new TID for the booked amount: %2',
+                $block->getAdditionalData('NnUpdatedZeroAmount'),
+                $block->getAdditionalData('NnZeroAmountRefTid')
+            ) ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Eps.phtml b/view/frontend/templates/info/Eps.phtml
new file mode 100755
index 0000000..cc52423
--- /dev/null
+++ b/view/frontend/templates/info/Eps.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Eps
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Giropay.phtml b/view/frontend/templates/info/Giropay.phtml
new file mode 100755
index 0000000..04d4237
--- /dev/null
+++ b/view/frontend/templates/info/Giropay.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Giropay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Googlepay.phtml b/view/frontend/templates/info/Googlepay.phtml
new file mode 100755
index 0000000..4827038
--- /dev/null
+++ b/view/frontend/templates/info/Googlepay.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Googlepay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Ideal.phtml b/view/frontend/templates/info/Ideal.phtml
new file mode 100755
index 0000000..362d902
--- /dev/null
+++ b/view/frontend/templates/info/Ideal.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Ideal
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Invoice.phtml b/view/frontend/templates/info/Invoice.phtml
new file mode 100755
index 0000000..2a4663a
--- /dev/null
+++ b/view/frontend/templates/info/Invoice.phtml
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Invoice
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+    <?php
+    if ($block->getAdditionalData('NnGuarantee')) {
+        /* @noEscape */ echo __('This is processed as a guarantee payment') . '<br /><br />';
+        if (($paymentStatus == 'PENDING')): ?>
+            <?= /* @noEscape */ __('Your order is being verified. Once confirmed, we will send you our bank details to which the order amount should be transferred. Please note that this may take up to 24 hours') ?><br><br>
+        <?php endif;
+    } ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed successfully for the TID: %1',
+            $transactionId
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('dueDateUpdateAt') && $paymentStatus != 'ON_HOLD'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been updated with amount %1 and due date with %2',
+            $totalAmount,
+            $block->getAdditionalData('NnDueDate')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/creditmemo/i', $block->getUrl('*/*/*', ['_current' => true])) &&
+        in_array($paymentStatus, ['PENDING', 'ON_HOLD', 'CONFIRMED']) && (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1) &&
+        (empty($block->getAdditionalData('NnGuarantee')) || (!empty($block->getAdditionalData('NnGuarantee')) && $paymentStatus != 'PENDING'))): ?>
+        <?php if (!empty($block->getAdditionalData('NnInvoiceComments')) && strlen($block->getAdditionalData('NnInvoiceComments'))): ?>
+            <?php if ($paymentStatus != 'ON_HOLD'): ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account on or before %2', $totalAmount, $block->getAdditionalData('NnDueDate')) ?>
+            <?php else: ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account', $totalAmount) ?>
+            <?php endif; ?>
+            <?php $invoiceComments = (!empty($block->getAdditionalData('NnInvoiceComments'))) ? explode('|', $block->getAdditionalData('NnInvoiceComments')) : []; ?>
+            <?php foreach ($invoiceComments as $noteValue): ?>
+                <?php list($text, $value) = (!empty($noteValue)) ? explode(':', $noteValue) : ['', '']; ?>
+                <?php if (!empty($value) && preg_match('/Order No&/i', $value)): ?>
+                    <?php list($referenceTxt, $value) = (!empty($value)) ? explode('&', $value) : ['', '']; ?>
+                    <?php str_replace('&', '', $referenceTxt); ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . __($referenceTxt) . ' ' . $value ?>
+                <?php elseif ($text != 'Due Date' || ($text == 'Due Date' && $paymentStatus != 'ON_HOLD')): ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . $value ?>
+                <?php endif; ?>
+            <?php endforeach; ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/InvoiceGuarantee.phtml b/view/frontend/templates/info/InvoiceGuarantee.phtml
new file mode 100755
index 0000000..9d6a2d9
--- /dev/null
+++ b/view/frontend/templates/info/InvoiceGuarantee.phtml
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\InvoiceGuarantee
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($paymentStatus == 'PENDING'): ?>
+        <?= /* @noEscape */ __('Your order is being verified. Once confirmed, we will send you our bank details to which the order amount should be transferred. Please note that this may take up to 24 hours') ?><br><br>
+    <?php endif; ?>
+
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed successfully for the TID: %1',
+            $transactionId
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/creditmemo/i', $block->getUrl('*/*/*', ['_current' => true])) && in_array($paymentStatus, ['ON_HOLD', 'CONFIRMED'])): ?>
+        <?php if (!empty($block->getAdditionalData('NnInvoiceComments')) && strlen($block->getAdditionalData('NnInvoiceComments'))): ?>
+            <?php if ($paymentStatus != 'ON_HOLD'): ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account on or before %2', $totalAmount, $block->getAdditionalData('NnDueDate')) ?>
+            <?php else: ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account', $totalAmount) ?>
+            <?php endif; ?>
+            <?php $invoiceComments = (!empty($block->getAdditionalData('NnInvoiceComments'))) ? explode('|', $block->getAdditionalData('NnInvoiceComments')) : []; ?>
+            <?php foreach ($invoiceComments as $noteValue): ?>
+                <?php list($text, $value) = (!empty($noteValue)) ? explode(':', $noteValue) : ['', '']; ?>
+                <?php if (!empty($value) && preg_match('/Order No&/i', $value)): ?>
+                    <?php list($referenceTxt, $value) = (!empty($value)) ? explode('&', $value) : ['', '']; ?>
+                    <?php str_replace('&', '', $referenceTxt); ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . __($referenceTxt) . ' ' . $value ?>
+                <?php elseif ($text != 'Due Date' || ($text == 'Due Date' && $paymentStatus != 'ON_HOLD')): ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . $value ?>
+                <?php endif; ?>
+            <?php endforeach; ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/InvoiceInstalment.phtml b/view/frontend/templates/info/InvoiceInstalment.phtml
new file mode 100755
index 0000000..586df66
--- /dev/null
+++ b/view/frontend/templates/info/InvoiceInstalment.phtml
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\InvoiceInstalment
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($paymentStatus == 'PENDING'): ?>
+        <?= /* @noEscape */ __('Your order is being verified. Once confirmed, we will send you our bank details to which the order amount should be transferred. Please note that this may take up to 24 hours') ?><br><br>
+    <?php endif; ?>
+
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed successfully for the TID: %1',
+            $transactionId
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('InstalmentCancel')): ?>
+        <?= /* @noEscape */ __(
+            'Instalment has been cancelled.'
+        ) ?><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/creditmemo/i', $block->getUrl('*/*/*', ['_current' => true])) && in_array($paymentStatus, ['ON_HOLD', 'CONFIRMED']) && empty($block->getAdditionalData('prepaid'))): ?>
+        <?php if (!empty($block->getAdditionalData('NnInvoiceComments')) && strlen($block->getAdditionalData('NnInvoiceComments'))): ?>
+            <?php if ($paymentStatus != 'ON_HOLD'): ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account on or before %2', $totalAmount, $block->getAdditionalData('NnDueDate')) ?>
+            <?php else: ?>
+                <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account', $totalAmount) ?>
+            <?php endif; ?>
+            <?php $invoiceComments = (!empty($block->getAdditionalData('NnInvoiceComments'))) ? explode('|', $block->getAdditionalData('NnInvoiceComments')) : []; ?>
+            <?php $notesCount = count($invoiceComments); ?>
+            <?php foreach ($invoiceComments as $key => $noteValue): ?>
+                <?php list($text, $value) = (!empty($noteValue)) ? explode(':', $noteValue) : ['', '']; ?>
+                <?php if ($text == 'Payment Reference' && $notesCount == 8 && $key == 6): ?>
+                    <?php continue; ?>
+                <?php endif; ?>
+                <?php if (!empty($value) && preg_match('/Order No&/i', $value)): ?>
+                    <?php list($referenceTxt, $value) = (!empty($value)) ? explode('&', $value) : ['', '']; ?>
+                    <?php str_replace('&', '', $referenceTxt); ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . __($referenceTxt) . ' ' . $value ?>
+                <?php elseif ($text != 'Due Date' || ($text == 'Due Date' && $paymentStatus != 'ON_HOLD')): ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . $value ?>
+                <?php endif; ?>
+            <?php endforeach; ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('PaidInstall') && $paymentStatus == 'CONFIRMED' && (empty($block->getAdditionalData('InstalmentCancel')) || $block->getAdditionalData('InstalmentCancel') != 1)): ?>
+        <br>
+        <br>
+        <p><b><?= /* @noEscape */ __('Instalment Information') . ':' ?></b></p>
+        <table class="data table table-order-items">
+            <tbody>
+                <tr>
+                    <td><?= /* @noEscape */ __('Processed Instalments') ?></td>
+                    <td><b><?= /* @noEscape */ $block->getAdditionalData('PaidInstall') ?></b></td>
+                </tr>
+                <tr>
+                    <td><?= /* @noEscape */ __('Due Instalments') ?></td>
+                    <td><b><?= /* @noEscape */ $block->getAdditionalData('DueInstall') ? $block->getAdditionalData('DueInstall') : 0 ?></b></td>
+                </tr>
+                <tr>
+                    <td><?= /* @noEscape */ __('Instalment Cycle Amount') ?></td>
+                    <td><b><?= /* @noEscape */ $block->getAdditionalData('InstallCycleAmount') ? $block->updateCurrency($block->getAdditionalData('InstallCycleAmount')) : '-' ?></b></td>
+                </tr>
+            </tbody>
+        </table>
+        <br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Multibanco.phtml b/view/frontend/templates/info/Multibanco.phtml
new file mode 100755
index 0000000..8b47289
--- /dev/null
+++ b/view/frontend/templates/info/Multibanco.phtml
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Multibanco
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnPartnerPaymentReference') && (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1)): ?>
+        <?= /* @noEscape */ __('Please use the following payment reference details to pay the amount of %1 at a Multibanco ATM or through your internet banking.', $block->getGrandTotal()) ?><br><br>
+        <?= /* @noEscape */ __('Partner Payment Reference: %1', $block->getAdditionalData('NnPartnerPaymentReference')) ?><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/OnlineBanktransfer.phtml b/view/frontend/templates/info/OnlineBanktransfer.phtml
new file mode 100755
index 0000000..4b5ebe2
--- /dev/null
+++ b/view/frontend/templates/info/OnlineBanktransfer.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\OnlineBanktransfer
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Paypal.phtml b/view/frontend/templates/info/Paypal.phtml
new file mode 100755
index 0000000..0e69501
--- /dev/null
+++ b/view/frontend/templates/info/Paypal.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Paypal
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/PostFinance.phtml b/view/frontend/templates/info/PostFinance.phtml
new file mode 100755
index 0000000..e7f2ec4
--- /dev/null
+++ b/view/frontend/templates/info/PostFinance.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\PostFinance
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/PostFinanceCard.phtml b/view/frontend/templates/info/PostFinanceCard.phtml
new file mode 100755
index 0000000..2fcec35
--- /dev/null
+++ b/view/frontend/templates/info/PostFinanceCard.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\PostFinanceCard
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Prepayment.phtml b/view/frontend/templates/info/Prepayment.phtml
new file mode 100755
index 0000000..31562cb
--- /dev/null
+++ b/view/frontend/templates/info/Prepayment.phtml
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Prepayment
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+$totalAmount = ($block->getAdditionalData('NnAmount')) ? $block->getAdditionalData('NnAmount') : $block->getGrandTotal();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed successfully for the TID: %1',
+            $transactionId
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('dueDateUpdateAt') && $paymentStatus != 'ON_HOLD'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been updated with amount %1 and due date with %2',
+            $totalAmount,
+            $block->getAdditionalData('NnDueDate')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if (!empty($block->getUrl('*/*/*', ['_current' => true])) && !preg_match('/invoice|creditmemo|shipment|callback/i', $block->getUrl('*/*/*', ['_current' => true])) &&
+        (empty($block->getAdditionalData('NnPaid')) || $block->getAdditionalData('NnPaid') != 1)): ?>
+        <?php if (!empty($block->getAdditionalData('NnInvoiceComments')) && strlen($block->getAdditionalData('NnInvoiceComments'))): ?>
+            <br><?= /* @noEscape */ __('Please transfer the amount of %1 to the following account on or before %2', $totalAmount, $block->getAdditionalData('NnDueDate')) ?>
+            <?php $invoiceComments = (!empty($block->getAdditionalData('NnInvoiceComments'))) ? explode('|', $block->getAdditionalData('NnInvoiceComments')) : []; ?>
+            <?php foreach ($invoiceComments as $noteValue): ?>
+                <?php list($text, $value) =  (!empty($noteValue)) ? explode(':', $noteValue) : ['', '']; ?>
+                <?php if (!empty($value) && preg_match('/Order No&/i', $value)): ?>
+                    <?php list($referenceTxt, $value) = (!empty($value)) ? explode('&', $value) : ['', '']; ?>
+                    <?php str_replace('&', '', $referenceTxt); ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . __($referenceTxt) . ' ' . $value ?>
+                <?php else: ?>
+                    <br><?= /* @noEscape */ __($text) . ': ' . $value ?>
+                <?php endif; ?>
+            <?php endforeach; ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Przelewy.phtml b/view/frontend/templates/info/Przelewy.phtml
new file mode 100755
index 0000000..114ecaf
--- /dev/null
+++ b/view/frontend/templates/info/Przelewy.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Przelewy
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Sepa.phtml b/view/frontend/templates/info/Sepa.phtml
new file mode 100755
index 0000000..64c8ca4
--- /dev/null
+++ b/view/frontend/templates/info/Sepa.phtml
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Sepa
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $info->getOrder());
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php
+    if ($block->getAdditionalData('NnGuarantee')) {
+        /* @noEscape */ echo __('This is processed as a guarantee payment') . '<br /><br />';
+        if ($paymentStatus == 'PENDING') {
+            /* @noEscape */ echo __('Your order is under verification and we will soon update you with the order status. Please note that this may take upto 24 hours.') . '<br /><br />';
+        }
+    }
+    ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnZeroAmountBooking')): ?>
+        <?= /* @noEscape */ __('This order processed as a zero amount booking') ?>
+        <br><br>
+        <?php if ($block->getAdditionalData('NnUpdatedZeroAmount') && $block->getAdditionalData('NnZeroAmountRefTid')): ?>
+            <?= /* @noEscape */ __(
+                'Your order has been booked with the amount of %1. Your new TID for the booked amount: %2',
+                $block->getAdditionalData('NnUpdatedZeroAmount'),
+                $block->getAdditionalData('NnZeroAmountRefTid')
+            ) ?><br>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/SepaGuarantee.phtml b/view/frontend/templates/info/SepaGuarantee.phtml
new file mode 100755
index 0000000..7489317
--- /dev/null
+++ b/view/frontend/templates/info/SepaGuarantee.phtml
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\SepaGuarantee
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($paymentStatus == 'PENDING'): ?>
+        <?= /* @noEscape */ __('Your order is under verification and we will soon update you with the order status. Please note that this may take upto 24 hours.') ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/SepaInstalment.phtml b/view/frontend/templates/info/SepaInstalment.phtml
new file mode 100755
index 0000000..f2970a5
--- /dev/null
+++ b/view/frontend/templates/info/SepaInstalment.phtml
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\SepaInstalment
+ */
+$info = $block->getInfo();
+$order = $info->getOrder();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+$paymentStatus = $block->novalnetHelper()->getStatus($block->getAdditionalData('NnStatus'), $order);
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br>
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($paymentStatus == 'PENDING'): ?>
+        <?= /* @noEscape */ __('Your order is under verification and we will soon update you with the order status. Please note that this may take upto 24 hours.') ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('ApiProcess') == 'capture'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been confirmed on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php elseif ($block->getAdditionalData('ApiProcess') == 'void'): ?>
+        <?= /* @noEscape */ __(
+            'The transaction has been canceled on %1',
+            $block->getAdditionalData('ApiProcessedAt')
+        ) ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('InstalmentCancel')): ?>
+        <?= /* @noEscape */ __(
+            'Instalment has been cancelled.'
+        ) ?><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('PaidInstall') && $paymentStatus == 'CONFIRMED' && (empty($block->getAdditionalData('InstalmentCancel')) || $block->getAdditionalData('InstalmentCancel') != 1)): ?>
+        <br>
+        <br>
+        <p><b><?= /* @noEscape */ __('Instalment Information') . ':' ?></b></p>
+        <table class="data table table-order-items">
+            <tbody>
+                <tr>
+                    <td><?= /* @noEscape */ __('Processed Instalments') ?></td>
+                    <td><b><?= /* @noEscape */ $block->getAdditionalData('PaidInstall') ?></b></td>
+                </tr>
+                <tr>
+                    <td><?= /* @noEscape */ __('Due Instalments') ?></td>
+                    <td><b><?= /* @noEscape */ $block->getAdditionalData('DueInstall') ? $block->getAdditionalData('DueInstall') : 0 ?></b></td>
+                </tr>
+                <tr>
+                    <td><?= /* @noEscape */ __('Instalment Cycle Amount') ?></td>
+                    <td><b><?= /* @noEscape */ $block->getAdditionalData('InstallCycleAmount') ? $block->updateCurrency($block->getAdditionalData('InstallCycleAmount')) : '-' ?></b></td>
+                </tr>
+            </tbody>
+        </table>
+        <br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Trustly.phtml b/view/frontend/templates/info/Trustly.phtml
new file mode 100755
index 0000000..75196d9
--- /dev/null
+++ b/view/frontend/templates/info/Trustly.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Trustly
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/info/Wechatpay.phtml b/view/frontend/templates/info/Wechatpay.phtml
new file mode 100755
index 0000000..1b037f8
--- /dev/null
+++ b/view/frontend/templates/info/Wechatpay.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payments\Block\Info\Wechatpay
+ */
+$info = $block->getInfo();
+$transactionId = $block->getAdditionalData('NnTid') ? $block->getAdditionalData('NnTid') : $info->getLastTransId();
+?>
+<?php if ($info): ?>
+    <?php if ($block->getAdditionalData('NnTestMode')): ?>
+        <div style="color:white;font-weight:bold;background:red;padding:5px 10px;text-align:center;font-size:15px">
+            <?= /* @noEscape */ __('Test order') ?>
+        </div>
+    <?php endif; ?>
+    <?= $block->escapeHtml($block->getMethod()->getTitle()) ?><br />
+
+    <?php if ($transactionId): ?>
+        <?= /* @noEscape */ __('Novalnet Transaction ID: '). $transactionId ?><br><br>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnRefunded')): ?>
+        <?php foreach ($block->getAdditionalData('NnRefunded') as $key => $value): ?>
+            <?php if (!empty($value['reftid']) && preg_match("/-refund/i", $value['reftid'])): ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID:%1 with the amount %2',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount']
+                ) ?><br>
+            <?php else: ?>
+                <?= /* @noEscape */ __(
+                    'Refund has been initiated for the TID: %1 with the amount %2. New TID:%3',
+                    $block->novalnetHelper()->makeValidNumber($value['reqtid']),
+                    $value['refamount'],
+                    $block->novalnetHelper()->makeValidNumber($value['reftid'])
+                ) ?><br>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    <?php endif; ?>
+
+    <?php if ($block->getAdditionalData('NnComments')): ?>
+        <?= /* @noEscape */ $block->getAdditionalData('NnComments') ?>
+    <?php endif; ?>
+<?php else: ?>
+    <?= /* @noEscape */ __('Error in getting payment method') ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/onepage/success/expresscheckoutmessage.phtml b/view/frontend/templates/onepage/success/expresscheckoutmessage.phtml
new file mode 100755
index 0000000..10e5673
--- /dev/null
+++ b/view/frontend/templates/onepage/success/expresscheckoutmessage.phtml
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payment\Block\Onepage\Success\Message
+ */
+$gpayAdditionalData = $block->getGpayAdditionalData();
+$applePayAdditionalData = $block->getApplepayAdditionalData();
+
+?>
+
+<?php if (!empty($gpayAdditionalData)): ?>
+    <p><?= /* @noEscape */ __('Your order was successfully processed using Google Pay') ?><b><?= /* @noEscape */ $gpayAdditionalData['NnGpaysuccesstext']; ?></b></p>
+<?php endif; ?>
+
+<?php if (!empty($applePayAdditionalData)): ?>
+    <p><?= /* @noEscape */ __('Your order was successfully processed using Apple Pay') ?> <b><?= /* @noEscape */ $gpayAdditionalData['NnApplepaysuccesstext']; ?></b></p>
+<?php endif; ?>
diff --git a/view/frontend/templates/onepage/success/message.phtml b/view/frontend/templates/onepage/success/message.phtml
new file mode 100755
index 0000000..b6b2a1b
--- /dev/null
+++ b/view/frontend/templates/onepage/success/message.phtml
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+/**
+ * @var \Novalnet\Payment\Block\Onepage\Success\Message
+ */
+$cpAdditionalData = $block->getCpAdditionalData();
+?>
+
+<?php if (!empty($cpAdditionalData)): ?>
+    <?php
+        $CheckoutJsUrl = !empty($cpAdditionalData['NnCheckoutJs']) ? $cpAdditionalData['NnCheckoutJs'] : '';
+        $CheckoutToken = !empty($cpAdditionalData['NnCheckoutToken']) ? $cpAdditionalData['NnCheckoutToken'] : '';
+    ?>
+    <style type="text/css">
+        #bz-checkout-modal { position: fixed !important; }
+    </style>
+    <script src="<?= /* @noEscape */ $CheckoutJsUrl ?>" class="bz-checkout"
+        data-token="<?= /* @noEscape */ $CheckoutToken ?>">
+    </script>
+    <a href="javascript:bzCheckout.display();"><?= /* @noEscape */ __('Pay now with Barzahlen'); ?></a>
+<?php endif;?>
diff --git a/view/frontend/templates/product/view/instalmentsinfo.phtml b/view/frontend/templates/product/view/instalmentsinfo.phtml
new file mode 100755
index 0000000..87e7b34
--- /dev/null
+++ b/view/frontend/templates/product/view/instalmentsinfo.phtml
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+
+$product = $block->getProductData();
+$productId = $product['productId'];
+$productType = $product['type'];
+?>
+
+<?php if (!empty($product) && $block->canShowInstalmentsInfo()): ?>
+    <div>
+        <p id="novalnet-instalment-notification" style="display:none" >You can pay this product in instalments. <span id="novalnet-instalment-info-toggle" ><a>Learn more</a></span></p>
+        <div id="novalnetInstalment-details" style="display:none" >
+            <div style="border: .1rem solid #8a837f;">
+                <div class="novalnet-instalment-tab" >
+                    <div class="novalnet-instalment-tab-sepa" id="nn-sepa-instalment-view" ><span>Instalment by Direct Debit SEPA</span></div>
+                    <div class="novalnet-instalment-tab-invoice" id="nn-invoice-instalment-view" style="" >Instalment by Invoice</div>
+                </div>
+                <table class="novalnet-instalment-details-table" id="novalnet-instalment-sepa-table" >
+                    <tbody id="novalnet-instalment-sepa-tbody" >
+                    </tbody>
+                </table>
+                <table class="novalnet-instalment-details-table" id="novalnet-instalment-invoice-table" style="display:none" >
+                    <tbody id="novalnet-instalment-invoice-tbody" >
+                    </tbody>
+                </table>
+                <br>
+                <div style="padding:10px;" >
+                    <p style="font-weight: 600" >Things to note:</p>
+                    <p>Available in Germany, Austria and Switzerland</p>
+                    <p>The shipping address must be the same as the billing address</p>
+                </div>
+            </div>
+        </div>
+        <br>
+    </div>
+<?php endif; ?>
+
+<script>
+require([
+    'jquery',
+    'Magento_Ui/js/modal/modal',
+    'mage/validation',
+    'mage/storage',
+    'mage/url',
+    'Magento_Ui/js/modal/alert',
+    'mage/translate'
+], function(
+    $,
+    modal,
+    validation,
+    storage,
+    urlBuilder,
+    mageAlert,
+    $t
+ ) {
+    /**
+     * To get instalment options with price and create table
+     *
+     * @return void
+     */
+    function getInstalmentOptions(price) {
+        $('#novalnet-instalment-sepa-tbody').empty();
+        $('#novalnet-instalment-invoice-tbody').empty();
+
+        getCycles(price, function (result) {
+            if (isJson(result)) {
+                result = JSON.parse(result);
+            }
+
+            if ($.isEmptyObject(result.sepa) !== true) {
+                var i = 1;
+                $.each(result.sepa, function (id, value) {
+                    var tr = '<tr style="text-align:center" >';
+                    tr += '<td><strong>Plan ' + i + '</strong></td>';
+                    tr += '<td>' + value.instalment_key + '</td>';
+                    tr += '</tr>';
+                    i++;
+
+                    $('#novalnet-instalment-sepa-tbody').append(tr);
+                });
+            } else {
+                $('#nn-sepa-instalment-view').css({'display' : 'none'});
+                $('#nn-invoice-instalment-view').css({'width' : '100%'}).trigger('click');
+            }
+
+            if ($.isEmptyObject(result.invoice) !== true) {
+                var j = 1;
+                $.each(result.invoice, function (id, value) {
+                    var tr = '<tr style="text-align:center" >';
+                    tr += '<td><strong>Plan ' + j + '</strong></td>';
+                    tr += '<td>' + value.instalment_key + '</td>';
+                    tr += '</tr>';
+                    j++;
+
+                    $('#novalnet-instalment-invoice-tbody').append(tr);
+                });
+            } else {
+                $('#nn-invoice-instalment-view').css({'display' : 'none'});
+                $('#nn-sepa-instalment-view').css({'width' : '100%'}).trigger('click');
+            }
+
+            if ($.isEmptyObject(result.sepa) && $.isEmptyObject(result.invoice)) {
+                $('#novalnet-instalment-notification').css({'display': 'none'});
+            } else {
+                $('#novalnet-instalment-notification').css({'display': 'block'});
+            }
+        });
+    }
+
+    /**
+     * Get instalment cycles info via ajax
+     *
+     * @return void
+     */
+    function getCycles(price, callback) {
+        storage.get(
+            urlBuilder.build('rest/V1/novalnet/payment/instalment_info/' + parseFloat(price), {})
+        ).done(function (response) {
+            callback(response);
+        });
+    }
+
+    /**
+     * To check if the data is JSON
+     *
+     * @return bool
+     */
+    function isJson(data) {
+        try {
+            JSON.parse(data);
+            return true;
+        } catch (e) {
+            return false;
+        }
+    }
+
+    /**
+     * Document on ready
+     */
+    $(document).ready(function () {
+        var productType = '<?= /* @noEscape */ $productType ?>',
+            priceField = '#product-price-' + '<?= /* @noEscape */ $productId ?>',
+            productPrice = '<?= /* @noEscape */ $block->getProductPrice() ?>';
+
+        getInstalmentOptions(productPrice);
+
+        $('#novalnet-instalment-info-toggle').click(function () {
+            $('#novalnetInstalment-details').slideToggle('fast');
+        });
+
+        $('#nn-sepa-instalment-view').click(function () {
+            $('.novalnet-instalment-tab-sepa').css({
+                'background-color' : '#f0f0f0',
+                'color' : 'black'
+            });
+
+            $('.novalnet-instalment-tab-invoice').css({
+                'background-color' : '#514943',
+                'color' : '#fff'
+            });
+
+            $('#novalnet-instalment-invoice-table').css({
+                'display' : 'none'
+            });
+
+            $('#novalnet-instalment-sepa-table').css({
+                'display' : 'inline-table'
+            });
+        });
+
+        $('#nn-invoice-instalment-view').click(function () {
+            $('.novalnet-instalment-tab-sepa').css({
+                'background-color' : '#514943',
+                'color' : '#fff'
+            });
+
+            $('.novalnet-instalment-tab-invoice').css({
+                'background-color' : '#f0f0f0',
+                'color' : 'black'
+            });
+
+            $('#novalnet-instalment-invoice-table').css({
+                'display' : 'inline-table'
+            });
+
+            $('#novalnet-instalment-sepa-table').css({
+                'display' : 'none'
+            });
+        });
+    });
+});
+</script>
diff --git a/view/frontend/templates/removeTokenPopup.phtml b/view/frontend/templates/removeTokenPopup.phtml
new file mode 100755
index 0000000..843c624
--- /dev/null
+++ b/view/frontend/templates/removeTokenPopup.phtml
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+?>
+<!-- Remove payment token popup -->
+<div id="remove-nntoken-modal" style="display:none">
+    <span><?= /* @noEscape */ __('Are you sure you want to remove these account details?') ?></span>
+</div>
+<div id="remove-nntoken-cc-modal" style="display:none">
+    <span><?= /* @noEscape */ __('Are you sure you want to remove these Credit Card details?') ?></span>
+</div>
diff --git a/view/frontend/web/css/novalnet_payment.css b/view/frontend/web/css/novalnet_payment.css
new file mode 100755
index 0000000..d54de82
--- /dev/null
+++ b/view/frontend/web/css/novalnet_payment.css
@@ -0,0 +1,262 @@
+.instalment-details-table tbody tr th, .instalment-details-table tbody tr td {
+    border-top: 1px solid #ccc;
+    border-left: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    border-right: 1px solid #ccc;
+    border: .1rem solid #8a837f;
+    padding: 5px 10px;
+}
+.instalment-details-table thead th {
+    background-color: #514943;
+    border: .1rem solid #8a837f;
+    border-left-color: transparent;
+    color: #fff;
+    font-weight: 600;
+    padding: 5px 10px;
+    text-align: left;
+}
+.instalment-details-table tr {
+    transition: background 0.2s ease-in;
+}
+.instalment-details-table tr:nth-child(even) {
+    background: #f5f5f5;
+}
+.instalment-details-table {
+    margin-bottom: 30px;
+}
+.checkout-payment-method .nnpayment-logo {
+    max-height: 75px;
+}
+.nntoken.action.delete {
+    padding-left: 15px;
+}
+.nntoken.action.delete:before {
+    content: '\e604';
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    font-size: 15px;
+    line-height: 18px;
+    color: #757575;
+    font-family: 'luma-icons';
+    vertical-align: middle;
+    display: inline-block;
+    font-weight: normal;
+    overflow: hidden;
+    speak: none;
+    text-align: center;
+}
+.nntoken.action.delete > span {
+    border: 0;
+    clip: rect(0, 0, 0, 0);
+    height: 1px;
+    margin: -1px;
+    overflow: hidden;
+    padding: 0;
+    position: absolute;
+    width: 1px;
+}
+.nntoken-remove-popup-modal.modal-popup .modal-header {
+    padding-top: 1.8rem;
+}
+.nntoken-remove-popup-modal.modal-slide .modal-content {
+    padding-bottom: 1rem;
+}
+.nntoken-remove-popup-modal.modal-popup .modal-footer {
+    padding-bottom: 1rem;
+    padding-top: 1rem;
+}
+.nn-payment-guarantee, .nn-payment-instalment {
+    display: block;
+    position: relative;
+    width: 100%;
+}
+.nn-payment-guarantee .control, .nn-payment-instalment .control {
+    display: block;
+    position: relative;
+    width: 100%;
+}
+.nn-payment-guarantee .control input, .nn-payment-instalment .control input {
+    width: 225px;
+    max-width: 225px;
+}
+.nn-payment-guarantee .control .nn-customer_dob_mm, .nn-payment-instalment .control .nn-customer_dob_mm {
+    width: 120px;
+    max-width: 120px;
+}
+.nn-payment-guarantee .control .autocomplete, .nn-payment-instalment .control .autocomplete {
+    display: inline-block;
+    position: relative;
+    width: 80px;
+    max-width: 80px;
+}
+.nn-payment-guarantee .control .autocomplete-items, .nn-payment-instalment .control .autocomplete-items {
+    display: block;
+    position: absolute;
+    border: 1px solid #d4d4d4;
+    border-bottom: none;
+    border-top: none;
+    z-index: 99;
+    width: 75px;
+}
+.nn-payment-guarantee .control .autocomplete-items div, .nn-payment-instalment .control .autocomplete-items div {
+    padding: 4px 10px;
+    cursor: pointer;
+    background-color: #fff;
+    border-bottom: 1px solid #d4d4d4;
+}
+.nn-payment-guarantee .control div.mage-error {
+    display: none !important;
+}
+.nn-payment-instalment .control div.mage-error {
+    display: none !important;
+}
+.nn-test-drive{
+    position: relative;
+    background-color: #0080c9;
+    color: #fff;
+    padding: 10px 20px;
+    margin-bottom: 8px;
+    font-size: 10px;
+    text-align: center;
+    text-transform: uppercase;
+    letter-spacing: 1px;
+    line-height: 0.8px;
+    border-radius: 0px 0px 5px 5px;
+    transition: transform 0.5s ease 0.5s;
+    animation: novalnet-blinker 4s linear infinite;
+    font-weight: bold;
+    float:right;
+}
+@keyframes novalnet-blinker {
+    100% {
+    opacity: 0;
+    }
+}
+
+.info-box{
+    position:relative;
+    width:auto;
+    height: auto;
+    background: content-box;
+    font-size: 14px;
+    color: #333;
+    margin: 20px 0px;
+    padding:1em 1em;
+    border-left: 5px solid #0080c9;
+    box-shadow: 0 0 8px 0px rgba(0,0,0,.4);
+    clear:both;
+    word-break: break-word;
+}
+.info-box ul{
+    margin: 0 20px 0px 20px;
+    padding: 0;
+}
+.info-box li{
+    list-style: disc !important;
+}
+.info-box li:before{
+    display:block !important;
+}
+.info-box p{
+    padding:0 1em;
+    margin-bottom:0px;
+}
+.info-box a{
+    padding:0 1em;
+    margin-bottom:0px;
+    display:block;
+}
+.novalnet-challenge-window-overlay {
+    position: fixed;
+    width: 100%;
+    height: 100% ! important;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0,0,0,0.5);
+    z-index: 999;
+    cursor: pointer;
+}
+.info-box .nn-instructions {
+    white-space: break-spaces;
+}
+.field-tooltip {
+    cursor: pointer;
+    position: relative;
+    right: 0;
+    top: 0;
+    display: inline-block;
+}
+
+@media screen and (min-width: 270px) and (max-width: 330px) {
+    #novalnet_form_cc {
+        width: 100%;
+    }
+
+    #novalnet_form_cc .field-tooltip .field-tooltip-content {
+        right: -10px;
+        top: 40px;
+        left: 475%;
+        transform: translateX(-62%);
+    }
+    #novalnet_form_cc .field-tooltip .field-tooltip-content::before, #novalnet_form_cc .field-tooltip .field-tooltip-content::after {
+        left: 28%;
+    }
+}
+@media screen and (min-width: 331px) and (max-width: 355px) {
+    #novalnet_form_cc .field-tooltip .field-tooltip-content {
+        right: -10px;
+        top: 40px;
+        left: -75px;
+    }
+    #novalnet_form_cc .field-tooltip .field-tooltip-content::before, #novalnet_form_cc .field-tooltip .field-tooltip-content::after {
+        left: 75px;
+    }
+}
+@media screen and (min-width: 356px) and (max-width: 384px) {
+    #novalnet_form_cc .field-tooltip .field-tooltip-content {
+        right: -10px;
+        top: 40px;
+        left: -30px;
+    }
+    #novalnet_form_cc .field-tooltip .field-tooltip-content::before, #novalnet_form_cc .field-tooltip .field-tooltip-content::after {
+        left: 30px;
+    }
+}
+@media screen and (min-width: 385px) and (max-width: 410px) {
+    #novalnet_form_cc .field-tooltip .field-tooltip-content {
+        right: -10px;
+        top: 40px;
+        left: 0px;
+    }
+    #novalnet_form_cc .field-tooltip .field-tooltip-content::before, #novalnet_form_cc .field-tooltip .field-tooltip-content::after {
+        left: 0px;
+    }
+}
+@media screen and (min-width: 331px) and (max-width: 768px) {
+
+    #novalnet_form_cc {
+        width: 100%;
+    }
+}
+
+div.novalnet-payment-saved-payments {
+    clear: both;
+}
+
+#nn_googlepay_product .gpay-card-info-container {
+   min-width: unset !important;
+}
+
+#nn_googlepay_cart .gpay-card-info-container {
+   min-width: unset !important;
+}
+
+#nn_googlepay_minicart .gpay-card-info-container {
+   min-width: unset !important;
+}
+
+#novalnet_googlepay_guest_checkout .gpay-card-info-container {
+   min-width: unset !important;
+}
diff --git a/view/frontend/web/js/action/get-redirect-url.js b/view/frontend/web/js/action/get-redirect-url.js
new file mode 100755
index 0000000..068bbf3
--- /dev/null
+++ b/view/frontend/web/js/action/get-redirect-url.js
@@ -0,0 +1,40 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/storage',
+        'Magento_Checkout/js/model/error-processor',
+        'Magento_Checkout/js/model/full-screen-loader',
+        'Magento_Checkout/js/model/quote'
+    ],
+    function (jQuery, urlBuilder, storage, errorProcessor, fullScreenLoader, quote) {
+        'use strict';
+
+        return function () {
+            fullScreenLoader.startLoader();
+
+            let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/getRedirectURL", {}),
+                payLoad = {data: {quote_id: quote.getQuoteId()}};
+
+            return storage.post(serviceUrl, JSON.stringify(payLoad));
+        };
+    }
+);
diff --git a/view/frontend/web/js/checkout/novalnetGuestCheckout.js b/view/frontend/web/js/checkout/novalnetGuestCheckout.js
new file mode 100755
index 0000000..f305742
--- /dev/null
+++ b/view/frontend/web/js/checkout/novalnetGuestCheckout.js
@@ -0,0 +1,554 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'uiComponent',
+        'mage/url',
+        'mage/storage',
+        'Magento_Ui/js/modal/alert',
+        'Magento_Checkout/js/model/quote',
+        'mage/translate',
+        'Magento_Checkout/js/model/totals',
+        'Magento_Customer/js/customer-data',
+        'Magento_Checkout/js/model/cart/totals-processor/default',
+        'novalnetUtilityJs',
+        'novalnetPaymentJs'
+    ],
+    function($, Component, urlBuilder, storage, alert, quote, $t, totals, customerData, totalsDefaultProvider)
+    {
+        "use strict";
+        return Component.extend({
+            /**
+             * Default's
+             */
+            defaults: {
+                template: {
+                    name: "Novalnet_Payment/checkout/novalnetGuestCheckout"
+                },
+                novalnetApplepay: "APPLEPAY",
+                novalnetGooglepay: "GOOGLEPAY"
+            },
+
+            /**
+             * Initialize function
+             */
+            initObservable: function () {
+                this._super();
+                window.addEventListener("hashchange", _.bind(this.handleCheckoutVisibility,this));
+                let cart = customerData.get("cart");
+                cart.subscribe(this.refreshCheckout, this);
+                return this;
+            },
+
+            /**
+             * Handle's Guest checkout button visibility
+             */
+            handleCheckoutVisibility: function() {
+                this.initGuestCheckoutPage();
+            },
+
+            /**
+             * Refresh quote grand total on cart change
+             */
+            refreshCheckout: function() {
+                const cart = customerData.get("cart");
+                if (cart().summary_count && cart().summary_count > 0) {
+                    totalsDefaultProvider.estimateTotals(quote.shippingAddress());
+                }
+            },
+
+            /**
+             * To check the data is JSON
+             *
+             * @return bool
+             */
+            isJson: function(data) {
+                try {
+                    JSON.parse(data);
+                    return true;
+                } catch (e) {
+                    return false;
+                }
+            },
+
+            /**
+             * Returns Grand Total
+             *
+             * @return mixed
+             */
+            getGrandTotal: function() {
+                if (quote.totals()) {
+                    return Math.round(parseFloat(quote.totals().base_grand_total) * 100);
+                }
+            },
+
+            /**
+             * Returns Languge Code
+             *
+             * @return string
+             */
+            getLangCode: function() {
+                return window.checkoutConfig.payment[this.getCode()].langCode;
+            },
+
+            /**
+             * Returns Method Code
+             *
+             * @return string
+             */
+            getCode: function() {
+                return "novalnetApplepay";
+            },
+
+
+            /**
+             * Throw's alert on payment error
+             */
+            throwError: function(message) {
+                alert({
+                    title: $t("Error"),
+                    content: message
+                });
+            },
+
+            /**
+             * Returns display items for payment sheet
+             *
+             * @return array
+             */
+            getLineItems: function() {
+                let items = totals.totals().items,
+                    currencyRate = window.checkoutConfig.quoteData.base_to_quote_rate,
+                    lineItem = [],
+                    i;
+
+                if (items.length) {
+                    for( i = 0; i < items.length; i++ ) {
+                        lineItem[i] = {
+                                label: items[i].name + " (" + Math.round(parseFloat(items[i].qty)) + " x " + Number.parseFloat(items[i].base_price).toFixed(2) + ")",
+                                type: "SUBTOTAL",
+                                amount: Math.round((parseFloat(items[i].base_row_total)) * 100) + ""
+                            };
+                    }
+                }
+
+                if (totals.totals().hasOwnProperty("tax_amount")) {
+                    let tax = Math.round( (parseFloat(totals.totals().tax_amount) / parseFloat(currencyRate)) * 100);
+
+                    if(parseInt(tax) > 0) {
+                        lineItem.push({label: "Tax", type: "SUBTOTAL", amount: tax + ""});
+                    }
+                }
+
+                if (totals.totals().hasOwnProperty("discount_amount")) {
+                    let discountTotal = (Math.round( (parseFloat(totals.totals().discount_amount) / parseFloat(currencyRate)) * 100)).toString(),
+                        discount = ((Math.sign(discountTotal)) == -1 ) ? discountTotal.substr(1) : discountTotal;
+
+                    if(parseInt(discount) > 0) {
+                        lineItem.push({label: "Discount", type: "SUBTOTAL", amount: "-" + discount});
+                    }
+                }
+
+                if (totals.totals().hasOwnProperty("shipping_amount") && !quote.isVirtual()) {
+                    let shippingTitle = "Shipping";
+                    if (totals.totals().hasOwnProperty("total_segments")) {
+                        let segments = totals.totals().total_segments;
+                        $.each(segments, function (index, value) {
+                            if (value.code == "shipping") {
+                                shippingTitle = value.title
+                                shippingTitle = shippingTitle.replace("Shipping & Handling", "")
+                            }
+                        });
+                    }
+
+                    if (shippingTitle == "") {
+                        shippingTitle = "Shipping";
+                    }
+
+                    let Shipping = Math.round( (parseFloat(totals.totals().shipping_amount) / parseFloat(currencyRate)) * 100),
+                        ShippingItem = {label: shippingTitle, type: "SUBTOTAL", amount: Shipping + ''};
+                        lineItem.push(ShippingItem);
+                }
+
+                return lineItem;
+            },
+
+            /**
+             * Built Applepay Payment Request
+             *
+             * @return object
+             */
+            applepayPaymentRequest: function() {
+                const requestData = window.checkoutConfig.payment.novalnetApplepay,
+                    self = this,
+                    requestObj = {
+                        clientKey: requestData.clientKey,
+                        paymentIntent: {
+                            merchant: {
+                                countryCode: requestData.countryCode,
+                                paymentDataPresent: false
+                            },
+                            transaction: {
+                                amount: self.getGrandTotal(),
+                                currency: requestData.currencyCode,
+                                paymentMethod: self.novalnetApplepay,
+                                environment: (requestData.testmode == 1) ? "SANDBOX" : "PRODUCTION",
+                                setPendingPayment: requestData.is_pending
+                            },
+                            order: {
+                                paymentDataPresent: false,
+                                merchantName: requestData.sellerName,
+                                lineItems: self.getLineItems(),
+                                billing: {
+                                    requiredFields: ["postalAddress"]
+                                },
+                                shipping: {
+                                    requiredFields: ["postalAddress", "phone", "email"],
+                                    methodsUpdatedLater: true
+                                }
+                            },
+                            button: {
+                                style: requestData.btnTheme,
+                                locale: requestData.langCode,
+                                type: requestData.btnType,
+                                boxSizing: "border-box",
+                                dimensions: {
+                                    width: 240,
+                                    cornerRadius: parseInt(requestData.btnRadius),
+                                    height: parseInt(requestData.btnHeight)
+                                }
+                            },
+                            callbacks: {
+                                onProcessCompletion: function (response, bookingResult) {
+                                    if (response.result.status == "SUCCESS") {
+                                    let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/placeOrder", {}),
+                                        payload = {
+                                            paymentData: {
+                                                methodCode: "novalnetApplepay",
+                                                amount: response.transaction.amount,
+                                                doRedirect: response.transaction.doRedirect,
+                                                token: response.transaction.token,
+                                                cardBrand: response.transaction.paymentData.cardBrand,
+                                                lastFour: response.transaction.paymentData.lastFour
+                                            },
+                                            billingAddress: {},
+                                            shippingAddress: {},
+                                            shippingMethod: {}
+                                        };
+
+                                    if (response.order.hasOwnProperty("billing") && response.order.billing.hasOwnProperty("contact")) {
+                                        payload.billingAddress = response.order.billing.contact;
+                                    }
+
+                                    if (response.order.hasOwnProperty("shipping") && response.order.shipping.hasOwnProperty("contact")) {
+                                        payload.shippingAddress = response.order.shipping.contact;
+                                    }
+
+                                    if (response.order.hasOwnProperty("shipping") && response.order.shipping.hasOwnProperty("method")) {
+                                        payload.shippingMethod = response.order.shipping.method;
+                                    }
+
+                                        storage.post( serviceUrl, JSON.stringify(payload)).done(function(response) {
+                                                if (self.isJson(response)) {
+                                                    response = JSON.parse(response);
+                                                }
+                                                $('body').trigger('processStart');
+                                                window.location.replace(response.redirectUrl);
+                                                bookingResult({status: "SUCCESS", statusText: ""});
+                                        }).fail(function(xhr, textStatus, errorThrown) {
+                                                $('body').trigger('processStop');
+                                                const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                                                self.throwError(errMsg);
+                                                bookingResult({status: "FAILURE", statusText: errMsg});
+                                        });
+                                    } else {
+                                        $('body').trigger('processStop');
+                                        bookingResult({status: "FAILURE", statusText: ""});
+                                    }
+                                },
+                                onShippingContactChange: function(choosenShippingAddress, updatedRequestData) {
+                                    let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/estimateShippingMethod", {}),
+                                        payload = {address : choosenShippingAddress};
+
+                                    new Promise(function(resolve, reject) {
+                                        storage.post( serviceUrl, JSON.stringify(payload)).done(function(response) {
+                                            response = JSON.parse(response);
+                                            resolve(response);
+                                        }).fail(function(xhr, textStatus, errorThrown) {
+                                            const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                                            self.throwError(errMsg);
+                                        });
+                                    }).then(function (result) {
+                                        if (!result.methods.length) {
+                                            updatedRequestData({methodsNotFound :"No Shipping Contact Available, please enter a valid contact"});
+                                        } else {
+                                            updatedRequestData({
+                                                amount: result.total.amount,
+                                                lineItems: result.displayItems,
+                                                methods: result.methods,
+                                                defaultIdentifier: result.methods[0].identifier
+                                            });
+                                        }
+                                    });
+                                },
+                                onShippingMethodChange: function(choosenShippingMethod, updatedRequestData) {
+                                    let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/applyShippingMethod", {}),
+                                        payload = {shippingMethod : choosenShippingMethod};
+
+                                       new Promise(function(resolve, reject) {
+                                            storage.post( serviceUrl, JSON.stringify(payload)).done(function(response) {
+                                                response = JSON.parse(response);
+                                                resolve(response);
+                                            }).fail(function(xhr, textStatus, errorThrown) {
+                                                const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                                                self.throwError(errMsg);
+                                            });
+                                        }).then(function(result) {
+                                            updatedRequestData({
+                                                amount: result.total.amount,
+                                                lineItems: result.displayItems
+                                            });
+                                        });
+                                },
+                                onPaymentButtonClicked: function(clickResult) {
+                                    clickResult({status: "SUCCESS"});
+                                }
+                            }
+                        }
+                    };
+
+                if (requestData.isVirtual) {
+                    requestObj.paymentIntent.transaction.setPendingPayment = true;
+                    requestObj.paymentIntent.order.shipping = {requiredFields: ["phone", "email"]};
+                }
+
+                return requestObj;
+            },
+
+            /**
+             * Built Googlepay payment request
+             *
+             * @return object
+             */
+            googlePayPaymentRequest: function(btnWidth = 0) {
+                let requestData = window.checkoutConfig.payment.novalnetGooglepay,
+                    self = this,
+                    requestObj = {
+                        clientKey: requestData.clientKey,
+                        paymentIntent: {
+                            merchant: {
+                                countryCode: requestData.countryCode,
+                                paymentDataPresent: false,
+                                partnerId: requestData.partnerId
+                            },
+                            transaction: {
+                                amount: self.getGrandTotal(),
+                                currency: requestData.currencyCode,
+                                paymentMethod: self.novalnetGooglepay,
+                                environment: (requestData.testmode == 1) ? "SANDBOX" : "PRODUCTION",
+                                setPendingPayment: requestData.is_pending,
+                                enforce3d: requestData.enforce3d
+                            },
+                            order: {
+                                paymentDataPresent: false,
+                                merchantName: requestData.sellerName,
+                                lineItems: self.getLineItems(),
+                                billing: {
+                                    requiredFields: ["postalAddress", "phone", "email"]
+                                },
+                                shipping: {
+                                    requiredFields: ["postalAddress", "phone"],
+                                    methodsUpdatedLater: true
+                                }
+                            },
+                            button: {
+                                style: requestData.btnTheme,
+                                locale: requestData.langCode,
+                                type: requestData.btnType,
+                                boxSizing: "fill",
+                                dimensions: {
+                                    width: btnWidth,
+                                    height: parseInt(requestData.btnHeight)
+                                }
+                            },
+                            callbacks: {
+                                onProcessCompletion: function (response, bookingResult) {
+                                    if (response.result.status == "SUCCESS") {
+                                        let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/placeOrder", {}),
+                                            payload = {
+                                                paymentData: {
+                                                    methodCode: "novalnetGooglepay",
+                                                    amount: response.transaction.amount,
+                                                    doRedirect: response.transaction.doRedirect,
+                                                    token: response.transaction.token,
+                                                    cardBrand: response.transaction.paymentData.cardBrand,
+                                                    lastFour: response.transaction.paymentData.lastFour
+                                                },
+                                                billingAddress: {},
+                                                shippingAddress: {},
+                                                shippingMethod: {}
+                                            };
+
+                                    if (response.order.hasOwnProperty("billing") && response.order.billing.hasOwnProperty("contact")) {
+                                        payload.billingAddress = response.order.billing.contact;
+                                    }
+
+                                    if (response.order.hasOwnProperty("shipping") && response.order.shipping.hasOwnProperty("contact")) {
+                                        payload.shippingAddress = response.order.shipping.contact;
+                                    }
+
+                                    if (response.order.hasOwnProperty("shipping") && response.order.shipping.hasOwnProperty("method")) {
+                                        payload.shippingMethod = response.order.shipping.method;
+                                    }
+
+                                        storage.post( serviceUrl, JSON.stringify(payload)).done(function(response) {
+                                                if (self.isJson(response)) {
+                                                    response = JSON.parse(response);
+                                                }
+                                                $('body').trigger('processStart');
+                                                window.location.replace(response.redirectUrl);
+                                                bookingResult({status: "SUCCESS", statusText: ""});
+                                        }).fail(function(xhr, textStatus, errorThrown) {
+                                            $('body').trigger('processStop');
+                                            const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                                            self.throwError(errMsg);
+                                            bookingResult({status: "FAILURE", statusText: errMsg});
+                                        });
+                                    } else {
+                                        $('body').trigger('processStop');
+                                        bookingResult({status: "FAILURE", statusText: ""});
+                                    }
+                                },
+                                onShippingContactChange: function(choosenShippingAddress, updatedRequestData) {
+                                    let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/estimateShippingMethod", {}),
+                                        payload = {address : choosenShippingAddress};
+
+                                    new Promise(function(resolve, reject) {
+                                        storage.post( serviceUrl, JSON.stringify(payload)).done(function(response) {
+                                            response = JSON.parse(response);
+                                            resolve(response);
+                                        }).fail(function(xhr, textStatus, errorThrown) {
+                                            const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                                            self.throwError(errMsg);
+                                        });
+                                    }).then(function (result) {
+                                        if (!result.methods.length) {
+                                            updatedRequestData({methodsNotFound :"No Shipping Contact Available, please enter a valid contact"});
+                                        } else {
+                                            updatedRequestData({
+                                                amount: result.total.amount,
+                                                lineItems: result.displayItems,
+                                                methods: result.methods,
+                                                defaultIdentifier: result.methods[0].identifier
+                                            });
+                                        }
+                                    });
+                                },
+                                onShippingMethodChange: function(choosenShippingMethod, updatedRequestData) {
+                                    let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/applyShippingMethod", {}),
+                                        payload = {shippingMethod : choosenShippingMethod};
+
+                                       new Promise(function(resolve, reject) {
+                                            storage.post( serviceUrl, JSON.stringify(payload)).done(function(response) {
+                                                response = JSON.parse(response);
+                                                resolve(response);
+                                            }).fail(function(xhr, textStatus, errorThrown) {
+                                                const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                                                self.throwError(errMsg);
+                                            });
+                                        }).then(function(result) {
+                                            updatedRequestData({
+                                                amount: result.total.amount,
+                                                lineItems: result.displayItems
+                                            });
+                                        });
+                                },
+                                onPaymentButtonClicked: function(clickResult) {
+                                    clickResult({status: "SUCCESS"});
+                                }
+                            }
+                        }
+                    };
+
+                if (quote.isVirtual()) {
+                    requestObj.paymentIntent.transaction.setPendingPayment = true;
+                    delete requestObj.paymentIntent.order.shipping;
+                }
+
+                return requestObj;
+            },
+
+            /**
+             * Init guest checkout payment buttons
+             *
+             * @see Novalnet_Payment/checkout/novalnetGuestCheckout
+             */
+            initGuestCheckoutPage: function() {
+                const self = this,
+                    currentURL = window.location.href,
+                    pattern = new RegExp("/checkout/#payment"),
+                    paymentPage = pattern.test(currentURL),
+                    googlePayInstance = NovalnetPayment().createPaymentObject(),
+                    applePayInstance = NovalnetPayment().createPaymentObject();
+
+                googlePayInstance.setPaymentIntent(self.googlePayPaymentRequest());
+                googlePayInstance.isPaymentMethodAvailable(function(canShowGooglepay) {
+                    if (canShowGooglepay && paymentPage !== true && window.checkoutConfig.payment.novalnetGooglepay.guest_page.novalnetGooglepay) {
+                        $("#novalnet_googlepay_guest_checkout").empty();
+                        googlePayInstance.addPaymentButton("#novalnet_googlepay_guest_checkout");
+                        $("#novalnet_guest_checkoutdiv").css({"display" : "block"});
+                        const btnWidth = ($(window).width() > 768) ? "63%" : "100%";
+                        $("#novalnet_googlepay_guest_checkout").find("button").css({'width': btnWidth});
+                        $(window).resize(function() {
+                            if ($(window).width() > 768) {
+                                $("#novalnet_googlepay_guest_checkout").find("button").css({'width': "63%"});
+                            } else {
+                                $("#novalnet_googlepay_guest_checkout").find("button").css({'width': "100%"});
+                            }
+                        });
+                    } else {
+                        $("#novalnet_guest_checkoutdiv").css({"display" : "none"});
+                    }
+                });
+
+                applePayInstance.setPaymentIntent(self.applepayPaymentRequest());
+                applePayInstance.isPaymentMethodAvailable(function(canShowApplepay) {
+                    if (canShowApplepay && paymentPage !== true && window.checkoutConfig.payment.novalnetGooglepay.guest_page.novalnetApplepay) {
+                        $("#novalnet_applepay_guest_checkout").empty();
+                        applePayInstance.addPaymentButton('#novalnet_applepay_guest_checkout');
+                        $("#novalnet_guest_checkoutdiv").css({"display" : "block"});
+                        const btnWidth = ($(window).width() > 768) ? "63%" : "100%";
+                        $("#novalnet_applepay_guest_checkout").find("apple-pay-button").css({'width': btnWidth});
+                        $(window).resize(function() {
+                            if ($(window).width() > 768) {
+                                $("#novalnet_applepay_guest_checkout").find("apple-pay-button").css({'width': "63%"});
+                            } else {
+                                $("#novalnet_applepay_guest_checkout").find("apple-pay-button").css({'width': "100%"});
+                            }
+                        });
+
+                    } else {
+                        $("#novalnet_guest_checkoutdiv").css({"display" : "none"});
+                    }
+                });
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/novalnetCheckoutHelper.js b/view/frontend/web/js/novalnetCheckoutHelper.js
new file mode 100755
index 0000000..cd5ba4b
--- /dev/null
+++ b/view/frontend/web/js/novalnetCheckoutHelper.js
@@ -0,0 +1,612 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/storage',
+        'Magento_Ui/js/modal/alert',
+        'mage/translate',
+        'Magento_Catalog/product/view/validation',
+        'Magento_Customer/js/customer-data',
+        'novalnetUtilityJs',
+        'novalnetPaymentJs'
+    ], function(
+        $,
+        urlBuilder,
+        storage,
+        mageAlert,
+        $t,
+        validation,
+        customerData
+    ) {
+        "use strict";
+         return {
+             defaults: {
+                novalnetApplepay: "APPLEPAY",
+                novalnetGooglepay: "GOOGLEPAY",
+                displayBlock: {"display" : "block"},
+                displayNone: {"display" : "none"},
+             },
+
+            /**
+             * Throw's Alert on Ajax Error
+             */
+            throwError: function(message) {
+                mageAlert({
+                    title: $t("Error"),
+                    content: message
+                });
+            },
+
+            /**
+             * To check the data is JSON
+             *
+             * @return bool
+             */
+            isJson: function(data) {
+                try {
+                    JSON.parse(data);
+                    return true;
+                } catch (e) {
+                    return false;
+                }
+            },
+
+            /**
+             * Returns cart items from quote
+             *
+             * @param callback
+             * @see Novalnet/Payment/view/frontend/templates/checkout/ProductPageShortcut.phtml
+             * @see Novalnet/Payment/view/frontend/templates/checkout/CartPageShortcut.phtml
+             * @see Novalnet/Payment/view/frontend/templates/checkout/MinicartShortcut.phtml
+             */
+             getCartItems: function(callback) {
+                const getCartUrl =  urlBuilder.build("/rest/V1/novalnet/payment/getCart", {}),
+                    self = this;
+
+                storage.post( getCartUrl, null , false).done(function(response) {
+                    if (self.isJson(response)) {
+                        response = JSON.parse(response);
+                    }
+
+                    callback(response);
+                }).fail(function(xhr, textStatus, errorThrown) {
+                    const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                    self.throwError(errMsg);
+                });
+             },
+
+            /**
+             * Add product to cart
+             *
+             * @param form
+             * @return void
+             */
+            addToCart: function(form) {
+                const addToCartUrl =  urlBuilder.build("/rest/V1/novalnet/payment/addToCart", {}),
+                    request = form.serialize(),
+                    payload = {data : request},
+                    self = this;
+
+                storage.post( addToCartUrl, JSON.stringify(payload)).done(function(response) {
+                    customerData.reload(["cart"], true);
+                }).fail(function(xhr, textStatus, errorThrown) {
+                    const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                    self.throwError(errMsg);
+                });
+            },
+
+            /**
+             * Get Initial Params
+             *
+             * @param productId
+             * @param callback
+             * @see Novalnet/Payment/view/frontend/templates/checkout/ProductPageShortcut.phtml
+             */
+            getQuoteValues: function(productId, callback) {
+                const serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/getProductPageParams", {}),
+                    payload = {data : {product_id: productId}},
+                    self = this;
+
+                storage.post(serviceUrl, JSON.stringify(payload)).done(function(response) {
+                    if (self.isJson(response)) {
+                        response = JSON.parse(response);
+                    }
+
+                    callback(response);
+                }).fail(function(xhr, textStatus, errorThrown) {
+                    const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                    self.throwError(errMsg);
+                });
+            },
+
+            /**
+             * Built ApplePay Payment Request
+             *
+             * @param requestData
+             * @return object
+             */
+            applepayPaymentRequest: function(requestData, btnWidth = 0, productPage = false) {
+                let self = this,
+                    requestObj = {
+                    clientKey: requestData.sheetConfig.clientKey,
+                    paymentIntent: {
+                        merchant: {
+                            countryCode: requestData.sheetConfig.countryCode,
+                            paymentDataPresent: false
+                        },
+                        transaction: {
+                            amount: requestData.total.amount,
+                            currency: requestData.sheetConfig.currencyCode,
+                            paymentMethod: self.defaults.novalnetApplepay,
+                            environment: requestData.sheetConfig.novalnetApplepay.environment,
+                            setPendingPayment: requestData.is_pending
+                        },
+                        order: {
+                            paymentDataPresent: false,
+                            merchantName: requestData.sheetConfig.novalnetApplepay.sellerName,
+                            lineItems: requestData.displayItems,
+                            billing: {
+                                 requiredFields: ["postalAddress"]
+                            },
+                            shipping: {
+                                requiredFields: ["postalAddress", "phone", "email"],
+                                methodsUpdatedLater: true
+                            }
+                        },
+                        button: {
+                            style: requestData.sheetConfig.novalnetApplepay.btnTheme,
+                            locale: requestData.sheetConfig.langCode,
+                            type: requestData.sheetConfig.novalnetApplepay.btnType,
+                            boxSizing: "border-box",
+                            dimensions: {
+                                width: btnWidth,
+                                cornerRadius: parseInt(requestData.sheetConfig.novalnetApplepay.btnRadius),
+                                height: parseInt(requestData.sheetConfig.novalnetApplepay.btnHeight)
+                            }
+                        },
+                        callbacks: {
+                            onProcessCompletion: function (response, bookingResult) {
+                                if (response.result.status == "SUCCESS") {
+                                    let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/placeOrder", {}),
+                                        payload = {
+                                            paymentData: {
+                                                methodCode: "novalnetApplepay",
+                                                amount: response.transaction.amount,
+                                                doRedirect: response.transaction.doRedirect,
+                                                token: response.transaction.token,
+                                                cardBrand: response.transaction.paymentData.cardBrand,
+                                                lastFour: response.transaction.paymentData.lastFour
+                                            },
+                                            billingAddress: {},
+                                            shippingAddress: {},
+                                            shippingMethod: {}
+                                        };
+
+                                    if (response.order.hasOwnProperty("billing") && response.order.billing.hasOwnProperty("contact")) {
+                                        payload.billingAddress = response.order.billing.contact;
+                                    }
+
+                                    if (response.order.hasOwnProperty("shipping") && response.order.shipping.hasOwnProperty("contact")) {
+                                        payload.shippingAddress = response.order.shipping.contact;
+                                    }
+
+                                    if (response.order.hasOwnProperty("shipping") && response.order.shipping.hasOwnProperty("method")) {
+                                        payload.shippingMethod = response.order.shipping.method;
+                                    }
+
+                                    storage.post( serviceUrl, JSON.stringify(payload)).done(function(response) {
+                                            if (self.isJson(response)) {
+                                                response = JSON.parse(response);
+                                            }
+                                            $('body').trigger('processStart');
+                                            window.location.replace(response.redirectUrl);
+                                            bookingResult({status: "SUCCESS", statusText: ""});
+                                    }).fail(function(xhr, textStatus, errorThrown) {
+                                            $('body').trigger('processStop');
+                                            const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                                            self.throwError(errMsg);
+                                            bookingResult({status: "FAILURE", statusText: errMsg});
+                                    });
+                                } else {
+                                    $('body').trigger('processStop');
+                                    bookingResult({status: "FAILURE", statusText: ""});
+                                }
+                            },
+                            onShippingContactChange: function(choosenShippingAddress, updatedRequestData) {
+                                let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/estimateShippingMethod", {}),
+                                    payload = {address : choosenShippingAddress};
+
+                                new Promise(function(resolve, reject) {
+                                    storage.post( serviceUrl, JSON.stringify(payload)).done(function(response) {
+                                        response = JSON.parse(response);
+                                        resolve(response);
+                                    }).fail(function(xhr, textStatus, errorThrown) {
+                                        const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                                        self.throwError(errMsg);
+                                    });
+                                }).then(function (result) {
+                                    if (!result.methods.length) {
+                                        updatedRequestData({methodsNotFound :"No Shipping Contact Available, please enter a valid contact"});
+                                    } else {
+                                        updatedRequestData({
+                                            amount: result.total.amount,
+                                            lineItems: result.displayItems,
+                                            methods: result.methods,
+                                            defaultIdentifier: result.methods[0].identifier
+                                        });
+                                    }
+                                });
+                            },
+                            onShippingMethodChange: function(choosenShippingMethod, updatedRequestData) {
+                                let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/applyShippingMethod", {}),
+                                    payload = {shippingMethod : choosenShippingMethod};
+
+                                   new Promise(function(resolve, reject) {
+                                        storage.post( serviceUrl, JSON.stringify(payload)).done(function(response) {
+                                            response = JSON.parse(response);
+                                            resolve(response);
+                                        }).fail(function(xhr, textStatus, errorThrown) {
+                                            const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                                            self.throwError(errMsg);
+                                        });
+                                    }).then(function(result) {
+                                        updatedRequestData({
+                                            amount: result.total.amount,
+                                            lineItems: result.displayItems
+                                        });
+                                    });
+                            },
+                            onPaymentButtonClicked: function(clickResult) {
+                                if (productPage) {
+                                    const productForm = $("#product_addtocart_form"),
+                                        validator = productForm.validation({radioCheckboxClosest: ".nested"});
+
+                                    if (!validator.valid()) {
+                                        clickResult({status: "FAILURE"});
+                                    } else {
+                                        clickResult({status: "SUCCESS"});
+                                        self.addToCart(productForm);
+                                    }
+                                } else {
+                                    clickResult({status: "SUCCESS"});
+                                }
+                            }
+                        }
+                    }
+                };
+
+                if (requestData.isVirtual) {
+                    requestObj.paymentIntent.transaction.setPendingPayment = true;
+                    requestObj.paymentIntent.order.shipping = {requiredFields: ["phone", "email"]};
+                }
+
+                return requestObj;
+            },
+
+            /**
+             * GooglePay request data
+             *
+             * @param requestData
+             * @param buttonWidth
+             * @param productPage
+             * @return object
+             */
+            googlePayPaymentRequest: function(requestData, buttonWidth = 0, productPage = false) {
+                let self = this,
+                    requestObj = {
+                    clientKey: requestData.sheetConfig.clientKey,
+                    paymentIntent: {
+                        merchant: {
+                            countryCode: requestData.sheetConfig.countryCode,
+                            paymentDataPresent: false,
+                            partnerId: requestData.sheetConfig.novalnetGooglepay.partnerId
+                        },
+                        transaction: {
+                            amount: requestData.total.amount,
+                            currency: requestData.sheetConfig.currencyCode,
+                            paymentMethod: self.defaults.novalnetGooglepay,
+                            environment: requestData.sheetConfig.novalnetGooglepay.environment,
+                            setPendingPayment: requestData.is_pending,
+                            enforce3d: requestData.sheetConfig.novalnetGooglepay.enforce3d
+                        },
+                        order: {
+                            paymentDataPresent: false,
+                            merchantName: requestData.sheetConfig.novalnetGooglepay.sellerName,
+                            lineItems: requestData.displayItems,
+                            billing: {
+                                requiredFields: ["postalAddress", "phone", "email"]
+                            },
+                            shipping: {
+                                requiredFields: ["postalAddress", "phone"],
+                                methodsUpdatedLater: true
+                            }
+                        },
+                        button: {
+                            style: requestData.sheetConfig.novalnetGooglepay.btnTheme,
+                            locale: requestData.sheetConfig.langCode,
+                            type: requestData.sheetConfig.novalnetGooglepay.btnType,
+                            boxSizing: "fill",
+                            dimensions: {
+                                width: buttonWidth,
+                                height: parseInt(requestData.sheetConfig.novalnetGooglepay.btnHeight)
+                            }
+                        },
+                        callbacks: {
+                            onProcessCompletion: function (response, bookingResult) {
+                                if (response.result.status == "SUCCESS") {
+                                    let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/placeOrder", {}),
+                                        payload = {
+                                            paymentData: {
+                                                methodCode: "novalnetGooglepay",
+                                                amount: response.transaction.amount,
+                                                doRedirect: response.transaction.doRedirect,
+                                                token: response.transaction.token,
+                                                cardBrand: response.transaction.paymentData.cardBrand,
+                                                lastFour: response.transaction.paymentData.lastFour
+                                            },
+                                            billingAddress: {},
+                                            shippingAddress: {},
+                                            shippingMethod: {}
+                                        };
+
+                                    if (response.order.hasOwnProperty("billing") && response.order.billing.hasOwnProperty("contact")) {
+                                        payload.billingAddress = response.order.billing.contact;
+                                    }
+
+                                    if (response.order.hasOwnProperty("shipping") && response.order.shipping.hasOwnProperty("contact")) {
+                                        payload.shippingAddress = response.order.shipping.contact;
+                                    }
+
+                                    if (response.order.hasOwnProperty("shipping") && response.order.shipping.hasOwnProperty("method")) {
+                                        payload.shippingMethod = response.order.shipping.method;
+                                    }
+
+                                    storage.post( serviceUrl, JSON.stringify(payload)).done(function(response) {
+                                            if (self.isJson(response)) {
+                                                response = JSON.parse(response);
+                                            }
+                                            $('body').trigger('processStart');
+                                            window.location.replace(response.redirectUrl);
+                                            bookingResult({status: "SUCCESS", statusText: ''});
+                                    }).fail(function(xhr, textStatus, errorThrown) {
+                                            $('body').trigger('processStop');
+                                            const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                                            self.throwError(errMsg);
+                                            bookingResult({status: "FAILURE", statusText: errMsg});
+                                    });
+                                } else {
+                                    $('body').trigger('processStop');
+                                    bookingResult({status: "FAILURE", statusText: ''});
+                                }
+                            },
+                            onShippingContactChange: function(choosenShippingAddress, updatedRequestData) {
+                                let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/estimateShippingMethod", {}),
+                                    payload = {address : choosenShippingAddress};
+
+                                new Promise(function(resolve, reject) {
+                                    storage.post( serviceUrl, JSON.stringify(payload)).done(function(response) {
+                                        response = JSON.parse(response);
+                                        resolve(response);
+                                    }).fail(function(xhr, textStatus, errorThrown) {
+                                        const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                                        self.throwError(errMsg);
+                                    });
+                                }).then(function (result) {
+                                    if (!result.methods.length) {
+                                        updatedRequestData({methodsNotFound :"No Shipping Contact Available, please enter a valid contact"});
+                                    } else {
+                                        updatedRequestData({
+                                            amount: result.total.amount,
+                                            lineItems: result.displayItems,
+                                            methods: result.methods,
+                                            defaultIdentifier: result.methods[0].identifier
+                                        });
+                                    }
+                                });
+                            },
+                            onShippingMethodChange: function(choosenShippingMethod, updatedRequestData) {
+                                let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/applyShippingMethod", {}),
+                                    payload = {shippingMethod : choosenShippingMethod};
+
+                                   new Promise(function(resolve, reject) {
+                                        storage.post( serviceUrl, JSON.stringify(payload)).done(function(response) {
+                                            response = JSON.parse(response);
+                                            resolve(response);
+                                        }).fail(function(xhr, textStatus, errorThrown) {
+                                            const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                                            self.throwError(errMsg);
+                                        });
+                                    }).then(function(result) {
+                                        updatedRequestData({
+                                            amount: result.total.amount,
+                                            lineItems: result.displayItems
+                                        });
+                                    });
+                            },
+                            onPaymentButtonClicked: function(clickResult) {
+                                if (productPage) {
+                                    const productForm = $("#product_addtocart_form"),
+                                        validator = productForm.validation({radioCheckboxClosest: ".nested"});
+
+                                    if (!validator.valid()) {
+                                        clickResult({status: "FAILURE"});
+                                    } else {
+                                        self.addToCart(productForm);
+                                        clickResult({status: "SUCCESS"});
+                                    }
+                                } else {
+                                    clickResult({status: "SUCCESS"});
+                                }
+                            }
+                        }
+                    }
+                };
+
+                if (requestData.isVirtual) {
+                    requestObj.paymentIntent.transaction.setPendingPayment = true;
+                    delete requestObj.paymentIntent.order.shipping;
+                }
+
+                return requestObj;
+            },
+
+           /**
+             * Init Mini Cart express checkout Button
+             *
+             * @param miniCartQuote
+             * @see Novalnet/Payment/view/frontend/templates/checkout/MinicartShortcut.phtml
+             */
+            initMiniCart: function(miniCartQuote) {
+                const self = this,
+                    googlePayMinicartDiv = $("#novalnet_googlepay_minicartdiv"),
+                    googlePayMinicartContainer = $("#nn_googlepay_minicart"),
+                    applePayMinicartDiv = $("#novalnet_applepay_minicartdiv"),
+                    applePayMinicartContainer = $("#nn_applepay_minicart"),
+                    googlePayInstance = NovalnetPayment().createPaymentObject(),
+                    applePayInstance = NovalnetPayment().createPaymentObject();
+
+                googlePayInstance.setPaymentIntent(self.googlePayPaymentRequest(miniCartQuote));
+                googlePayInstance.isPaymentMethodAvailable(function(canShowGooglePay) {
+                    if (canShowGooglePay && miniCartQuote.isEnabled.novalnetGooglepay) {
+                        googlePayMinicartContainer.empty();
+                        googlePayInstance.addPaymentButton("#nn_googlepay_minicart");
+                        googlePayMinicartDiv.css(self.defaults.displayBlock);
+                        $("#nn_googlepay_cart").find("button").css({'width': '100%'});
+                    } else {
+                        googlePayMinicartDiv.css(self.defaults.displayNone);
+                    }
+                });
+
+                applePayInstance.setPaymentIntent(self.applepayPaymentRequest(miniCartQuote));
+                applePayInstance.isPaymentMethodAvailable(function(canShowApplePay) {
+                    if (canShowApplePay && miniCartQuote.isEnabled.novalnetApplepay) {
+                        applePayMinicartContainer.empty();
+                        applePayInstance.addPaymentButton("#nn_applepay_minicart");
+                        applePayMinicartDiv.css(self.defaults.displayBlock);
+                        $("#nn_applepay_minicart").find("apple-pay-button").css({'width': '100%'});
+                    } else {
+                        applePayMinicartDiv.css(self.defaults.displayNone);
+                    }
+                });
+            },
+
+            /**
+             * Init Product Page express checkout Button
+             *
+             * @param isProductVirtual
+             * @param productPageQuote
+             * @see Novalnet/Payment/view/frontend/templates/checkout/ProductPageShortcut.phtml
+             */
+            initProductPage: function(isProductVirtual, productPageQuote) {
+                const self = this,
+                    isRequestVirtual = ((isProductVirtual == true && productPageQuote.isVirtual == null) || (isProductVirtual == true && productPageQuote.isVirtual == true) ) ? true : false,
+                    googlePayProductDiv = $("#novalnet_googlepay_productdiv"),
+                    googlePayProductContainer = $("#nn_googlepay_product"),
+                    applePayProductDiv = $("#novalnet_applepay_productdiv"),
+                    applePayProductContainer = $("#nn_applepay_product"),
+                    googlePayInstance = NovalnetPayment().createPaymentObject(),
+                    applePayInstance = NovalnetPayment().createPaymentObject();
+
+                productPageQuote.isVirtual = isRequestVirtual;
+                googlePayInstance.setPaymentIntent(self.googlePayPaymentRequest(productPageQuote, 0, true));
+                googlePayInstance.isPaymentMethodAvailable(function(canShowGooglePay) {
+                    if (canShowGooglePay && productPageQuote.isEnabled.novalnetGooglepay) {
+                        googlePayProductContainer.empty();
+                        googlePayInstance.addPaymentButton("#nn_googlepay_product");
+                        googlePayProductDiv.css(self.defaults.displayBlock);
+                        const btnWidth = ($(window).width() <= 768) ? "100%" : "49%";
+                        $("#nn_googlepay_product").find("button").css({'width': btnWidth});
+                        $( window ).resize(function() {
+                            if ($(window).width() <= 768) {
+                                $("#nn_googlepay_product").find("button").css({'width': "100%"});
+                            } else {
+                                $("#nn_googlepay_product").find("button").css({'width': "49%"});
+                            }
+                        });
+                    } else {
+                        googlePayProductDiv.css(self.defaults.displayNone);
+                    }
+                });
+
+                applePayInstance.setPaymentIntent(self.applepayPaymentRequest(productPageQuote, 0, true));
+                applePayInstance.isPaymentMethodAvailable(function(canShowApplePay) {
+                    if (canShowApplePay && productPageQuote.isEnabled.novalnetApplepay) {
+                        applePayProductContainer.empty();
+                        applePayInstance.addPaymentButton("#nn_applepay_product", true);
+                        applePayProductDiv.css(self.defaults.displayBlock);
+                        const btnWidth = ($(window).width() <= 768) ? "100%" : "49%";
+                        $("#nn_applepay_product").find("apple-pay-button").css({'width': btnWidth});
+                        $( window ).resize(function() {
+                            if ($(window).width() <= 768) {
+                                $("#nn_applepay_product").find("apple-pay-button").css({'width': "100%"});
+                            } else {
+                                $("#nn_applepay_product").find("apple-pay-button").css({'width': "49%"});
+                            }
+                        });
+
+                    } else {
+                        applePayProductDiv.css(self.defaults.displayNone);
+                    }
+                });
+            },
+
+            /**
+             * Init cart page express checkout button
+             *
+             * @param cartPageQuote
+             * @see Novalnet/Payment/view/frontend/templates/checkout/CartPageShortcut.phtml
+             */
+            initCartPage: function(cartPageQuote) {
+                const self = this,
+                    googlePayCartDiv = $("#novalnet_googlepay_cartdiv"),
+                    googlePayCartContainer = $("#nn_googlepay_cart"),
+                    applePayCartDiv = $("#novalnet_applepay_cartdiv"),
+                    applePayCartContainer = $("#nn_applepay_cart"),
+                    googlePayInstance = NovalnetPayment().createPaymentObject(),
+                    applePayInstance = NovalnetPayment().createPaymentObject();
+
+                googlePayInstance.setPaymentIntent(self.googlePayPaymentRequest(cartPageQuote));
+                googlePayInstance.isPaymentMethodAvailable(function(canShowGooglePay) {
+                    if (canShowGooglePay) {
+                        googlePayCartContainer.empty();
+                        googlePayInstance.addPaymentButton("#nn_googlepay_cart");
+                        googlePayCartDiv.css(self.defaults.displayBlock);
+                        $("#nn_googlepay_cart").find("button").css({'width': '100%'});
+                    } else {
+                        googlePayCartDiv.css(self.defaults.displayNone);
+                    }
+                });
+
+                applePayInstance.setPaymentIntent(self.applepayPaymentRequest(cartPageQuote));
+                applePayInstance.isPaymentMethodAvailable(function(canShowApplePay) {
+                    if (canShowApplePay) {
+                        applePayCartContainer.empty();
+                        applePayInstance.addPaymentButton("#nn_applepay_cart");
+                        applePayCartDiv.css(self.defaults.displayBlock);
+                        $("#nn_applepay_cart").find("apple-pay-button").css({'width': '100%'});
+                    } else {
+                        applePayCartDiv.css(self.defaults.displayNone);
+                    }
+                });
+            }
+        };
+    }
+);
diff --git a/view/frontend/web/js/novalnetRefreshMinicart.js b/view/frontend/web/js/novalnetRefreshMinicart.js
new file mode 100755
index 0000000..bb47917
--- /dev/null
+++ b/view/frontend/web/js/novalnetRefreshMinicart.js
@@ -0,0 +1,27 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+require([
+    'Magento_Customer/js/customer-data'
+], function (customerData) {
+    return function() {
+        var sections = ['cart'];
+        customerData.invalidate(sections);
+        customerData.reload(sections, true);
+    }
+});
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetAlipay.js b/view/frontend/web/js/view/payment/method-renderer/novalnetAlipay.js
new file mode 100755
index 0000000..74a707c
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetAlipay.js
@@ -0,0 +1,83 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList'
+    ],
+    function (
+        $,
+        url,
+        $t,
+        Component,
+        redirectOnSuccessAction,
+        redirectURLAction,
+        globalMessageList
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetAlipay'
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                this.redirectAfterPlaceOrder = false;
+
+                redirectURLAction().done(function (redirectUrl) {
+                    window.location.replace(redirectUrl);
+                }).fail(function (xhr, ajaxOptions, thrownError) {
+                    globalMessageList.addErrorMessage({
+                        message: $t(thrownError)
+                    });
+                    window.location.replace(url.build('checkout/cart'));
+                });
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetApplepay.js b/view/frontend/web/js/view/payment/method-renderer/novalnetApplepay.js
new file mode 100755
index 0000000..de8f6f6
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetApplepay.js
@@ -0,0 +1,361 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Ui/js/modal/alert',
+        'Magento_Checkout/js/model/quote',
+        'mage/translate',
+        'Magento_Checkout/js/model/totals',
+        'mage/url',
+        'mage/storage',
+        'Magento_Customer/js/customer-data',
+        'Magento_Checkout/js/model/cart/totals-processor/default',
+        'Magento_Checkout/js/model/payment/additional-validators',
+        'novalnetUtilityJs',
+        'novalnetPaymentJs'
+    ],
+    function(
+        $,
+        Component,
+        alert,
+        quote,
+        $t,
+        totals,
+        urlBuilder,
+        storage,
+        customerData,
+        totalsDefaultProvider,
+        additionalValidators
+    ) {
+        "use strict";
+        let nn_applepay = {
+            /**
+             * Default's
+             */
+            defaults: {
+                template: {
+                    name: "Novalnet_Payment/payment/novalnetApplepay"
+                },
+                novalnetApplepay: "APPLEPAY",
+                canShowPaymentMethod: "",
+                applePayInstance: NovalnetPayment().createPaymentObject()
+            },
+
+            /**
+             * Initialize observables
+             */
+            initObservable: function () {
+                this._super().observe(["canShowPaymentMethod"]);
+                let cart = customerData.get("cart");
+                cart.subscribe(this.refreshCheckout, this);
+                return this;
+            },
+
+            /**
+             * Refresh quote grand total on cart change
+             */
+            refreshCheckout: function() {
+                let cart = customerData.get("cart");
+                if (cart().summary_count && cart().summary_count > 0) {
+                    totalsDefaultProvider.estimateTotals(quote.shippingAddress());
+                }
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function() {
+                return window.checkoutConfig.payment[this.item.method].instructions;
+            },
+
+            /**
+             * Returns payment method logo
+             */
+            getLogo: function() {
+                return window.checkoutConfig.payment[this.item.method].logo;
+            },
+
+            /**
+             * Check payment availability
+             *
+             * @return object Promise
+             */
+            checkAvailability: async function() {
+                const self = this,
+                    response = new Promise(function(resolve, reject) {
+                        self.applePayInstance.setPaymentIntent(self.paymentRequest());
+                        self.applePayInstance.isPaymentMethodAvailable(function(canShowButton) {
+                            resolve(canShowButton);
+                        });
+                    }),
+                    isAllowed = await response.then(function(result) {
+                        return result;
+                    });
+
+                return (isAllowed == true) ? self.canShowPaymentMethod(1) : self.canShowPaymentMethod(0);
+            },
+
+            /**
+             * Can show apple pay payment
+             *
+             * @return bool
+             */
+            isApplePayAllowed: function() {
+                var self = this;
+                self.checkAvailability();
+                return self.canShowPaymentMethod();
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function() {
+                return window.checkoutConfig.payment[this.item.method].testmode;
+            },
+
+            /**
+             * Returns Grand Total
+             */
+            getGrandTotal: function() {
+                if (quote.totals()) {
+                    return Math.round(parseFloat(quote.totals().base_grand_total) * 100);
+                }
+            },
+
+            /**
+             * Throw's alert on payment error
+             */
+            throwError: function(message) {
+                alert({
+                    title: $t("Error"),
+                    content: message
+                });
+            },
+
+            /**
+             * To check the data is JSON
+             *
+             * @return bool
+             */
+            isJson: function(data) {
+                try {
+                    JSON.parse(data);
+                    return true;
+                } catch (e) {
+                    return false;
+                }
+            },
+
+            /**
+             * Returns display items for payment sheet
+             *
+             * @return array
+             */
+            getLineItems: function() {
+                let items = totals.totals().items,
+                    currencyRate = window.checkoutConfig.quoteData.base_to_quote_rate,
+                    lineItem = [],
+                    i;
+
+                if (items.length) {
+                    for( i = 0; i < items.length; i++ ) {
+                        lineItem[i] = {
+                                label: items[i].name + " (" + Math.round(parseFloat(items[i].qty)) + " x " + Number.parseFloat(items[i].base_price).toFixed(2) + ")",
+                                type: "SUBTOTAL",
+                                amount: Math.round((parseFloat(items[i].base_row_total)) * 100) + ""
+                            };
+                    }
+                }
+
+                if (totals.totals().hasOwnProperty("tax_amount")) {
+                    let tax = Math.round( (parseFloat(totals.totals().tax_amount) / parseFloat(currencyRate)) * 100);
+
+                    if(parseInt(tax) > 0) {
+                        lineItem.push({label: "Tax", type: "SUBTOTAL", amount: tax + ""});
+                    }
+                }
+
+                if (totals.totals().hasOwnProperty("discount_amount")) {
+                    let discountTotal = (Math.round( (parseFloat(totals.totals().discount_amount) / parseFloat(currencyRate)) * 100)).toString(),
+                        discount = ((Math.sign(discountTotal)) == -1 ) ? discountTotal.substr(1) : discountTotal;
+
+                    if(parseInt(discount) > 0) {
+                        lineItem.push({label: "Discount", type: "SUBTOTAL", amount: "-" + discount});
+                    }
+                }
+
+                if (totals.totals().hasOwnProperty("shipping_amount") && !quote.isVirtual()) {
+                    let shippingTitle = "Shipping";
+                    if (totals.totals().hasOwnProperty("total_segments")) {
+                        let segments = totals.totals().total_segments;
+                        $.each(segments, function (index, value) {
+                            if (value.code == "shipping") {
+                                shippingTitle = value.title
+                                shippingTitle = shippingTitle.replace("Shipping & Handling", "")
+                            }
+                        });
+                    }
+
+                    if (shippingTitle == "") {
+                        shippingTitle = "Shipping";
+                    }
+
+                    let Shipping = Math.round( (parseFloat(totals.totals().shipping_amount) / parseFloat(currencyRate)) * 100),
+                        ShippingItem = {label: shippingTitle, type: "SUBTOTAL", amount: Shipping + ''};
+                        lineItem.push(ShippingItem);
+                }
+
+                return lineItem;
+            },
+
+            /**
+             * Init checkout page applepay button on DOM load
+             */
+            initApplePay: function() {
+                const self = this;
+
+                $("#novalnet_guest_checkoutdiv").css({"display" : "none"});
+                self.applePayInstance.setPaymentIntent(self.paymentRequest());
+                self.applePayInstance.isPaymentMethodAvailable(function(canShowApplePay) {
+                    if (canShowApplePay) {
+                        $("#novalnet_applepay_checkoutdiv").empty();
+                        self.applePayInstance.addPaymentButton("#novalnet_applepay_checkoutdiv");
+                        $("#novalnet_applepay_checkoutdiv").find("apple-pay-button").css({'width': "100%"});
+                    }
+                });
+            },
+
+            /**
+             * Applepay Payment Request
+             *
+             * @return object
+             */
+            paymentRequest: function() {
+                const self = this,
+                    requestData = window.checkoutConfig.payment.novalnetApplepay;
+
+                return {
+                    clientKey: requestData.clientKey,
+                    paymentIntent: {
+                        merchant: {
+                            countryCode: requestData.countryCode,
+                            paymentDataPresent: false
+                        },
+                        transaction: {
+                            amount: self.getGrandTotal(),
+                            currency: requestData.currencyCode,
+                            paymentMethod: self.novalnetApplepay,
+                            environment: (requestData.testmode == 1) ? "SANDBOX" : "PRODUCTION",
+                            setPendingPayment: quote.isVirtual() ? true : requestData.is_pending
+                        },
+                        order: {
+                            paymentDataPresent: false,
+                            merchantName: requestData.sellerName,
+                            lineItems: self.getLineItems(),
+                            billing: {
+                                requiredFields: ["postalAddress"]
+                            },
+                            shipping: {
+                                requiredFields: ["phone", "email"],
+                            }
+                        },
+                        button: {
+                            style: requestData.btnTheme,
+                            locale: requestData.langCode,
+                            type: requestData.btnType,
+                            boxSizing: "border-box",
+                            dimensions: {
+                                width: 240,
+                                cornerRadius: parseInt(requestData.btnRadius),
+                                height: parseInt(requestData.btnHeight)
+                            }
+                        },
+                        callbacks: {
+                            onProcessCompletion: function (response, bookingResult) {
+                                if (response.result.status == "SUCCESS") {
+                                    let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/placeOrder", {}),
+                                        payload = {
+                                            paymentData: {
+                                                methodCode: "novalnetApplepay",
+                                                amount: response.transaction.amount,
+                                                doRedirect: response.transaction.doRedirect,
+                                                token: response.transaction.token,
+                                                cardBrand: response.transaction.paymentData.cardBrand,
+                                                lastFour: response.transaction.paymentData.lastFour
+                                            },
+                                            billingAddress: {},
+                                            shippingAddress: {},
+                                            shippingMethod: {},
+                                            isPaymentPage: true
+                                        };
+
+                                    if (response.order.hasOwnProperty("billing") && response.order.billing.hasOwnProperty("contact")) {
+                                        payload.billingAddress = response.order.billing.contact;
+                                    }
+
+                                    if (response.order.hasOwnProperty("shipping") && response.order.shipping.hasOwnProperty("contact")) {
+                                        payload.shippingAddress = response.order.shipping.contact;
+                                    }
+
+                                    storage.post( serviceUrl, JSON.stringify(payload)).done(function(response) {
+                                        if (self.isJson(response)) {
+                                            response = JSON.parse(response);
+                                        }
+                                        $('body').trigger('processStart');
+                                        window.location.replace(response.redirectUrl);
+                                        bookingResult({status: "SUCCESS", statusText: ""});
+                                    }).fail(function(xhr, textStatus, errorThrown) {
+                                        $('body').trigger('processStop');
+                                        const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                                        self.throwError(errMsg);
+                                        bookingResult({status: "FAILURE", statusText: errMsg});
+                                    });
+                                } else {
+                                    $('body').trigger('processStop');
+                                    bookingResult({status: 'FAILURE', statusText: ""});
+                                }
+                            },
+                            onPaymentButtonClicked: function(clickResult) {
+                                clickResult({status: "SUCCESS"});
+                            }
+                        }
+                    }
+                };
+            }
+        };
+
+        $(document).on("click", '#co-payment-form input[type="radio"]', function() {
+            if(this.value == "novalnetApplepay") {
+                const applePayInstance = NovalnetPayment().createPaymentObject();
+                applePayInstance.setPaymentIntent(nn_applepay.paymentRequest());
+                applePayInstance.isPaymentMethodAvailable(function(canShowApplePay) {
+                    if (canShowApplePay) {
+                        $("#novalnet_applepay_checkoutdiv").empty();
+                        applePayInstance.addPaymentButton("#novalnet_applepay_checkoutdiv");
+                        $("#novalnet_applepay_checkoutdiv").find("apple-pay-button").css({'width': "100%"});
+                    }
+                });
+            }
+        });
+
+        return Component.extend(nn_applepay);
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetBancontact.js b/view/frontend/web/js/view/payment/method-renderer/novalnetBancontact.js
new file mode 100755
index 0000000..837def7
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetBancontact.js
@@ -0,0 +1,83 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList'
+    ],
+    function (
+        $,
+        url,
+        $t,
+        Component,
+        redirectOnSuccessAction,
+        redirectURLAction,
+        globalMessageList
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetBancontact'
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                this.redirectAfterPlaceOrder = false;
+
+                redirectURLAction().done(function (redirectUrl) {
+                    window.location.replace(redirectUrl);
+                }).fail(function (xhr, ajaxOptions, thrownError) {
+                    globalMessageList.addErrorMessage({
+                        message: $t(thrownError)
+                    });
+                    window.location.replace(url.build('checkout/cart'));
+                });
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetBanktransfer.js b/view/frontend/web/js/view/payment/method-renderer/novalnetBanktransfer.js
new file mode 100755
index 0000000..d603f04
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetBanktransfer.js
@@ -0,0 +1,83 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList'
+    ],
+    function (
+        $,
+        url,
+        $t,
+        Component,
+        redirectOnSuccessAction,
+        redirectURLAction,
+        globalMessageList
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetBanktransfer'
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                this.redirectAfterPlaceOrder = false;
+
+                redirectURLAction().done(function (redirectUrl) {
+                    window.location.replace(redirectUrl);
+                }).fail(function (xhr, ajaxOptions, thrownError) {
+                    globalMessageList.addErrorMessage({
+                        message: $t(thrownError)
+                    });
+                    window.location.replace(url.build('checkout/cart'));
+                });
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetBlik.js b/view/frontend/web/js/view/payment/method-renderer/novalnetBlik.js
new file mode 100755
index 0000000..645a5dc
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetBlik.js
@@ -0,0 +1,83 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList'
+    ],
+    function (
+        $,
+        url,
+        $t,
+        Component,
+        redirectOnSuccessAction,
+        redirectURLAction,
+        globalMessageList
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetBlik'
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                this.redirectAfterPlaceOrder = false;
+
+                redirectURLAction().done(function (redirectUrl) {
+                    window.location.replace(redirectUrl);
+                }).fail(function (xhr, ajaxOptions, thrownError) {
+                    globalMessageList.addErrorMessage({
+                        message: $t(thrownError)
+                    });
+                    window.location.replace(url.build('checkout/cart'));
+                });
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetCashpayment.js b/view/frontend/web/js/view/payment/method-renderer/novalnetCashpayment.js
new file mode 100755
index 0000000..72baf62
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetCashpayment.js
@@ -0,0 +1,52 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'Magento_Checkout/js/view/payment/default'
+    ],
+    function (Component) {
+        'use strict';
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetCashpayment'
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetCc.js b/view/frontend/web/js/view/payment/method-renderer/novalnetCc.js
new file mode 100755
index 0000000..1421f21
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetCc.js
@@ -0,0 +1,516 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/storage',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/model/url-builder',
+        'Magento_Customer/js/model/customer',
+        'Magento_Customer/js/customer-data',
+        'Magento_Checkout/js/model/cart/totals-processor/default',
+        'Magento_Checkout/js/model/quote',
+        'Magento_Ui/js/modal/alert',
+        'Magento_Ui/js/modal/modal',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList',
+        'novalnetUtilityJs'
+    ],
+    function (
+        $,
+        url,
+        storage,
+        $t,
+        Component,
+        urlBuilder,
+        customer,
+        customerData,
+        totalsDefaultProvider,
+        quote,
+        alert,
+        modal,
+        redirectURLAction,
+        globalMessageList
+    ) {
+        'use strict';
+
+        var nn_cc = {
+            defaults: {
+                template: {
+                    name: 'Novalnet_Payment/payment/novalnetCc',
+                    afterRender: function (renderedNodesArray, data) {
+                        data.initIframe();
+                    }
+                },
+                ccHashValue: '',
+                ccUniqueid: '',
+                ccDoRedirect: '',
+                novalnetPaymentToken: ''
+            },
+
+            initObservable: function () {
+                this._super()
+                    .observe([
+                        'ccHashValue',
+                        'ccUniqueid',
+                        'ccDoRedirect',
+                        'novalnetPaymentToken'
+                    ]);
+                this.novalnetPaymentToken.subscribe(this.onAccountChange, this);
+                if (window.checkoutConfig.payment[this.getCode()].tokenId != '' &&
+                    window.checkoutConfig.payment[this.getCode()].storePayment == '1') {
+                        this.novalnetPaymentToken(window.checkoutConfig.payment[this.getCode()].tokenId);
+                } else {
+                    this.novalnetPaymentToken('new_account');
+                }
+                var cart = customerData.get('cart');
+                cart.subscribe(this.refreshCheckout, this);
+                quote.totals.subscribe(this.reLoadIframe, this);
+                return this;
+            },
+
+            refreshCheckout: function() {
+                var cart = customerData.get('cart');
+                if (cart().summary_count && cart().summary_count > 0) {
+                    totalsDefaultProvider.estimateTotals(quote.shippingAddress());
+                }
+            },
+
+            reLoadIframe: function() {
+                nn_cc.initIframe();
+                if (window.checkoutConfig.payment[this.getCode()].tokenId != '' &&
+                    window.checkoutConfig.payment[this.getCode()].storePayment == '1') {
+                        this.novalnetPaymentToken(window.checkoutConfig.payment[this.getCode()].tokenId);
+                        this.onAccountChange(window.checkoutConfig.payment[this.getCode()].tokenId);
+                } else {
+                    this.novalnetPaymentToken('new_account');
+                    this.onAccountChange('new_account');
+                }
+            },
+
+            onAccountChange: function (selectedAccount) {
+                if (selectedAccount == 'new_account') {
+                    $("#novalnet_form_cc").show();
+                } else {
+                    $("#novalnet_form_cc").hide();
+                }
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                // check is cc3d
+                if ($('#' + this.getCode() + '_do_redirect').val() != 0) {
+                    this.redirectAfterPlaceOrder = false;
+
+                    redirectURLAction().done(function (redirectUrl) {
+                        window.location.replace(redirectUrl);
+                    }).fail(function (xhr, ajaxOptions, thrownError) {
+                        globalMessageList.addErrorMessage({
+                            message: $t(thrownError)
+                        });
+                        window.location.replace(url.build('checkout/cart'));
+                    });
+                }
+            },
+
+            getData: function () {
+                return {
+                    'method': this.item.method,
+                    'additional_data': {
+                        'novalnetCc_pan_hash': $('#' + this.getCode() + '_hash').val(),
+                        'novalnetCc_unique_id': $('#' + this.getCode() + '_uniqueid').val(),
+                        'novalnetCc_do_redirect': $('#' + this.getCode() + '_do_redirect').val(),
+                        'novalnetCc_create_token': this.canStorePayment(),
+                        'novalnetCc_token': this.getPaymentToken()
+                    }
+                };
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method icons
+             */
+            getIcons: function () {
+                return window.checkoutConfig.payment[this.item.method].icon;
+            },
+
+            getCardlogo : function (cardName) {
+                return window.checkoutConfig.payment[this.getCode()].cardLogoUrl+'/novalnet'+cardName.toLowerCase()+'.png';
+            },
+
+            isZeroAmountBooking: function () {
+                return window.checkoutConfig.payment[this.item.method].isZeroAmountBooking;
+            },
+
+            /**
+             * check can store payment reference
+             */
+            canStorePayment: function () {
+                if (!this.getPaymentToken()) {
+                    return ($('#' + this.getCode() + '_store_payment').prop("checked") == true);
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * check can show store payment
+             */
+            showStorePayment: function () {
+                if (window.checkoutConfig.payment[this.getCode()].storePayment == '1') {
+                    return customer.isLoggedIn();
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * get stored payments
+             */
+            getStoredPayments: function () {
+                if (window.checkoutConfig.payment[this.getCode()].storePayment == '1') {
+                    return window.checkoutConfig.payment[this.getCode()].storedPayments;
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * get payment token
+             */
+            getPaymentToken: function () {
+                if (this.novalnetPaymentToken() && this.novalnetPaymentToken() != 'new_account') {
+                    return this.novalnetPaymentToken();
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * remove payment token
+             */
+            removeToken: function (tokenId) {
+                var parent = this;
+
+                var options = {
+                    type: 'popup',
+                    modalClass: 'nntoken-remove-popup-modal',
+                    responsive: true,
+                    innerScroll: false,
+                    buttons: [{
+                        text: $t('No'),
+                        class: 'nntoken-cancel-remove-modal action tocart primary',
+                        click: function () {
+                            this.closeModal();
+                        }
+                    },
+                    {
+                        text: $t('Yes'),
+                        class: 'nntoken-confirm-remove-modal action tocart primary',
+                        click: function () {
+                            var button = this;
+                            storage.get(
+                                urlBuilder.createUrl('/novalnet/payment/remove_token/' + tokenId, {})
+                            ).done(function (response) {
+                                button.closeModal();
+                                if (response) {
+                                    $('a[nntoken-id=' + tokenId + ']').closest('.novalnet-payment-saved-payments').remove();
+                                    if ($('form#novalnetCc .novalnet-payment-saved-payments').length <= 0) {
+                                        $('form#novalnetCc .novalnet-payment-new_account').remove();
+                                    }
+                                    $('#novalnet_form_cc').show();
+                                    parent.novalnetPaymentToken('new_account');
+                                    window.location = window.location.hash ;
+                                    location.reload();
+                                } else {
+                                    alert({
+                                        content: $t('Novalnet Payment Token does not found')
+                                    });
+                                }
+                            }).fail(function (xhr, ajaxOptions, thrownError) {
+                                button.closeModal();
+                                alert({
+                                    content: $t(thrownError)
+                                });
+                            });
+                        }
+                    }]
+                };
+
+                // Initialize and Open popup
+                modal(options, $('#remove-nntoken-cc-modal'));
+                $("#remove-nntoken-cc-modal").modal("openModal");
+            },
+
+            /**
+             * Returns payment method signature key
+             */
+            initIframe: function () {
+                var paymentCode = "novalnetCc";
+                if ((window.checkoutConfig.payment[paymentCode].storePayment != '1') || (window.checkoutConfig.payment[paymentCode].storedPayments.length == '0')) {
+                    this.onAccountChange('new_account');
+                } else {
+                    this.onAccountChange(window.checkoutConfig.payment[paymentCode].tokenId);
+                }
+
+                var iframeParams = window.checkoutConfig.payment[paymentCode].iframeParams;
+                NovalnetUtility.setClientKey(iframeParams.client_key);
+                var request = {
+                    callback: {
+                        on_success: function (result) {
+                            if (result) {
+                                $('#' + paymentCode + '_hash').val(result['hash']);
+                                $('#' + paymentCode + '_uniqueid').val(result['unique_id']);
+                                $('#' + paymentCode + '_do_redirect').val(result['do_redirect']);
+                                $('#' + paymentCode + '_submit').trigger('click');
+                                return false;
+                            }
+                        },
+                        on_error: function (result) {
+                            alert({
+                                content: result['error_message']
+                            });
+                        },
+                        on_show_overlay: function () {
+                            $('#novalnet_iframe').addClass("novalnet-challenge-window-overlay");
+                        },
+                        on_hide_overlay: function () {
+                            $('#novalnet_iframe').removeClass("novalnet-challenge-window-overlay");
+                        },
+                        on_show_captcha: function (result) {
+                            $('#' + this.getCode() + '_gethash').val(0);
+                        },
+                    },
+                    iframe: {
+                        id: "novalnet_iframe",
+                        inline: window.checkoutConfig.payment[paymentCode].inlineForm,
+                        style: {
+                            container: window.checkoutConfig.payment[paymentCode].styleText,
+                            input: window.checkoutConfig.payment[paymentCode].inputStyle,
+                            label: window.checkoutConfig.payment[paymentCode].labelStyle,
+                        },
+                        text: {
+                            lang : iframeParams.lang,
+                            error: $t("Your credit card details are invalid"),
+                            card_holder : {
+                                label: $t("Card holder name"),
+                                place_holder: $t("Name on card"),
+                                error: $t("Please enter the valid card holder name")
+                            },
+                            card_number : {
+                                label: $t("Card number"),
+                                place_holder: $t("XXXX XXXX XXXX XXXX"),
+                                error: $t("Please enter the valid card number")
+                            },
+                            expiry_date : {
+                                label: $t("Expiry date"),
+                                error: $t("Please enter the valid expiry month / year in the given format")
+                            },
+                            cvc : {
+                                label: $t("CVC/CVV/CID"),
+                                place_holder: $t("XXX"),
+                                error: $t("Please enter the valid CVC/CVV/CID")
+                            }
+                        }
+                    },
+                    customer: this.getCustomerObject(),
+                    transaction: {
+                        amount: this.getGrandTotal(),
+                        currency: window.checkoutConfig.payment[paymentCode].currencyCode,
+                        test_mode: window.checkoutConfig.payment[paymentCode].testmode,
+                        enforce_3d: window.checkoutConfig.payment[paymentCode].enforce_3d
+                    },
+                    custom: {
+                        lang : iframeParams.lang
+                    }
+                };
+                if ($('#novalnet_iframe').length) {
+                    NovalnetUtility.createCreditCardForm(request);
+                }
+            },
+
+            getEmail: function () {
+                if(quote.guestEmail) return quote.guestEmail;
+                else return window.checkoutConfig.customerData.email;
+            },
+
+            getCustomerObject : function () {
+                if (quote.isVirtual()) {
+                    if (quote.billingAddress() != null) {
+                        var customer = {
+                            first_name: quote.billingAddress().firstname,
+                            last_name: quote.billingAddress().lastname,
+                            email: this.getEmail(),
+                            billing: {
+                                street: this.getStreet(quote.billingAddress().street),
+                                city: quote.billingAddress().city,
+                                zip: quote.billingAddress().postcode,
+                                country_code: quote.billingAddress().countryId
+                            },
+                            shipping: { same_as_billing: 1 }
+                        };
+                        return customer;
+                    } else {
+                        return;
+                    }
+                } else if (quote.billingAddress() != null && quote.shippingAddress() != null) {
+                    if (this.getStreet(quote.billingAddress().street) == this.getStreet(quote.shippingAddress().street) &&
+                        quote.billingAddress().city == quote.shippingAddress().city &&
+                        quote.billingAddress().postcode == quote.shippingAddress().postcode &&
+                        quote.billingAddress().countryId == quote.shippingAddress().countryId) {
+                            var customer = {
+                                first_name: quote.billingAddress().firstname,
+                                last_name: quote.billingAddress().lastname,
+                                email: this.getEmail(),
+                                billing: {
+                                    street: this.getStreet(quote.billingAddress().street),
+                                    city: quote.billingAddress().city,
+                                    zip: quote.billingAddress().postcode,
+                                    country_code: quote.billingAddress().countryId
+                                },
+                                shipping: { same_as_billing: 1 }
+
+                            };
+                    } else {
+                        var customer = {
+                            first_name: quote.billingAddress().firstname,
+                            last_name: quote.billingAddress().lastname,
+                            email: this.getEmail(),
+                            billing: {
+                                street: this.getStreet(quote.billingAddress().street),
+                                city: quote.billingAddress().city,
+                                zip: quote.billingAddress().postcode,
+                                country_code: quote.billingAddress().countryId
+                            },
+                            shipping: {
+                                first_name: quote.shippingAddress().firstname,
+                                last_name: quote.shippingAddress().lastname,
+                                street: this.getStreet(quote.shippingAddress().street),
+                                city: quote.shippingAddress().city,
+                                zip: quote.shippingAddress().postcode,
+                                country_code: quote.shippingAddress().countryId
+                            }
+                        };
+                    }
+                    return customer;
+                } else if (quote.billingAddress() != null) {
+                    var customer = {
+                        first_name: quote.billingAddress().firstname,
+                        last_name: quote.billingAddress().lastname,
+                        email: this.getEmail(),
+                        billing: {
+                            street: this.getStreet(quote.billingAddress().street),
+                            city: quote.billingAddress().city,
+                            zip: quote.billingAddress().postcode,
+                            country_code: quote.billingAddress().countryId
+                        },
+                        shipping: { same_as_billing: 1 }
+                    };
+                    return customer;
+                } else {
+                    return null;
+                }
+            },
+
+            getStreet: function(streetArray) {
+                var i, street = '';
+                if (streetArray) {
+                    for(i=0; i<streetArray.length; i++) {
+                        if(streetArray[i] != '') {
+                            street += streetArray[i] + ' ';
+                        }
+                    }
+
+                    return street.trim();
+                }
+
+                return street;
+            },
+
+            getGrandTotal: function() {
+                if (quote.totals()) {
+                    return Math.round(parseFloat(quote.totals()['base_grand_total']) * 100);
+                }
+            },
+
+            reSize: function () {
+                if ($('#novalnet_iframe').length > 0) {
+                    NovalnetUtility.setCreditCardFormHeight();
+                }
+            },
+
+            validate: function () {
+                if (this.getPaymentToken()) {
+                    return true;
+                } else {
+                    if ($('#' + this.getCode() + '_gethash').val() != 0 && $('#' + this.getCode() + '_hash').val() != '') {
+                        $('#' + this.getCode() + '_gethash').val(0);
+                        return true;
+                    } else {
+                        $('#' + this.getCode() + '_gethash').val(1);
+                        NovalnetUtility.getPanHash();
+                    }
+                }
+
+                return false;
+            },
+        };
+
+        $(document).on('click', '#co-payment-form input[type="radio"]', function (event) {
+            if (this.value == "novalnetCc") {
+                nn_cc.reSize();
+            }
+        });
+
+        $(document).on('click', '.action-update, #billing-address-same-as-shipping-novalnetCc', function (event) {
+            if ($('.payment-method-title input[type="radio"]:checked').val() == "novalnetCc") {
+                nn_cc.initIframe();
+                if($('#novalnetCc_new_account').is(':checked'))
+                {
+                    $("#novalnet_form_cc").show();
+                }
+            }
+        });
+
+        $(document).ready(function () {
+            $(window).resize(function () {
+                nn_cc.reSize();
+            });
+        });
+
+        return Component.extend(nn_cc);
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetEps.js b/view/frontend/web/js/view/payment/method-renderer/novalnetEps.js
new file mode 100755
index 0000000..e7a8cb4
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetEps.js
@@ -0,0 +1,83 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList'
+    ],
+    function (
+        $,
+        url,
+        $t,
+        Component,
+        redirectOnSuccessAction,
+        redirectURLAction,
+        globalMessageList
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetEps'
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                this.redirectAfterPlaceOrder = false;
+
+                redirectURLAction().done(function (redirectUrl) {
+                    window.location.replace(redirectUrl);
+                }).fail(function (xhr, ajaxOptions, thrownError) {
+                    globalMessageList.addErrorMessage({
+                        message: $t(thrownError)
+                    });
+                    window.location.replace(url.build('checkout/cart'));
+                });
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetGiropay.js b/view/frontend/web/js/view/payment/method-renderer/novalnetGiropay.js
new file mode 100755
index 0000000..3700db9
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetGiropay.js
@@ -0,0 +1,83 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList'
+    ],
+    function (
+        $,
+        url,
+        $t,
+        Component,
+        redirectOnSuccessAction,
+        redirectURLAction,
+        globalMessageList
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetGiropay'
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                this.redirectAfterPlaceOrder = false;
+
+                redirectURLAction().done(function (redirectUrl) {
+                    window.location.replace(redirectUrl);
+                }).fail(function (xhr, ajaxOptions, thrownError) {
+                    globalMessageList.addErrorMessage({
+                        message: $t(thrownError)
+                    });
+                    window.location.replace(url.build('checkout/cart'));
+                });
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetGooglepay.js b/view/frontend/web/js/view/payment/method-renderer/novalnetGooglepay.js
new file mode 100755
index 0000000..65575cb
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetGooglepay.js
@@ -0,0 +1,359 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Ui/js/modal/alert',
+        'Magento_Checkout/js/model/quote',
+        'mage/translate',
+        'Magento_Checkout/js/model/totals',
+        'mage/url',
+        'mage/storage',
+        'Magento_Customer/js/customer-data',
+        'Magento_Checkout/js/model/cart/totals-processor/default',
+        'Magento_Checkout/js/model/payment/additional-validators',
+        'novalnetUtilityJs',
+        'novalnetPaymentJs'
+    ],
+    function(
+        $,
+        Component,
+        alert,
+        quote,
+        $t,
+        totals,
+        urlBuilder,
+        storage,
+        customerData,
+        totalsDefaultProvider,
+        additionalValidators
+    ) {
+        "use strict";
+        let nn_googlepay = {
+            /**
+             * Default's
+             */
+            defaults: {
+                template: {
+                    name: "Novalnet_Payment/payment/novalnetGooglepay"
+                },
+                novalnetGooglepay: "GOOGLEPAY",
+                canShowPaymentMethod: "",
+                googlePayInstance: NovalnetPayment().createPaymentObject()
+            },
+
+            /**
+             * Initialize observables
+             */
+            initObservable: function () {
+                this._super().observe(["canShowPaymentMethod"]);
+                let cart = customerData.get("cart");
+                cart.subscribe(this.refreshCheckout, this);
+                return this;
+            },
+
+            /**
+             * Refresh quote grand total on cart change
+             */
+            refreshCheckout: function() {
+                let cart = customerData.get("cart");
+                if (cart().summary_count && cart().summary_count > 0) {
+                    totalsDefaultProvider.estimateTotals(quote.shippingAddress());
+                }
+            },
+
+            /**
+             * Returns display items for payment sheet
+             *
+             * @return array
+             */
+            getLineItems: function() {
+                let items = totals.totals().items,
+                    currencyRate = window.checkoutConfig.quoteData.base_to_quote_rate,
+                    lineItem = [],
+                    i;
+
+                if (items.length) {
+                    for( i = 0; i < items.length; i++ ) {
+                        lineItem[i] = {
+                                label: items[i].name + " (" + Math.round(parseFloat(items[i].qty)) + " x " + Number.parseFloat(items[i].base_price).toFixed(2) + ")",
+                                type: "SUBTOTAL",
+                                amount: Math.round((parseFloat(items[i].base_row_total)) * 100) + ""
+                            };
+                    }
+                }
+
+                if (totals.totals().hasOwnProperty("tax_amount")) {
+                    let tax = Math.round( (parseFloat(totals.totals().tax_amount) / parseFloat(currencyRate)) * 100);
+
+                    if(parseInt(tax) > 0) {
+                        lineItem.push({label: "Tax", type: "SUBTOTAL", amount: tax + ""});
+                    }
+                }
+
+                if (totals.totals().hasOwnProperty("discount_amount")) {
+                    let discountTotal = (Math.round( (parseFloat(totals.totals().discount_amount) / parseFloat(currencyRate)) * 100)).toString(),
+                        discount = ((Math.sign(discountTotal)) == -1 ) ? discountTotal.substr(1) : discountTotal;
+
+                    if(parseInt(discount) > 0) {
+                        lineItem.push({label: "Discount", type: "SUBTOTAL", amount: "-" + discount});
+                    }
+                }
+
+                if (totals.totals().hasOwnProperty("shipping_amount") && !quote.isVirtual()) {
+                    let shippingTitle = "Shipping";
+                    if (totals.totals().hasOwnProperty("total_segments")) {
+                        let segments = totals.totals().total_segments;
+                        $.each(segments, function (index, value) {
+                            if (value.code == "shipping") {
+                                shippingTitle = value.title
+                                shippingTitle = shippingTitle.replace("Shipping & Handling", "")
+                            }
+                        });
+                    }
+
+                    if (shippingTitle == "") {
+                        shippingTitle = "Shipping";
+                    }
+
+                    let Shipping = Math.round( (parseFloat(totals.totals().shipping_amount) / parseFloat(currencyRate)) * 100),
+                        ShippingItem = {label: shippingTitle, type: "SUBTOTAL", amount: Shipping + ''};
+                        lineItem.push(ShippingItem);
+                }
+
+                return lineItem;
+            },
+
+            /**
+             * Returns Grand Total
+             */
+            getGrandTotal: function() {
+                if (quote.totals()) {
+                    return Math.round(parseFloat(quote.totals().base_grand_total) * 100);
+                }
+            },
+
+            /**
+             * To check the data is JSON
+             *
+             * @return bool
+             */
+            isJson: function(data) {
+                try {
+                    JSON.parse(data);
+                    return true;
+                } catch (e) {
+                    return false;
+                }
+            },
+
+            /**
+             * Returns payment method instructions
+             *
+             * @return string
+             */
+            getInstructions: function() {
+                return window.checkoutConfig.payment[this.item.method].instructions;
+            },
+
+            /**
+             * Returns payment method logo
+             *
+             * @return string
+             */
+            getLogo: function() {
+                return window.checkoutConfig.payment[this.item.method].logo;
+            },
+
+            /**
+             * Check payment availability
+             *
+             * @return object Promise
+             */
+            checkAvailability: async function() {
+                const self = this,
+                    response = new Promise(function(resolve, reject) {
+                        self.googlePayInstance.setPaymentIntent(self.paymentRequest());
+                        self.googlePayInstance.isPaymentMethodAvailable(function(canShowButton) {
+                            resolve(canShowButton);
+                        });
+                    }),
+                    isAllowed = await response.then(function(result) {
+                        return result;
+                    });
+
+                return (isAllowed == true) ? self.canShowPaymentMethod(1) : self.canShowPaymentMethod(0);
+            },
+
+            /**
+             * Can show google pay payment
+             *
+             * @return bool
+             */
+            isGooglePayAllowed: function() {
+                var self = this;
+                self.checkAvailability();
+                return self.canShowPaymentMethod();
+            },
+
+            /**
+             * Init GooglePay button
+             */
+            initGooglePay: function() {
+                const self = this;
+
+                $("#novalnet_guest_checkoutdiv").css({"display" : "none"});
+                self.googlePayInstance.setPaymentIntent(self.paymentRequest());
+                self.googlePayInstance.isPaymentMethodAvailable(function(canShowGooglePay) {
+                    if (canShowGooglePay) {
+                        $("#novalnet_googlepay_checkoutdiv").empty();
+                        self.googlePayInstance.addPaymentButton("#novalnet_googlepay_checkoutdiv");
+                        $("#novalnet_googlepay_checkoutdiv").find("button").css({'width': "100%"});
+                    }
+                });
+            },
+
+            /**
+             * Returns payment testmode status
+             *
+             * @return string
+             */
+            getTestmode: function() {
+                return window.checkoutConfig.payment[this.item.method].testmode;
+            },
+
+            /**
+             * Throw's alert on payment error
+             */
+            throwError: function(message) {
+                alert({
+                    title: $t("Error"),
+                    content: message
+                });
+            },
+
+            /**
+             * GooglePay payment request
+             */
+            paymentRequest: function(btnWidth = 0) {
+                const self = this,
+                    requestData = window.checkoutConfig.payment.novalnetGooglepay;
+
+                return {
+                    clientKey: requestData.clientKey,
+                    paymentIntent: {
+                        merchant: {
+                            countryCode: requestData.countryCode,
+                            paymentDataPresent: false,
+                            partnerId: requestData.partnerId
+                        },
+                        transaction: {
+                            amount: self.getGrandTotal(),
+                            currency: requestData.currencyCode,
+                            paymentMethod: self.novalnetGooglepay,
+                            environment: (requestData.testmode == 1) ? "SANDBOX" : "PRODUCTION",
+                            setPendingPayment: quote.isVirtual() ? true : requestData.is_pending,
+                            enforce3d: requestData.enforce3d
+                        },
+                        order: {
+                            paymentDataPresent: false,
+                            merchantName: requestData.sellerName,
+                            lineItems: self.getLineItems(),
+                            billing: {
+                                requiredFields: ["postalAddress", "phone", "email"]
+                            }
+                        },
+                        button: {
+                            style: requestData.btnTheme,
+                            locale: requestData.langCode,
+                            type: requestData.btnType,
+                            boxSizing: "fill",
+                            dimensions: {
+                                width: btnWidth,
+                                height: parseInt(requestData.btnHeight)
+                            }
+                        },
+                        callbacks: {
+                            onProcessCompletion: function (response, bookingResult) {
+                                if (response.result.status == "SUCCESS") {
+                                    let serviceUrl = urlBuilder.build("/rest/V1/novalnet/payment/placeOrder", {}),
+                                        payload = {
+                                            paymentData: {
+                                                methodCode: "novalnetGooglepay",
+                                                amount: response.transaction.amount,
+                                                doRedirect: response.transaction.doRedirect,
+                                                token: response.transaction.token,
+                                                cardBrand: response.transaction.paymentData.cardBrand,
+                                                lastFour: response.transaction.paymentData.lastFour
+                                            },
+                                            billingAddress: {},
+                                            shippingAddress: {},
+                                            shippingMethod: {},
+                                            isPaymentPage: true
+                                        };
+
+                                    if (response.order.hasOwnProperty("billing") && response.order.billing.hasOwnProperty("contact")) {
+                                        payload.billingAddress = response.order.billing.contact;
+                                    }
+
+                                    storage.post( serviceUrl, JSON.stringify(payload)).done(function(response) {
+                                        if (self.isJson(response)) {
+                                            response = JSON.parse(response);
+                                        }
+                                        $('body').trigger('processStart');
+                                        window.location.replace(response.redirectUrl);
+                                        bookingResult({status: "SUCCESS", statusText: ""});
+                                    }).fail(function(xhr, textStatus, errorThrown) {
+                                        $('body').trigger('processStop');
+                                        const errMsg = (xhr.responseJSON.message) ? xhr.responseJSON.message : errorThrown;
+                                        self.throwError(errMsg);
+                                        bookingResult({status: "FAILURE", statusText: errMsg});
+                                    });
+                                } else {
+                                    $('body').trigger('processStop');
+                                    bookingResult({status: "FAILURE", statusText: ""});
+                                }
+                            }
+                        },
+                        onPaymentButtonClicked: function(clickResult) {
+                            clickResult({status: "SUCCESS"});
+                        }
+                    }
+                };
+            }
+        };
+
+        $(document).on("click", '#co-payment-form input[type="radio"]', function() {
+            if(this.value == "novalnetGooglepay") {
+                const googlePayInstance = NovalnetPayment().createPaymentObject();
+                googlePayInstance.setPaymentIntent(nn_googlepay.paymentRequest());
+                googlePayInstance.isPaymentMethodAvailable(function(canShowGooglePay) {
+                    if (canShowGooglePay) {
+                        $("#novalnet_googlepay_checkoutdiv").empty();
+                        googlePayInstance.addPaymentButton("#novalnet_googlepay_checkoutdiv");
+                        $("#novalnet_googlepay_checkoutdiv").find("button").css({'width': "100%"});
+                    }
+                });
+            }
+        });
+
+        return Component.extend(nn_googlepay);
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetIdeal.js b/view/frontend/web/js/view/payment/method-renderer/novalnetIdeal.js
new file mode 100755
index 0000000..aa846f3
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetIdeal.js
@@ -0,0 +1,83 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList'
+    ],
+    function (
+        $,
+        url,
+        $t,
+        Component,
+        redirectOnSuccessAction,
+        redirectURLAction,
+        globalMessageList
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetIdeal'
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                this.redirectAfterPlaceOrder = false;
+
+                redirectURLAction().done(function (redirectUrl) {
+                    window.location.replace(redirectUrl);
+                }).fail(function (xhr, ajaxOptions, thrownError) {
+                    globalMessageList.addErrorMessage({
+                        message: $t(thrownError)
+                    });
+                    window.location.replace(url.build('checkout/cart'));
+                });
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetInvoice.js b/view/frontend/web/js/view/payment/method-renderer/novalnetInvoice.js
new file mode 100755
index 0000000..714b6bd
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetInvoice.js
@@ -0,0 +1,108 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'Magento_Checkout/js/model/quote',
+        'Magento_Checkout/js/checkout-data',
+        'Magento_Checkout/js/action/select-payment-method',
+        'Magento_Checkout/js/view/payment/default'
+    ],
+    function (
+        $,
+        quote,
+        checkoutData,
+        selectPaymentMethodAction,
+        Component
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: {
+                    name: 'Novalnet_Payment/payment/novalnetInvoice',
+                    afterRender: function (renderedNodesArray, data) {
+                        data.displayPayment();
+                    },
+                },
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            },
+             
+            displayPayment: function () {
+                if ($('input[id="novalnetInvoice"][name="payment[method]"]').length && $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').length) {
+                    if (JSON.stringify(quote.billingAddress()) == JSON.stringify(quote.shippingAddress()) || quote.isVirtual()) {
+                        if ($('input[id="novalnetInvoice"][name="payment[method]"]:visible').length) {
+                            $('input[id="novalnetInvoice"][name="payment[method]"]').closest('.payment-method').hide();
+                        }
+                        if ($('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]:hidden').length) {
+                            $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').closest('.payment-method').show();
+                            if (checkoutData.getSelectedPaymentMethod() == 'novalnetInvoice') {
+                                var methodData = {
+                                    'method': 'novalnetInvoiceGuarantee',
+                                    'additional_data': {}
+                                };
+                                selectPaymentMethodAction(methodData);
+                                checkoutData.setSelectedPaymentMethod(methodData.method);
+                            }
+                        }
+                    } else {
+                        if ($('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]:visible').length) {
+                            $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').closest('.payment-method').hide();
+                        }
+                        if ($('input[id="novalnetInvoice"][name="payment[method]"]:hidden').length) {
+                            $('input[id="novalnetInvoice"][name="payment[method]"]').closest('.payment-method').show();
+                            if (checkoutData.getSelectedPaymentMethod() == 'novalnetInvoiceGuarantee') {
+                                var methodData = {
+                                    'method': 'novalnetInvoice',
+                                    'additional_data': {}
+                                };
+                                selectPaymentMethodAction(methodData);
+                                checkoutData.setSelectedPaymentMethod(methodData.method);
+                            }
+                        }
+                    }
+                } else if (($('input[id="novalnetInvoice"][name="payment[method]"]').length && !$('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').length)) {
+                    $('input[id="novalnetInvoice"][name="payment[method]"]').closest('.payment-method').show();
+                } else if ((!$('input[id="novalnetInvoice"][name="payment[method]"]').length && $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').length)) {
+                    $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').closest('.payment-method').show();
+                }
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetInvoiceGuarantee.js b/view/frontend/web/js/view/payment/method-renderer/novalnetInvoiceGuarantee.js
new file mode 100755
index 0000000..9649b41
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetInvoiceGuarantee.js
@@ -0,0 +1,164 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/model/quote',
+        'Magento_Checkout/js/checkout-data',
+        'Magento_Checkout/js/action/select-payment-method',
+        'mage/validation',
+        'novalnetUtilityJs'
+    ],
+    function (
+        $,
+        Component,
+        quote,
+        checkoutData,
+        selectPaymentMethodAction,
+    ) {
+        'use strict';
+
+        var current_date = new Date();
+        var max_year = current_date.getFullYear() - 18;
+        var min_year = current_date.getFullYear() - 91;
+        var years_range = [];
+        for(var year = max_year; year >= min_year; year--) {
+            years_range.push(String(year));
+        }
+
+        return Component.extend({
+            defaults: {
+                template: {
+                    name: 'Novalnet_Payment/payment/novalnetInvoiceGuarantee',
+                    afterRender: function (renderedNodesArray, data) {
+                        data.displayPayment();
+                    }
+                },
+            },
+            currentBillingAddress: quote.billingAddress,
+
+            getData: function () {
+                return {
+                    'method': this.item.method,
+                    'additional_data': {
+                        'novalnetInvoiceGuarantee_dob': $('#' + this.getCode() + '_dob').val(),
+                    }
+                };
+            },
+
+            displayPayment: function () {
+                if ($('input[id="novalnetInvoice"][name="payment[method]"]').length && $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').length) {
+                    if (JSON.stringify(quote.billingAddress()) == JSON.stringify(quote.shippingAddress()) || quote.isVirtual()) {
+                        if ($('input[id="novalnetInvoice"][name="payment[method]"]:visible').length) {
+                            $('input[id="novalnetInvoice"][name="payment[method]"]').closest('.payment-method').hide();
+                        }
+                        if ($('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]:hidden').length) {
+                            $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').closest('.payment-method').show();
+                            if (checkoutData.getSelectedPaymentMethod() == 'novalnetInvoice') {
+                                var methodData = {
+                                    'method': 'novalnetInvoiceGuarantee',
+                                    'additional_data': {}
+                                };
+                                selectPaymentMethodAction(methodData);
+                                checkoutData.setSelectedPaymentMethod(methodData.method);
+                            }
+                        }
+                    } else {
+                        if ($('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]:visible').length) {
+                            $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').closest('.payment-method').hide();
+                        }
+                        if ($('input[id="novalnetInvoice"][name="payment[method]"]:hidden').length) {
+                            $('input[id="novalnetInvoice"][name="payment[method]"]').closest('.payment-method').show();
+                            if (checkoutData.getSelectedPaymentMethod() == 'novalnetInvoiceGuarantee') {
+                                var methodData = {
+                                    'method': 'novalnetInvoice',
+                                    'additional_data': {}
+                                };
+                                selectPaymentMethodAction(methodData);
+                                checkoutData.setSelectedPaymentMethod(methodData.method);
+                            }
+                        }
+                    }
+                }
+                if (($('input[id="novalnetInvoice"][name="payment[method]"]').length && !$('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').length)) {
+                    $('input[id="novalnetInvoice"][name="payment[method]"]').closest('.payment-method').show();
+                }
+                if ((!$('input[id="novalnetInvoice"][name="payment[method]"]').length && $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').length)) {
+                    $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').closest('.payment-method').show();
+                }
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            },
+
+            /**
+             * get DOB
+             */
+            getDob: function () {
+                if (window.checkoutConfig.customerData.dob) {
+                    var date = new Date(window.checkoutConfig.customerData.dob);
+                    var newDate = ("0" + date.getDate()).slice(-2)+'.'+("0" + (date.getMonth() + 1)).slice(-2)+'.'+date.getFullYear();
+                    return newDate;
+                }
+            },
+
+            validate: function () {
+                var form = 'form[data-role=novalnetInvoiceGuarantee]';
+                return $(form).validation() && $(form).validation('isValid');
+            },
+
+            validateCompany: function (company) {
+                if (company != null && window.checkoutConfig.payment[this.getCode()].allow_b2b_customer == 1) {
+                    if (!NovalnetUtility.isValidCompanyName(company)) {
+                        return false;
+                    } else {
+                        return true;
+                    }
+                }
+                return false;
+            },
+
+            allowOnlyNumber: function (data, event) {
+                if(event.charCode < 48 || event.charCode > 57) {
+                    return false;
+                }
+                return true;
+            },
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetInvoiceInstalment.js b/view/frontend/web/js/view/payment/method-renderer/novalnetInvoiceInstalment.js
new file mode 100755
index 0000000..0b8cae7
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetInvoiceInstalment.js
@@ -0,0 +1,189 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/translate',
+        'mage/storage',
+        'Magento_Checkout/js/model/url-builder',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/model/quote',
+        'Magento_Catalog/js/price-utils',
+        'mage/validation',
+        'novalnetUtilityJs'
+    ],
+    function (
+        $,
+        $t,
+        storage,
+        urlBuilder,
+        Component,
+        quote,
+        priceUtils
+    ) {
+        'use strict';
+
+        $(document).on('change','#novalnetInvoiceInstalment_cycle',function(){
+            var orderTotal = quote.totals()['base_grand_total'];
+            var cycle = $(this).val();
+            if (cycle == null) {
+                return;
+            }
+            var cycleAmount;
+            var lastCycleAmount;
+            storage.get(
+                urlBuilder.createUrl('/novalnet/payment/instalment_cycle/' + orderTotal + '/' + cycle, {})
+            ).done(function (response) {
+                response = $.parseJSON(response);
+                cycleAmount = response.cycle_amount;
+                lastCycleAmount = response.last_cycle;
+                var html = '<table class="instalment-details-table"><thead><tr><th>' + $.mage.__("Instalment cycles") + '</th><th>' + $.mage.__("Instalment Amount") + '</th></thead><tbody>';
+                var j = 0;
+                var number_text = '';
+                for (var i = 1; i <= cycle; i++) {
+                    if (i != cycle) {
+                        html += '<tr><td>'+ i + '</td><td>' + priceUtils.formatPrice(cycleAmount, quote.getPriceFormat()) + '</td></tr>';
+                    } else if (i == cycle) {
+                        html += '<tr><td>'+ i + '</td><td>' + priceUtils.formatPrice(lastCycleAmount, quote.getPriceFormat()) + '</td></tr>';
+                    }
+                    j++;
+                }
+
+                $('.novalnetInvoiceInstalment-details').html(html);
+            });
+        });
+
+        var current_date = new Date();
+        var max_year = current_date.getFullYear() - 18;
+        var min_year = current_date.getFullYear() - 91;
+        var years_range = [];
+        for(var year = max_year; year >= min_year; year--) {
+            years_range.push(String(year));
+        }
+
+        return Component.extend({
+            defaults: {
+                template: {
+                    name: 'Novalnet_Payment/payment/novalnetInvoiceInstalment',
+                    afterRender: function (renderedNodesArray, data) {
+                    }
+                },
+            },
+            currentBillingAddress: quote.billingAddress,
+            totals: quote.getTotals(),
+
+            getData: function () {
+                return {
+                    'method': this.item.method,
+                    'additional_data': {
+                        'novalnetInvoiceInstalment_cycle': $('#' + this.getCode() + '_cycle').val(),
+                        'novalnetInvoiceInstalment_dob': $('#' + this.getCode() + '_dob').val(),
+                    }
+                };
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            },
+
+            /**
+             * get DOB
+             */
+            getDob: function () {
+                if (window.checkoutConfig.customerData.dob) {
+                    var date = new Date(window.checkoutConfig.customerData.dob);
+                    var newDate = ("0" + date.getDate()).slice(-2)+'.'+("0" + (date.getMonth() + 1)).slice(-2)+'.'+date.getFullYear();
+                    return newDate;
+                }
+            },
+
+            validate: function () {
+                var form = 'form[data-role=novalnetInvoiceInstalment]';
+                return $(form).validation() && $(form).validation('isValid');
+            },
+
+            validateCompany: function (company) {
+                if (company != null && window.checkoutConfig.payment[this.getCode()].allow_b2b_customer == 1) {
+                    if (!NovalnetUtility.isValidCompanyName(company)) {
+                        return false;
+                    } else {
+                        return true;
+                    }
+                }
+                return false;
+            },
+
+            /**
+             * @return {*|String}
+             */
+            getValue: function () {
+                var price = 0;
+
+                if (this.totals()) {
+                    price = quote.totals()['base_grand_total'];
+                }
+
+                return priceUtils.formatPrice(price, quote.getPriceFormat());
+            },
+
+            getInstalmentOptions: function () {
+                var orderTotal = quote.totals()['base_grand_total'];
+                storage.get(
+                    urlBuilder.createUrl('/novalnet/payment/instalment_options/'+ this.getCode() + '/' + orderTotal, {})
+                ).done(function (response) {
+                    var allCycles = $.parseJSON(response);
+                    var tariffField = $('#novalnetInvoiceInstalment_cycle');
+                    tariffField.find('option').remove();
+                    $.each(allCycles, function(id, value) {
+                        if (0 == $('#novalnetInvoiceInstalment_cycle[value='+value.instalment_value+']').length) {
+                            tariffField.append(
+                                $('<option></option>').attr('value', value.instalment_value).text(value.instalment_key)
+                            );
+                        }
+                    });
+                    $('#novalnetInvoiceInstalment_cycle').trigger('change');
+                });
+            },
+
+            allowOnlyNumber: function (data, event) {
+                if(event.charCode < 48 || event.charCode > 57) {
+                    return false;
+                }
+                return true;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetMultibanco.js b/view/frontend/web/js/view/payment/method-renderer/novalnetMultibanco.js
new file mode 100755
index 0000000..c594e05
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetMultibanco.js
@@ -0,0 +1,52 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'Magento_Checkout/js/view/payment/default'
+    ],
+    function (Component) {
+        'use strict';
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetMultibanco'
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetOnlineBanktransfer.js b/view/frontend/web/js/view/payment/method-renderer/novalnetOnlineBanktransfer.js
new file mode 100755
index 0000000..763d4f8
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetOnlineBanktransfer.js
@@ -0,0 +1,83 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList'
+    ],
+    function (
+        $,
+        url,
+        $t,
+        Component,
+        redirectOnSuccessAction,
+        redirectURLAction,
+        globalMessageList
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetOnlineBanktransfer'
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                this.redirectAfterPlaceOrder = false;
+
+                redirectURLAction().done(function (redirectUrl) {
+                    window.location.replace(redirectUrl);
+                }).fail(function (xhr, ajaxOptions, thrownError) {
+                    globalMessageList.addErrorMessage({
+                        message: $t(thrownError)
+                    });
+                    window.location.replace(url.build('checkout/cart'));
+                });
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetPaypal.js b/view/frontend/web/js/view/payment/method-renderer/novalnetPaypal.js
new file mode 100755
index 0000000..2c18e6c
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetPaypal.js
@@ -0,0 +1,243 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/storage',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/model/url-builder',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList',
+        'Magento_Customer/js/model/customer',
+        'Magento_Ui/js/modal/alert',
+        'Magento_Ui/js/modal/modal',
+        'mage/validation'
+    ],
+    function (
+        $,
+        url,
+        storage,
+        $t,
+        Component,
+        urlBuilder,
+        redirectOnSuccessAction,
+        redirectURLAction,
+        globalMessageList,
+        customer,
+        alert,
+        modal
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: {
+                    name: 'Novalnet_Payment/payment/novalnetPaypal',
+                    afterRender: function (renderedNodesArray, data) {
+                        data.displayForm();
+                    }
+                },
+                novalnetPaymentToken: ''
+            },
+
+            initObservable: function () {
+                this._super()
+                    .observe(
+                        [
+                        'novalnetPaymentToken'
+                        ]
+                    );
+                this.novalnetPaymentToken.subscribe(this.onAccountChange, this);
+                this.novalnetPaymentToken(window.checkoutConfig.payment[this.getCode()].tokenId);
+
+                return this;
+            },
+
+            onAccountChange: function (selectedAccount) {
+                if (selectedAccount == 'new_account') {
+                    $('#' + this.getCode() + '_store_payment_container').show();
+                } else {
+                    $('#' + this.getCode() + '_store_payment_container').hide();
+                }
+            },
+
+            displayForm: function () {
+                if ((window.checkoutConfig.payment[this.getCode()].storePayment != '1') || (window.checkoutConfig.payment[this.getCode()].storedPayments.length == '0')) {
+                    this.onAccountChange('new_account');
+                } else {
+                    this.onAccountChange(window.checkoutConfig.payment[this.getCode()].tokenId);
+                }
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                this.redirectAfterPlaceOrder = false;
+
+                redirectURLAction().done(function (redirectUrl) {
+                    window.location.replace(redirectUrl);
+                }).fail(function (xhr, ajaxOptions, thrownError) {
+                    globalMessageList.addErrorMessage({
+                        message: $t(thrownError)
+                    });
+                    window.location.replace(url.build('checkout/cart'));
+                });
+            },
+
+            getData: function () {
+                return {
+                    'method': this.item.method,
+                    'additional_data': {
+                        'novalnetPaypal_create_token': this.canStorePayment(),
+                        'novalnetPaypal_token': this.getPaymentToken()
+                    }
+                };
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            },
+
+            /**
+             * check can store payment reference
+             */
+            canStorePayment: function () {
+                if (!this.getPaymentToken()) {
+                    return ($('#' + this.getCode() + '_store_payment').prop("checked") == true);
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * check can show store payment
+             */
+            showStorePayment: function () {
+                if (window.checkoutConfig.payment[this.getCode()].storePayment == '1') {
+                    return customer.isLoggedIn();
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * get stored payments
+             */
+            getStoredPayments: function () {
+                if (window.checkoutConfig.payment[this.getCode()].storePayment == '1') {
+                    return window.checkoutConfig.payment[this.getCode()].storedPayments;
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * get payment token
+             */
+            getPaymentToken: function () {
+                if (this.novalnetPaymentToken() && this.novalnetPaymentToken() != 'new_account') {
+                    return this.novalnetPaymentToken();
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * remove payment token
+             */
+            removeToken: function (tokenId) {
+                var parent = this;
+
+                var options = {
+                    type: 'popup',
+                    modalClass: 'nntoken-remove-popup-modal',
+                    responsive: true,
+                    innerScroll: false,
+                    buttons: [{
+                        text: $t('No'),
+                        class: 'nntoken-cancel-remove-modal action tocart primary',
+                        click: function () {
+                            this.closeModal();
+                        }
+                    },
+                    {
+                        text: $t('Yes'),
+                        class: 'nntoken-confirm-remove-modal action tocart primary',
+                        click: function () {
+                            var button = this;
+                            storage.get(
+                                urlBuilder.createUrl('/novalnet/payment/remove_token/' + tokenId, {})
+                            ).done(function (response) {
+                                button.closeModal();
+                                if (response) {
+                                    $('a[nntoken-id=' + tokenId + ']').closest('.novalnet-payment-saved-payments').remove();
+                                    if ($('form#novalnetPaypal .novalnet-payment-saved-payments').length <= 0) {
+                                        $('form#novalnetPaypal .novalnet-payment-new_account').remove();
+                                    }
+                                    $('#novalnetPaypal_store_payment_container').show();
+                                    parent.novalnetPaymentToken('new_account');
+                                    window.location = window.location.hash ;
+                                    location.reload();
+                                } else {
+                                    alert({
+                                        content: $t('Novalnet Payment Token does not found')
+                                    });
+                                }
+                            }).fail(function (xhr, ajaxOptions, thrownError) {
+                                button.closeModal();
+                                alert({
+                                    content: $t(thrownError)
+                                });
+                            });
+                        }
+                    }]
+                };
+
+                // Initialize and Open popup
+                modal(options, $('#remove-nntoken-modal'));
+                $("#remove-nntoken-modal").modal("openModal");
+            },
+
+            validate: function () {
+                return true;
+            },
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetPostFinance.js b/view/frontend/web/js/view/payment/method-renderer/novalnetPostFinance.js
new file mode 100755
index 0000000..946fcc5
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetPostFinance.js
@@ -0,0 +1,83 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList'
+    ],
+    function (
+        $,
+        url,
+        $t,
+        Component,
+        redirectOnSuccessAction,
+        redirectURLAction,
+        globalMessageList
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetPostFinance'
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                this.redirectAfterPlaceOrder = false;
+
+                redirectURLAction().done(function (redirectUrl) {
+                    window.location.replace(redirectUrl);
+                }).fail(function (xhr, ajaxOptions, thrownError) {
+                    globalMessageList.addErrorMessage({
+                        message: $t(thrownError)
+                    });
+                    window.location.replace(url.build('checkout/cart'));
+                });
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetPostFinanceCard.js b/view/frontend/web/js/view/payment/method-renderer/novalnetPostFinanceCard.js
new file mode 100755
index 0000000..ecd4cae
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetPostFinanceCard.js
@@ -0,0 +1,83 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList'
+    ],
+    function (
+        $,
+        url,
+        $t,
+        Component,
+        redirectOnSuccessAction,
+        redirectURLAction,
+        globalMessageList
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetPostFinanceCard'
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                this.redirectAfterPlaceOrder = false;
+
+                redirectURLAction().done(function (redirectUrl) {
+                    window.location.replace(redirectUrl);
+                }).fail(function (xhr, ajaxOptions, thrownError) {
+                    globalMessageList.addErrorMessage({
+                        message: $t(thrownError)
+                    });
+                    window.location.replace(url.build('checkout/cart'));
+                });
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetPrepayment.js b/view/frontend/web/js/view/payment/method-renderer/novalnetPrepayment.js
new file mode 100755
index 0000000..ec700c8
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetPrepayment.js
@@ -0,0 +1,52 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'Magento_Checkout/js/view/payment/default'
+    ],
+    function (Component) {
+        'use strict';
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetPrepayment'
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetPrzelewy.js b/view/frontend/web/js/view/payment/method-renderer/novalnetPrzelewy.js
new file mode 100755
index 0000000..a773690
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetPrzelewy.js
@@ -0,0 +1,83 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList'
+    ],
+    function (
+        $,
+        url,
+        $t,
+        Component,
+        redirectOnSuccessAction,
+        redirectURLAction,
+        globalMessageList
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetPrzelewy'
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                this.redirectAfterPlaceOrder = false;
+
+                redirectURLAction().done(function (redirectUrl) {
+                    window.location.replace(redirectUrl);
+                }).fail(function (xhr, ajaxOptions, thrownError) {
+                    globalMessageList.addErrorMessage({
+                        message: $t(thrownError)
+                    });
+                    window.location.replace(url.build('checkout/cart'));
+                });
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetSepa.js b/view/frontend/web/js/view/payment/method-renderer/novalnetSepa.js
new file mode 100755
index 0000000..00321d5
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetSepa.js
@@ -0,0 +1,302 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/storage',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/model/url-builder',
+        'Magento_Customer/js/model/customer',
+        'Magento_Checkout/js/model/quote',
+        'Magento_Checkout/js/checkout-data',
+        'Magento_Checkout/js/action/select-payment-method',
+        'Magento_Ui/js/modal/alert',
+        'Magento_Ui/js/modal/modal',
+        'mage/validation',
+        'novalnetUtilityJs'
+    ],
+    function (
+        $,
+        storage,
+        $t,
+        Component,
+        urlBuilder,
+        customer,
+        quote,
+        checkoutData,
+        selectPaymentMethodAction,
+        alert,
+        modal
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: {
+                    name: 'Novalnet_Payment/payment/novalnetSepa',
+                    afterRender: function (renderedNodesArray, data) {
+                        data.displayPayment();
+                    },
+                },
+                sepaAccountNumber: '',
+                sepaBicCode: '',
+                novalnetPaymentToken: ''
+            },
+            currentBillingAddress: quote.billingAddress,
+
+            initObservable: function () {
+                this._super()
+                    .observe(
+                        [
+                        'sepaAccountNumber',
+                        'novalnetPaymentToken'
+                        ]
+                    );
+                this.novalnetPaymentToken.subscribe(this.onAccountChange, this);
+                this.novalnetPaymentToken(window.checkoutConfig.payment[this.getCode()].tokenId);
+
+                return this;
+            },
+
+            onAccountChange: function (selectedAccount) {
+                if (selectedAccount == 'new_account') {
+                    $("#novalnet_form_sepa").show();
+                } else {
+                    $("#novalnet_form_sepa").hide();
+                }
+            },
+
+            getData: function () {
+                return {
+                    'method': this.item.method,
+                    'additional_data': {
+                        'novalnetSepa_iban': this.getIBAN(),
+                        'novalnetSepa_bic': this.getBIC(),
+                        'novalnetSepa_create_token': this.canStorePayment(),
+                        'novalnetSepa_token': this.getPaymentToken()
+                    }
+                };
+            },
+
+            displayPayment: function () {
+                if ((window.checkoutConfig.payment[this.getCode()].storePayment != '1') || (window.checkoutConfig.payment[this.getCode()].storedPayments.length == 0)) {
+                    this.onAccountChange('new_account');
+                } else {
+                    this.onAccountChange(window.checkoutConfig.payment[this.getCode()].tokenId);
+                }
+                if (($('input[id="novalnetSepa"][name="payment[method]"]').length && $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').length)) {
+                    if (JSON.stringify(quote.billingAddress()) == JSON.stringify(quote.shippingAddress()) || quote.isVirtual()) {
+                        if ($('input[id="novalnetSepa"][name="payment[method]"]:visible').length) {
+                            $('input[id="novalnetSepa"][name="payment[method]"]').closest('.payment-method').hide();
+                        }
+                        if ($('input[id="novalnetSepaGuarantee"][name="payment[method]"]:hidden').length) {
+                            $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').closest('.payment-method').show();
+                            if (checkoutData.getSelectedPaymentMethod() == 'novalnetSepa') {
+                                var methodData = {
+                                    'method': 'novalnetSepaGuarantee',
+                                    'additional_data': {}
+                                };
+                                selectPaymentMethodAction(methodData);
+                                checkoutData.setSelectedPaymentMethod(methodData.method);
+                            }
+                        }
+                    } else {
+                        if ($('input[id="novalnetSepaGuarantee"][name="payment[method]"]:visible').length) {
+                            $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').closest('.payment-method').hide();
+                        }
+                        if ($('input[id="novalnetSepa"][name="payment[method]"]:hidden').length) {
+                            $('input[id="novalnetSepa"][name="payment[method]"]').closest('.payment-method').show();
+                            if (checkoutData.getSelectedPaymentMethod() == 'novalnetSepaGuarantee') {
+                                var methodData = {
+                                    'method': 'novalnetSepa',
+                                    'additional_data': {}
+                                };
+                                selectPaymentMethodAction(methodData);
+                                checkoutData.setSelectedPaymentMethod(methodData.method);
+                            }
+                        }
+                    }
+                } else if (($('input[id="novalnetSepa"][name="payment[method]"]').length && !$('input[id="novalnetSepaGuarantee"][name="payment[method]"]').length)) {
+                    $('input[id="novalnetSepa"][name="payment[method]"]').closest('.payment-method').show();
+                } else if ((!$('input[id="novalnetSepa"][name="payment[method]"]').length && $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').length)) {
+                    $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').closest('.payment-method').show();
+                }
+
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            },
+
+            isZeroAmountBooking: function () {
+                return window.checkoutConfig.payment[this.item.method].isZeroAmountBooking;
+            },
+
+            /**
+             * check can store payment reference
+             */
+            canStorePayment: function () {
+                if (!this.getPaymentToken()) {
+                    return ($('#' + this.getCode() + '_store_payment').prop("checked") == true);
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * check can show store payment
+             */
+            showStorePayment: function () {
+                if (window.checkoutConfig.payment[this.getCode()].storePayment == '1') {
+                    return customer.isLoggedIn();
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * get stored payments
+             */
+            getStoredPayments: function () {
+                if (window.checkoutConfig.payment[this.getCode()].storePayment == '1') {
+                    return window.checkoutConfig.payment[this.getCode()].storedPayments;
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * get payment token
+             */
+            getPaymentToken: function () {
+                if (this.novalnetPaymentToken() && this.novalnetPaymentToken() != 'new_account') {
+                    return this.novalnetPaymentToken();
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * remove payment token
+             */
+            removeToken: function (tokenId) {
+                var parent = this;
+
+                var options = {
+                    type: 'popup',
+                    modalClass: 'nntoken-remove-popup-modal',
+                    responsive: true,
+                    innerScroll: false,
+                    buttons: [{
+                        text: $t('No'),
+                        class: 'nntoken-cancel-remove-modal action tocart primary',
+                        click: function () {
+                            this.closeModal();
+                        }
+                    },
+                    {
+                        text: $t('Yes'),
+                        class: 'nntoken-confirm-remove-modal action tocart primary',
+                        click: function () {
+                            var button = this;
+                            storage.get(
+                                urlBuilder.createUrl('/novalnet/payment/remove_token/' + tokenId, {})
+                            ).done(function (response) {
+                                button.closeModal();
+                                if (response) {
+                                    $('a[nntoken-id=' + tokenId + ']').closest('.novalnet-payment-saved-payments').remove();
+                                    if ($('form#novalnetSepa .novalnet-payment-saved-payments').length <= 0) {
+                                        $('form#novalnetSepa .novalnet-payment-new_account').remove();
+                                    }
+                                    $('#novalnet_form_sepa').show();
+                                    parent.novalnetPaymentToken('new_account');
+                                    window.location = window.location.hash ;
+                                    location.reload();
+                                } else {
+                                    alert({
+                                        content: $t('Novalnet Payment Token does not found')
+                                    });
+                                }
+                            }).fail(function (xhr, ajaxOptions, thrownError) {
+                                button.closeModal();
+                                alert({
+                                    content: $t(thrownError)
+                                });
+                            });
+                        }
+                    }]
+                };
+
+                // Initialize and Open popup
+                modal(options, $('#remove-nntoken-modal'));
+                $("#remove-nntoken-modal").modal("openModal");
+            },
+
+            /**
+             * get IBAN
+             */
+            getIBAN: function () {
+                if (!this.getPaymentToken()) {
+                    return $('#' + this.getCode() + '_account_number').val();
+                }
+            },
+
+            /**
+             * get BIC
+             */
+            getBIC: function () {
+                if (!this.getPaymentToken()) {
+                    return $('#' + this.getCode() + '_bic_code').val();
+                }
+            },
+
+            validate: function () {
+                if (this.getPaymentToken()) {
+                    return true;
+                } else {
+                    var form = 'form[data-role=novalnetSepa]';
+                    return $(form).validation() && $(form).validation('isValid');
+                }
+            },
+
+            sepaMandateToggle: function () {
+                $('#sepa_mandate_details').toggle('slow');
+            },
+
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetSepaGuarantee.js b/view/frontend/web/js/view/payment/method-renderer/novalnetSepaGuarantee.js
new file mode 100755
index 0000000..e1e4923
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetSepaGuarantee.js
@@ -0,0 +1,332 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/storage',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/model/url-builder',
+        'Magento_Customer/js/model/customer',
+        'Magento_Checkout/js/model/quote',
+        'Magento_Checkout/js/checkout-data',
+        'Magento_Checkout/js/action/select-payment-method',
+        'Magento_Ui/js/modal/alert',
+        'Magento_Ui/js/modal/modal',
+        'mage/validation',
+        'novalnetUtilityJs'
+    ],
+    function (
+        $,
+        storage,
+        $t,
+        Component,
+        urlBuilder,
+        customer,
+        quote,
+        checkoutData,
+        selectPaymentMethodAction,
+        alert,
+        modal
+    ) {
+        'use strict';
+
+        var current_date = new Date();
+        var max_year = current_date.getFullYear() - 18;
+        var min_year = current_date.getFullYear() - 91;
+        var years_range = [];
+        for(var year = max_year; year >= min_year; year--) {
+            years_range.push(String(year));
+        }
+
+        return Component.extend({
+            defaults: {
+                template: {
+                    name: 'Novalnet_Payment/payment/novalnetSepaGuarantee',
+                    afterRender: function (renderedNodesArray, data) {
+                        data.displayPayment();
+                    }
+                },
+                sepaAccountNumber: '',
+                sepaBicCode: '',
+                novalnetPaymentToken: ''
+            },
+            currentBillingAddress: quote.billingAddress,
+
+            initObservable: function () {
+                this._super()
+                    .observe([
+                        'sepaAccountNumber',
+                        'novalnetPaymentToken'
+                    ]);
+                this.novalnetPaymentToken.subscribe(this.onAccountChange, this);
+                this.novalnetPaymentToken(window.checkoutConfig.payment[this.getCode()].tokenId);
+
+                return this;
+            },
+
+            onAccountChange: function (selectedAccount) {
+                if (selectedAccount == 'new_account') {
+                    $("#novalnet_form_sepa_guarantee").show();
+                } else {
+                    $("#novalnet_form_sepa_guarantee").hide();
+                }
+            },
+
+            getData: function () {
+                var CustomerDOB = $('#' + this.getCode() + '_dob').val();
+
+                return {
+                    'method': this.item.method,
+                    'additional_data': {
+                        'novalnetSepaGuarantee_iban': this.getIBAN(),
+                        'novalnetSepaGuarantee_bic': this.getBIC(),
+                        'novalnetSepaGuarantee_dob': CustomerDOB,
+                        'novalnetSepaGuarantee_create_token': this.canStorePayment(),
+                        'novalnetSepaGuarantee_token': this.getPaymentToken()
+                    }
+                };
+            },
+
+            displayPayment: function () {
+                if (window.checkoutConfig.payment[this.getCode()].storePayment != '1' || window.checkoutConfig.payment[this.getCode()].storedPayments.length == 0) {
+                    this.onAccountChange('new_account');
+                } else {
+                    this.onAccountChange(window.checkoutConfig.payment[this.getCode()].tokenId);
+                }
+                if (($('input[id="novalnetSepa"][name="payment[method]"]').length && $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').length)) {
+                    if (JSON.stringify(quote.billingAddress()) == JSON.stringify(quote.shippingAddress()) || quote.isVirtual()) {
+                        if ($('input[id="novalnetSepa"][name="payment[method]"]:visible').length) {
+                            $('input[id="novalnetSepa"][name="payment[method]"]').closest('.payment-method').hide();
+                        }
+                        if ($('input[id="novalnetSepaGuarantee"][name="payment[method]"]:hidden').length) {
+                            $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').closest('.payment-method').show();
+                            if (checkoutData.getSelectedPaymentMethod() == 'novalnetSepa') {
+                                var methodData = {
+                                    'method': 'novalnetSepaGuarantee',
+                                    'additional_data': {}
+                                };
+                                selectPaymentMethodAction(methodData);
+                                checkoutData.setSelectedPaymentMethod(methodData.method);
+                            }
+                        }
+                    } else {
+                        if ($('input[id="novalnetSepaGuarantee"][name="payment[method]"]:visible').length) {
+                            $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').closest('.payment-method').hide();
+                        }
+                        if ($('input[id="novalnetSepa"][name="payment[method]"]:hidden').length) {
+                            $('input[id="novalnetSepa"][name="payment[method]"]').closest('.payment-method').show();
+                            if (checkoutData.getSelectedPaymentMethod() == 'novalnetSepaGuarantee') {
+                                var methodData = {
+                                    'method': 'novalnetSepa',
+                                    'additional_data': {}
+                                };
+                                selectPaymentMethodAction(methodData);
+                                checkoutData.setSelectedPaymentMethod(methodData.method);
+                            }
+                        }
+                    }
+                } else if (($('input[id="novalnetSepa"][name="payment[method]"]').length && !$('input[id="novalnetSepaGuarantee"][name="payment[method]"]').length)) {
+                    $('input[id="novalnetSepa"][name="payment[method]"]').closest('.payment-method').show();
+                } else if ((!$('input[id="novalnetSepa"][name="payment[method]"]').length && $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').length)) {
+                    $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').closest('.payment-method').show();
+                }
+
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            },
+
+            /**
+             * check can store payment reference
+             */
+            canStorePayment: function () {
+                if (!this.getPaymentToken()) {
+                    return ($('#' + this.getCode() + '_store_payment').prop("checked") == true);
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * check can show store payment
+             */
+            showStorePayment: function () {
+                if (window.checkoutConfig.payment[this.getCode()].storePayment == '1') {
+                    return customer.isLoggedIn();
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * get stored payments
+             */
+            getStoredPayments: function () {
+                if (window.checkoutConfig.payment[this.getCode()].storePayment == '1') {
+                    return window.checkoutConfig.payment[this.getCode()].storedPayments;
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * get payment token
+             */
+            getPaymentToken: function () {
+                if (this.novalnetPaymentToken() && this.novalnetPaymentToken() != 'new_account') {
+                    return this.novalnetPaymentToken();
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * remove payment token
+             */
+            removeToken: function (tokenId) {
+                var parent = this;
+
+                var options = {
+                    type: 'popup',
+                    modalClass: 'nntoken-remove-popup-modal',
+                    responsive: true,
+                    innerScroll: false,
+                    buttons: [{
+                        text: $t('No'),
+                        class: 'nntoken-cancel-remove-modal action tocart primary',
+                        click: function () {
+                            this.closeModal();
+                        }
+                    },
+                    {
+                        text: $t('Yes'),
+                        class: 'nntoken-confirm-remove-modal action tocart primary',
+                        click: function () {
+                            var button = this;
+                            storage.get(
+                                urlBuilder.createUrl('/novalnet/payment/remove_token/' + tokenId, {})
+                            ).done(function (response) {
+                                button.closeModal();
+                                if (response) {
+                                    $('a[nntoken-id=' + tokenId + ']').closest('.novalnet-payment-saved-payments').remove();
+                                    if ($('form#novalnetSepaGuarantee .novalnet-payment-saved-payments').length <= 0) {
+                                        $('form#novalnetSepaGuarantee .novalnet-payment-new_account').remove();
+                                    }
+                                    $('#novalnet_form_sepa_guarantee').show();
+                                    parent.novalnetPaymentToken('new_account');
+                                    window.location = window.location.hash ;
+                                    location.reload();
+                                } else {
+                                    alert({
+                                        content: $t('Novalnet Payment Token does not found')
+                                    });
+                                }
+                            }).fail(function (xhr, ajaxOptions, thrownError) {
+                                button.closeModal();
+                                alert({
+                                    content: $t(thrownError)
+                                });
+                            });
+                        }
+                    }]
+                };
+
+                // Initialize and Open popup
+                modal(options, $('#remove-nntoken-modal'));
+                $("#remove-nntoken-modal").modal("openModal");
+            },
+
+            /**
+             * get IBAN
+             */
+            getIBAN: function () {
+                if (!this.getPaymentToken()) {
+                    return $('#' + this.getCode() + '_account_number').val();
+                }
+            },
+
+            /**
+             * get BIC
+             */
+            getBIC: function () {
+                if (!this.getPaymentToken()) {
+                    return $('#' + this.getCode() + '_bic_code').val();
+                }
+            },
+
+            /**
+             * get DOB
+             */
+            getDob: function () {
+                if (window.checkoutConfig.customerData.dob) {
+                    var date = new Date(window.checkoutConfig.customerData.dob);
+                    var newDate = ("0" + date.getDate()).slice(-2)+'.'+("0" + (date.getMonth() + 1)).slice(-2)+'.'+date.getFullYear();
+                    return newDate;
+                }
+            },
+
+            validate: function () {
+                var form = 'form[data-role=novalnetSepaGuarantee]';
+                return $(form).validation() && $(form).validation('isValid');
+            },
+
+            validateCompany: function (company) {
+                if (company != null && window.checkoutConfig.payment[this.getCode()].allow_b2b_customer == 1) {
+                    if (!NovalnetUtility.isValidCompanyName(company)) {
+                        return false;
+                    } else {
+                        return true;
+                    }
+                }
+                return false;
+            },
+
+            sepaGuaranteeMandateToggle: function () {
+                $('#sepa_guarantee_mandate_details').toggle('slow');
+            },
+
+            allowOnlyNumber: function (data, event) {
+                if(event.charCode < 48 || event.charCode > 57) {
+                    return false;
+                }
+                return true;
+            },
+
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetSepaInstalment.js b/view/frontend/web/js/view/payment/method-renderer/novalnetSepaInstalment.js
new file mode 100755
index 0000000..cfec61b
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetSepaInstalment.js
@@ -0,0 +1,362 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/storage',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/model/url-builder',
+        'Magento_Customer/js/model/customer',
+        'Magento_Checkout/js/model/quote',
+        'Magento_Ui/js/modal/alert',
+        'Magento_Ui/js/modal/modal',
+        'Magento_Catalog/js/price-utils',
+        'mage/validation',
+        'novalnetUtilityJs'
+    ],
+    function (
+        $,
+        storage,
+        $t,
+        Component,
+        urlBuilder,
+        customer,
+        quote,
+        alert,
+        modal,
+        priceUtils
+    ) {
+        'use strict';
+
+        $(document).on('change','#novalnetSepaInstalment_cycle',function(){
+            var orderTotal = quote.totals()['base_grand_total'];
+            var cycle = $(this).val();
+            if (cycle == null) {
+                return;
+            }
+            var cycleAmount;
+            var lastCycleAmount;
+            storage.get(
+                urlBuilder.createUrl('/novalnet/payment/instalment_cycle/' + orderTotal + '/' + cycle, {})
+            ).done(function (response) {
+                response = $.parseJSON(response);
+                cycleAmount = response.cycle_amount;
+                lastCycleAmount = response.last_cycle;
+                var html = '<table class="instalment-details-table"><thead><tr><th>' + $.mage.__("Instalment cycles") + '</th><th>' + $.mage.__("Instalment Amount") + '</th></thead><tbody>';
+                var j = 0;
+                var number_text = '';
+                for (var i = 1; i <= cycle; i++) {
+                    if (i != cycle) {
+                        html += '<tr><td>'+ i + '</td><td>' + priceUtils.formatPrice(cycleAmount, quote.getPriceFormat()) + '</td></tr>';
+                    } else if (i == cycle) {
+                        html += '<tr><td>'+ i + '</td><td>' + priceUtils.formatPrice(lastCycleAmount, quote.getPriceFormat()) + '</td></tr>';
+                    }
+                    j++;
+                }
+                $('.novalnetSepaInstalment-details').html(html);
+            });
+        });
+
+        var current_date = new Date();
+        var max_year = current_date.getFullYear() - 18;
+        var min_year = current_date.getFullYear() - 91;
+        var years_range = [];
+        for(var year = max_year; year >= min_year; year--) {
+            years_range.push(String(year));
+        }
+
+        return Component.extend({
+            defaults: {
+                template: {
+                    name: 'Novalnet_Payment/payment/novalnetSepaInstalment',
+                    afterRender: function (renderedNodesArray, data) {
+                        data.displayForm();
+                    }
+                },
+                sepaAccountNumber: '',
+                sepaBicCode: '',
+                novalnetPaymentToken: ''
+            },
+            currentBillingAddress: quote.billingAddress,
+            totals: quote.getTotals(),
+
+            initObservable: function () {
+                this._super()
+                    .observe([
+                        'sepaAccountNumber',
+                        'novalnetPaymentToken'
+                    ]);
+                this.novalnetPaymentToken.subscribe(this.onAccountChange, this);
+                this.novalnetPaymentToken(window.checkoutConfig.payment[this.getCode()].tokenId);
+
+                return this;
+            },
+
+            onAccountChange: function (selectedAccount) {
+                if (selectedAccount == 'new_account') {
+                    $("#novalnet_form_sepa_instalment").show();
+                } else {
+                    $("#novalnet_form_sepa_instalment").hide();
+                }
+            },
+
+            displayForm: function () {
+                if (window.checkoutConfig.payment[this.getCode()].storePayment != '1' || window.checkoutConfig.payment[this.getCode()].storedPayments.length == 0) {
+                    this.onAccountChange('new_account');
+                } else {
+                    this.onAccountChange(window.checkoutConfig.payment[this.getCode()].tokenId);
+                }
+            },
+
+            getData: function () {
+                var CustomerDOB = $('#' + this.getCode() + '_dob').val();
+
+                return {
+                    'method': this.item.method,
+                    'additional_data': {
+                        'novalnetSepaInstalment_iban': this.getIBAN(),
+                        'novalnetSepaInstalment_bic': this.getBIC(),
+                        'novalnetSepaInstalment_dob': CustomerDOB,
+                        'novalnetSepaInstalment_cycle': this.getInstalmentCycle(),
+                        'novalnetSepaInstalment_create_token': this.canStorePayment(),
+                        'novalnetSepaInstalment_token': this.getPaymentToken()
+                    }
+                };
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            },
+
+            /**
+             * check can store payment reference
+             */
+            canStorePayment: function () {
+                if (!this.getPaymentToken()) {
+                    return ($('#' + this.getCode() + '_store_payment').prop("checked") == true);
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * check can show store payment
+             */
+            showStorePayment: function () {
+                if (window.checkoutConfig.payment[this.getCode()].storePayment == '1') {
+                    return customer.isLoggedIn();
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * get stored payments
+             */
+            getStoredPayments: function () {
+                if (window.checkoutConfig.payment[this.getCode()].storePayment == '1') {
+                    return window.checkoutConfig.payment[this.getCode()].storedPayments;
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * get payment token
+             */
+            getPaymentToken: function () {
+                if (this.novalnetPaymentToken() && this.novalnetPaymentToken() != 'new_account') {
+                    return this.novalnetPaymentToken();
+                } else {
+                    return false;
+                }
+            },
+
+            /**
+             * remove payment token
+             */
+            removeToken: function (tokenId) {
+                var parent = this;
+
+                var options = {
+                    type: 'popup',
+                    modalClass: 'nntoken-remove-popup-modal',
+                    responsive: true,
+                    innerScroll: false,
+                    buttons: [{
+                        text: $t('No'),
+                        class: 'nntoken-cancel-remove-modal action tocart primary',
+                        click: function () {
+                            this.closeModal();
+                        }
+                    },
+                    {
+                        text: $t('Yes'),
+                        class: 'nntoken-confirm-remove-modal action tocart primary',
+                        click: function () {
+                            var button = this;
+                            storage.get(
+                                urlBuilder.createUrl('/novalnet/payment/remove_token/' + tokenId, {})
+                            ).done(function (response) {
+                                button.closeModal();
+                                if (response) {
+                                    $('a[nntoken-id=' + tokenId + ']').closest('.novalnet-payment-saved-payments').remove();
+                                    if ($('form#novalnetSepaInstalment .novalnet-payment-saved-payments').length <= 0) {
+                                        $('form#novalnetSepaInstalment .novalnet-payment-new_account').remove();
+                                    }
+                                    $('#novalnet_form_sepa_instalment').show();
+                                    parent.novalnetPaymentToken('new_account');
+                                    window.location = window.location.hash ;
+                                    location.reload();
+                                } else {
+                                    alert({
+                                        content: $t('Novalnet Payment Token does not found')
+                                    });
+                                }
+                            }).fail(function (xhr, ajaxOptions, thrownError) {
+                                button.closeModal();
+                                alert({
+                                    content: $t(thrownError)
+                                });
+                            });
+                        }
+                    }]
+                };
+
+                // Initialize and Open popup
+                modal(options, $('#remove-nntoken-modal'));
+                $("#remove-nntoken-modal").modal("openModal");
+            },
+
+            /**
+             * get IBAN
+             */
+            getIBAN: function () {
+                if (!this.getPaymentToken()) {
+                    return $('#' + this.getCode() + '_account_number').val();
+                }
+            },
+
+            /**
+             * get BIC
+             */
+            getBIC: function () {
+                if (!this.getPaymentToken()) {
+                    return $('#' + this.getCode() + '_bic_code').val();
+                }
+            },
+
+            /**
+             * get DOB
+             */
+            getDob: function () {
+                if (window.checkoutConfig.customerData.dob) {
+                    var date = new Date(window.checkoutConfig.customerData.dob);
+                    var newDate = ("0" + date.getDate()).slice(-2)+'.'+("0" + (date.getMonth() + 1)).slice(-2)+'.'+date.getFullYear();
+                    return newDate;
+                }
+            },
+
+            /**
+             * get InstalmentCycle
+             */
+            getInstalmentCycle: function () {
+                return $('#' + this.getCode() + '_cycle').val();
+            },
+
+            validate: function () {
+                var form = 'form[data-role=novalnetSepaInstalment]';
+                return $(form).validation() && $(form).validation('isValid');
+            },
+
+            validateCompany: function (company) {
+                if (company != null && window.checkoutConfig.payment[this.getCode()].allow_b2b_customer == 1) {
+                    if (!NovalnetUtility.isValidCompanyName(company)) {
+                        return false;
+                    } else {
+                        return true;
+                    }
+                }
+                return false;
+            },
+
+            sepaInstalmentMandateToggle: function () {
+                $('#sepa_instalment_mandate_details').toggle('slow');
+            },
+
+            /**
+             * @return {*|String}
+             */
+            getValue: function () {
+                var price = 0;
+
+                if (this.totals()) {
+                    price = quote.totals()['base_grand_total'];
+                }
+
+                return priceUtils.formatPrice(price, quote.getPriceFormat());
+            },
+
+            getInstalmentOptions: function () {
+                var orderTotal = quote.totals()['base_grand_total'];
+                storage.get(
+                    urlBuilder.createUrl('/novalnet/payment/instalment_options/'+ this.getCode() + '/' + orderTotal, {})
+                ).done(function (response) {
+                    var allCycles = $.parseJSON(response);
+                    var tariffField = $('#novalnetSepaInstalment_cycle');
+                    tariffField.find('option').remove();
+                    $.each(allCycles, function(id, value) {
+                        if (0 == $('#novalnetSepaInstalment_cycle[value='+value.instalment_value+']').length) {
+                            tariffField.append(
+                                $('<option></option>').attr('value', value.instalment_value).text(value.instalment_key)
+                            );
+                        }
+                    });
+                    $('#novalnetSepaInstalment_cycle').trigger('change');
+                });
+            },
+
+            allowOnlyNumber: function (data, event) {
+                if(event.charCode < 48 || event.charCode > 57) {
+                    return false;
+                }
+                return true;
+            },
+
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetTrustly.js b/view/frontend/web/js/view/payment/method-renderer/novalnetTrustly.js
new file mode 100755
index 0000000..5e9fd7c
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetTrustly.js
@@ -0,0 +1,83 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList'
+    ],
+    function (
+        $,
+        url,
+        $t,
+        Component,
+        redirectOnSuccessAction,
+        redirectURLAction,
+        globalMessageList
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetTrustly'
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                this.redirectAfterPlaceOrder = false;
+
+                redirectURLAction().done(function (redirectUrl) {
+                    window.location.replace(redirectUrl);
+                }).fail(function (xhr, ajaxOptions, thrownError) {
+                    globalMessageList.addErrorMessage({
+                        message: $t(thrownError)
+                    });
+                    window.location.replace(url.build('checkout/cart'));
+                });
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/method-renderer/novalnetWechatpay.js b/view/frontend/web/js/view/payment/method-renderer/novalnetWechatpay.js
new file mode 100755
index 0000000..b388ca5
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/novalnetWechatpay.js
@@ -0,0 +1,83 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'mage/url',
+        'mage/translate',
+        'Magento_Checkout/js/view/payment/default',
+        'Magento_Checkout/js/action/redirect-on-success',
+        'Novalnet_Payment/js/action/get-redirect-url',
+        'Magento_Ui/js/model/messageList'
+    ],
+    function (
+        $,
+        url,
+        $t,
+        Component,
+        redirectOnSuccessAction,
+        redirectURLAction,
+        globalMessageList
+    ) {
+        'use strict';
+
+        return Component.extend({
+            defaults: {
+                template: 'Novalnet_Payment/payment/novalnetWechatpay'
+            },
+
+            /**
+             * After place order callback
+             */
+            afterPlaceOrder: function () {
+                this.redirectAfterPlaceOrder = false;
+
+                redirectURLAction().done(function (redirectUrl) {
+                    window.location.replace(redirectUrl);
+                }).fail(function (xhr, ajaxOptions, thrownError) {
+                    globalMessageList.addErrorMessage({
+                        message: $t(thrownError)
+                    });
+                    window.location.replace(url.build('checkout/cart'));
+                });
+            },
+
+            /**
+             * Returns payment method instructions
+             */
+            getInstructions: function () {
+                return window.checkoutConfig.payment[this.getCode()].instructions;
+            },
+
+            /**
+             * Returns payment testmode status
+             */
+            getTestmode: function () {
+                return window.checkoutConfig.payment[this.getCode()].testmode;
+            },
+
+            /**
+             * Returns payment method logo URL
+             */
+            getLogo: function () {
+                return window.checkoutConfig.payment[this.getCode()].logo;
+            }
+        });
+    }
+);
diff --git a/view/frontend/web/js/view/payment/novalnet-payment.js b/view/frontend/web/js/view/payment/novalnet-payment.js
new file mode 100755
index 0000000..bf448ab
--- /dev/null
+++ b/view/frontend/web/js/view/payment/novalnet-payment.js
@@ -0,0 +1,280 @@
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+define(
+    [
+        'jquery',
+        'uiComponent',
+        'Magento_Checkout/js/model/quote',
+        'Magento_Checkout/js/action/select-payment-method',
+        'Magento_Checkout/js/checkout-data',
+        'Magento_Checkout/js/model/payment/renderer-list'
+    ],
+    function (
+        $,
+        Component,
+        quote,
+        selectPaymentMethodAction,
+        checkoutData,
+        rendererList
+    ) {
+        'use strict';
+
+        rendererList.push(
+            {
+                type: 'novalnetCc',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetCc'
+            },
+            {
+                type: 'novalnetSepa',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetSepa'
+            },
+            {
+                type: 'novalnetInvoice',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetInvoice'
+            },
+            {
+                type: 'novalnetPrepayment',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetPrepayment'
+            },
+            {
+                type: 'novalnetInvoiceGuarantee',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetInvoiceGuarantee'
+            },
+            {
+                type: 'novalnetSepaGuarantee',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetSepaGuarantee'
+            },
+            {
+                type: 'novalnetCashpayment',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetCashpayment'
+            },
+            {
+                type: 'novalnetMultibanco',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetMultibanco'
+            },
+            {
+                type: 'novalnetPaypal',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetPaypal'
+            },
+            {
+                type: 'novalnetBanktransfer',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetBanktransfer'
+            },
+            {
+                type: 'novalnetOnlineBanktransfer',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetOnlineBanktransfer'
+            },
+            {
+                type: 'novalnetIdeal',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetIdeal'
+            },
+            {
+                type: 'novalnetApplepay',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetApplepay'
+            },
+            {
+                type: 'novalnetGooglepay',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetGooglepay'
+            },
+            {
+                type: 'novalnetBancontact',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetBancontact'
+            },
+            {
+                type: 'novalnetEps',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetEps'
+            },
+            {
+                type: 'novalnetGiropay',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetGiropay'
+            },
+            {
+                type: 'novalnetPrzelewy',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetPrzelewy'
+            },
+            {
+                type: 'novalnetPostFinance',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetPostFinance'
+            },
+            {
+                type: 'novalnetPostFinanceCard',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetPostFinanceCard'
+            },
+            {
+                type: 'novalnetInvoiceInstalment',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetInvoiceInstalment'
+            },
+            {
+                type: 'novalnetSepaInstalment',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetSepaInstalment'
+            },
+            {
+                type: 'novalnetTrustly',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetTrustly'
+            },
+            {
+                type: 'novalnetAlipay',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetAlipay'
+            },
+            {
+                type: 'novalnetWechatpay',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetWechatpay'
+            },
+            {
+                type: 'novalnetBlik',
+                component: 'Novalnet_Payment/js/view/payment/method-renderer/novalnetBlik'
+            }
+        );
+
+        var novalnetPayments = {
+            initObservable: function () {
+                quote.billingAddress.subscribe(this.onBillingAddressChange, this);
+                quote.totals.subscribe(this.onBillingAddressChange, this);
+                return this;
+            },
+
+            onBillingAddressChange: function (selectedAddress) {
+                var self = this;
+                if (selectedAddress == null) {
+                    return;
+                }
+
+                $(document).ready(function(){
+                    $.validator.addMethod(
+                        "validate-novalnet-date",
+                        function (val, elm) {
+                            if(!NovalnetUtility.validateDateFormat(val)) {
+                                return false;
+                            }
+                            return true;
+                         },
+                        $.mage.__("Please Enter valid date of Birth!")
+                    );
+
+                    var saveInAddressBook = selectedAddress["saveInAddressBook"];
+                    delete selectedAddress["saveInAddressBook"];
+
+                    setTimeout(function(){
+                        if (($('input[id="novalnetSepa"][name="payment[method]"]').length && $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').length)) {
+
+                            // check billingAddress and shippingAddress are same and toggle payments
+                            if (self.checkBillingShippingAreSame()) {
+                                if ($('input[id="novalnetSepa"][name="payment[method]"]:visible').length) {
+                                    $('input[id="novalnetSepa"][name="payment[method]"]').closest('.payment-method').hide();
+                                }
+                                if ($('input[id="novalnetSepaGuarantee"][name="payment[method]"]:hidden').length) {
+                                    $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').closest('.payment-method').show();
+                                    if (checkoutData.getSelectedPaymentMethod() == 'novalnetSepa') {
+                                        var methodData = {
+                                            'method': 'novalnetSepaGuarantee',
+                                            'additional_data': {}
+                                        };
+                                        selectPaymentMethodAction(methodData);
+                                        checkoutData.setSelectedPaymentMethod(methodData.method);
+                                    }
+                                }
+                            } else {
+                                if ($('input[id="novalnetSepaGuarantee"][name="payment[method]"]:visible').length) {
+                                    $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').closest('.payment-method').hide();
+                                }
+                                if ($('input[id="novalnetSepa"][name="payment[method]"]:hidden').length) {
+                                    $('input[id="novalnetSepa"][name="payment[method]"]').closest('.payment-method').show();
+                                    if (checkoutData.getSelectedPaymentMethod() == 'novalnetSepaGuarantee') {
+                                        var methodData = {
+                                            'method': 'novalnetSepa',
+                                            'additional_data': {}
+                                        };
+                                        selectPaymentMethodAction(methodData);
+                                        checkoutData.setSelectedPaymentMethod(methodData.method);
+                                    }
+                                }
+                            }
+                        } else if (($('input[id="novalnetSepa"][name="payment[method]"]').length && !$('input[id="novalnetSepaGuarantee"][name="payment[method]"]').length)) {
+                            $('input[id="novalnetSepa"][name="payment[method]"]').closest('.payment-method').show();
+                        } else if ((!$('input[id="novalnetSepa"][name="payment[method]"]').length && $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').length)) {
+                            $('input[id="novalnetSepaGuarantee"][name="payment[method]"]').closest('.payment-method').show();
+                        }
+
+                        if ($('input[id="novalnetInvoice"][name="payment[method]"]').length && $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').length) {
+                            if (self.checkBillingShippingAreSame()) {
+                                if ($('input[id="novalnetInvoice"][name="payment[method]"]:visible').length) {
+                                    $('input[id="novalnetInvoice"][name="payment[method]"]').closest('.payment-method').hide();
+                                }
+                                if ($('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]:hidden').length) {
+                                    $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').closest('.payment-method').show();
+                                    if (checkoutData.getSelectedPaymentMethod() == 'novalnetInvoice') {
+                                        var methodData = {
+                                            'method': 'novalnetInvoiceGuarantee',
+                                            'additional_data': {}
+                                        };
+                                        selectPaymentMethodAction(methodData);
+                                        checkoutData.setSelectedPaymentMethod(methodData.method);
+                                    }
+                                }
+                            } else {
+                                if ($('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]:visible').length) {
+                                    $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').closest('.payment-method').hide();
+                                }
+                                if ($('input[id="novalnetInvoice"][name="payment[method]"]:hidden').length) {
+                                    $('input[id="novalnetInvoice"][name="payment[method]"]').closest('.payment-method').show();
+                                    if (checkoutData.getSelectedPaymentMethod() == 'novalnetInvoiceGuarantee') {
+                                        var methodData = {
+                                            'method': 'novalnetInvoice',
+                                            'additional_data': {}
+                                        };
+                                        selectPaymentMethodAction(methodData);
+                                        checkoutData.setSelectedPaymentMethod(methodData.method);
+                                    }
+                                }
+                            }
+                        } else if (($('input[id="novalnetInvoice"][name="payment[method]"]').length && !$('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').length)) {
+                            $('input[id="novalnetInvoice"][name="payment[method]"]').closest('.payment-method').show();
+                        } else if ((!$('input[id="novalnetInvoice"][name="payment[method]"]').length && $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').length)) {
+                            $('input[id="novalnetInvoiceGuarantee"][name="payment[method]"]').closest('.payment-method').show();
+                        }
+
+                        selectedAddress["saveInAddressBook"] = saveInAddressBook;
+                    }, 300);
+                });
+            },
+
+            checkBillingShippingAreSame: function() {
+                var billingAddress = quote.billingAddress(),
+                    shippingAddress = quote.shippingAddress();
+
+                if (quote.isVirtual()) {
+                    return true;
+                }
+
+                if (
+                    billingAddress.city == shippingAddress.city &&
+                    JSON.stringify(billingAddress.street) == JSON.stringify(shippingAddress.street) &&
+                    billingAddress.postcode == shippingAddress.postcode &&
+                    billingAddress.countryId == shippingAddress.countryId
+                ) {
+                    return true;
+                }
+
+                return false;
+            }
+        };
+
+        return Component.extend(novalnetPayments);
+    }
+);
diff --git a/view/frontend/web/template/checkout/novalnetGuestCheckout.html b/view/frontend/web/template/checkout/novalnetGuestCheckout.html
new file mode 100755
index 0000000..6ba04f3
--- /dev/null
+++ b/view/frontend/web/template/checkout/novalnetGuestCheckout.html
@@ -0,0 +1,25 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div id="novalnet_guest_checkoutdiv" style="display: none" data-bind="event: {load: initGuestCheckoutPage()}" >
+    <div id="novalnet_express_checkout_title" class="step-title" data-role="title" data-bind="i18n: 'Express Checkout'">Express Checkout</div><br>
+    <div id="novalnet_applepay_guest_checkout" ></div><br>
+    <div id="novalnet_googlepay_guest_checkout" ></div><br>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetAlipay.html b/view/frontend/web/template/payment/novalnetAlipay.html
new file mode 100755
index 0000000..a7b5032
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetAlipay.html
@@ -0,0 +1,81 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'You will be redirected to Alipay. Please don’t close or refresh the browser until the payment is completed.'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetApplepay.html b/view/frontend/web/template/payment/novalnetApplepay.html
new file mode 100755
index 0000000..dc3ac93
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetApplepay.html
@@ -0,0 +1,77 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<!-- ko if: (isApplePayAllowed()) -->
+    <div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+        <div class="payment-method-title field choice">
+            <input type="radio"
+                   name="payment[method]"
+                   class="radio"
+                   data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+            <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+        </div>
+
+        <div class="payment-method-content">
+            <!-- ko foreach: getRegion('messages') -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+
+            <div data-bind="if: getLogo()">
+                <span>
+                    <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+                </span>
+            </div>
+
+            <div class="payment-method-billing-address">
+                <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+                <!--/ko-->
+            </div>
+
+            <div class="nn-mode" data-bind="if: getTestmode()">
+                <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+            </div>
+
+            <div class="info-box">
+                <p>
+                    <!-- ko i18n: "Amount will be booked from your card after successful authentication"--><!-- /ko -->
+                </p>
+                <br>
+                <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+            </div>
+
+            <div class="checkout-agreements-block">
+                <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                    <!-- ko template: getTemplate() --><!-- /ko -->
+                <!--/ko-->
+            </div>
+
+            <!-- Apple pay button -->
+            <div class="actions-toolbar" id="review-buttons-container">
+                <div class="primary">
+                    <div id="novalnet_applepay_checkoutdiv" style="display:block" data-bind="event: {load: initApplePay()}">
+
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+<!-- /ko -->
diff --git a/view/frontend/web/template/payment/novalnetBancontact.html b/view/frontend/web/template/payment/novalnetBancontact.html
new file mode 100755
index 0000000..6afe765
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetBancontact.html
@@ -0,0 +1,80 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+        
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+       
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'You will be redirected to Bancontact. Please don’t close or refresh the browser until the payment is completed'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetBanktransfer.html b/view/frontend/web/template/payment/novalnetBanktransfer.html
new file mode 100755
index 0000000..a5c5afe
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetBanktransfer.html
@@ -0,0 +1,81 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+        
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'You will be redirected to Sofort. Please don’t close or refresh the browser until the payment is completed'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetBlik.html b/view/frontend/web/template/payment/novalnetBlik.html
new file mode 100755
index 0000000..3148321
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetBlik.html
@@ -0,0 +1,81 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'You will be redirected to Blik. Please don’t close or refresh the browser until the payment is completed'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetCashpayment.html b/view/frontend/web/template/payment/novalnetCashpayment.html
new file mode 100755
index 0000000..849b023
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetCashpayment.html
@@ -0,0 +1,80 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'On successful checkout, you will receive a payment slip/SMS to pay your online purchase at one of our retail partners (e.g. supermarket)'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar" id="review-buttons-container">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        css: {disabled: !isPlaceOrderActionAllowed()},
+                        enable: (getCode() == isChecked())
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetCc.html b/view/frontend/web/template/payment/novalnetCc.html
new file mode 100755
index 0000000..92f87e7
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetCc.html
@@ -0,0 +1,181 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div>
+            <span data-bind="foreach: {data: getIcons(), as: 'novalnetCcIcons'}">
+                <img data-bind="attr: {src: novalnetCcIcons.src, alt: novalnetCcIcons.title, title: novalnetCcIcons.title}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <form class="form" class="form" method="post" data-bind="attr: {id: getCode()}">
+            <div data-bind="attr: {id: getCode() + '_saved_payments'}, foreach: {data: getStoredPayments(), as: 'storedPayment'}">
+                <div class="novalnet-payment-saved-payments" data-bind="attr: {title: $data.key}">
+                    <input type="radio" name="payment[saved_payment]" class=""
+                        data-bind="checked: $parent.novalnetPaymentToken,
+                            value: storedPayment.NnToken,
+                            attr: {id: ('nn_token_' + storedPayment.id)}">
+                    <label data-bind="attr: {for: ('nn_token_' + storedPayment.id)}">
+                        <span>
+                            <img class="nnpayment-logo" data-bind="attr: {src: $parent.getCardlogo(storedPayment.token_info.NnCardBrand), alt: storedPayment.token_info.NnCardBrand, title: storedPayment.token_info.NnCardBrand}"/>
+                        </span>
+                        <span data-bind="text: storedPayment.text"></span>
+                    </label>
+                    <a href="#" data-bind="click: function() {
+                            $parent.removeToken(storedPayment.id);
+                        },
+                        attr: {class: 'nntoken action delete', 'nntoken-id': storedPayment.id},
+                        title: $t('Remove Novalnet Token')">
+                        <span data-bind="i18n: 'Remove'"></span>
+                    </a>
+                </div>
+            </div>
+
+            <div data-bind="if: getStoredPayments().length">
+                <div class="novalnet-payment-new_account">
+                    <input type="radio" name="payment[saved_payment]" value="new_account" class=""
+                        data-bind="checked: novalnetPaymentToken, attr: {id: getCode() + '_new_account'}">
+                    <label data-bind="attr: {for: getCode() + '_new_account'}">
+                        <span><!-- ko i18n: 'Add new card details'--><!-- /ko --></span>
+                    </label>
+                </div>
+            </div>
+            <br>
+
+            <fieldset data-bind="attr: {class: 'fieldset payment items ' + getCode(), id: 'novalnet_form_cc'}">
+                <div class="field required" style="max-width:100%">
+                    <div class="control _with-tooltip">
+                        <span data-bind="i18n: 'More security with the new Payment Policy (PSD2) Info'"></span>
+                        <div class="field-tooltip toggle">
+                            <!-- ko if: (tooltip.link)--><!-- /ko -->
+                                <!-- ko if: (!tooltip.link)-->
+                                    <span id="tooltip" class="field-tooltip-action action-help" tabindex="0" data-toggle="dropdown" data-bind="mageInit: {'dropdown':{'activeClass': '_active', 'parent': '.field-tooltip.toggle'}}" aria-labelledby="tooltip-label" aria-haspopup="true" aria-expanded="false" role="button"></span>
+                                <!-- /ko -->
+                             <div class="field-tooltip-content" data-target="dropdown" aria-hidden="true"><!-- ko i18n: "European card issuing banks often requires a password or some other form of authentication (EU Payment Services Directive 'PSD2') for secure payment. If the payment is not successful, you can try again. If you have any further questions, please contact your bank." --><!-- /ko --></div>
+                        </div>
+                    </div>
+                </div>
+                <iframe width='100%'
+                        frameborder="0"
+                        border="0"
+                        scrolling="no"
+                        id="novalnet_iframe">
+                </iframe>
+                <div class="field" data-bind="attr: {id: getCode() + '_store_payment_div'},
+                    if: showStorePayment(),
+                    visible: showStorePayment()">
+                    <div class="control">
+                        <input type="checkbox"
+                            name="payment[novalnetCc_store_payment]"
+                            data-bind="attr: {id: getCode() + '_store_payment'}" checked />
+                        <label data-bind="attr: {for: getCode() + '_store_payment'}" class="label">
+                            <span><!-- ko i18n: 'Save for future purchase'--><!-- /ko --></span>
+                        </label>
+                    </div>
+                </div>
+            </fieldset>
+            <div class="info-box">
+                <div class="nn-cc-description">
+					<!-- ko ifnot: (isZeroAmountBooking()) -->
+						<p >
+							<!-- ko i18n: 'Your credit/debit card will be charged immediately after the order is completed'--><!-- /ko -->
+						</p>
+					<!-- /ko -->
+					<!-- ko if: (isZeroAmountBooking()) -->
+                    <ul>
+						<li>
+							<p>
+								<!-- ko i18n: 'Your credit/debit card will be charged immediately after the order is completed'--><!-- /ko -->
+							</p>
+						</li>
+						<li>
+							<p style="color:red" >
+								<!-- ko i18n: 'This order will be processed as zero amount booking which store your payment data for further online purchases.'--><!-- /ko -->
+							</p>
+						</li>
+                    </ul>
+                    <!-- /ko -->
+                </div>
+                <br>
+                <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+            </div>
+            <input type="hidden"
+                   value="0"
+                   name="payment[novalnetCc_gethash]"
+                   data-bind="attr: {id: getCode() + '_gethash'}, value: ccHashValue" />
+            <input type="hidden"
+                   value=""
+                   name="payment[novalnetCc_hash]"
+                   data-bind="attr: {id: getCode() + '_hash'}, value: ccHashValue" />
+            <input type="hidden"
+                   value=""
+                   name="payment[novalnetCc_uniqueid]"
+                   data-bind="attr: {id: getCode() + '_uniqueid'}, value: ccUniqueid" />
+            <input type="hidden"
+                   value=""
+                   name="payment[novalnetCc_do_redirect]"
+                   data-bind="attr: {id: getCode() + '_do_redirect'}, value: ccDoRedirect" />
+        </form>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {id: getCode() + '_submit', title: $t('Place Order')},
+                        css: {disabled: !isPlaceOrderActionAllowed()},
+                        enable: (getCode() == isChecked())
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetEps.html b/view/frontend/web/template/payment/novalnetEps.html
new file mode 100755
index 0000000..a0b3f81
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetEps.html
@@ -0,0 +1,81 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+        
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+        
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'You will be redirected to eps. Please don’t close or refresh the browser until the payment is completed'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetGiropay.html b/view/frontend/web/template/payment/novalnetGiropay.html
new file mode 100755
index 0000000..1e77934
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetGiropay.html
@@ -0,0 +1,81 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+        
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'You will be redirected to giropay. Please don’t close or refresh the browser until the payment is completed'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetGooglepay.html b/view/frontend/web/template/payment/novalnetGooglepay.html
new file mode 100755
index 0000000..9c670ee
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetGooglepay.html
@@ -0,0 +1,77 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<!-- ko if: (isGooglePayAllowed()) -->
+    <div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+        <div class="payment-method-title field choice">
+            <input type="radio"
+                   name="payment[method]"
+                   class="radio"
+                   data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+            <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+        </div>
+
+        <div class="payment-method-content">
+            <!-- ko foreach: getRegion('messages') -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+
+            <div data-bind="if: getLogo()">
+                <span>
+                    <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+                </span>
+            </div>
+
+            <div class="payment-method-billing-address">
+                <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+                <!--/ko-->
+            </div>
+
+            <div class="nn-mode" data-bind="if: getTestmode()">
+                <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+            </div>
+
+            <div class="info-box">
+                <p>
+                    <!-- ko i18n: "Amount will be booked from your card after successful authentication"--><!-- /ko -->
+                </p>
+                <br>
+                <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+            </div>
+
+            <div class="checkout-agreements-block">
+                <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                    <!-- ko template: getTemplate() --><!-- /ko -->
+                <!--/ko-->
+            </div>
+
+            <!-- Google pay button -->
+            <div class="actions-toolbar" id="review-buttons-container">
+                <div class="primary">
+                    <div id="novalnet_googlepay_checkoutdiv" style="display:block" data-bind="event: {load: initGooglePay()}">
+
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+<!-- /ko -->
diff --git a/view/frontend/web/template/payment/novalnetIdeal.html b/view/frontend/web/template/payment/novalnetIdeal.html
new file mode 100755
index 0000000..dc7968e
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetIdeal.html
@@ -0,0 +1,81 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+        
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'You will be redirected to iDEAL. Please don’t close or refresh the browser until the payment is completed'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetInvoice.html b/view/frontend/web/template/payment/novalnetInvoice.html
new file mode 100755
index 0000000..9477fed
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetInvoice.html
@@ -0,0 +1,80 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}" style="display:none">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: "You will receive an e-mail with the Novalnet account details to complete the payment"--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar" id="review-buttons-container">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        css: {disabled: !isPlaceOrderActionAllowed()},
+                        enable: (getCode() == isChecked())
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetInvoiceGuarantee.html b/view/frontend/web/template/payment/novalnetInvoiceGuarantee.html
new file mode 100755
index 0000000..3198622
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetInvoiceGuarantee.html
@@ -0,0 +1,107 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}" style="display:none">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="nn-payment-guarantee">
+            <form class="form" method="post" data-bind="attr: {id: getCode()}" data-role="novalnetInvoiceGuarantee">
+                <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'novalnet_form_invoice_guarantee'}">
+                    <!-- ko if: (currentBillingAddress()) -->
+                    <div class="field number required" data-bind="ifnot: validateCompany(currentBillingAddress().company)">
+                        <label data-bind="attr: {for: getCode() + '_dob'}" class="label">
+                            <span><!-- ko i18n: 'Your date of birth'--><!-- /ko --></span>
+                        </label>
+                        <div class="control">
+                            <input type="text"
+                                   name="payment[_dob]"
+                                   maxlength="10"
+                                   minlength="10"
+                                   class="input-text validate-novalnet-date"
+                                   data-validate="{required:true}"
+                                   data-bind="attr: {
+                                    id: getCode() + '_dob',
+                                    autocomplete: off,
+                                    title: $t('Date of Birth'),
+                                    'data-container': getCode() + '_dob',
+                                    placeholder: $t('DD.MM.YYYY')},
+                                    value: getDob()"
+                                   onkeydown = "return NovalnetUtility.isNumericBirthdate(this, event)" />
+                        </div>
+                    </div>
+                    <!-- /ko -->
+                </fieldset>
+            </form>
+        </div>
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: "You will receive an e-mail with the Novalnet account details to complete the payment"--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar" id="review-buttons-container">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        css: {disabled: !isPlaceOrderActionAllowed()},
+                        enable: (getCode() == isChecked())
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetInvoiceInstalment.html b/view/frontend/web/template/payment/novalnetInvoiceInstalment.html
new file mode 100755
index 0000000..dab4d12
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetInvoiceInstalment.html
@@ -0,0 +1,132 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        
+
+        <div class="nn-payment-instalment">
+            <form class="form" method="post" data-bind="attr: {id: getCode()}" data-role="novalnetInvoiceInstalment">
+                <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'novalnet_form_invoice_instalment'}">
+                    <!-- ko if: (currentBillingAddress()) -->
+                    <div class="field number required" data-bind="ifnot: validateCompany(currentBillingAddress().company)">
+                        <label data-bind="attr: {for: getCode() + '_dob'}" class="label">
+                            <span><!-- ko i18n: 'Your date of birth'--><!-- /ko --></span>
+                        </label>
+                        <div class="control">
+                            <input type="text"
+                                   name="payment[_dob]"
+                                   maxlength="10"
+                                   minlength="10"
+                                   class="input-text"
+                                   data-validate="{required:true}"
+                                   data-bind="attr: {
+                                    id: getCode() + '_dob',
+                                    autocomplete: off,
+                                    title: $t('Date of Birth'),
+                                    'data-container': getCode() + '_dob',
+                                    placeholder: $t('DD.MM.YYYY')},
+                                    value: getDob()"
+                                   onkeydown = "return NovalnetUtility.isNumericBirthdate(this, event)"
+                                   onblur  = "NovalnetUtility.validateDateFormat(this)" />
+                        </div>
+                    </div>
+                    <!-- /ko -->
+                </fieldset>
+                <div class="nn-payment-instalment">
+                    <label data-bind="attr: {for: getCode() + '_cycle'}" class="label">
+                        <h3>
+                            <!-- ko i18n: 'Choose your instalment plan'--><!-- /ko --> (<!-- ko i18n: 'Net loan amount: '--><!-- /ko --><span class="price" data-bind="text: getValue()"></span>)
+                        </h3>
+                    </label>
+                    </strong>
+                    <div class="control">
+                        <select name="invoice-instalment"
+                            data-bind="attr: {id: getCode() + '_cycle', 'data-container': getCode() + '-invoice-instalment'},
+                            enable: true,
+                            options: getInstalmentOptions(),
+                            optionsValue: 'instalment_value',
+                            optionsText: 'instalment_key',
+                            value: ''"
+                            data-validate="{required:true}">
+                        </select>
+                    </div>
+                </div>
+            </form>
+        </div>
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <br/>
+        <div class="novalnetInvoiceInstalment-details"></div>
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: "You will receive an e-mail with the Novalnet account details to complete the payment"--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+        <div class="actions-toolbar" id="review-buttons-container">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        css: {disabled: !isPlaceOrderActionAllowed()},
+                        enable: (getCode() == isChecked())
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetMultibanco.html b/view/frontend/web/template/payment/novalnetMultibanco.html
new file mode 100755
index 0000000..aedc3b9
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetMultibanco.html
@@ -0,0 +1,80 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'On successful checkout, you will receive a payment reference. Using this payment reference, you can either pay in the Multibanco ATM or through your online bank account'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar" id="review-buttons-container">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        css: {disabled: !isPlaceOrderActionAllowed()},
+                        enable: (getCode() == isChecked())
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetOnlineBanktransfer.html b/view/frontend/web/template/payment/novalnetOnlineBanktransfer.html
new file mode 100755
index 0000000..e95e9f9
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetOnlineBanktransfer.html
@@ -0,0 +1,81 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'You will be redirected to banking page. Please don’t close or refresh the browser until the payment is completed'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetPaypal.html b/view/frontend/web/template/payment/novalnetPaypal.html
new file mode 100755
index 0000000..9dbe57d
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetPaypal.html
@@ -0,0 +1,126 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+        
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <form class="form" class="form" method="post" data-bind="attr: {id: getCode()}">
+            <div data-bind="attr: {id: getCode() + '_saved_payments'}, foreach: {data: getStoredPayments(), as: 'storedPayment'}">
+                <div class="novalnet-payment-saved-payments" data-bind="attr: {title: $data.key}">
+                    <input type="radio" name="payment[saved_payment]" class=""
+                        data-bind="checked: $parent.novalnetPaymentToken,
+                            value: storedPayment.NnToken,
+                            attr: {id: ('nn_token_' + storedPayment.id)}">
+                    <label data-bind="attr: {for: ('nn_token_' + storedPayment.id)}">
+                        <span data-bind="text: storedPayment.token_info.NnPaypalAccount"></span>
+                    </label>
+                    <a href="#" data-bind="click: function() {
+                            $parent.removeToken(storedPayment.id);
+                        },
+                        attr: {class: 'nntoken action delete', 'nntoken-id': storedPayment.id},
+                        title: $t('Remove Novalnet Token')">
+                        <span data-bind="i18n: 'Remove'"></span>
+                    </a>
+                </div>
+            </div>
+
+            <div data-bind="if: getStoredPayments().length">
+                <div class="novalnet-payment-new_account">
+                    <input type="radio" name="payment[saved_payment]" value="new_account" class=""
+                        data-bind="checked: novalnetPaymentToken, attr: {id: getCode() + '_new_account'}">
+                    <label data-bind="attr: {for: getCode() + '_new_account'}">
+                        <span><!-- ko i18n: 'Add new account details'--><!-- /ko --></span>
+                    </label>
+                </div>
+            </div>
+            <br/>
+
+            <div class="field" data-bind="attr: {id: getCode() + '_store_payment_container'},
+                if: showStorePayment(),
+                visible: showStorePayment()">
+                <div class="control">
+                    <input type="checkbox"
+                        name="payment[novalnetPaypal_store_payment]"
+                        data-bind="attr: {id: getCode() + '_store_payment'}" checked />
+                    <label data-bind="attr: {for: getCode() + '_store_payment'}" class="label">
+                        <span><!-- ko i18n: 'Save for future purchase'--><!-- /ko --></span>
+                    </label>
+                </div>
+            </div>
+        </form>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'You will be redirected to PayPal. Please don’t close or refresh the browser until the payment is completed'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetPostFinance.html b/view/frontend/web/template/payment/novalnetPostFinance.html
new file mode 100755
index 0000000..e0bdee7
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetPostFinance.html
@@ -0,0 +1,81 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+        
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'You will be redirected to PostFinance. Please don’t close or refresh the browser until the payment is completed'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetPostFinanceCard.html b/view/frontend/web/template/payment/novalnetPostFinanceCard.html
new file mode 100755
index 0000000..e0bdee7
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetPostFinanceCard.html
@@ -0,0 +1,81 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+        
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'You will be redirected to PostFinance. Please don’t close or refresh the browser until the payment is completed'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetPrepayment.html b/view/frontend/web/template/payment/novalnetPrepayment.html
new file mode 100755
index 0000000..951e964
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetPrepayment.html
@@ -0,0 +1,80 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: "You will receive an e-mail with the Novalnet account details to complete the payment"--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar" id="review-buttons-container">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        css: {disabled: !isPlaceOrderActionAllowed()},
+                        enable: (getCode() == isChecked())
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetPrzelewy.html b/view/frontend/web/template/payment/novalnetPrzelewy.html
new file mode 100755
index 0000000..7e6842b
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetPrzelewy.html
@@ -0,0 +1,81 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+        
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'You will be redirected to Przelewy24. Please don’t close or refresh the browser until the payment is completed'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetSepa.html b/view/frontend/web/template/payment/novalnetSepa.html
new file mode 100755
index 0000000..b0bfcd3
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetSepa.html
@@ -0,0 +1,194 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}" style="display:none">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <form class="form" method="post" data-bind="attr: {id: getCode()}" data-role="novalnetSepa">
+            <div data-bind="attr: {id: getCode() + '_saved_payments'}, foreach: {data: getStoredPayments(), as: 'storedPayment'}">
+                <div class="novalnet-payment-saved-payments" data-bind="attr: {title: $data.key}">
+                    <input type="radio" name="payment[saved_payment]" class=""
+                        data-bind="checked: $parent.novalnetPaymentToken,
+                            value: storedPayment.NnToken,
+                            attr: {id: ('nn_token_' + storedPayment.id)}">
+                    <label data-bind="attr: {for: ('nn_token_' + storedPayment.id)}">
+                        <span><!-- ko i18n: 'IBAN'--><!-- /ko --></span>&nbsp;<span data-bind="text: storedPayment.token_info.NnIban"></span>
+                    </label>
+                    <a href="#" data-bind="click: function() {
+                            $parent.removeToken(storedPayment.id);
+                        },
+                        attr: {class: 'nntoken action delete', 'nntoken-id': storedPayment.id},
+                        title: $t('Remove Novalnet Token')">
+                        <span data-bind="i18n: 'Remove'"></span>
+                    </a>
+                </div>
+            </div>
+
+            <div data-bind="if: getStoredPayments().length">
+                <div class="novalnet-payment-new_account">
+                    <input type="radio" name="payment[saved_payment]" value="new_account" class=""
+                        data-bind="checked: novalnetPaymentToken, attr: {id: getCode() + '_new_account'}">
+                    <label data-bind="attr: {for: getCode() + '_new_account'}">
+                        <span><!-- ko i18n: 'Add new account details'--><!-- /ko --></span>
+                    </label>
+                </div>
+            </div>
+            <br>
+
+            <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'novalnet_form_sepa'}">
+                    <div class="field number required">
+                        <label data-bind="attr: {for: getCode() + '_account_number'}" class="label">
+                            <span><!-- ko i18n: 'IBAN'--><!-- /ko --></span>
+                        </label>
+                        <div class="control">
+                            <input type="text" name="payment[_account_number]" class="input-text" value=""
+                                   data-validate="{required:true}"
+                                   data-bind="attr: {
+                                    autocomplete: off,
+                                    id: getCode() + '_account_number',
+                                    title: $t('IBAN'),
+                                    placeholder: 'DE00 0000 0000 0000 0000 00',
+                                    'data-container': getCode() + '-account-number'},
+                                    value: sepaAccountNumber"
+                                    style="text-transform:uppercase;"
+                                    onkeypress = "return NovalnetUtility.formatIban(event, 'novalnetSepa_bic_code_div')"
+                                    onkeyup = "return NovalnetUtility.checkIban(event)"
+                                    onchange = "return NovalnetUtility.formatIban(event, 'novalnetSepa_bic_code_div')" />
+                        </div>
+                    </div>
+                    <div class="field number required" data-bind="attr: {id: getCode() + '_bic_code_div'} " style="display:none" >
+                        <label data-bind="attr: {for: getCode() + '_bic_code'}" class="label">
+                            <span><!-- ko i18n: 'BIC'--><!-- /ko --></span>
+                        </label>
+                        <div class="control">
+                            <input type="text" name="payment[_bic_code]" class="input-text" value=""
+                                   data-validate="{required:true}"
+                                   data-bind="attr: {
+                                    autocomplete: off,
+                                    id: getCode() + '_bic_code',
+                                    title: $t('BIC'),
+                                    placeholder: 'XXXX XX XX XXX',
+                                    'data-container': getCode() + '-bic-code'},
+                                    value: sepaBicCode"
+                                    style="text-transform:uppercase;"
+                                    onkeypress = "return NovalnetUtility.formatBic(event)"
+                                    onchange = "return NovalnetUtility.formatBic(event)" />
+                        </div>
+                    </div>
+                    <div class="field" data-bind="attr: {id: getCode() + '_store_payment_div'},
+                        if: showStorePayment(),
+                        visible: showStorePayment()">
+                        <div class="control">
+                            <input type="checkbox"
+                                name="payment[_store_payment]"
+                                data-bind="attr: {id: getCode() + '_store_payment'}" checked />
+                            <label data-bind="attr: {for: getCode() + '_store_payment'}" class="label">
+                                <span><!-- ko i18n: 'Save for future purchase'--><!-- /ko --></span>
+                            </label>
+                        </div>
+                    </div>
+            </fieldset>
+        </form>
+        <div class="info-box">
+            <ul>
+                <li>
+                    <p>
+                        <!-- ko i18n: 'The amount will be debited from your account by Novalnet'--><!-- /ko -->
+                    </p>
+                </li>
+                <!-- ko if: (isZeroAmountBooking()) -->
+                    <li>
+                        <p style="color:red" >
+                            <!-- ko i18n: 'This order will be processed as zero amount booking which store your payment data for further online purchases.'--><!-- /ko -->
+                        </p>
+                    </li>
+                <!-- /ko -->
+                <li>
+                    <a data-bind="click: sepaMandateToggle" style="cursor:pointer;">
+                        <strong>
+                            <strong><!-- ko i18n: 'I hereby grant the mandate for the SEPA direct debit'--><!-- /ko --></strong>
+                            <!-- ko i18n: '(electronic transmission)'--><!-- /ko -->
+                            <strong><!-- ko i18n: 'and confirm that the given bank details are correct!'--><!-- /ko --></strong>
+                        </strong>
+                    </a>
+                    <div id="sepa_mandate_details" style="display:none; padding:5px; border:1px solid; border-color:#ddd;">
+                        <!-- ko i18n: 'I authorise (A) Novalnet AG to send instructions to my bank to debit my account and (B) my bank to debit my account in accordance with the instructions from Novalnet AG.'--><!-- /ko -->
+                        <br>
+                        <br>
+                        <strong><!-- ko i18n: 'Creditor identifier: DE53ZZZ00000004253'--><!-- /ko --></strong>
+                        <br>
+                        <br>
+                        <strong><!-- ko i18n: 'Note:'--><!-- /ko --></strong>
+                        <!-- ko i18n: 'You are entitled to a refund from your bank under the terms and conditions of your agreement with bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.'--><!-- /ko -->
+                    </div>
+                    <br>
+                    <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+                </li>
+            </ul>
+        </div>
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar" id="review-buttons-container">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        css: {disabled: !isPlaceOrderActionAllowed()},
+                        enable: (getCode() == isChecked())
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetSepaGuarantee.html b/view/frontend/web/template/payment/novalnetSepaGuarantee.html
new file mode 100755
index 0000000..edaea1e
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetSepaGuarantee.html
@@ -0,0 +1,212 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}" style="display:none">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <form class="form" method="post" data-bind="attr: {id: getCode()}" data-role="novalnetSepaGuarantee">
+            <div data-bind="attr: {id: getCode() + '_saved_payments'}, foreach: {data: getStoredPayments(), as: 'storedPayment'}">
+                <div class="novalnet-payment-saved-payments" data-bind="attr: {title: $data.key}">
+                    <input type="radio" name="payment[saved_payment]" class=""
+                        data-bind="checked: $parent.novalnetPaymentToken,
+                            value: storedPayment.NnToken,
+                            attr: {id: ('nn_token_guarantee_' + storedPayment.id)}">
+                    <label data-bind="attr: {for: ('nn_token_guarantee_' + storedPayment.id)}">
+                        <span><!-- ko i18n: 'IBAN'--><!-- /ko --></span>&nbsp;<span data-bind="text: storedPayment.token_info.NnIban"></span>
+                    </label>
+                    <a href="#" data-bind="click: function() {
+                            $parent.removeToken(storedPayment.id);
+                        },
+                        attr: {class: 'nntoken action delete', 'nntoken-id': storedPayment.id},
+                        title: $t('Remove Novalnet Token')">
+                        <span data-bind="i18n: 'Remove'"></span>
+                    </a>
+                </div>
+            </div>
+
+            <div data-bind="if: getStoredPayments().length">
+                <div class="novalnet-payment-new_account">
+                    <input type="radio" name="payment[saved_payment]" value="new_account" class=""
+                        data-bind="checked: novalnetPaymentToken, attr: {id: getCode() + '_new_account'}">
+                    <label data-bind="attr: {for: getCode() + '_new_account'}">
+                        <span><!-- ko i18n: 'Add new account details'--><!-- /ko --></span>
+                    </label>
+                </div>
+            </div>
+            <br>
+
+            <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'novalnet_form_sepa_guarantee'}">
+                <div class="field number required">
+                    <label data-bind="attr: {for: getCode() + '_account_number'}" class="label">
+                        <span><!-- ko i18n: 'IBAN'--><!-- /ko --></span>
+                    </label>
+                    <div class="control">
+                        <input type="text" name="payment[_account_number]" class="input-text" value=""
+                               data-validate="{required:true}"
+                               data-bind="attr: {
+                                autocomplete: off,
+                                id: getCode() + '_account_number',
+                                title: $t('IBAN'),
+                                placeholder: 'DE00 0000 0000 0000 0000 00',
+                                'data-container': getCode() + '-account-number'},
+                                value: sepaAccountNumber"
+                                style="text-transform:uppercase;"
+                                onkeypress = "return NovalnetUtility.formatIban(event, 'novalnetSepaGuarantee_bic_code_div')"
+                                onkeyup = "return NovalnetUtility.checkIban(event)"
+                                onchange = "return NovalnetUtility.formatIban(event, 'novalnetSepaGuarantee_bic_code_div')" />
+                    </div>
+                </div>
+                <div class="field number required" data-bind="attr: {id: getCode() + '_bic_code_div'} " style="display:none" >
+                    <label data-bind="attr: {for: getCode() + '_bic_code'}" class="label">
+                        <span><!-- ko i18n: 'BIC'--><!-- /ko --></span>
+                    </label>
+                    <div class="control">
+                        <input type="text" name="payment[_bic_code]" class="input-text" value=""
+                               data-validate="{required:true}"
+                               data-bind="attr: {
+                                autocomplete: off,
+                                id: getCode() + '_bic_code',
+                                title: $t('BIC'),
+                                placeholder: 'XXXX XX XX XXX',
+                                'data-container': getCode() + '-bic-code'},
+                                value: sepaBicCode"
+                                style="text-transform:uppercase;"
+                                onkeypress = "return NovalnetUtility.formatBic(event)"
+                                onchange = "return NovalnetUtility.formatBic(event)" />
+                    </div>
+                </div>
+                <div class="field" data-bind="attr: {id: getCode() + '_store_payment_div'},
+                    if: showStorePayment(),
+                    visible: showStorePayment()">
+                    <div class="control">
+                        <input type="checkbox"
+                            name="payment[_store_payment]"
+                            data-bind="attr: {id: getCode() + '_store_payment'}" checked />
+                        <label data-bind="attr: {for: getCode() + '_store_payment'}" class="label">
+                            <span><!-- ko i18n: 'Save for future purchase'--><!-- /ko --></span>
+                        </label>
+                    </div>
+                </div>
+            </fieldset>
+            <fieldset data-bind="attr: {class: 'fieldset payment items ccard dob ' + getCode(), id: 'novalnet_form_sepa_guarantee_dob'}">
+                <!-- ko if: (currentBillingAddress()) -->
+                <div class="field number required" data-bind="ifnot: validateCompany(currentBillingAddress().company)">
+                    <label data-bind="attr: {for: getCode() + '_dob'}" class="label">
+                        <span><!-- ko i18n: 'Your date of birth'--><!-- /ko --></span>
+                    </label>
+                    <div class="control">
+                        <input type="text"
+                               name="payment[dob]"
+                               maxlength="10"
+                               minlength="10"
+                               class="input-text validate-novalnet-date"
+                               data-validate="{required:true}"
+                               data-bind="attr: {
+                                id: getCode() + '_dob',
+                                autocomplete: off,
+                                title: $t('Date of Birth'),
+                                'data-container': getCode() + '_dob',
+                                placeholder: $t('DD.MM.YYYY')},
+                                value: getDob()"
+                                onkeydown = "return NovalnetUtility.isNumericBirthdate(this, event)" />
+                    </div>
+                </div>
+                <!-- /ko -->
+            </fieldset>
+        </form>
+        <div class="info-box">
+           <ul>
+               <li>
+                    <p>
+                        <!-- ko i18n: 'The amount will be debited from your account by Novalnet'--><!-- /ko -->
+                    </p>
+                </li>
+                <li>
+                    <a data-bind="click: sepaGuaranteeMandateToggle" style="cursor:pointer;">
+                        <strong>
+                            <strong><!-- ko i18n: 'I hereby grant the mandate for the SEPA direct debit'--><!-- /ko --></strong>
+                            <!-- ko i18n: '(electronic transmission)'--><!-- /ko -->
+                            <strong><!-- ko i18n: 'and confirm that the given bank details are correct!'--><!-- /ko --></strong>
+                        </strong>
+                    </a>
+                    <div id="sepa_guarantee_mandate_details" style="display:none; padding:5px; border:1px solid; border-color:#ddd;margin:1em;">
+                      <!-- ko i18n: 'I authorise (A) Novalnet AG to send instructions to my bank to debit my account and (B) my bank to debit my account in accordance with the instructions from Novalnet AG.'--><!-- /ko -->
+                      <br>
+                      <br>
+                      <strong><!-- ko i18n: 'Creditor identifier: DE53ZZZ00000004253'--><!-- /ko --></strong>
+                      <br>
+                      <br>
+                      <strong><!-- ko i18n: 'Note:'--><!-- /ko --></strong>
+                      <!-- ko i18n: 'You are entitled to a refund from your bank under the terms and conditions of your agreement with bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.'--><!-- /ko -->
+                    </div>
+                    <br>
+                    <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+                </li>
+            </ul>
+        </div>
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar" id="review-buttons-container">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        css: {disabled: !isPlaceOrderActionAllowed()},
+                        enable: (getCode() == isChecked())
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetSepaInstalment.html b/view/frontend/web/template/payment/novalnetSepaInstalment.html
new file mode 100755
index 0000000..0e930c7
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetSepaInstalment.html
@@ -0,0 +1,233 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <form class="form" method="post" data-bind="attr: {id: getCode()}" data-role="novalnetSepaInstalment">
+            <div data-bind="attr: {id: getCode() + '_saved_payments'}, foreach: {data: getStoredPayments(), as: 'storedPayment'}">
+                <div class="novalnet-payment-saved-payments" data-bind="attr: {title: $data.key}">
+                    <input type="radio" name="payment[saved_payment]" class=""
+                        data-bind="checked: $parent.novalnetPaymentToken,
+                            value: storedPayment.NnToken,
+                            attr: {id: ('nn_token_instalment_' + storedPayment.id)}">
+                    <label data-bind="attr: {for: ('nn_token_instalment_' + storedPayment.id)}">
+                        <span><!-- ko i18n: 'IBAN'--><!-- /ko --></span>&nbsp;<span data-bind="text: storedPayment.token_info.NnIban"></span>
+                    </label>
+                    <a href="#" data-bind="click: function() {
+                            $parent.removeToken(storedPayment.id);
+                        },
+                        attr: {class: 'nntoken action delete', 'nntoken-id': storedPayment.id},
+                        title: $t('Remove Novalnet Token')">
+                        <span data-bind="i18n: 'Remove'"></span>
+                    </a>
+                </div>
+            </div>
+
+            <div data-bind="if: getStoredPayments().length">
+                <div class="novalnet-payment-new_account">
+                    <input type="radio" name="payment[saved_payment]" value="new_account" class=""
+                        data-bind="checked: novalnetPaymentToken, attr: {id: getCode() + '_new_account'}">
+                    <label data-bind="attr: {for: getCode() + '_new_account'}">
+                        <span><!-- ko i18n: 'Add new account details'--><!-- /ko --></span>
+                    </label>
+                </div>
+            </div>
+            <br>
+
+            <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'novalnet_form_sepa_instalment'}">
+                    <div class="field number required">
+                        <label data-bind="attr: {for: getCode() + '_account_number'}" class="label">
+                            <span><!-- ko i18n: 'IBAN'--><!-- /ko --></span>
+                        </label>
+                        <div class="control">
+                            <input type="text" name="payment[_account_number]" class="input-text" value=""
+                                   data-validate="{required:true}"
+                                   data-bind="attr: {
+                                    autocomplete: off,
+                                    id: getCode() + '_account_number',
+                                    title: $t('IBAN'),
+                                    placeholder: 'DE00 0000 0000 0000 0000 00',
+                                    'data-container': getCode() + '-account-number'},
+                                    value: sepaAccountNumber"
+                                    style="text-transform:uppercase;"
+                                    onkeypress = "return NovalnetUtility.formatIban(event, 'novalnetSepaInstalment_bic_code_div')"
+                                    onkeyup = "return NovalnetUtility.checkIban(event)"
+                                    onchange = "return NovalnetUtility.formatIban(event, 'novalnetSepaInstalment_bic_code_div')" />
+                        </div>
+                    </div>
+                    <div class="field number required" data-bind="attr: {id: getCode() + '_bic_code_div'} " style="display:none" >
+                        <label data-bind="attr: {for: getCode() + '_bic_code'}" class="label">
+                            <span><!-- ko i18n: 'BIC'--><!-- /ko --></span>
+                        </label>
+                        <div class="control">
+                            <input type="text" name="payment[_bic_code]" class="input-text" value=""
+                                   data-validate="{required:true}"
+                                   data-bind="attr: {
+                                    autocomplete: off,
+                                    id: getCode() + '_bic_code',
+                                    title: $t('BIC'),
+                                    placeholder: 'XXXX XX XX XXX',
+                                    'data-container': getCode() + '-bic-code'},
+                                    value: sepaBicCode"
+                                    style="text-transform:uppercase;"
+                                    onkeypress = "return NovalnetUtility.formatBic(event)"
+                                    onchange = "return NovalnetUtility.formatBic(event)" />
+                        </div>
+                    </div>
+                    <div class="field" data-bind="attr: {id: getCode() + '_store_payment_div'},
+                        if: showStorePayment(),
+                        visible: showStorePayment()">
+                        <div class="control">
+                            <input type="checkbox"
+                                name="payment[_store_payment]"
+                                data-bind="attr: {id: getCode() + '_store_payment'}" checked />
+                            <label data-bind="attr: {for: getCode() + '_store_payment'}" class="label">
+                                <span><!-- ko i18n: 'Save for future purchase'--><!-- /ko --></span>
+                            </label>
+                        </div>
+                    </div>
+            </fieldset>
+            <fieldset data-bind="attr: {class: 'fieldset payment items ccard dob' + getCode(), id: 'novalnet_form_sepa_instalment_dob'}">
+                <!-- ko if: (currentBillingAddress()) -->
+                <div class="field number required" data-bind="ifnot: validateCompany(currentBillingAddress().company)">
+                    <label data-bind="attr: {for: getCode() + '_dob'}" class="label">
+                        <span><!-- ko i18n: 'Your date of birth'--><!-- /ko --></span>
+                    </label>
+                    <div class="control">
+                        <input type="text"
+                               name="payment[_dob]"
+                               maxlength="10"
+                               minlength="10"
+                               class="input-text validate-novalnet-date"
+                               data-validate="{required:true}"
+                               data-bind="attr: {
+                                id: getCode() + '_dob',
+                                autocomplete: off,
+                                title: $t('Date of Birth'),
+                                'data-container': getCode() + '_dob',
+                                placeholder: $t('DD.MM.YYYY')},
+                                value: getDob()"
+                                onkeydown = "return NovalnetUtility.isNumericBirthdate(this, event)" />
+                    </div>
+                </div>
+                <!-- /ko -->
+            </fieldset>
+            <div class="nn-payment-instalment">
+                <label data-bind="attr: {for: getCode() + '_cycle'}" class="label">
+                    <span><h3>
+                        <!-- ko i18n: 'Choose your instalment plan'--><!-- /ko --> (<!-- ko i18n: 'Net loan amount: '--><!-- /ko --><span class="price" data-bind="text: getValue()"></span>)
+                    </h3></span>
+                </label>
+                <div class="control">
+                    <select name="sepa-instalment"
+                        data-bind="attr: {id: getCode() + '_cycle', 'data-container': getCode() + '-sepa-instalment'},
+                        enable: true,
+                        options: getInstalmentOptions(),
+                        optionsValue: 'instalment_value',
+                        optionsText: 'instalment_key',
+                        value: ''"
+                        data-validate="{required:true}">
+                    </select>
+                </div>
+            </div>
+        </form>
+
+        <br>
+        <div class="novalnetSepaInstalment-details"></div>
+        <div class="info-box">
+            <ul>
+                <li>
+                    <p>
+                        <!-- ko i18n: 'The amount will be debited from your account by Novalnet'--><!-- /ko -->
+                    </p>
+                </li>
+                <li>
+                    <a data-bind="click: sepaInstalmentMandateToggle" style="cursor:pointer;">
+                        <strong>
+                            <strong><!-- ko i18n: 'I hereby grant the mandate for the SEPA direct debit'--><!-- /ko --></strong>
+                            <!-- ko i18n: '(electronic transmission)'--><!-- /ko -->
+                            <strong><!-- ko i18n: 'and confirm that the given bank details are correct!'--><!-- /ko --></strong>
+                        </strong>
+                    </a>
+                    <div id="sepa_instalment_mandate_details" style="display:none; padding:5px; border:1px solid; border-color:#ddd;margin:1em;">
+                      <!-- ko i18n: 'I authorise (A) Novalnet AG to send instructions to my bank to debit my account and (B) my bank to debit my account in accordance with the instructions from Novalnet AG.'--><!-- /ko -->
+                      <br>
+                      <br>
+                      <strong><!-- ko i18n: 'Creditor identifier: DE53ZZZ00000004253'--><!-- /ko --></strong>
+                      <br>
+                      <br>
+                      <strong><!-- ko i18n: 'Note:'--><!-- /ko --></strong>
+                      <!-- ko i18n: 'You are entitled to a refund from your bank under the terms and conditions of your agreement with bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.'--><!-- /ko -->
+                    </div>
+                    <br>
+                    <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+                </li>
+            </ul>
+        </div>
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar" id="review-buttons-container">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        css: {disabled: !isPlaceOrderActionAllowed()},
+                        enable: (getCode() == isChecked())
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetTrustly.html b/view/frontend/web/template/payment/novalnetTrustly.html
new file mode 100755
index 0000000..0c7ea3d
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetTrustly.html
@@ -0,0 +1,81 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'You will be redirected to Trustly. Please don’t close or refresh the browser until the payment is completed.'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/novalnetWechatpay.html b/view/frontend/web/template/payment/novalnetWechatpay.html
new file mode 100755
index 0000000..eb9f398
--- /dev/null
+++ b/view/frontend/web/template/payment/novalnetWechatpay.html
@@ -0,0 +1,81 @@
+<!--
+/**
+ * Novalnet payment extension
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ * that is bundled with this package in the file LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @category   Novalnet
+ * @package    Novalnet_Payment
+ * @copyright  Copyright (c) Novalnet AG
+ * @license    https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+
+        <div data-bind="if: getLogo()">
+            <span>
+                <img class="nnpayment-logo" data-bind="attr: {src: getLogo(), alt: getTitle(), title: getTitle()}"/>
+            </span>
+        </div>
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
+        <div class="nn-mode" data-bind="if: getTestmode()">
+            <div class="nn-test-drive"><!-- ko i18n: 'TestMode'--><!-- /ko --></div>
+        </div>
+
+        <div class="info-box">
+            <p>
+                <!-- ko i18n: 'You will be redirected to WeChat Pay. Please don’t close or refresh the browser until the payment is completed.'--><!-- /ko -->
+            </p>
+            <br>
+            <p class="nn-instructions" data-bind="html: getInstructions()"></p>
+        </div>
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+
+    </div>
+</div>