diff --git a/Bootstrap.php b/Bootstrap.php
new file mode 100644
index 0000000..bfc4d1b
--- /dev/null
+++ b/Bootstrap.php
@@ -0,0 +1,78 @@
+<?php 
+/**
+ * This file refers to the initialization of a plugin for the subsequent use
+ *
+ * @author      Novalnet
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+ * Script: Bootstrap.php
+ *
+*/
+ 
+namespace Plugin\jtl_novalnet;
+
+use JTL\Events\Dispatcher;
+use JTL\Plugin\Bootstrapper;
+use JTL\Shop;
+use JTL\Smarty\JTLSmarty;
+use Plugin\jtl_novalnet\frontend\NovalnetHookHandler;
+use Plugin\jtl_novalnet\src\NovalnetWebhookHandler;
+use Plugin\jtl_novalnet\adminmenu\NovalnetBackendTabRenderer;
+
+/**
+ * Class Bootstrap
+ * @package Plugin\jtl_novalnet
+ */
+class Bootstrap extends Bootstrapper
+{   
+    /**
+     * Boot additional services for the payment method
+     */
+    public function boot(Dispatcher $dispatcher): void
+    {
+        parent::boot($dispatcher);
+        // Custom frontend operations for the Novalnet Plugin
+        if (Shop::isFrontend()) {
+            $novalnetHookHandler        = new NovalnetHookHandler($this->getPlugin());
+            // Display the Novalnet transaction comments on order status page when payment before order completion option is set to 'Ja'
+            $dispatcher->listen('shop.hook.' . \HOOK_BESTELLABSCHLUSS_INC_BESTELLUNGINDB, [$novalnetHookHandler, 'orderStatusPage']); 
+            // Loads the Novalnet Payment form on the checkout page  
+            $dispatcher->listen('shop.hook.' . \HOOK_BESTELLVORGANG_PAGE_STEPZAHLUNG, [$novalnetHookHandler, 'displayNnPaymentForm']);         
+            // Used for the frontend template customization
+            $dispatcher->listen('shop.hook.' . \HOOK_SMARTY_OUTPUTFILTER, [$novalnetHookHandler, 'contentUpdate']);
+            // Display the Novalnet transaction comments aligned in My Account page of the user
+            $dispatcher->listen('shop.hook.' . \HOOK_JTL_PAGE, [$novalnetHookHandler, 'accountPage']);
+            // Change the WAWI pickup status as 'JA' before payment completion
+            $dispatcher->listen('shop.hook.' . \HOOK_BESTELLABSCHLUSS_INC_BESTELLUNGINDB_ENDE, [$novalnetHookHandler, 'changeWawiPickupStatus']);
+            // Change the payment name based on the customer chosen payment in the payment form
+            $dispatcher->listen('shop.hook.' . \HOOK_BESTELLVORGANG_PAGE_STEPBESTAETIGUNG, [$novalnetHookHandler, 'updatePaymentName']);
+            // Handle the webhook process          
+            if (isset($_REQUEST['novalnet_webhook'])) {
+                // When the Novalnet webhook is triggered and known through URL, we call the appropriate Novalnet webhook handler
+                $novalnetWebhookHandler = new NovalnetWebhookHandler($this->getPlugin());
+                $dispatcher->listen('shop.hook.' . \HOOK_INDEX_NAVI_HEAD_POSTGET, [$novalnetWebhookHandler, 'handleNovalnetWebhook']);
+            }
+            if (isset($_REQUEST['novalnet_refund'])) {
+                // When the Novalnet webhook is triggered and known through URL, we call the appropriate Novalnet webhook handler
+                $novalnetWebhookHandler = new NovalnetWebhookHandler($this->getPlugin());
+                $dispatcher->listen('shop.hook.' . \HOOK_INDEX_NAVI_HEAD_POSTGET, [$novalnetWebhookHandler, 'handleNovalnetRefund']);
+            }
+        }
+    }
+
+    /**
+     * Render the Novalnet admin tabs in the shop backend
+     * 
+     * @param  string    $tabName
+     * @param  int       $menuID
+     * @param  JTLSmarty $smarty
+     * @return string
+     */
+    public function renderAdminMenuTab(string $tabName, int $menuID, JTLSmarty $smarty): string
+    {
+        // Render Novalnet Plugin's backend tabs and it's related functions
+        $backendRenderer = new NovalnetBackendTabRenderer($this->getPlugin(), $this->getDB());
+        return $backendRenderer->renderNovalnetTabs($tabName, $menuID, $smarty);
+    }
+}
diff --git a/Migrations/Migration20210608221920.php b/Migrations/Migration20210608221920.php
new file mode 100644
index 0000000..9ff6c38
--- /dev/null
+++ b/Migrations/Migration20210608221920.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * This file create the custom table
+ *
+ * @author      Novalnet
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+ * Script: Migration20210608221920.php
+*/
+ 
+namespace Plugin\jtl_novalnet\Migrations;
+
+use JTL\Plugin\Migration;
+use JTL\Update\IMigration;
+
+/**
+ * Class Migration20210608221920
+ * @package Plugin\jtl_novalnet\Migrations
+ */
+class Migration20210608221920 extends Migration implements IMigration
+{
+    /**
+     * Create Novalnet transaction details table during the novalnet plugin installation
+     *
+     */
+    public function up()
+    {
+        $this->execute('CREATE TABLE IF NOT EXISTS `xplugin_novalnet_transaction_details` (
+                       `kId` int(10) NOT NULL AUTO_INCREMENT,
+                       `cNnorderid` VARCHAR(64) NOT NULL,
+                       `nNntid` BIGINT(20) NOT NULL,
+                       `cZahlungsmethode` VARCHAR(64) NOT NULL,
+                       `cMail` VARCHAR(255) NOT NULL,
+                       `cStatuswert` VARCHAR(64),
+                       `nBetrag` INT(11) NOT NULL,
+                       `cSaveOnetimeToken` TINYINT(1) DEFAULT 0,
+                       `cTokenInfo` LONGTEXT DEFAULT NULL,
+                       `cAdditionalInfo` LONGTEXT DEFAULT NULL,
+                        INDEX (cNnorderid, nNntid, cZahlungsmethode),
+                        PRIMARY KEY (`kId`)
+                       ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'
+        );
+            
+        $this->execute('CREATE TABLE IF NOT EXISTS `xplugin_novalnet_callback` (
+                       `kId` INT(10) NOT NULL AUTO_INCREMENT,
+                       `cNnorderid` VARCHAR(64) NOT NULL,
+                       `nCallbackTid` BIGINT(20) NOT NULL,
+                       `nReferenzTid` BIGINT(20) NOT NULL,
+                       `cZahlungsmethode` VARCHAR(64) NOT NULL,
+                       `dDatum` datetime NOT NULL,
+                       `nCallbackAmount` INT(11) DEFAULT NULL,
+                       `cWaehrung` VARCHAR(64) DEFAULT NULL,
+                        INDEX (cNnorderid),
+                        PRIMARY KEY (`kId`)
+                       ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'
+        );
+    }
+    
+    /**
+     * Delete Novalnet transaction details table during the novalnet plugin uninstallation
+     *
+     */
+    public function down()
+    {
+        $this->execute('DROP TABLE IF EXISTS `xplugin_novalnet_transaction_details`');
+        $this->execute('DROP TABLE IF EXISTS `xplugin_novalnet_callback`');
+    }
+}
diff --git a/Migrations/Migration20230303113003.php b/Migrations/Migration20230303113003.php
new file mode 100644
index 0000000..2f89ab4
--- /dev/null
+++ b/Migrations/Migration20230303113003.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * This file update the previous Novalnet custom the table
+ *
+ * @author      Novalnet
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+ * Script: Migration20210608221920.php
+*/
+
+namespace Plugin\jtl_novalnet\Migrations;
+
+use JTL\Plugin\Migration;
+use JTL\Update\IMigration;
+use JTL\Shop;
+/**
+ * Class Migration20230303113003
+ * @package Plugin\jtl_novalnet\Migrations
+ */
+class Migration20230303113003 extends Migration implements IMigration
+{
+    /**
+     * Remove the column from the Novalnet transaction details table during the novalnet plugin installation
+     *
+     */
+    public function up()
+    {
+        $this->execute('ALTER TABLE xplugin_novalnet_transaction_details 
+                        ADD COLUMN `nCallbackAmount` INT(11) DEFAULT NULL,
+                        DROP COLUMN cSaveOnetimeToken, 
+                        DROP COLUMN cTokenInfo'
+        );
+        // Check if the callback history table already exist or not
+        $isCallbackTableExists = Shop::Container()->getDB()->queryPrepared("SHOW TABLES LIKE :callback", [":callback" => "%xplugin_novalnet_callback%"]);
+        if ($isCallbackTableExists) {
+            $previousCallBackDetails = Shop::Container()->getDB()->queryPrepared("SELECT nc.nCallbackTid callbackTid, sum(nc.nCallbackAmount) callbackAmount FROM xplugin_novalnet_callback nc, xplugin_novalnet_transaction_details nt WHERE nc.nCallbackTid = :nCallbackTid group by :nCallbackTid", [":nCallbackTid" => "nt.nNntid", ":nCallbackTid" => "nc.nCallbackTid"]);
+			if (is_array($previousCallBackDetails) || is_object($previousCallBackDetails)) {
+				foreach ($previousCallBackDetails as $previousCallBackDetail) {
+					$previousCallBackDetails = Shop::Container()->getDB()->queryPrepared("UPDATE xplugin_novalnet_transaction_details SET nCallbackAmount = :callbackamount WHERE nNntid = :nCallbackTid and nCallbackAmount IS NULL LIMIT 1", [":callbackamount" => "$previousCallBackDetail->callbackAmount", ":nCallbackTid" => "$previousCallBackDetail->callbackTid"]);      
+				}
+			}
+            // After updating the values to xplugin_novalnet_transaction_details from callback history table and the delete the below table
+            $this->execute('DROP TABLE `xplugin_novalnet_callback`');
+        }
+    }
+    
+    public function down()
+    {
+        
+    }
+}
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c4e5c36
--- /dev/null
+++ b/README.md
@@ -0,0 +1,87 @@
+#  JTL5 SHOP PAYMENT PLUGIN BY NOVALNET
+
+The JTL shop payment plugin by Novalnet enables secure integration of payments and payment services for all JTL shops. Novalnet payment plugin for JTL shop helps merchants to automate payment processing from checkout till collection.
+
+## Integration Requirements for JTL5 Shop Payment Plugin
+
+The module is available for the 5.0.0 - 5.3.2 versions in the following languages: EN & DE and requires PHP versions 5.6 and higher. 
+Novalnet merchant account is required for processing all international and local payments in JTL shop. You can get yours here: <a href= "https://www.novalnet.de/kontakt"> https://www.novalnet.de/kontakt/sales </a>
+  
+## Key Features of JTL5 Shop Payment Plugin
+
+* Easy configuration of all payment methods (local & international)
+* Up-to-date payment portfolio & automated processing
+* Plug & Play platform eliminating the need of extra plugins/scripts/contracts
+* PCI-certified payment integration
+* Credit Card with 3D Secure
+* Seamless checkout Iframe integration
+* Comprehensive fraud prevention solution with more than 60 modules 
+* Secure SSL encoded gateways
+* On-hold transaction configuration in the shop admin panel
+* One click shopping supported Credit/Debit Cards & Direct Debit SEPA
+* Zero amount authorization supported for Credit/Debit Cards, Direct Debit SEPA, Apple Pay & Google Pay
+* Real-time synchronization of data between JTL-Shop and JTL-Wawi
+* Responsive templates
+
+For detailed documentation and other technical inquiries, please send us an email at <a href="mailto:sales@novalnet.de"> sales@novalnet.de </a>
+
+## Integrated Payment Methods
+
+- Direct Debit SEPA
+- Direct Debit ACH
+- Credit/Debit Cards
+- Apple Pay
+- Google Pay
+- Invoice
+- Prepayment
+- Invoice with payment guarantee
+- Direct Debit SEPA with payment guarantee
+- Instalment by Invoice
+- Instalment by Direct Debit SEPA
+- iDEAL
+- Sofort
+- giropay
+- Barzahlen/viacash
+- Przelewy24
+- eps
+- PayPal
+- MB Way
+- PostFinance Card
+- PostFinance E-Finance
+- Bancontact
+- Multibanco
+- Online bank transfer
+- Alipay
+- WeChat Pay
+- Trustly
+- Blik
+- Payconiq
+
+## Installation of JTL5 Shop Payment Plugin
+
+Follow these steps for JTL shop Payment Integration by Novalnet:
+1.	Get the payment plugin for JTL shop & detailed documentation by <a href="https://www.novalnet.de/kontakt"> contacting us </a>
+2.	Upload the payment plugin to your JTL shop
+3.	Activate the plugin 
+4.	Configure Product Activation Key & Payment access key in the shop admin panel
+5.	Activate & configure the preferred payment types in your shop admin panel
+
+## License
+
+See our License Agreement at: https://www.novalnet.com/payment-plugins-free-license/
+
+## Documentation & Support
+
+If you have any inquiries, please contact one of the following departments:
+
+### Technical support 
+technic@novalnet.de <br>
++49 89 9230683-19
+
+### Sales team 
+sales@novalnet.de <br>
++49 89 9230683-20
+
+## Who is Novalnet?
+ 
+<a href="www.novalnet.de/">Novalnet AG</a> is a German payment provider offering payment gateways for online merchants and marketplaces worldwide. Our PCI  DSS certified SaaS engine is designed to automate the entire payment process from checkout to debt collection – with a single integration. We cover real-time risk management; secure payments (local + international) through escrow accounts, integrate receivables management, dynamic member and subscription management as well as other customized payment solutions to your JTL shop. For a complete and seamless shop system we do support JTL-Wawi integration for JTL shop.
diff --git a/adminmenu/NovalnetBackendTabRenderer.php b/adminmenu/NovalnetBackendTabRenderer.php
new file mode 100644
index 0000000..0e245d4
--- /dev/null
+++ b/adminmenu/NovalnetBackendTabRenderer.php
@@ -0,0 +1,226 @@
+<?php
+/**
+ * This file used for rendering the Novalnet pages
+ *
+ * @author      Novalnet
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+ * Script: NovalnetBackendTabRenderer.php
+ *
+*/
+
+namespace Plugin\jtl_novalnet\adminmenu;
+
+use InvalidArgumentException;
+use JTL\Plugin\PluginInterface;
+use JTL\Shop;
+use JTL\DB\DbInterface;
+use JTL\DB\ReturnType;
+use JTL\Pagination\Pagination;
+use JTL\Checkout\Bestellung;
+use JTL\Smarty\JTLSmarty;
+use Plugin\jtl_novalnet\paymentmethod\NovalnetPaymentGateway;
+
+/**
+ * Class NovalnetBackendTabRenderer
+ * @package Plugin\jtl_novalnet\adminmenu
+ */
+class NovalnetBackendTabRenderer
+{
+    /**
+     * @var PluginInterface
+     */
+    private $plugin;
+    
+    /**
+     * @var DbInterface
+     */
+    private $db;
+    
+    /**
+     * @var JTLSmarty
+     */
+    private $smarty;
+    
+    /**
+     * @var NovalnetPaymentGateway
+     */
+    private $novalnetPaymentGateway;
+    
+    /**
+     * NovalnetBackendTabRenderer constructor.
+     * @param PluginInterface $plugin
+     * @param DbInterface     $db
+     */
+    public function __construct(PluginInterface $plugin, DbInterface $db)
+    {
+        $this->plugin = $plugin;
+        $this->db = $db;
+        $this->novalnetPaymentGateway = new NovalnetPaymentGateway();
+    }
+    
+    /**
+     * @param  string    $tabName
+     * @param  int       $menuID
+     * @param  JTLSmarty $smarty
+     * @return string
+     * @throws \SmartyException
+     */
+    public function renderNovalnetTabs(string $tabName, int $menuID, JTLSmarty $smarty): string
+    {
+        $this->smarty = $smarty;
+        
+        if ($tabName == 'Info') {
+            return $this->renderNovalnetInfoPage();
+        } elseif ($tabName == 'Bestellungen') {
+            return $this->renderNovalnetOrdersPage($menuID);
+        } else {
+            throw new InvalidArgumentException('Cannot render tab ' . $tabName);
+        }
+    }
+    
+    /**
+     * Display the Novalnet info template page 
+     * 
+     * @return string
+     */
+    private function renderNovalnetInfoPage(): string
+    {
+        $request = $_REQUEST;
+        $novalnetRequestType = !empty($request['nn_request_type']) ? $request['nn_request_type'] : null;
+        $langCode = ($_SESSION['AdminAccount']->language == 'de-DE') ? 'ger' : 'eng';
+        $configuredWebhookUrl = $this->novalnetPaymentGateway->novalnetPaymentHelper->getConfigurationValues('novalnet_webhook_url');
+        $novalnetWebhookUrl = !empty($configuredWebhookUrl) ? $configuredWebhookUrl : Shop::getURL() . '/?novalnet_webhook';
+        
+        if (!empty($novalnetRequestType)) {
+            // Based on the request type, we either auto-configure the merchant settings or configure the webhook URL
+            if ($novalnetRequestType == 'autofill') {
+                $this->handleMerchantAutoConfig($request);
+            } elseif ($novalnetRequestType == 'configureWebhook') {
+                $this->configureWebhookUrl($request);
+            } 
+        }                
+        
+        return $this->smarty->assign('postUrl', Shop::getURL() . '/' . \PFAD_ADMIN . 'plugin.php?kPlugin=' . $this->plugin->getID())
+                            ->assign('languageTexts', $this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLanguageText(['jtl_novalnet_notification_text', 'jtl_novalnet_configure_webhook', 'jtl_novalnet_webhook_alert_text', 'jtl_novalnet_webhook_notification_text', 'jtl_novalnet_webhook_error_text', 'jtl_novalnet_webhook_configuration_tooltip', 'jtl_novalnet_webhook_notification', 'jtl_novalnet_info_page_text'], $langCode))
+                            ->assign('adminUrl', $this->plugin->getPaths()->getadminURL())
+                            ->assign('webhookUrl', $novalnetWebhookUrl)
+                            ->fetch($this->plugin->getPaths()->getAdminPath() . 'templates/novalnet_info.tpl');
+    }
+    
+    /**
+     * Display the Novalnet order template
+     * 
+     * @param  int    $menuID
+     * @return string
+     */
+    private function renderNovalnetOrdersPage(int $menuID): string
+    {
+        $request = $_REQUEST;
+        $novalnetRequestType = !empty($request['nn_request_type']) ? $request['nn_request_type'] : null;
+        
+        if (!empty($novalnetRequestType)) {
+            $this->displayNovalnetorderDetails($request['order_no'], $menuID);
+        }
+        
+        $orders       = [];
+        $nnOrderCount = $this->db->query('SELECT cNnorderid FROM xplugin_novalnet_transaction_details', ReturnType::AFFECTED_ROWS);
+        $pagination   = (new Pagination('novalnetorders'))->setItemCount($nnOrderCount)->assemble();
+        $langCode     = ($_SESSION['AdminAccount']->language == 'de-DE') ? 'ger' : 'eng';
+        
+        $orderArr = $this->db->query('SELECT DISTINCT ord.kBestellung FROM tbestellung ord JOIN xplugin_novalnet_transaction_details nov WHERE ord.cBestellNr = nov.cNnorderid ORDER BY ord.kBestellung DESC LIMIT ' . $pagination->getLimitSQL(), ReturnType::ARRAY_OF_OBJECTS);
+        
+        foreach ($orderArr as $order) {
+            $orderId = (int) $order->kBestellung;
+            $ordObj  = new Bestellung($orderId);
+            $ordObj->fuelleBestellung(true, 0, false);
+            $orders[$orderId] = $ordObj;
+        }
+        
+        if ($_SESSION['AdminAccount']->language == 'de-DE') {
+            $paymentStatus = ['5' => 'teilversendet', '4' => 'versendet', '3' => 'bezahlt', '2' => 'in Bearbeitung' , '1' => 'neu' , '-1' => 'storniert'];
+        } else {
+            $paymentStatus = ['5' => 'partially delivered', '4' => 'shipped', '3' => 'paid', '2' => 'in progress' , '1' => 'new' , '-1' => 'cancelled'];
+        }
+        
+        return $this->smarty->assign('orders', $orders)
+                            ->assign('pagination', $pagination)
+                            ->assign('pluginId', $this->plugin->getID())
+                            ->assign('postUrl', Shop::getURL() . '/' . \PFAD_ADMIN . 'plugin.php?kPlugin=' . $this->plugin->getID())
+                            ->assign('paymentStatus', $paymentStatus)
+                            ->assign('hash', 'plugin-tab-' . $menuID)
+                            ->assign('adminUrl', $this->plugin->getPaths()->getadminURL())
+                            ->assign('languageTexts', $this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLanguageText(['jtl_novalnet_order_number', 'jtl_novalnet_customer_text', 'jtl_novalnet_payment_name_text', 'jtl_novalnet_wawi_pickup', 'jtl_novalnet_total_amount_text', 'jtl_novalnet_order_creation_date', 'jtl_novalnet_orders_not_available', 'jtl_novalnet_order_status'], $langCode))
+                            ->fetch($this->plugin->getPaths()->getAdminPath() . 'templates/novalnet_orders.tpl');
+    }
+    
+    /**
+     * Handling of the merchant auto configuration process
+     * 
+     * @param  array $post
+     * @return none
+     */
+    private function handleMerchantAutoConfig(array $post): void
+    {
+        $autoConfigRequestParams = [];
+        $autoConfigRequestParams['merchant']['signature'] = $post['nn_public_key'];
+        $autoConfigRequestParams['custom']['lang'] = ($_SESSION['AdminAccount']->language == 'de-DE') ? 'DE' : 'EN';
+        
+        $responseData = $this->novalnetPaymentGateway->performServerCall($autoConfigRequestParams, 'merchant_details', $post['nn_private_key']);
+        print json_encode($responseData);
+        exit;
+    }
+    
+    
+    /**
+     * Configuring webhook URL in admin portal
+     * 
+     * @param  array  $post
+     * @return none
+     */
+    private function configureWebhookUrl(array $post): void
+    {
+        $webhookRequestParams = [];
+        $webhookRequestParams['merchant']['signature'] = $post['nn_public_key'];
+        $webhookRequestParams['webhook']['url']        = $post['nn_webhook_url'];
+        $webhookRequestParams['custom']['lang']        = ($_SESSION['AdminAccount']->language == 'de-DE') ? 'DE' : 'EN';
+        
+        $responseData = $this->novalnetPaymentGateway->performServerCall($webhookRequestParams, 'webhook_configure', $post['nn_private_key']);
+        
+        // Upon successful intimation in Novalnet server, we also store it in the internal DB
+        if ($responseData['result']['status'] == 'SUCCESS') {
+            $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('tplugineinstellungen', 'cName', 'novalnet_webhook_url', ['cWert' => $post['nn_webhook_url']]);
+        }
+        
+        print json_encode($responseData);
+        exit;
+    }
+    
+    /**
+     * Display the Novalnet transaction details template
+     * 
+     * @param  mixed  $orderNo
+     * @param  int    $menuID
+     * @return string
+     */
+    private function displayNovalnetorderDetails($orderNo, int $menuID): string
+    {
+        $getOrderComment = $this->db->query('SELECT ord.cKommentar, ord.kSprache FROM tbestellung ord JOIN xplugin_novalnet_transaction_details nov ON ord.cBestellNr = nov.cNnorderid WHERE cNnorderid = "' . $orderNo . '"', ReturnType::SINGLE_OBJECT);
+                
+        $langCode = ($getOrderComment->kSprache == 1) ? 'ger' : 'eng';
+        
+        $instalmentInfo = $this->novalnetPaymentGateway->getInstalmentInfoFromDb($orderNo, $langCode);
+        
+        $smartyVar = $this->smarty->assign('adminUrl', $this->plugin->getPaths()->getadminURL())
+                                  ->assign('orderNo', $orderNo)
+                                  ->assign('languageTexts',$this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLanguageText(['jtl_novalnet_invoice_payments_order_number_reference'], $langCode))
+                                  ->assign('orderComment', $getOrderComment)
+                                  ->assign('menuId', '#plugin-tab-' . $menuID)
+                                  ->assign('instalmentDetails', $instalmentInfo)
+                                  ->fetch($this->plugin->getPaths()->getAdminPath() . 'templates/novalnet_order_details.tpl');
+                                  
+        print $smartyVar;
+        exit;
+    }
+}
diff --git a/adminmenu/css/novalnet_admin.css b/adminmenu/css/novalnet_admin.css
new file mode 100644
index 0000000..b86d38a
--- /dev/null
+++ b/adminmenu/css/novalnet_admin.css
@@ -0,0 +1,36 @@
+.nn_fa {
+    float: right;
+    font-size: 15px;
+}
+
+#nn_header {
+    color :#e85b0e;
+    font-size:14px;
+    font-weight:bold;
+}
+
+.body_div {
+    padding:5px;
+    overflow-y:auto;
+    margin-bottom : 2%;
+    height:82%;
+}
+
+#overlay_window_block_body h1 {
+    font-weight:bold;
+}
+
+#nn_transaction_details {
+    line-height: 2.0;
+}
+
+.nn_back_tab {
+    color: white;
+    float: right;
+    padding-left: 15px;
+    padding-right: 15px;
+}
+
+.nn_webhook_button, .nn_webhook_notify  {
+    margin-left: 35% !important;
+}
diff --git a/adminmenu/js/novalnet_admin.js b/adminmenu/js/novalnet_admin.js
new file mode 100644
index 0000000..cff0481
--- /dev/null
+++ b/adminmenu/js/novalnet_admin.js
@@ -0,0 +1,251 @@
+/*
+ * This script is used for Novalnet plugin admin management process
+ *
+ * @author      Novalnet
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+*/
+
+jQuery(document).ready(function() {
+        // set the toggle for the payment settings
+        var paymentSettings = jQuery('.tab-content').children()[2];
+        
+        jQuery(paymentSettings).find('[class*=subheading]').append('<i class="fa fa-chevron-circle-down nn_fa"></i>');
+    
+        jQuery(paymentSettings).find('.mb-3').hover(function () {               
+                jQuery(this).css('cursor', 'pointer');
+        });
+        
+        // Payment settings toggle
+        jQuery('.nn_fa').each(function(){
+            jQuery(this).parent().addClass('nn-toggle-heading');
+            jQuery(this).parent().next().next().addClass('nn-toggle-content');
+        });
+        jQuery('.nn-toggle-content').hide();
+        
+        jQuery('.nn-toggle-heading').on('click',function(){
+            jQuery(this).next().next().toggle(700);
+            if( jQuery(this).children('i').hasClass('fa-chevron-circle-down') ) {
+                jQuery(this).children('i').addClass('fa-chevron-circle-up').removeClass('fa-chevron-circle-down');
+            } else {
+                jQuery(this).children('i').addClass('fa-chevron-circle-down').removeClass('fa-chevron-circle-up');
+            }
+        });
+        
+        if (jQuery('#novalnet_tariffid').val() == undefined) {
+            jQuery('input[name=novalnet_tariffid]').attr('id', 'novalnet_tariffid');
+        }
+        
+        // Display the alert box if the public and private key was not configured
+        if (jQuery('input[name=novalnet_public_key]').val() == '' && jQuery('input[name=novalnet_private_key]').val() == '') {
+            if (jQuery('.nn_mandatory_alert').length == 0) {
+                jQuery('.content-header').prepend('<div class="alert alert-info nn_mandatory_alert"><i class="fal fa-info-circle"></i>' + ' '  + jQuery('input[name=nn_lang_notification]').val() + '</div>');
+            }
+        }
+    
+        // Autofill the merchant details
+        if (jQuery('input[name=novalnet_public_key]').val() != undefined && jQuery('input[name=novalnet_public_key]').val() != '') {
+              fillMerchantConfiguration();
+        } else if (jQuery('input[name=novalnet_public_key]').val() == '') {
+           jQuery('#novalnet_tariffid').val('');
+        }
+    
+        jQuery('input[name=novalnet_public_key], input[name=novalnet_private_key]' ).on('change', function () {
+            if (jQuery('input[name=novalnet_public_key]').val() != '' &&  jQuery('input[name=novalnet_private_key]').val() != '') {
+                fillMerchantConfiguration();
+            } else {
+                jQuery('#novalnet_tariffid').val('');
+            }
+        });
+        
+        // Set the webhook URL
+        jQuery('input[name=novalnet_webhook_url]').val(jQuery('#nn_webhook_url').val());
+        
+        if (jQuery('.nn_webhook_button').length == 0) {
+            jQuery('#novalnet_webhook_url').parent().parent().after('<div class="row"><div class="ml-auto col-sm-6 col-xl-auto nn_webhook_button"><button name="nn_webhook_configure" id="nn_webhook_configure_button" class="btn btn-primary btn-block">' + jQuery('input[name=nn_webhook_configure]').val() + '</button></div></div>');
+        }
+        jQuery('#nn_webhook_configure_button').on('click', function() {
+            if(jQuery('#novalnet_webhook_url').val() != undefined && jQuery('#novalnet_webhook_url').val() != '') {
+                alert(jQuery('input[name=nn_webhook_change]').val());
+                configureWebhookUrlAdminPortal();
+            } else {
+                alert(jQuery('input[name=nn_webhook_invalid]').val());
+            }
+        });
+        
+        // Display the webhook test mode activation message
+        if (jQuery('.nn_webhook_notify').length == 0) {
+            jQuery('#novalnet_webhook_testmode').parent().parent().parent().parent().after(('<div class="nn_webhook_notify">' + jQuery('#nn_webhook_notification').val() + '</div><br>'));
+        }
+        
+        // While click the back button in the Novalnet order history show the order table
+        jQuery(document).on('click', '.nn_back_tab', function() {
+            jQuery('.nn_order_table').show();
+            jQuery('#nn_transaction_info').hide();
+            jQuery('.pagination-toolbar').show();
+        });
+});
+
+function fillMerchantConfiguration() {
+    var autoconfigurationRequestParams = { 'nn_public_key' : jQuery('input[name=novalnet_public_key]').val(), 'nn_private_key' : jQuery('input[name=novalnet_private_key]').val(), 'nn_request_type' : 'autofill' };
+    transactionRequestHandler(autoconfigurationRequestParams);
+}
+
+function transactionRequestHandler(requestParams)
+{
+    requestParams = typeof(requestParams !== 'undefined') ? requestParams : '';
+    
+    var requestUrl = jQuery('input[id=nn_post_url]').val() ;
+        if ('XDomainRequest' in window && window.XDomainRequest !== null) {
+            var xdr = new XDomainRequest();
+            var query = jQuery.param(requestParams);
+            xdr.open('GET', requestUrl + query) ;
+            xdr.onload = function () {
+                autofillMerchantDetails(this.responseText);
+            };
+            xdr.onerror = function () {
+                _result = false;
+            };
+            xdr.send();
+        } else {
+            jQuery.ajax({
+                url        :  requestUrl,
+                type       : 'post',
+                dataType   : 'html',
+                data       :  requestParams,
+                global     :  false,
+                async      :  false,
+                success    :  function (result) {
+                    autofillMerchantDetails(result);
+                }
+            });
+        }
+}
+
+function autofillMerchantDetails(result)
+{
+     var fillParams = jQuery.parseJSON(result);
+
+    if (fillParams.result.status != 'SUCCESS') {
+        jQuery('input[name="novalnet_public_key"],input[name="novalnet_private_key"]').val('');
+        jQuery('.content-header').prepend('<div class="alert alert-danger align-items-center"><i class="fal fa-info-circle mr-2"></i>' + fillParams.result.status_text + '</div>');
+        jQuery('#novalnet_tariffid').val('');
+        return false;
+    }
+    
+    var tariffKeys = Object.keys(fillParams.merchant.tariff);
+    var saved_tariff_id = jQuery('#novalnet_tariffid').val();
+    var tariff_id;
+
+    try {
+        var select_text = decodeURIComponent(escape('Auswählen'));
+    } catch(e) {
+        var select_text = 'Auswählen';
+    }
+
+    jQuery('#novalnet_tariffid').replaceWith('<select id="novalnet_tariffid" class="form-control combo" name="novalnet_tariffid"><option value="" disabled>'+select_text+'</option></select>');
+
+    jQuery('#novalnet_tariffid').find('option').remove();
+    
+    for (var i = 0; i < tariffKeys.length; i++) 
+    {
+        if (tariffKeys[i] !== undefined) {
+            jQuery('#novalnet_tariffid').append(
+                jQuery(
+                    '<option>', {
+                        value: jQuery.trim(tariffKeys[i])+'-'+  jQuery.trim(fillParams.merchant.tariff[tariffKeys[i]].type),
+                        text : jQuery.trim(fillParams.merchant.tariff[tariffKeys[i]].name)
+                    }
+                )
+            );
+        }
+        if (saved_tariff_id == jQuery.trim(tariffKeys[i])+'-'+  jQuery.trim(fillParams.merchant.tariff[tariffKeys[i]].type)) {
+            jQuery('#novalnet_tariffid').val(jQuery.trim(tariffKeys[i])+'-'+  jQuery.trim(fillParams.merchant.tariff[tariffKeys[i]].type));
+        }
+    }
+}
+
+
+function configureWebhookUrlAdminPortal()
+{
+    var novalnetWebhookParams = { 'nn_public_key' : jQuery('input[name=novalnet_public_key]').val(), 'nn_private_key' : jQuery('input[name=novalnet_private_key]').val(), 'nn_webhook_url' : jQuery('input[name=novalnet_webhook_url]').val(), 'nn_request_type' : 'configureWebhook' };
+    
+    webhookRequestParams = typeof(novalnetWebhookParams !== 'undefined') ? novalnetWebhookParams : '';
+    
+    var requestUrl = jQuery('input[id=nn_post_url]').val();
+        if ('XDomainRequest' in window && window.XDomainRequest !== null) {
+            var xdr = new XDomainRequest();
+            var query = jQuery.param(webhookRequestParams);
+            xdr.open('GET', requestUrl + query) ;
+            xdr.onload = function () {
+                updateWebhookStatus(result);
+            };
+            xdr.onerror = function () {
+                _result = false;
+            };
+            xdr.send();
+        } else {
+            jQuery.ajax({
+                url        :  requestUrl,
+                type       : 'post',
+                dataType   : 'html',
+                data       :  webhookRequestParams,
+                global     :  false,
+                async      :  false,
+                success    :  function (result) {
+                    updateWebhookStatus(result);
+                }
+            });
+        }
+}
+
+function updateWebhookStatus(result) 
+{
+    var webhookResult = jQuery.parseJSON(result);
+    
+    if(webhookResult.result.status == 'SUCCESS') {
+        alert(jQuery('input[name=nn_webhook_success]').val());
+    } else {
+        alert(webhookResult.result.status_text);
+    }
+}
+
+function senddata(orderNo) 
+{
+    var requestParams = { 'order_no' : orderNo, 'nn_request_type' : 'orderDetails' };
+    orderDetailsHandler(requestParams);
+}
+
+function orderDetailsHandler(requestParams) 
+{
+    var requestUrl = jQuery('input[id=nn_post_url]').val() ;
+        if ('XDomainRequest' in window && window.XDomainRequest !== null) {
+            var xdr = new XDomainRequest();
+            var query = jQuery.param(requestParams);
+            xdr.open('GET', requestUrl + query) ;
+            xdr.onload = function () {
+                jQuery('.nn_instalment_table').html(result);
+                jQuery('.pagination-toolbar').hide();
+            };
+            xdr.onerror = function () {
+                _result = false;
+            };
+            xdr.send();
+        } else {
+            jQuery.ajax({
+                url        :  requestUrl,
+                type       : 'post',
+                dataType   : 'html',
+                data       :  requestParams,
+                global     :  false,
+                async      :  false,
+                success    :  function (result) {
+                     jQuery('.nn_order_table').hide();
+                     jQuery('#nn_transaction_info').html(result);
+                     jQuery('#nn_transaction_info').show();
+                     jQuery('.pagination-toolbar').hide();
+                }
+            });
+        }
+}
diff --git a/adminmenu/templates/novalnet_info.tpl b/adminmenu/templates/novalnet_info.tpl
new file mode 100644
index 0000000..e1efe9e
--- /dev/null
+++ b/adminmenu/templates/novalnet_info.tpl
@@ -0,0 +1,26 @@
+{**
+ * This file renders the Novalnet plugin information page
+ *
+ * @author      Novalnet
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+*}
+
+<input type="hidden" name="nn_post_url" id="nn_post_url" value="{$postUrl}">
+<input type="hidden" name="nn_lang_notification" id="nn_lang_notification" value="{$languageTexts.jtl_novalnet_notification_text}">
+<input type="hidden" name="nn_webhook_configure" id="nn_webhook_configure" value="{$languageTexts.jtl_novalnet_configure_webhook}">
+<input type="hidden" name="nn_webhook_change" id="nn_webhook_change" value="{$languageTexts.jtl_novalnet_webhook_alert_text}">
+<input type="hidden" name="nn_webhook_invalid" id="nn_webhook_invalid" value="{$languageTexts.jtl_novalnet_webhook_error_text}">
+<input type="hidden" name="nn_webhook_success" id="nn_webhook_success" value="{$languageTexts.jtl_novalnet_webhook_notification_text}">
+<input type="hidden" name="nn_webhook_url" id="nn_webhook_url" value="{$webhookUrl}">
+<input type="hidden" name="nn_webhook_notification" id="nn_webhook_notification" value="{$languageTexts.jtl_novalnet_webhook_notification}">
+
+<div class="row">
+    <div class="col col-12">
+        {$languageTexts.jtl_novalnet_info_page_text}
+    </div>
+</div>
+
+<link rel="stylesheet" type="text/css" href="{$adminUrl}css/novalnet_admin.css" integrity="sha384-J/zSDgUsPgkXirOOdcgZc4CTd4w2tJFKXQgSNJiUfHnRVX2Asw39ZP4HzPEb1VIk">
+<script type="text/javascript" src="{$adminUrl}js/novalnet_admin.js" integrity="sha384-wLf9tKVICpQvZ4YbPa3+FJCCrvVrPQGJGGEnoKxaq2do9CdI+OTnn5JTFnlr+dMz"></script>
diff --git a/adminmenu/templates/novalnet_order_details.tpl b/adminmenu/templates/novalnet_order_details.tpl
new file mode 100644
index 0000000..adf6ae6
--- /dev/null
+++ b/adminmenu/templates/novalnet_order_details.tpl
@@ -0,0 +1,54 @@
+{**
+ * This file renders the transaction details
+ *
+ * @author      Novalnet
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+*}
+
+<div id="nn_header">
+    <center>
+        {$languageTexts.jtl_novalnet_invoice_payments_order_number_reference} {$orderNo}
+    </center>
+    <a class="btn btn-primary nn_back_tab" href="{$menuId}"><span class="fal fa-long-arrow-left"></span></a>
+</div>
+
+<div class="body_div" id="overlay_window_block_body">
+    <div class="nn_accordion">
+        <div class="nn_accordion_section">
+            <div id="nn_transaction_details" class="nn_accordion_section_content" style="display:block;">
+                {if !empty($orderComment->cKommentar)}
+                    <div>{$orderComment->cKommentar|nl2br}</div><br>
+                {/if}
+                {if !empty($instalmentDetails) && $instalmentDetails.status == 'CONFIRMED'}
+                <div class="nn_instalment">
+                    <h6 style="padding-bottom:1rem;">{$instalmentDetails.lang.jtl_novalnet_instalment_information}</h6>           
+                    <table class="table table-striped nn_instalment_table">
+                        <thead>
+                          <tr>
+                            <th>{$instalmentDetails.lang.jtl_novalnet_serial_no}</th>
+                            <th>{$instalmentDetails.lang.jtl_novalnet_instalment_future_date}</th>
+                            <th>{$instalmentDetails.lang.jtl_novalnet_instalment_transaction_id}</th>
+                            <th>{$instalmentDetails.lang.jtl_novalnet_order_status}</th>
+                            <th>{$instalmentDetails.lang.jtl_novalnet_instalment_amount}</th>
+                          </tr>
+                        </thead>
+                        <tbody>
+                        {foreach from=$instalmentDetails['insDetails'] key="index" item=$instalment}
+                          <tr>
+                            <td>{$index}</td>
+                            <td>{$instalment.future_instalment_date}</td>
+                            <td>{$instalment.tid}</td>
+                            <td>{$instalment.payment_status}</td>
+                            <td>{$instalment.cycle_amount}</td>
+                          </tr>
+                        {/foreach}
+                        </tbody>
+                      </table>
+                {/if}
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/adminmenu/templates/novalnet_orders.tpl b/adminmenu/templates/novalnet_orders.tpl
new file mode 100644
index 0000000..fbfed28
--- /dev/null
+++ b/adminmenu/templates/novalnet_orders.tpl
@@ -0,0 +1,77 @@
+{**
+ * This file renders the Novalnet orders in the order tab under the novalnet plugin
+ *
+ * @author      Novalnet
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+*}
+
+<input type="hidden" name="nn_post_url" id="nn_post_url" value="{$postUrl}">
+{if $orders|@count > 0 && $orders}
+{include file='tpl_inc/pagination.tpl' pagination=$pagination cParam_arr=['kPlugin'=>$pluginId] cAnchor=$hash}
+
+    <form method="post" name="bestellungen" action="{$postUrl}">
+    {$jtl_token}
+        <div class="table-responsive">           
+            <table class="table table-striped nn_order_table">
+            <thead>
+                <tr>
+                    <th>{$languageTexts.jtl_novalnet_order_number}</th>
+                    <th>{$languageTexts.jtl_novalnet_customer_text}</th>
+                    <th>{$languageTexts.jtl_novalnet_payment_name_text}</th>
+                    <th>{$languageTexts.jtl_novalnet_wawi_pickup}</th>
+                    <th>{$languageTexts.jtl_novalnet_order_status}</th>
+                    <th>{$languageTexts.jtl_novalnet_total_amount_text}</th>
+                    <th></th>
+                </tr>
+            </thead>
+            <tbody>
+                {foreach $orders as $order}
+                <tr>
+                    <td class="text-left">
+                        <div>{$order->cBestellNr}</div>
+                        <small class="text-muted"><i class="far fa-calendar-alt" aria-hidden="true"></i> {$order->dErstellt}</small>
+                    </td>
+                    <td>
+                        <div>
+                        {if isset($order->oKunde->cVorname) || isset($order->oKunde->cNachname) || isset($order->oKunde->cFirma)}
+                            {$order->oKunde->cVorname} {$order->oKunde->cNachname}
+                            {if isset($order->oKunde->cFirma) && $order->oKunde->cFirma|strlen > 0}
+                                ({$order->oKunde->cFirma})
+                            {/if}
+                        {else}
+                        {__('noAccount')}
+                        {/if}
+                        </div>
+                        <small class="text-muted"><i class="fa fa-user" aria-hidden="true"></i> {$order->oKunde->cMail}</small>
+                    </td>   
+                    <td class="text-left">{$order->cZahlungsartName}</td>
+                    <td class="text-center">
+                        {if $order->cAbgeholt === 'Y'}
+                            <i class="fal fa-check text-success"></i>
+                        {else}
+                            <i class="fal fa-times text-danger"></i>
+                        {/if}
+                    </td>
+                    <td class="text-left">
+                        
+                        {if $paymentStatus[$order->cStatus]|in_array:$paymentStatus}
+                            {$paymentStatus[$order->cStatus]}
+                        {else}
+                            {$order->cStatus}
+                        {/if}
+                    </td>   
+                    <td class="text-center">{$order->WarensummeLocalized[0]}</td>
+                    <td onclick="senddata('{$order->cBestellNr}')"><a href="#overlay_window_block_body"><i class="fa fa-eye"></i></a></td>
+                </tr>
+                {/foreach}
+            </tbody>
+            </table>
+        </div>
+    </form>
+{else}
+    <div class="alert alert-info"><i class="fa fa-info-circle"></i> {$languageTexts.jtl_novalnet_orders_not_available}</div>
+{/if}
+<div id="nn_transaction_info"></div>
+
diff --git a/changelog.txt b/changelog.txt
new file mode 100644
index 0000000..eb492c9
--- /dev/null
+++ b/changelog.txt
@@ -0,0 +1,48 @@
+*** Changelog ***
+
+= 13.1.1 - 2024.06.13 =
+* Fix - Transaction amount are now handled correctly with thousand separators to avoid booking discrepancies
+
+= 13.1.0 - 2024.04.05 =
+* New    - Refunding a transaction through JTL WAWI
+* Fix    - Booking amount was mismatched when using a credit bonus 
+* Enhanced - Offering Instalment payments and Guarantee payments to B2B customers in Switzerland
+* Enhanced - Extension of Instalment Payment cycles till 36 cycles
+* Removed  - Payment due date configuration for Direct Debit SEPA with payment guarantee
+
+= 13.0.2 - 2024.01.31 =
+* Fix    - Plugin has been made compatible with the shop's default PayPal payment
+* Enhanced - Built-in Sub-Resource Integrity (SRI) integrated for JavaScript files to improve security for preventing unauthorized modifications
+
+= 13.0.1 - 2023.11.16 =
+* Fix    - Minor changes were made to match the JTL coding standards
+
+= 13.0.0 - 2023.09.06 =
+* Major version release: We've improved the seamless customer experience and brand configurations in the Novalnet Merchant Admin Portal to make it easier to preview and customise the checkout page
+
+= 12.0.1 - 2023.05.23 =
+* New   - Adjusted payment plugin to display Apple Pay button on supported devices
+
+= 12.0.0 - 2023.02.16 =
+* New   - Implemented Apple pay and Google pay payments
+* Fix   - Compatibility for JTL 5.2.2
+ 
+= 1.2.0 - 2022.12.08 =
+* New   - Implemented payment Trustly, Wechat pay and Alipay payments
+* Fix   - Credit/Debit Cards form alignment
+* Enhanced - Invoice payment name is updated for German translation
+* Removed  - One-click shopping for PayPal payment
+
+= 1.1.0 - 2022.08.22 =
+* New   - Implemented Online bank transfer payment
+* New   - Added "state" parameter in the payment request   
+
+= 1.0.1 - 2021.09.27 =
+* Fix   - Compatibility for PHP version 8.0
+
+= 1.0.0 - 2021.08.06 =
+* New Release: Payment plugin built with additional payment methods integration, enhanced features with better usability
+
+
+
+
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..b0a109d
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,15 @@
+{
+  "name": "novalnet_payment/jtl_novalnet",
+  "type": "project",
+  "description": "PCI Compliant, seamless integration with the various types of payment and payment-related services integrated into one unique platform",
+  "license": "proprietary",
+  "authors": [
+        {
+            "name": "Novalnet AG",
+            "homepage": "https://www.novalnet.de"
+        }
+    ],
+  "require": {
+    "php": ">=8.0"
+  }
+}
diff --git a/frontend/NovalnetHookHandler.php b/frontend/NovalnetHookHandler.php
new file mode 100644
index 0000000..3788c36
--- /dev/null
+++ b/frontend/NovalnetHookHandler.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Novalnet payment plugin
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Novalnet End User License Agreement
+ *
+ * DISCLAIMER
+ *
+ * If you wish to customize Novalnet payment extension for your needs,
+ * please contact technic@novalnet.de for more information.
+ *
+ * @author      Novalnet AG
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+ * Script: NovalnetHookHandler.php
+ *
+*/
+
+namespace Plugin\jtl_novalnet\frontend;
+
+use JTL\Shop;
+use JTL\Checkout\Bestellung;
+use Plugin\jtl_novalnet\paymentmethod\NovalnetPaymentGateway;
+
+/**
+ * Class NovalnetHookHandler
+ * @package Plugin\jtl_novalnet\frontend
+ */
+class NovalnetHookHandler
+{
+    /**
+     * @var NovalnetPaymentGateway
+     */
+    private $novalnetPaymentGateway;
+
+    /**
+     * NovalnetHookHandler constructor.
+     */
+    public function __construct()
+    {
+        $this->novalnetPaymentGateway = new NovalnetPaymentGateway();
+    }
+    
+    /**
+     * Display the Novalnet transaction comments on order status page when payment before order completion option is set to 'Ja'
+     *
+     * @param  array $args
+     * @return none
+     */
+    public function orderStatusPage(array $args): void
+    {
+        if (strpos($_SESSION['Zahlungsart']->cModulId, 'novalnet') !== false && !empty($_SESSION['novalnet']['comments'] )) {
+            $args['oBestellung']->cKommentar = $_SESSION['novalnet']['comments'] ;
+        }
+    }
+
+    /**
+     * Display the Novalnet transaction comments aligned in My Account page of the user
+     *
+     * @return none
+     */
+    public function accountPage(): void
+    {
+        if (!empty(Shop::Smarty()->tpl_vars['Bestellung'])) {
+            Shop::Smarty()->tpl_vars['Bestellung']->value->cKommentar = nl2br(Shop::Smarty()->tpl_vars['Bestellung']->value->cKommentar);
+            $lang = (Shop::Smarty()->tpl_vars['Bestellung']->value->kSprache == 1) ? 'ger' : 'eng';
+            $instalmentInfo = $this->novalnetPaymentGateway->getInstalmentInfoFromDb(Shop::Smarty()->tpl_vars['Bestellung']->value->cBestellNr, $lang);
+            Shop::Smarty()->assign('instalmentDetails', $instalmentInfo);
+        }
+    }
+
+    /**
+     * Used for the frontend template customization for the Credit Card Logo and Barzahlen slip
+     *
+     * @param  array $args
+     * @return none
+     */
+    public function contentUpdate(array $args): void
+    {
+        if(Shop::getPageType() == \PAGE_BESTELLABSCHLUSS) {
+            $this->displayNnCashpaymentSlip();
+        }
+    }
+
+    /**
+     * Display the Barzahlen slip on success page
+     *
+     * @return none
+     */
+    public function displayNnCashpaymentSlip(): void
+    {
+        if (!empty($_SESSION['kBestellung'])) {
+
+            $order = new Bestellung($_SESSION['kBestellung']);
+            $paymentModule = Shop::Container()->getDB()->queryPrepared('SELECT cModulId FROM tzahlungsart WHERE kZahlungsart = :kZahlungsart', [':kZahlungsart' => $order->kZahlungsart], 1);
+            
+            // Verifies if the cashpayment token is set and loads the slip from Barzahlen accordingly.
+            if ($paymentModule && strpos($paymentModule->cModulId, 'novalnet') !== false && !empty($_SESSION['novalnet_cashpayment_token'])) {
+
+                pq('body')->append('<script src="'. $_SESSION['novalnet_cashpayment_checkout_js'] . '"
+                                            class="bz-checkout"
+                                            data-token="'. $_SESSION['novalnet_cashpayment_token'] . '"
+                                            data-auto-display="true">
+                                    </script>
+                                    <style type="text/css">
+                                        #bz-checkout-modal { position: fixed !important; }
+                                        #barzahlen_button {width: max-content; margin-top: -30px !important; margin-bottom: 5% !important; margin-left: 20px !important; }
+                                    </style>');
+
+                pq('#order-confirmation')->append('<button id="barzahlen_button" class="bz-checkout-btn" onclick="javascript:bzCheckout.display();">' . $this->novalnetPaymentGateway->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_cashpayment_slipurl') . '</button>');
+
+                unset($_SESSION['novalnet_cashpayment_token']);
+                unset($_SESSION['novalnet_cashpayment_checkout_js']);
+            }
+        }
+    }
+
+    /**
+     * Change the WAWI pickup status as 'JA' before payment completion
+     *
+     * @param  array $args
+     * @return none
+     */
+    public function changeWawiPickupStatus(array $args): void
+    {
+        if(!empty($args['oBestellung']->kBestellung) && strpos($_SESSION['Zahlungsart']->cModulId, 'novalnet') !== false) {
+            $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('tbestellung', 'kBestellung', $args['oBestellung']->kBestellung, ['cAbgeholt' => 'Y']);
+        }
+
+    }
+    
+    /**
+     * Change the payment name based on the customer chosen payment in the payment form
+     *
+     * @return none
+     */
+    public function updatePaymentName(): void
+    {
+        if(!empty($_SESSION['novalnet']['seamless_payment_form_response']) && strpos($_SESSION['Zahlungsart']->cModulId, 'novalnet') !== false) {
+            $_SESSION['Zahlungsart']->cName = $_SESSION['Zahlungsart']->angezeigterName['ger'] = $_SESSION['Zahlungsart']->angezeigterName['eng'] = !empty($_SESSION['novalnet']['seamless_payment_form_response']['payment_details']['name']) ? $_SESSION['novalnet']['seamless_payment_form_response']['payment_details']['name'] . ' (Novalnet)' : 'Novalnet';
+        }
+    }
+    
+    /**
+	 * Load the seamless payment form on the checkout
+	 *
+	 * @return none
+	 */
+	public function displayNnPaymentForm(): void
+	{
+		global $step;       
+		$nnPaymentFormScript = '';
+		
+		foreach (Shop::Smarty()->tpl_vars['Zahlungsarten']->value as $payment) {
+			 if (strpos($payment->cModulId, 'novalnet')) {
+				if (in_array($step, ['Zahlung', 'Versand'])) {
+					// Build the pay by link parameters
+					$paymentFormRequestData = $this->novalnetPaymentGateway->generatePaymentParams($order = null, true);
+					$paymentFormRequestData['hosted_page'] =    ['type' => 'PAYMENTFORM'];
+					// Wallet order details
+					$walletOrderDetails = htmlentities($this->novalnetPaymentGateway->getBasketDetails());
+					if (!empty($_SESSION['novalnet']['order_amount'])) {
+						$paymentFormRequestData['transaction']['amount'] = $_SESSION['novalnet']['order_amount'];
+					}
+					// Send the payment form request to server
+					$paymentFormResponseData = $this->novalnetPaymentGateway->performServerCall($paymentFormRequestData, 'seamless_payment');
+					if(!empty($paymentFormResponseData)) {
+						
+						if ($paymentFormResponseData['result']['status'] == 'FAILURE') {
+							//  Stay on the checkout page
+							\header('Location:' . Shop::getURL() . '/Bestellvorgang?editVersandart=1');
+							exit;
+						} else {
+							// Novalnet payment plugin path
+							$pluginPath = $this->novalnetPaymentGateway->novalnetPaymentHelper->plugin->getPaths()->getBaseURL();
+							
+									$nnPaymentFormScript .= <<<HTML
+									<input type="hidden" name="nn_payment_id" id="nn_payment_id" value="{$payment->cModulId}">
+									<style type="text/css">
+										#$payment->cModulId .custom-control.custom-radio {display:none;}
+										#$payment->cModulId {margin-left: -1.75rem;}
+										.row.checkout-payment-options.form-group div {width: 100%;}
+									</style>
+									<fieldset>
+										<iframe style="width:100%;border:0;scrolling:no;" id="v13PaymentForm" src="{$paymentFormResponseData['result']['redirect_url']}"></iframe>
+										<script type='text/javascript' src='https://cdn.novalnet.de/js/pv13/checkout.js'></script>
+										<input type="hidden" name="nn_wallet_data" id="nn_wallet_data" value="{$walletOrderDetails}">
+										<script type='text/javascript' src='{$pluginPath}frontend/js/novalnet_payment.js'  integrity='sha384-qbry1rgKKp0UJABzBMT3Xi68UBAGchcJp3wdvZSMiN178ktNLPMVP8UkKX0Vr5Lk'></script>
+										<div class="card-header alert-danger text-center mb-3 d-none" id="novalnet_payment_form_error_alert"></div>
+									 </fieldset>
+HTML;
+						}
+					} else {
+						$nnPaymentFormScript .= <<<HTML
+						<style type="text/css">
+							   #$payment->cModulId .custom-control.custom-radio {display:none;}
+						</style>	
+HTML;
+					}
+				}
+			 }
+		}
+		Shop::Smarty()->assign('novalnetPaymentForm', $nnPaymentFormScript)
+		->assign('cModulId', $payment->cModulId);
+	}
+}
diff --git a/frontend/js/novalnet_payment.js b/frontend/js/novalnet_payment.js
new file mode 100644
index 0000000..c441259
--- /dev/null
+++ b/frontend/js/novalnet_payment.js
@@ -0,0 +1,132 @@
+/*
+ * This script load the payment form on the checkout
+ *
+ * @author      Novalnet
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+*/
+
+jQuery(document).ready(function () {
+    // Initialize the payment form
+    const v13PaymentForm = new NovalnetPaymentForm();
+    // Hide the Novalnet payment radio option
+    var paymentId = jQuery('#nn_payment_id').val();
+    var novalnetPaymentValue = jQuery('#' + paymentId).find('input').val();
+    // Hide the uncheck the Novalnet payment if other payment method is selected
+    jQuery('input[type="radio"]').on('click',function() {
+        if(this.value != novalnetPaymentValue) {
+            v13PaymentForm.uncheckPayment();
+        }
+    });
+    var checkPaymentType = null;
+    var uncheckPayments = true;
+    
+    // Set the checkPayment and uncheckPayments
+    if(jQuery('#payment' + novalnetPaymentValue).is(':checked')) {
+		uncheckPayments = false;
+		checkPaymentType = (checkPaymentType) ? checkPaymentType : getCookie('novalnet_selected_payment');
+	}
+	
+    // Set the payment form style
+    const paymentFormDisplay = {
+        iframe: '#v13PaymentForm',
+        initForm : {
+            orderInformation : {
+                lineItems: jQuery.parseJSON(jQuery("#nn_wallet_data").val())
+            },
+            setWalletPending: true,
+            uncheckPayments: uncheckPayments,
+            showButton: false
+        }
+    };
+    if(checkPaymentType) {
+		paymentFormDisplay.checkPayment = checkPaymentType;
+	}
+	
+    jQuery("div[id*='_novalnet']").append(jQuery('#v13PaymentForm'));
+    
+    // Before  Iframe load clicking the submit button active the process again
+    jQuery('#v13PaymentForm').on("load", function() {
+		 if(jQuery('#payment' + novalnetPaymentValue).is(':checked')) {
+			 jQuery('.submit_once').prop('disabled',false);
+		}
+	});
+	
+    // Initiatialize the payment form 
+    v13PaymentForm.initiate(paymentFormDisplay);
+    // Get the payment methods response
+    if(jQuery("div[id*='_novalnet']").closest('form').find('.submit_once').length == 1) {
+            jQuery('form.checkout-shipping-form').submit(function(e) {
+                if(jQuery('#nn_seamless_payment_form_response').length == 0 && jQuery('#'+paymentId+ ' ' + 'input[name="Zahlungsart"]').is(':checked')) {                    
+                    // callback for checkout button clicked
+                    if(jQuery('#nn_seamless_payment_form_response').length <= 0 || jQuery('#nn_seamless_payment_form_response').val() == '' ) {
+                        e.preventDefault();
+                    }        
+                    try {
+						v13PaymentForm.getPayment(
+							(data) => {
+								if(data.result.status == 'ERROR') {
+									jQuery('#novalnet_payment_form_error_alert').text(data.result.message);
+									jQuery('#novalnet_payment_form_error_alert').removeClass('d-none'); 
+									jQuery('html, body').animate({
+										scrollTop: (jQuery('#checkout').offset().top - 160)
+										}, 500, function() {
+											jQuery('#checkout').prepend(jQuery('#novalnet_payment_form_error_alert'));
+									});
+									jQuery('.submit_once').prop('disabled',false);
+									return false;
+								} else {
+									jQuery('form.checkout-shipping-form').append('<input type="hidden" name="nn_seamless_payment_form_response" id="nn_seamless_payment_form_response">');
+									jQuery('#nn_seamless_payment_form_response').val(btoa(unescape(encodeURIComponent(JSON.stringify(data)))));
+									jQuery('form.checkout-shipping-form').submit();
+									return true;
+								}
+							}
+						)
+					} catch (e) {
+							return true;
+				   }
+				}
+            }); 
+        }
+            
+    // Handle wallet payment response
+    v13PaymentForm.walletResponse({
+        "onProcessCompletion": async (response) =>  {
+            if(response.result.status == 'FAILURE' || response.result.status == 'ERROR' ) {
+                return {status: 'FAILURE', statusText: 'failure'};
+            } else {
+				if(jQuery('#nn_seamless_payment_form_response').length == 0) {
+					jQuery('form.checkout-shipping-form').append('<input type="hidden" name="nn_seamless_payment_form_response" id="nn_seamless_payment_form_response">');
+				}
+                jQuery('#nn_seamless_payment_form_response').val(btoa(JSON.stringify(response)));
+                jQuery("div[id*='_novalnet']").closest('form').submit();
+                return {status: 'SUCCESS', statusText: 'successful'};
+            }
+        }
+    });
+    // receive form selected payment action
+    v13PaymentForm.selectedPayment(
+        (data)=> {
+			setCookie(getCookie(), '-1');
+			setCookie(data.payment_details.type);
+            // Set Novalnet payment as selected
+            jQuery('#' + paymentId).find('input').prop('checked', true);
+            jQuery('#'+paymentId).find('input[type="radio"]').click();
+       }
+    )
+});
+
+function setCookie(value, expiry)
+{
+	let expires = new Date();
+	expires.setTime(expires.getTime() + (expiry * 24 * 60 * 60 * 1000));
+	document.cookie = 'novalnet_selected_payment=' + value + ';expires=' + expires.toUTCString() + ';path=/;SameSite=None;Secure';
+}
+
+function getCookie()
+{
+	var keyValue = document.cookie.match('(^|;) ?novalnet_selected_payment=([^;]*)(;|$)');
+    return (keyValue != null && keyValue.length) ? keyValue[2] : null;
+}
diff --git a/frontend/template/account/order_details.tpl b/frontend/template/account/order_details.tpl
new file mode 100644
index 0000000..3cfabac
--- /dev/null
+++ b/frontend/template/account/order_details.tpl
@@ -0,0 +1,41 @@
+{**
+ * Extended the shop template file for adding the instalment information
+ *
+ * @author      Novalnet
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+*}
+
+{block name='account-order-details-order-comment'}
+    {if !empty($Bestellung->cKommentar|trim)}
+        <div class='h3'>{lang key='yourOrderComment' section='login'}</div>
+        <p>{$Bestellung->cKommentar}</p>
+    {/if}
+    
+    {if !empty($instalmentDetails) && $instalmentDetails.status == 'CONFIRMED'}
+    <h6>{$instalmentDetails.lang.jtl_novalnet_instalment_information}</h6>           
+    <table class="table table-striped table-bordered nn_instalment_table">
+        <thead>
+          <tr>
+            <th>{$instalmentDetails.lang.jtl_novalnet_serial_no}</th>
+            <th>{$instalmentDetails.lang.jtl_novalnet_instalment_future_date}</th>
+            <th>{$instalmentDetails.lang.jtl_novalnet_instalment_transaction_id}</th>
+            <th>{$instalmentDetails.lang.jtl_novalnet_order_status}</th>
+            <th>{$instalmentDetails.lang.jtl_novalnet_instalment_amount}</th>
+          </tr>
+        </thead>
+        <tbody>
+        {foreach from=$instalmentDetails['insDetails'] key='index' item=$instalment}
+          <tr>
+            <td>{$index}</td>
+            <td>{$instalment.future_instalment_date}</td>
+            <td>{$instalment.tid}</td>
+            <td>{$instalment.payment_status}</td>
+            <td>{$instalment.cycle_amount}</td>
+          </tr>
+        {/foreach}
+        </tbody>
+      </table>
+    {/if}
+{/block}
diff --git a/frontend/template/checkout/inc_payment_methods.tpl b/frontend/template/checkout/inc_payment_methods.tpl
new file mode 100644
index 0000000..68e0a6f
--- /dev/null
+++ b/frontend/template/checkout/inc_payment_methods.tpl
@@ -0,0 +1,47 @@
+{block name='checkout-inc-payment-methods'}
+    {radiogroup}
+        {foreach $Zahlungsarten as $zahlungsart}
+            {col cols=12 id=$zahlungsart->cModulId class="checkout-payment-method"}
+                {radio name="Zahlungsart"
+                        value=$zahlungsart->kZahlungsart
+                        id="payment{$zahlungsart->kZahlungsart}"
+                        checked=($AktiveZahlungsart === $zahlungsart->kZahlungsart || $Zahlungsarten|@count === 1)
+                        required=($zahlungsart@first)
+                }
+                    {block name='checkout-inc-payment-methods-image-title'}
+                        {if $zahlungsart->cBild}
+                                {image src=$zahlungsart->cBild alt=$zahlungsart->angezeigterName|trans fluid=true class="img-sm"}
+                        {else}
+                            <span class="content">
+                                <span class="title">{$zahlungsart->angezeigterName|trans}</span>
+                            </span>
+                        {/if}
+                    {/block}
+                    {if $zahlungsart->fAufpreis != 0}
+                        {block name='checkout-inc-payment-methods-badge'}
+                            <strong class="checkout-payment-method-badge">
+                            {if $zahlungsart->cGebuehrname|has_trans}
+                                <span>{$zahlungsart->cGebuehrname|trans} </span>
+                            {/if}
+                                {$zahlungsart->cPreisLocalized}
+                            </strong>
+                        {/block}
+                    {/if}
+                    {if $zahlungsart->cHinweisText|has_trans}
+                        {block name='checkout-inc-payment-methods-note'}
+                            <span class="checkout-payment-method-note">
+                                <small>{$zahlungsart->cHinweisText|trans}</small>
+                            </span>
+                        {/block}
+                    {/if}
+                {/radio}
+            {/col}
+        {/foreach}
+        
+    {/radiogroup}
+    {foreach $Zahlungsarten as $zahlungsart}
+		{if $zahlungsart->cModulId == $cModulId}
+			{$novalnetPaymentForm}
+		{/if}
+	{/foreach}
+{/block}
diff --git a/info.xml b/info.xml
new file mode 100644
index 0000000..f2bf35a
--- /dev/null
+++ b/info.xml
@@ -0,0 +1,645 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<jtlshopplugin>
+    <Name>Novalnet</Name>
+    <Description>Novalnet-Zahlungsplugin</Description>
+    <Author>Novalnet AG</Author>
+    <URL>https://www.novalnet.de</URL>
+    <XMLVersion>102</XMLVersion>
+    <ShopVersion>500</ShopVersion>
+    <PluginID>jtl_novalnet</PluginID>
+    <CreateDate>2024-06-13</CreateDate>
+    <Version>13.1.1</Version>
+    <Install>
+        <Adminmenu>
+            <Customlink sort="0">
+                <Name>Info</Name>
+            </Customlink>
+            <!-- Novalnet Global Settings -->
+            <Settingslink sort="1">
+                <Name>Novalnet-Konfigurationseinstellungen</Name>
+                <Setting type="text" initialValue="Y" sort="0" conf="N">
+                    <Name>Novalnet-Konfigurationseinstellungen</Name>
+                    <ValueName>novalnet_global_configuration</ValueName>
+                </Setting>
+                <Setting type="text" initialValue="" sort="1" conf="Y">
+                    <Name>Produktaktivierungsschlüssel</Name>
+                    <Description><![CDATA[Ihren Produktaktivierungsschlüssel finden Sie im Novalnet Admin-Portal: Projekte > Wählen Sie Ihr Projekt > API-Anmeldeinformationen > API Signature (Aktivierungsschlüssel des Produkts)]]></Description>
+                    <ValueName>novalnet_public_key</ValueName>
+                </Setting>
+                <Setting type="text" initialValue="" sort="2" conf="Y">
+                    <Name>Zahlungs-Zugriffsschlüssel</Name>
+                    <Description><![CDATA[Ihren Paymentzugriffsschlüssel finden Sie im Novalnet Admin-Portal: Projekte > Wählen Sie Ihr Projekt > API-Anmeldeinformationen > Paymentzugriffsschlüssel]]></Description>
+                    <ValueName>novalnet_private_key</ValueName>
+                </Setting>
+                <Setting type="text" initialValue="" sort="3" conf="Y">
+                    <Name>Auswahl der Tarif-ID</Name>
+                    <Description><![CDATA[Wählen Sie eine Tarif-ID, die dem bevorzugten Tarifplan entspricht, den Sie im Novalnet Admin-Portal für dieses Projekt erstellt haben]]></Description>
+                    <ValueName>novalnet_tariffid</ValueName>
+                </Setting>
+                <Setting type="checkbox" initialValue="" sort="4" conf="Y">
+                    <Name>Zahlungsart anzeigen</Name>
+                    <ValueName>novalnet_enable_payment_method</ValueName>
+                </Setting>
+                <Setting type="text" initialValue="Y" sort="5" conf="N">
+                    <Name>Verwaltung des Bestellstatus für ausgesetzte Zahlungen</Name>
+                    <ValueName>novalnet_bestellstatus_verwaltung</ValueName>
+                </Setting>
+                <Setting type="selectbox" initialValue="BESTELLUNG_STATUS_OFFEN" sort="6" conf="Y">
+                    <Name>On-hold-Bestellstatus</Name>
+                    <ValueName>novalnet_onhold_order_status</ValueName>
+                    <SelectboxOptions>
+                        <Option value="BESTELLUNG_STATUS_OFFEN" sort="0">offen</Option>
+                        <Option value="BESTELLUNG_STATUS_IN_BEARBEITUNG" sort="1">in Bearbeitung</Option>
+                        <Option value="BESTELLUNG_STATUS_BEZAHLT" sort="2">bezahlt</Option>
+                        <Option value="BESTELLUNG_STATUS_STORNO" sort="3">Storno</Option>
+                    </SelectboxOptions>
+                </Setting>
+                <Setting type="text" initialValue="Y" sort="7" conf="N">
+                    <Name>Benachrichtigungs- / Webhook-URL festlegen</Name>
+                    <ValueName>novalnet_webhook_scripts</ValueName>
+                </Setting>
+                <Setting type="text" initialValue="" sort="8" conf="Y">
+                    <Name>Benachrichtigungs- / Webhook-URL</Name>
+                    <Description><![CDATA[Sie müssen die folgende Webhook-URL im Novalnet Admin-Portal hinzufügen. Dadurch können Sie Benachrichtigungen über den Transaktionsstatus erhalten.]]></Description>
+                    <ValueName>novalnet_webhook_url</ValueName>
+                </Setting>
+               <Setting type="checkbox" initialValue="" sort="9" conf="Y">
+                    <Name>Manuelles Testen der Benachrichtigungs- / Webhook-URL erlauben</Name>
+                    <ValueName>novalnet_webhook_testmode</ValueName>
+                </Setting>
+            </Settingslink>
+            <Customlink sort="2">
+                <Name>Bestellungen</Name>
+            </Customlink>
+        </Adminmenu>
+        <PaymentMethod>
+            <!-- Novalnet Payment Method -->
+            <Method>
+                <Name>Novalnet</Name>
+                <PictureURL>novalnet.png</PictureURL>
+                <Sort>0</Sort>
+                <SendMail>1</SendMail>
+                <Provider>Novalnet</Provider>
+                <TSCode>OTHER</TSCode>
+                <PreOrder>0</PreOrder>
+                <Soap>0</Soap>
+                <Curl>1</Curl>
+                <Sockets>0</Sockets>
+                <ClassFile>NovalnetPayment.php</ClassFile>
+                <ClassName>NovalnetPayment</ClassName>
+                <AdditionalTemplateFile>template/novalnet_payment.tpl</AdditionalTemplateFile>
+                <MethodLanguage iso="GER">
+                    <Name>Novalnet</Name>
+                    <ChargeName>Gebühr</ChargeName>
+                    <InfoText>Novalnet</InfoText>
+                </MethodLanguage>
+                <MethodLanguage iso="ENG">
+                    <Name>Novalnet</Name>
+                    <ChargeName>Fee</ChargeName>
+                    <InfoText>Novalnet</InfoText>
+                </MethodLanguage>
+            </Method>
+        </PaymentMethod>
+        <!-- Email Template -->
+        <Emailtemplate>
+            <Template>
+                <Name>Email-Benachrichtigung für Callback</Name>
+                <Description></Description>
+                <Type>text/html</Type>
+                <ModulId>novalnetwebhookmail</ModulId>
+                <Active>N</Active>
+                <AKZ>0</AKZ>
+                <AGB>0</AGB>
+                <WRB>0</WRB>
+                <TemplateLanguage iso="GER">
+                    <Subject>Novalnet Webhook-Skript-Benachrichtigung</Subject>
+                    <ContentHtml><![CDATA[{includeMailTemplate template=header type=html}
+Sehr geehrte Kundin,<br><br>
+{$oPluginMail->webhookMessage}<br><br>
+Mit freundlichen Grüßen<br>
+Novalnet AG
+{includeMailTemplate template=footer type=html}]]></ContentHtml>
+                    <ContentText><![CDATA[{includeMailTemplate template=header type=plain}
+Sehr geehrte Kundin,
+{$oPluginMail->webhookMessage}
+Ignorieren Sie bitte diese E-Mail, falls die Bestellung von Ihnen zu Testzwecken durchgeführt wurde.
+Mit freundlichen Grüßen
+Novalnet AG
+{includeMailTemplate template=footer type=plain}]]></ContentText>
+                </TemplateLanguage>
+                <TemplateLanguage iso="ENG">
+                    <Subject>Novalnet webhook script notification</Subject>
+                    <ContentHtml><![CDATA[{includeMailTemplate template=header type=html}
+Dear client,<br><br>
+{$oPluginMail->webhookMessage}<br><br>
+Regards,<br>
+Novalnet AG
+{includeMailTemplate template=footer type=html}]]></ContentHtml>
+                    <ContentText><![CDATA[{includeMailTemplate template=header type=plain}
+Dear client,
+{$oPluginMail->webhookMessage}
+Regards,
+Novalnet AG
+{includeMailTemplate template=footer type=plain}]]></ContentText>
+                </TemplateLanguage>
+            </Template>
+            <Template>
+                <Name>Email-Benachrichtigung für Instalment</Name>
+                <Description></Description>
+                <Type>text/html</Type>
+                <ModulId>novalnetinstalmentmail</ModulId>
+                <Active>Y</Active>
+                <AKZ>0</AKZ>
+                <AGB>0</AGB>
+                <WRB>0</WRB>
+                <TemplateLanguage iso="GER">
+                    <Subject>Neue Rate Auftrag</Subject>
+                    <ContentHtml><![CDATA[{includeMailTemplate template=header type=html}
+Sehr geehrte Kundin,<br>
+{$oPluginMail->nextInstalmentMsg}<br>
+{$oPluginMail->instalmentMessage}<br><br>
+Mit freundlichen Grüßen<br>
+Novalnet AG
+{includeMailTemplate template=footer type=html}]]></ContentHtml>
+                    <ContentText><![CDATA[{includeMailTemplate template=header type=plain}
+Sehr geehrte Kundin,
+{$oPluginMail->nextInstalmentMsg}
+{$oPluginMail->instalmentMessage}
+Ignorieren Sie bitte diese E-Mail, falls die Bestellung von Ihnen zu Testzwecken durchgeführt wurde.
+Mit freundlichen Grüßen
+Novalnet AG
+{includeMailTemplate template=footer type=plain}]]></ContentText>
+                </TemplateLanguage>
+                <TemplateLanguage iso="ENG">
+                    <Subject>New Instalment order</Subject>
+                    <ContentHtml><![CDATA[{includeMailTemplate template=header type=html}
+Dear client,<br><br>
+{$oPluginMail->nextInstalmentMsg}<br>
+{$oPluginMail->instalmentMessage}<br><br>
+Regards,<br>
+Novalnet AG
+{includeMailTemplate template=footer type=html}]]></ContentHtml>
+                    <ContentText><![CDATA[{includeMailTemplate template=header type=plain}
+Dear client,
+{$oPluginMail->nextInstalmentMsg}
+{$oPluginMail->instalmentMessage}
+Regards,
+Novalnet AG
+{includeMailTemplate template=footer type=plain}]]></ContentText>
+                </TemplateLanguage>
+            </Template>
+        </Emailtemplate>
+        <!-- Novalnet Language texts-->
+        <Locales>
+            <!-- Backend language text -->
+            <Variable>
+                <Name>jtl_novalnet_notification_text</Name>
+                <Description>Benachrichtigungstext</Description>
+                <VariableLocalized iso="GER"><![CDATA[Bitte geben Sie den gültigen Produktaktivierungsschlüssel und Paymentzugriffsschlüssel ein.]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Please enter a valid Product Activation Key and Payment Access key.]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_configure_webhook</Name>
+                <Description>Webhook-Konfiguration im Admin-Portal</Description>
+                <VariableLocalized iso="GER"><![CDATA[Konfigurieren]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Configure]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_webhook_alert_text</Name>
+                <Description>Webhook-Warnungstext</Description>
+                <VariableLocalized iso="GER"><![CDATA[Sind Sie sicher, dass Sie die Webhook-URL im Novalnet Admin Portal konfigurieren möchten?]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Are you sure you want to configure the Webhook URL in Novalnet Admin Portal?]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_webhook_notification_text</Name>
+                <Description>Benachrichtigungstext nach der Konfiguration des Webhooks</Description>
+                <VariableLocalized iso="GER"><![CDATA[Callbackskript-/ Webhook-URL wurde erfolgreich im Novalnet Admin Portal konfiguriert]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Notification / Webhook URL is configured successfully in Novalnet Admin Portal]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_webhook_error_text</Name>
+                <Description>Fehlertext für Webhook-Fehlkonfiguration</Description>
+                <VariableLocalized iso="GER"><![CDATA[Bitte geben Sie eine gültige Webhook-URL ein]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Please enter the valid Webhook URL]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_webhook_configuration_tooltip</Name>
+                <Description>Text für Webhook-Tooltip</Description>
+                <VariableLocalized iso="GER"><![CDATA[Klicken Sie hier, um die Callbackskript-/ Webhook-URL im Novalnet Admin Portal automatisch zu konfigurieren]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Click here to auto configure Notification / Webhook URL in Novalnet Admin Portal]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_order_number</Name>
+                <Description>Label zur Anzeige von Novalnet-Bestellungen</Description>
+                <VariableLocalized iso="GER"><![CDATA[BESTELLNUMMER]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[ORDER ID]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_customer_text</Name>
+                <Description>Etikett zur Anzeige von Kundennamen</Description>
+                <VariableLocalized iso="GER"><![CDATA[KUNDE]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[CUSTOMER]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_payment_name_text</Name>
+                <Description>Beschriftung zur Anzeige von Zahlungen</Description>
+                <VariableLocalized iso="GER"><![CDATA[ZAHLUNGSART]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[PAYMENT METHOD]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_wawi_pickup</Name>
+                <Description>Etikett für JTL-Wawi-Pickup</Description>
+                <VariableLocalized iso="GER"><![CDATA[BEREITS AN JTL-WAWI GESENDET]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[ALREADY SENT TO JTL-WAWI]]></VariableLocalized>
+            </Variable>
+             <Variable>
+                <Name>jtl_novalnet_orders_not_available</Name>
+                <Description>Text für Bestellungen im Shop-Backend nicht verfügbar</Description>
+                <VariableLocalized iso="GER"><![CDATA[Keine Daten vorhanden.]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[No data available]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_total_amount_text</Name>
+                <Description>Etikett zur Anzeige des Bestellbetrags</Description>
+                <VariableLocalized iso="GER"><![CDATA[GESAMTSUMME]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[TOTAL SUM]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_order_creation_date</Name>
+                <Description>Beschriftung zur Anzeige der Auftragserstellung</Description>
+                <VariableLocalized iso="GER"><![CDATA[BESTELLDATUM]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[ORDER DATE]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_order_status</Name>
+                <Description>Text für den Bestellstatus</Description>
+                <VariableLocalized iso="GER"><![CDATA[STATUS]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[STATUS]]></VariableLocalized>
+            </Variable>
+            <!-- Payment text-->
+            <Variable>
+                <Name>jtl_novalnet_customer_comment</Name>
+                <Description>Kundenkommentartext</Description>
+                <VariableLocalized iso="GER"><![CDATA[Kundenkommentare: ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Customer comments: ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_transaction_detail</Name>
+                <Description>Detailtext zur Novalnet-Transaktion</Description>
+                <VariableLocalized iso="GER"><![CDATA[Novalnet-Transaktionsdetails]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Novalnet transaction details]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_transaction_tid</Name>
+                <Description>Novalnet-Transaktions-ID-Text</Description>
+                <VariableLocalized iso="GER"><![CDATA[Novalnet-Transaktions-ID: ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Novalnet transaction ID: ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_test_order</Name>
+                <Description>Informationstext zur Testbestellung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Testbestellung]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Test order]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_iban</Name>
+                <Description>Text für die Novalnet-IBAN</Description>
+                <VariableLocalized iso="GER"><![CDATA[IBAN: ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[IBAN: ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_bic</Name>
+                <Description>Text für den Novalnet BIC</Description>
+                <VariableLocalized iso="GER"><![CDATA[BIC: ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[BIC: ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_bank</Name>
+                <Description>Text für die Novalnet BANK</Description>
+                <VariableLocalized iso="GER"><![CDATA[BANK: ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[BANK: ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_invoice_payment_transfer_comment</Name>
+                <Description>Kopftext des Kommentars zu Rechnungszahlungen</Description>
+                <VariableLocalized iso="GER"><![CDATA[Bitte überweisen Sie den Betrag von %s auf das folgende Konto]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Please transfer the amount of %s to the following account]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_invoice_payment_transfer_duedate_comments</Name>
+                <Description>Kopftext des Kommentars zu Rechnungszahlungen</Description>
+                <VariableLocalized iso="GER"><![CDATA[Bitte überweisen Sie den Betrag von %s  spätestens bis zum %s auf das folgende Konto]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Please transfer the amount of %s  to the following account on or before %s]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_invoice_payments_holder</Name>
+                <Description>Text des Kontoinhabers für Rechnungszahlungen</Description>
+                <VariableLocalized iso="GER"><![CDATA[Kontoinhaber: ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Account holder: ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_invoice_due_date</Name>
+                <Description>Text zum Fälligkeitsdatum der Rechnungszahlungen</Description>
+                <VariableLocalized iso="GER"><![CDATA[Fälligkeitsdatum: ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Due date: ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_invoice_payments_amount</Name>
+                <Description>Text zum Betrag des Rechnungszahlungsauftrags</Description>
+                <VariableLocalized iso="GER"><![CDATA[Betrag: ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Amount: ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_invoice_payments_order_number_reference</Name>
+                <Description>Referenztext zur Rechnungszahlungsauftragsnummer</Description>
+                <VariableLocalized iso="GER"><![CDATA[Bestellnummer: ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Order number: ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_invoice_payments_single_reference_text</Name>
+                <Description>Referenztext für Rechnungszahlungen</Description>
+                <VariableLocalized iso="GER"><![CDATA[Bitte verwenden Sie einen der unten angegebenen Verwendungszwecke für die Überweisung. Nur so kann Ihr Geldeingang Ihrer Bestellung zugeordnet werden]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Please use any of the following payment references when transferring the amount. This is necessary to match it with your corresponding order]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_instalment_payment_reference</Name>
+                <Description>Referenztext zur Ratenzahlung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Zahlungsreferenz: ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Payment Reference: ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_instalment_per_month_text</Name>
+                <Description>Ratenzahlung pro Monat Text</Description>
+                <VariableLocalized iso="GER"><![CDATA[(Monatlich)]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[(per month)]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_invoice_payments_first_reference</Name>
+                <Description>Referenztext für die erste Zahlung bei Rechnungszahlungen</Description>
+                <VariableLocalized iso="GER"><![CDATA[Zahlungsreferenz1: ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Payment Reference1: ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_invoice_payments_second_reference</Name>
+                <Description>Rechnungszahlungen, zweiter Zahlungsreferenztext</Description>
+                <VariableLocalized iso="GER"><![CDATA[Zahlungsreferenz2: ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Payment Reference2: ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_zero_amount_booking_text</Name>
+                <Description>Text für Nullbetrag-Prozess</Description>
+                <VariableLocalized iso="GER"><![CDATA[Diese Transaktion wird mit Nullbuchung bearbeitet]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[This order processed as a zero amount booking]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_guarantee_text</Name>
+                <Description>Text für garantierte Zahlung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Diese Transaktion wird mit Zahlungsgarantie verarbeitet]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[This is processed as a guarantee payment]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_guaranteed_invoice_pending_text</Name>
+                <Description>Text für eine garantierte Rechnung mit ausstehender Zahlung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Ihre Bestellung ist unter Bearbeitung. Sobald diese bestätigt wurde, erhalten Sie alle notwendigen Informationen zum Ausgleich der Rechnung. Wir bitten Sie zu beachten, dass dieser Vorgang bis zu 24 Stunden andauern kann]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[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]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_guaranteed_sepa_pending_text</Name>
+                <Description>Text für garantiertes Sepa bis zur Zahlung</Description>
+                <VariableLocalized iso="GER"><![CDATA[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]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Your order is under verification and we will soon update you with the order status. Please note that this may take upto 24 hours]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_instalment_information</Name>
+                <Description>Label for instalment information</Description>
+                <VariableLocalized iso="GER"><![CDATA[Zusammenfassung der Ratenzahlung]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Instalment Summary]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_serial_no</Name>
+                <Description>Label for serial no</Description>
+                <VariableLocalized iso="GER"><![CDATA[S.Nr]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[S.No]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_instalment_future_date</Name>
+                <Description>Label for instalment date</Description>
+                <VariableLocalized iso="GER"><![CDATA[Datum]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Date]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_instalment_transaction_id</Name>
+                <Description>Novalnet transaction id text</Description>
+                <VariableLocalized iso="GER"><![CDATA[Novalnet-Transaktions-ID]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Novalnet transaction ID]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_instalment_amount</Name>
+                <Description>Instalment amount text</Description>
+                <VariableLocalized iso="GER"><![CDATA[Anzahl der Raten]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Instalment Amount]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_cashpayment_expiry_date</Name>
+                <Description>Cashpayment expiry date text</Description>
+                <VariableLocalized iso="GER"><![CDATA[Verfallsdatum des Zahlscheins: ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Slip expiry date: ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_cashpayment_nearest_store_details</Name>
+                <Description>Cashpayment nearest store details</Description>
+                <VariableLocalized iso="GER"><![CDATA[Barzahlen-Partnerfiliale in Ihrer Nähe]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Store(s) near you]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_cashpayment_slipurl</Name>
+                <Description>Cashpayment slip URL text</Description>
+                <VariableLocalized iso="GER"><![CDATA[Bezahlen mit Barzahlen]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Pay now with Barzahlen]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_wallet_text</Name>
+                <Description>Wallet payment reference</Description>
+                <VariableLocalized iso="GER"><![CDATA[Ihre Bestellung wurde erfolgreich mit %s durchgeführt (%s **** %s)]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Your order was successfully processed using %s (%s **** %s)]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_multibanco_reference_text</Name>
+                <Description>Multibanco payment reference text</Description>
+                <VariableLocalized iso="GER"><![CDATA[Bitte verwenden Sie die folgende Zahlungsreferenz, um den Betrag von %s  an einem Multibanco-Geldautomaten oder über Ihr Onlinebanking zu bezahlen]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Please use the following payment reference details to pay the amount of %s  at a Multibanco ATM or through your internet banking]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_multibanco_reference_one</Name>
+                <Description>Multibanco first reference</Description>
+                <VariableLocalized iso="GER"><![CDATA[Partner-Zahlungsreferenz: ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Partner Payment Reference: ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_multibanco_reference_two</Name>
+                <Description>Multibanco second reference</Description>
+                <VariableLocalized iso="GER"><![CDATA[Entität (Nummer der Bank / des Unternehmens, welches die Zahlung durchführt): ]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Entity: ]]></VariableLocalized>
+            </Variable>
+            <!-- Common Text -->
+            <Variable>
+                <Name>jtl_novalnet_payment_charge</Name>
+                <Description>Payment method charge fee</Description>
+                <VariableLocalized iso="GER"><![CDATA[Gebühr]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Fee]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_checksum_error</Name>
+                <Description>Prüfsummenfehlermeldung für die Umleitung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Prüfsumme ungültig]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Checksum Invalid]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_payment_form_error</Name>
+                <Description>Der Text wird angezeigt, während das Zahlungsformular keine Antwort erhält</Description>
+                <VariableLocalized iso="GER"><![CDATA[Leider konnte Ihre Bestellung nicht erfolgreich abgeschlossen werden. Bitte führen Sie nun die Zahlung durch.]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Unfortunately your order was not suceed.Please proceed the payment now]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_credit_used</Name>
+                <Description>Credit Reviwe System</Description>
+                <VariableLocalized iso="GER"><![CDATA[Verrechnetes Guthaben]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Credit used]]></VariableLocalized>
+            </Variable>
+            <!-- Webhook text -->
+            <Variable>
+                <Name>jtl_novalnet_confirmation_text</Name>
+                <Description>Bestellbestätigungstext</Description>
+                <VariableLocalized iso="GER"><![CDATA[Die Bestellung wurde am %s um %s. Uhr bestätigt.]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Transaction has been confirmed on %s %s.]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_amount_confirmation_text</Name>
+                <Description>Bestellbestätigungstext</Description>
+                <VariableLocalized iso="GER"><![CDATA[Bitte überweisen Sie den Betrag in Höhe von %s bis spätestens %s]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Please transfer the amount of %s on or before %s]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_update_confirmation_text</Name>
+                <Description>Bestellbestätigungstext</Description>
+                <VariableLocalized iso="GER"><![CDATA[Transaktion mit TID %s und Betrag %s %s wurde am %s um %s erfolgreich aktualisiert]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Transaction updated successfully for the TID: %s with the amount %s %s on %s %s]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_transaction_cancellation</Name>
+                <Description>Webhook-Text während eines Transaktionsfehlers</Description>
+                <VariableLocalized iso="GER"><![CDATA[Die Transaktion wurde am %s um %s Uhr storniert.]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[The transaction has been canceled on %s %s.]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_pending_to_onhold_status_change</Name>
+                <Description>Webhook-Text während der anfänglichen Ausführung der Zahlung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Der Status der Transaktion mit der TID: %s wurde am %s um %s Uhr von ausstehend auf ausgesetzt geändert.]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[The transaction status has been changed from pending to on hold for the TID: %s on %s %s.]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_amount_update_message</Name>
+                <Description>Erfolgstext zum Aktualisieren des Betrags</Description>
+                <VariableLocalized iso="GER"><![CDATA[Die Transaktion wurde mit dem Betrag %s am % um %s erfolgreich aktualisiert.]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[The transaction has been updated with amount %s  on %s %s]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_duedate_update_message</Name>
+                <Description>Erfolgstext zum Aktualisieren des Betrags</Description>
+                <VariableLocalized iso="GER"><![CDATA[Die Transaktion wurde mit dem Betrag %s und dem Fälligkeitsdatum %s aktualisiert.]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[The transaction has been updated with amount %s and due date with %s]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_chargeback_execution_text</Name>
+                <Description>Webhook-Text für die Ausführung der Rückbuchung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Rückbuchung erfolgreich ausgeführt für die TID: %s Betrag: %s  am %s %s. Die nachfolgende TID: %s.]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Chargeback executed successfully for the TID: %s amount: %s  on %s %s. The subsequent TID: %s]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_reversal_execution_text</Name>
+                <Description>Webhook-Text für die Umkehrausführung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Chargeback für Rücküberweisung mit dem Betrag %s am %s um %s für TID %s ausgeführt. Die neue TID lautet: %s]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Chargeback executed for reversal of TID %s with the amount %s  on %s %s. The subsequent TID: %s]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_return_debit_execution_text</Name>
+                <Description>Webhook-Text für die Ausführung der Rücklastschrift</Description>
+                <VariableLocalized iso="GER"><![CDATA[Chargeback für Rücklastschrift mit dem Betrag %s  am %s um %s für TID %s ausgeführt. Die neue TID lautet: %s]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Chargeback executed for return debit of TID: %s with the amount  %s on %s %s. The subsequent TID: %s]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_instalment_cancellation</Name>
+                <Description>Webhook-Text während Ratenfehler</Description>
+                <VariableLocalized iso="GER"><![CDATA[Die Ratenzahlung für die TID wurde gekündigt: %s am %s um %s]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Instalment has been cancelled for the TID: %s on %s %s]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_webhook_initial_execution</Name>
+                <Description>Webhook-Text während der anfänglichen Ausführung der Zahlung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Die Gutschrift für die TID ist erfolgreich eingegangen: %s mit Betrag %s am %s um %s. Bitte entnehmen Sie die TID den Einzelheiten der Bestellung bei BEZAHLT in unserem Novalnet Adminportal: %s]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Credit has been successfully received for the TID: %s with amount %s  on %s %s. Please refer PAID order details in our Novalnet Admin Portal for the TID: %s]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_refund_failure</Name>
+                <Description>Webhook-Text bei fehlgeschlagener Rückerstattung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Die Rückerstattung für die Bestellung %s ist fehlgeschlagen aufgrund von: %s]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Payment refund failed for the order: %s due to: %s]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_new_tid_refund_execution</Name>
+                <Description>Webhook-Text für die Ausführung der neuen TID-Rückerstattung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Die neue TID für den erstatteten Betrag lautet: %s]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[New TID: %s for the refunded amount.]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_refund_execution</Name>
+                <Description>Webhook-Text während der Rückerstattungsausführung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Die Rückerstattung für die TID %s mit dem Betrag %s  wurde veranlasst]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Refund has been initiated for the TID: %s with the amount %s ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_instalment_payment_execution</Name>
+                <Description>Webhook-Text während der Ausführung der Ratenzahlung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Für die Transaktions-ID ist eine neue Rate eingegangen: %s mit Betrag %s am %s um %s. Die Transaktions-ID der neuen Rate lautet: %s]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[A new instalment has been received for the Transaction ID: %s with amount %s on %s %s. The new instalment transaction ID is: %s]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_next_instalment_message</Name>
+                <Description>Webhook-Text für die Ausführung der nächsten Ratenzahlung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Der nächste Ratenzyklus für den Ratenzahlungsauftrag  ist eingetroffen]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[The next instalment cycle have received for the instalment order, ]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_payment_reminder</Name>
+                <Description>Webhook-Text für Zahlungserinnerung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Zahlungserinnerung %s wurde an den Kunden gesendet]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Payment Reminder %s has been sent to the customer]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_collection_submission</Name>
+                <Description>Webhook-Text für den Zahlungseinzug</Description>
+                <VariableLocalized iso="GER"><![CDATA[Die Transaktion wurde an das Inkassobüro übergeben. Inkasso-Referenz: %s]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[The transaction has been submitted to the collection agency. Collection Reference: %s]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_zero_amount_booking</Name>
+                <Description>Webhook-Text für Nullbetragbuchung</Description>
+                <VariableLocalized iso="GER"><![CDATA[Ihre Bestellung wurde mit einem Betrag von %s  EUR gebucht. Ihre neue TID für den gebuchten Betrag:  %s]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Your order has been booked with the amount of %s . Your new TID for the booked amount: %s]]></VariableLocalized>
+            </Variable>
+            <!-- Backend configuration text -->
+            <Variable>
+                <Name>jtl_novalnet_webhook_notification</Name>
+                <Description>Text für Webhook-Benachrichtigung</Description>
+                <VariableLocalized iso="GER"><![CDATA[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]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Enable this to test the Novalnet Notification / Webhook URL manually. Disable this before setting your shop live to block unauthorized calls from external parties]]></VariableLocalized>
+            </Variable>
+            <Variable>
+                <Name>jtl_novalnet_info_page_text</Name>
+                <Description>Text für Novalnet-Infoseite</Description>
+                <VariableLocalized iso="GER"><![CDATA[Bieten Sie Ihren Kunden auf sichere und vertrauenswürdige Weise alle weltweit unterstützten Zahlungsarten. Mit Novalnet können Sie Ihre Verkäufe steigern und Ihren Kunden ein ansprechendes Zahlungserlebnis aus einem Guss bieten <br><br>Bevor Sie beginnen, lesen Sie bitte die Installationsanleitung und melden Sie sich mit Ihrem Händlerkonto im <b><a href="https://admin.novalnet.de" target="_blank"> Novalnet Admin-Portal </a></b> an. Um ein Händlerkonto zu erhalten, senden Sie bitte eine E-Mail an <b><a href="mailto:sales@novalnet.de"> sales@novalnet.de</a></b> oder rufen Sie uns unter <b> +49 89 923068320</b> an]]></VariableLocalized>
+                <VariableLocalized iso="ENG"><![CDATA[Secured and trusted means of accepting all payment methods supported worldwide. Novalnet provides the most convenient way to increase your sales and deliver seamless checkout experience for your customers.<br><br>Please read the Installation Guide before you start and login to the <b><a href="https://admin.novalnet.de" target="_blank"> Novalnet Admin-Portal </a></b> using your merchant account. To get a merchant account, mail to <b><a href="mailto:sales@novalnet.de"> sales@novalnet.de</a></b> or call <b> +49 (089) 923068320</b>]]></VariableLocalized>
+            </Variable>
+        </Locales>
+    </Install>
+</jtlshopplugin>
diff --git a/locale/de-DE/base.mo b/locale/de-DE/base.mo
new file mode 100644
index 0000000..db63543
Binary files /dev/null and b/locale/de-DE/base.mo differ
diff --git a/locale/de-DE/base.po b/locale/de-DE/base.po
new file mode 100644
index 0000000..636fcd2
--- /dev/null
+++ b/locale/de-DE/base.po
@@ -0,0 +1,72 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
+"X-Generator: Poedit 2.0.6\n"
+
+msgid "Novalnet-Zahlungsplugin"
+msgstr "Novalnet-Zahlungsplugin"
+
+msgid "Novalnet-Konfigurationseinstellungen"
+msgstr "Novalnet-Konfigurationseinstellungen"
+
+msgid "Produktaktivierungsschlüssel"
+msgstr "Produktaktivierungsschlüssel"
+
+msgid "Zahlungs-Zugriffsschlüssel"
+msgstr "Zahlungs-Zugriffsschlüssel"
+
+msgid "Auswahl der Tarif-ID"
+msgstr "Auswahl der Tarif-ID"
+
+msgid "Zahlungsart anzeigen"
+msgstr "Zahlungsart anzeigen"
+
+msgid "Verwaltung des Bestellstatus für ausgesetzte Zahlungen"
+msgstr "Verwaltung des Bestellstatus für ausgesetzte Zahlungen"
+
+msgid "On-hold-Bestellstatus"
+msgstr "On-hold-Bestellstatus"
+
+msgid "Benachrichtigungs- / Webhook-URL festlegen"
+msgstr "Benachrichtigungs- / Webhook-URL festlegen"
+
+msgid "Benachrichtigungs- / Webhook-URL"
+msgstr "Benachrichtigungs- / Webhook-URL"
+
+msgid "Manuelles Testen der Benachrichtigungs- / Webhook-URL erlauben"
+msgstr "Manuelles Testen der Benachrichtigungs- / Webhook-URL erlauben"
+
+msgid "Wählen Sie eine Tarif-ID, die dem bevorzugten Tarifplan entspricht, den Sie im Novalnet Admin-Portal für dieses Projekt erstellt haben"
+msgstr "Wählen Sie eine Tarif-ID, die dem bevorzugten Tarifplan entspricht, den Sie im Novalnet Admin-Portal für dieses Projekt erstellt haben"
+
+msgid "Sie müssen die folgende Webhook-URL im Novalnet Admin-Portal hinzufügen. Dadurch können Sie Benachrichtigungen über den Transaktionsstatus erhalten."
+msgstr "Sie müssen die folgende Webhook-URL im Novalnet Admin-Portal hinzufügen. Dadurch können Sie Benachrichtigungen über den Transaktionsstatus erhalten."
+
+msgid "Bestellungen"
+msgstr "Bestellungen"
+
+msgid "Ihren Produktaktivierungsschlüssel finden Sie im Novalnet Admin-Portal: Projekte > Wählen Sie Ihr Projekt > API-Anmeldeinformationen > API Signature (Aktivierungsschlüssel des Produkts)"
+msgstr "Ihren Produktaktivierungsschlüssel finden Sie im Novalnet Admin-Portal: Projekte > Wählen Sie Ihr Projekt > API-Anmeldeinformationen > API Signature (Aktivierungsschlüssel des Produkts)"
+
+msgid "Ihren Paymentzugriffsschlüssel finden Sie im Novalnet Admin-Portal: Projekte > Wählen Sie Ihr Projekt > API-Anmeldeinformationen > Paymentzugriffsschlüssel"
+msgstr "Ihren Paymentzugriffsschlüssel finden Sie im Novalnet Admin-Portal: Projekte > Wählen Sie Ihr Projekt > API-Anmeldeinformationen > Paymentzugriffsschlüssel"
+
+msgid "offen"
+msgstr "offen"
+
+msgid "in Bearbeitung"
+msgstr "in Bearbeitung"
+
+msgid "bezahlt"
+msgstr "bezahlt"
+
+msgid "Storno"
+msgstr "Storno"
diff --git a/locale/en-GB/base.mo b/locale/en-GB/base.mo
new file mode 100644
index 0000000..2ec1d8c
Binary files /dev/null and b/locale/en-GB/base.mo differ
diff --git a/locale/en-GB/base.po b/locale/en-GB/base.po
new file mode 100644
index 0000000..8f4710b
--- /dev/null
+++ b/locale/en-GB/base.po
@@ -0,0 +1,72 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"X-Generator: Poedit 2.0.6\n"
+
+msgid "Novalnet-Zahlungsplugin"
+msgstr "Novalnet payment plugin"
+
+msgid "Novalnet-Konfigurationseinstellungen"
+msgstr "Novalnet Global Configuration"
+
+msgid "Produktaktivierungsschlüssel"
+msgstr "Product activation key"
+
+msgid "Zahlungs-Zugriffsschlüssel"
+msgstr "Payment access key"
+
+msgid "Auswahl der Tarif-ID"
+msgstr "Select Tariff ID"
+
+msgid "Zahlungsart anzeigen"
+msgstr "Display payment method"
+
+msgid "Verwaltung des Bestellstatus für ausgesetzte Zahlungen"
+msgstr "Order status management for on-hold transactions"
+
+msgid "On-hold-Bestellstatus"
+msgstr "Onhold order status"
+
+msgid "Benachrichtigungs- / Webhook-URL festlegen"
+msgstr "Notification / Webhook URL Setup"
+
+msgid "Benachrichtigungs- / Webhook-URL"
+msgstr "Notification / Webhook URL"
+
+msgid "Manuelles Testen der Benachrichtigungs- / Webhook-URL erlauben"
+msgstr "Allow manual testing of the Notification / Webhook URL"
+
+msgid "Bestellungen"
+msgstr "Orders"
+
+msgid "Wählen Sie eine Tarif-ID, die dem bevorzugten Tarifplan entspricht, den Sie im Novalnet Admin-Portal für dieses Projekt erstellt haben"
+msgstr "Select a Tariff ID to match the preferred tariff plan you created at the Novalnet Admin Portal for this project"
+
+msgid "Sie müssen die folgende Webhook-URL im Novalnet Admin-Portal hinzufügen. Dadurch können Sie Benachrichtigungen über den Transaktionsstatus erhalten."
+msgstr "You must add the following webhook endpoint to your Novalnet Admin Portal . This will allow you to receive notifications about the transaction status."
+
+msgid "Ihren Produktaktivierungsschlüssel finden Sie im Novalnet Admin-Portal: Projekte > Wählen Sie Ihr Projekt > API-Anmeldeinformationen > API Signature (Aktivierungsschlüssel des Produkts)"
+msgstr "Get your Product activation key from the Novalnet Admin Portal: Projects > Choose your project > API credentials > API Signature (Product activation key)"
+
+msgid "Ihren Paymentzugriffsschlüssel finden Sie im Novalnet Admin-Portal: Projekte > Wählen Sie Ihr Projekt > API-Anmeldeinformationen > Paymentzugriffsschlüssel"
+msgstr "Get your Payment access key from the Novalnet Admin Portal: Projects > Choose your project > API credentials > Payment access key"
+
+msgid "offen"
+msgstr "open"
+
+msgid "in Bearbeitung"
+msgstr "in progress"
+
+msgid "bezahlt"
+msgstr "paid"
+
+msgid "Storno"
+msgstr "Cancelled"
diff --git a/paymentmethod/NovalnetPayment.php b/paymentmethod/NovalnetPayment.php
new file mode 100644
index 0000000..59e643e
--- /dev/null
+++ b/paymentmethod/NovalnetPayment.php
@@ -0,0 +1,290 @@
+<?php 
+/**
+ * This file is used for processing the payment method
+ *
+ * @author      Novalnet
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+ * Script: NovalnetPayment.php
+ *
+*/
+
+namespace Plugin\jtl_novalnet\paymentmethod;
+
+use JTL\Plugin\Payment\Method;
+use JTL\Checkout\Bestellung;
+use JTL\Shop;
+use Plugin\jtl_novalnet\paymentmethod\NovalnetPaymentGateway;
+use JTL\Alert\Alert;
+use stdClass;
+
+/**
+ * Class NovalnetPayment
+ * @package Plugin\jtl_novalnet\paymentmethod
+ */
+class NovalnetPayment extends Method
+{     
+    /**
+     * @var NovalnetPaymentGateway
+     */
+    private $novalnetPaymentGateway;
+    
+    /**
+     * @var string
+     */
+    public $name;
+    
+    /**
+     * @var string
+     */
+    public $caption;
+    
+    /**
+     * NovalnetPayment constructor.
+     * 
+     * @param string $moduleID
+     */
+    public function __construct(string $moduleID)
+    {
+        // Preparing the NovalnetGateway object for calling the Novalnet's Gateway functions 
+        $this->novalnetPaymentGateway = new NovalnetPaymentGateway();
+        parent::__construct($moduleID);
+    }
+    
+    /**
+     * Sets the name and caption for the payment method - required for WAWI Synchronization
+     * 
+     * @param  int $nAgainCheckout
+     * @return $this
+     */
+    public function init(int $nAgainCheckout = 0): self
+    {
+        parent::init($nAgainCheckout);
+
+        $this->name    = 'Novalnet';
+        $this->caption = 'Novalnet';
+
+        return $this;
+    }
+    
+    /**
+     * Check the payment condition for displaying the payment on payment page
+     * 
+     * @param  array $args_arr
+     * @return bool
+     */
+    public function isValidIntern(array $args_arr = []): bool
+    {
+        return ($this->novalnetPaymentGateway->canPaymentMethodProcessed());
+    }
+    
+    /**
+     * Called when additional template is used
+     *
+     * @param  array $post
+     * @return bool
+     */
+    public function handleAdditional(array $post): bool
+    {       
+        if (!empty($post['nn_seamless_payment_form_response'])) {
+			$decoded_response = base64_decode($post['nn_seamless_payment_form_response']);
+            $_SESSION['novalnet']['seamless_payment_form_response'] = json_decode(mb_convert_encoding($decoded_response, 'UTF-8', mb_detect_encoding($decoded_response)), true);
+        }
+        return true;
+    }
+    
+    /**
+     * Initiates the Payment process
+     * 
+     * @param  Bestellung    $order
+     * @return none
+     */
+    public function preparePaymentProcess(Bestellung $order): void
+    {
+        $paymentType = !empty($_SESSION['novalnet']['seamless_payment_form_response']['payment_details']['type']) ? $_SESSION['novalnet']['seamless_payment_form_response']['payment_details']['type'] : 'novalnet';
+        // Set the Novalnet payment methods key as payment method type for further payment process handling
+        $_SESSION['novalnet']['payment_key'] = strtolower($paymentType);
+        if (!isset($_SESSION['novalnet']['seamless_payment_form_response'])) {
+			$errorMessage = $this->novalnetPaymentGateway->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_payment_form_error');
+			// Setting up the error message in the shop variable 
+			$alertHelper = Shop::Container()->getAlertService();        
+			$alertHelper->addAlert(Alert::TYPE_ERROR, $errorMessage, 'display error on payment page', ['saveInSession' => true]);        
+			
+			// Redirecting to the checkout page 
+			\header('Location:' . Shop::getURL() . '/Bestellvorgang?editVersandart=1');
+			exit;
+		}
+            
+        // Handle the payment process based on the payment form chosen payment method
+        if ($_SESSION['novalnet']['seamless_payment_form_response']['result']['status'] != 'SUCCESS') {
+            $this->novalnetPaymentGateway->redirectOnError($order, $_SESSION['novalnet']['seamless_payment_form_response'], $_SESSION['novalnet']['payment_key']);
+        } else {
+            $orderHash = $this->generateHash($order);
+            
+            // Collecting the payment parameters to initiate the call to the Novalnet server 
+            $paymentRequestData = $this->novalnetPaymentGateway->generatePaymentParams($order);
+            
+            // Send the payment mode is in LIVE or TEST
+             $paymentRequestData['transaction']['test_mode'] = $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['test_mode'];
+             
+            // Payment type included to notify the server 
+            $paymentRequestData['transaction']['payment_type'] = $paymentType;
+            
+            // Sending the specific parameters to the server for requested payment methods
+            $this->novalnetPaymentGateway->getMandatoryPaymentParameters($paymentRequestData);
+            
+            // Sending cart details to Paypal payment
+            if ($_SESSION['novalnet']['payment_key'] == 'paypal') {
+                $paymentRequestData['cart_info'] = $this->novalnetPaymentGateway->getBasketDetails(true);
+            }
+            
+            // Checking if the payment has authorization is in place or immediate capture 
+            $_SESSION['novalnet']['payment_url'] = (isset($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['payment_action']) && $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['payment_action'] == 'authorized') ? 'authorize' : 'payment';
+            
+            // If the Card processing requires a 3D authentication from the consumer or if it redirection payment, we redirect 
+            if (!empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['do_redirect']) || $_SESSION['novalnet']['seamless_payment_form_response']['payment_details']['process_mode'] == 'redirect') {
+                // Setting up the return URL for the success / error message information (the landing page after customer redirecting back from partner)
+                $paymentRequestData['transaction']['return_url']   = ($_SESSION['Zahlungsart']->nWaehrendBestellung == 0) ? $this->getNotificationURL($orderHash) : $this->getNotificationURL($orderHash).'&sh=' . $orderHash;
+            
+                // Do the payment call to Novalnet server
+                $paymentResponseData = $this->novalnetPaymentGateway->performServerCall($paymentRequestData, $_SESSION['novalnet']['payment_url']);
+            }
+            
+            $_SESSION['novalnet']['payment_request'] = $paymentRequestData;
+            // Do redirect if the redirect URL is present
+            if (!empty($paymentResponseData['result']['redirect_url']) && !empty($paymentResponseData['transaction']['txn_secret'])) {  
+
+                // Transaction secret used for the later checksum verification
+                $_SESSION[$_SESSION['novalnet']['payment_key']]['novalnet_txn_secret'] = $paymentResponseData['transaction']['txn_secret'];
+                
+                \header('Location: ' . $paymentResponseData['result']['redirect_url']);
+                exit;
+            } else {
+            
+                if($this->duringCheckout == 0) {
+                    
+                    // Do the payment call to Novalnet server when payment before order completion option is set to 'Nein'            
+                    $_SESSION['novalnet']['payment_response'] = $this->novalnetPaymentGateway->performServerCall($_SESSION['novalnet']['payment_request'], $_SESSION['novalnet']['payment_url']);
+                    
+                    $this->novalnetPaymentGateway->validatePaymentResponse($order, $_SESSION['novalnet']['payment_response'], $_SESSION['novalnet']['payment_key']);
+                    // If the payment is done after order completion process
+                    \header('Location:' . $this->getNotificationURL($orderHash));
+                    exit;
+                    
+                } else {
+                    // If the payment is done during ordering process
+                    \header('Location:' . $this->getNotificationURL($orderHash) . '&sh=' . $orderHash);
+                    exit;
+                }
+            }
+        }
+    }
+    
+    /**
+     * Called on notification URL
+     *
+     * @param  Bestellung $order
+     * @param  string     $hash
+     * @param  array      $args
+     * @return bool
+     */
+    public function finalizeOrder(Bestellung $order, string $hash, array $args): bool
+    {
+        if (!empty($args['txn_secret'])) {
+            // Checksum validation for redirects
+            if (!empty($args['tid'])) {
+                // Checksum verification and transaction status call to retrieve the full response
+                $paymentResponseData = $this->novalnetPaymentGateway->checksumValidateAndPerformTxnStatusCall($order, $args, $_SESSION['novalnet']['payment_key']);
+                $_SESSION['novalnet']['payment_response'] = $paymentResponseData;
+                
+                // Evaluating the payment response for the redirected payment
+                return $this->novalnetPaymentGateway->validatePaymentResponse($order, $paymentResponseData, $_SESSION['novalnet']['payment_key']);
+            } else {
+                $this->novalnetPaymentGateway->redirectOnError($order, $args, $_SESSION['novalnet']['payment_key']);
+            }
+        } else {
+            // Do the payment call to Novalnet server when payment before order completion option is set to 'Nein'        
+            $_SESSION['novalnet']['payment_response'] = $this->novalnetPaymentGateway->performServerCall($_SESSION['novalnet']['payment_request'], $_SESSION['novalnet']['payment_url']);
+        
+            return $this->novalnetPaymentGateway->validatePaymentResponse($order, $_SESSION['novalnet']['payment_response'], $_SESSION['novalnet']['payment_key']);
+        }
+    }
+    
+    /**
+     * Called when order is finalized and created on notification URL
+     *
+     * @param  Bestellung $order
+     * @param  string     $hash
+     * @param  array      $args
+     * @return none
+     */
+    public function handleNotification(Bestellung $order, string $hash, array $args): void
+    {   
+        // Set the cashpayment token to session         
+        if (isset($_SESSION['novalnet']['payment_response']) && $_SESSION['novalnet']['payment_response']['result']['status'] == 'SUCCESS' && isset($_SESSION['novalnet']['payment_response']['transaction']['checkout_token'])) {
+            $_SESSION['novalnet_cashpayment_token'] = $_SESSION['novalnet']['payment_response']['transaction']['checkout_token'];
+            $_SESSION['novalnet_cashpayment_checkout_js']  = $_SESSION['novalnet']['payment_response']['transaction']['checkout_js'];
+        }
+        
+        $referenceTid = !empty($args['tid']) ? $args['tid'] : 0;
+        // Confirming if there is problem in synchronization and there is a payment entry already
+        $incomingPayment = Shop::Container()->getDB()->select('tzahlungseingang', ['kBestellung', 'cHinweis'], [$order->kBestellung, $referenceTid]);
+        if (is_object($incomingPayment) && intval($incomingPayment->kZahlungseingang) > 0) {
+            $this->novalnetPaymentGateway->completeOrder($order, $_SESSION['novalnet']['payment_key'], $this->generateHash($order));
+        } else {
+            if (isset($_SESSION['Zahlungsart']->nWaehrendBestellung) && $_SESSION['Zahlungsart']->nWaehrendBestellung == 0 && !empty($referenceTid)) {
+                // Checksum verification and transaction status call to retrieve the full response
+                $paymentResponseData = $this->novalnetPaymentGateway->checksumValidateAndPerformTxnStatusCall($order, $args, $_SESSION['novalnet']['payment_key']);
+                $_SESSION['novalnet']['payment_response'] = $paymentResponseData;
+            }
+            // Adds the payment method into the shop table and change the order status
+            $this->updateShopDatabase($order);
+        
+            // Completing the order based on the resultant status 
+            $this->novalnetPaymentGateway->handlePaymentCompletion($order, $_SESSION['novalnet']['payment_key'], $this->generateHash($order));            
+        }
+    }
+    
+    /**
+     * Adds the payment method into the shop table, updates notification ID and set the order status
+     *
+     * @param  object $order
+     * @return none
+     */
+    public function updateShopDatabase(object $order): void
+    {           
+        $isTransactionPaid = '';
+
+        // Add the incoming payments if the transaction was confirmed
+        if ($_SESSION['novalnet']['payment_response']['transaction']['status'] == 'CONFIRMED' && !in_array($_SESSION['novalnet']['payment_key'], array('invoice', 'prepayment', 'cashpayment', 'multibanco')) && $_SESSION['novalnet']['payment_response']['transaction']['amount'] != 0) {
+            $incomingPayment           = new stdClass();
+            $incomingPayment->fBetrag  = $order->fGesamtsummeKundenwaehrung;
+            $incomingPayment->cISO     = $order->Waehrung->cISO;
+            $incomingPayment->cHinweis = $_SESSION['novalnet']['payment_response']['transaction']['tid'];
+            $this->name                = $order->cZahlungsartName;
+            
+            // Add the current transaction payment into db
+            $this->addIncomingPayment($order, $incomingPayment);  
+            
+            // Update the payment paid time to the shop order table
+            $isTransactionPaid = true;
+        }
+        
+        // Updates transaction ID into shop for reference
+        $this->updateNotificationID($order->kBestellung, (string) $_SESSION['novalnet']['payment_response']['transaction']['tid']); 
+        
+        // Getting the transaction comments to store it in the order 
+        $transactionDetails = $this->novalnetPaymentGateway->getTransactionInformation($order, $_SESSION['novalnet']['payment_response'], $_SESSION['novalnet']['payment_key']);
+        
+        // Setting up the Order Comments and Order status in the order table 
+        $orderStatus = ($_SESSION['novalnet']['payment_response']['transaction']['status'] == 'PENDING') ? \BESTELLUNG_STATUS_OFFEN : ($_SESSION['novalnet']['payment_response']['transaction']['status'] == 'ON_HOLD' ? constant($this->novalnetPaymentGateway->novalnetPaymentHelper->getConfigurationValues('novalnet_onhold_order_status')) : \BESTELLUNG_STATUS_BEZAHLT);
+        
+        // Set the ON-HOLD order status for zero amount booking transactions
+        if(isset($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['payment_action']) && $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['payment_action'] == 'zero_amount') {
+			$orderStatus = constant($this->novalnetPaymentGateway->novalnetPaymentHelper->getConfigurationValues('novalnet_onhold_order_status'));
+		}
+		
+        $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('tbestellung', 'cBestellNr', $order->cBestellNr, ['cStatus' => $orderStatus, 'cKommentar' =>  $transactionDetails, 'dBezahltDatum' => ($isTransactionPaid ? 'NOW()' : '')]); 
+    }
+}
diff --git a/paymentmethod/NovalnetPaymentGateway.php b/paymentmethod/NovalnetPaymentGateway.php
new file mode 100644
index 0000000..a57b5e4
--- /dev/null
+++ b/paymentmethod/NovalnetPaymentGateway.php
@@ -0,0 +1,912 @@
+<?php
+/**
+ * This file is act as helper for the Novalnet payment plugin
+ *
+ * @author      Novalnet
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+ * Script: NovalnetPaymentGateway.php
+ *
+*/
+
+namespace Plugin\jtl_novalnet\paymentmethod;
+
+use JTL\Shop;
+use Plugin\jtl_novalnet\src\NovalnetPaymentHelper;
+use JTL\Session\Frontend;
+use JTL\Cart\CartHelper;
+use JTL\Plugin\Payment\Method;
+use JTL\Checkout\Bestellung;
+use JTL\Checkout\Lieferadresse;
+use JTL\Catalog\Product\Preise;
+use JTL\Checkout\Rechnungsadresse;
+use JTL\Customer\Customer;
+use JTL\Plugin\Helper;
+use JTL\Helpers\Request;
+use JTL\Catalog\Currency;
+use JTL\Helpers\Text;
+use JTL\Alert\Alert;
+use JTLShop\SemVer\Version;
+use stdClass;
+
+/**
+ * Class NovalnetPaymentGateway
+ * @package Plugin\jtl_novalnet\paymentmethod
+ */
+class NovalnetPaymentGateway
+{
+    /**
+     * @var NovalnetPaymentHelper
+     */
+    public $novalnetPaymentHelper;
+
+    /**
+     * NovalnetPaymentGateway constructor.
+     */
+    public function __construct()
+    {
+       $this->novalnetPaymentHelper = new NovalnetPaymentHelper();
+    }
+
+    /**
+     * Checks the required payment activation configurations
+     *
+     * return bool
+     */
+    public function canPaymentMethodProcessed(): bool
+    {
+        return ($this->novalnetPaymentHelper->getConfigurationValues('novalnet_enable_payment_method') && ($this->novalnetPaymentHelper->getConfigurationValues('novalnet_public_key') != '' && $this->novalnetPaymentHelper->getConfigurationValues('novalnet_private_key') != '' && $this->novalnetPaymentHelper->getConfigurationValues('novalnet_tariffid') != ''));
+    }
+
+    /**
+     * Build payment parameters to server
+     *
+     * @param  object|null $order
+     * @return array
+     */
+    public function generatePaymentParams(?object $order = null, $theme = false): array
+    {
+        $paymentRequestData = [];
+
+        // Extracting the customer
+        $customerDetails = Frontend::getCustomer();
+
+        // Building the merchant Data
+        $paymentRequestData['merchant'] = [
+                                            'signature'    => $this->novalnetPaymentHelper->getConfigurationValues('novalnet_public_key'),
+                                            'tariff'       => $this->novalnetPaymentHelper->getConfigurationValues('novalnet_tariffid'),
+                                          ];
+
+        // Building the customer Data
+        $paymentRequestData['customer'] = [
+                                            'first_name'   => !empty($customerDetails->cVorname) ? $customerDetails->cVorname : $customerDetails->cNachname,
+                                            'last_name'    => !empty($customerDetails->cNachname) ? $customerDetails->cNachname : $customerDetails->cVorname,
+                                            'gender'       => !empty($customerDetails->cAnrede) ? $customerDetails->cAnrede : 'u',
+                                            'email'        => $customerDetails->cMail,
+                                            'customer_no'  => !empty($customerDetails->kKunde) ? $customerDetails->kKunde : 'guest',
+                                            'customer_ip'  => $this->novalnetPaymentHelper->getNnIpAddress('REMOTE_ADDR')
+                                          ];
+
+        if (!empty($customerDetails->cTel)) { // Check if telephone field is given
+            $paymentRequestData['customer']['tel'] = $customerDetails->cTel;
+        }
+
+        if (!empty($customerDetails->cMobil)) { // Check if mobile field is given
+            $paymentRequestData['customer']['mobile'] = $customerDetails->cMobil;
+        }
+
+        // Extracting the required billing and shipping details from the customer session object
+        $billingShippingDetails = $this->novalnetPaymentHelper->getRequiredBillingShippingDetails($customerDetails);
+
+        $paymentRequestData['customer'] = array_merge($paymentRequestData['customer'], $billingShippingDetails);
+
+        // If the billing and shipping are equal, we notify it too
+        if ($paymentRequestData['customer']['billing'] == $paymentRequestData['customer']['shipping']) {
+            $paymentRequestData['customer']['shipping']['same_as_billing'] = '1';
+        }
+
+        if (!empty($customerDetails->cFirma)) { // Check if company field is given in the billing address
+            $paymentRequestData['customer']['billing']['company'] = $customerDetails->cFirma;
+        }
+
+        if (!empty($_SESSION['Lieferadresse']->cFirma)) { // Check if company field is given in the shipping address
+            $paymentRequestData['customer']['shipping']['company'] = $_SESSION['Lieferadresse']->cFirma;
+        }
+
+        if (!empty($customerDetails->cBundesland)) { // Check if state field is given in the billing address
+            $paymentRequestData['customer']['billing']['state'] = $customerDetails->cBundesland;
+        }
+
+        if (!empty($_SESSION['Lieferadresse']->cBundesland)) { // Check if state field is given in the shipping address
+            $paymentRequestData['customer']['shipping']['state'] = $_SESSION['Lieferadresse']->cBundesland;
+        }
+
+        // Building the transaction Data
+        $paymentRequestData['transaction'] = [
+                                               'amount'    => $this->novalnetPaymentHelper->getOrderAmount($order),
+                                               'currency'  => Frontend::getCurrency()->getCode(),
+                                               'system_name'   => 'jtlshop',
+                                               'system_version' => $this->getSytemVersion($theme),
+                                               'system_url' => Shop::getURL(),
+                                               'system_ip'  => $this->novalnetPaymentHelper->getNnIpAddress('SERVER_ADDR')
+                                             ];
+
+        // If the order generation is done before the payment completion, we get the order number in the initial call itself
+        if (isset($_SESSION['Zahlungsart']->nWaehrendBestellung) && $_SESSION['Zahlungsart']->nWaehrendBestellung == 0 && isset($order->cBestellNr)) {
+            $paymentRequestData['transaction']['order_no'] = $order->cBestellNr;
+        }
+        // Send the order language
+        $paymentRequestData['custom']['lang'] = (!empty($_SESSION['cISOSprache']) && $_SESSION['cISOSprache'] == 'ger') ? 'DE' : 'EN';
+
+        // Unset the shipping address if the billing and shipping address are equal
+        if (!empty($paymentRequestData['customer']['shipping']['same_as_billing'])) {
+            unset($paymentRequestData['customer']['shipping']);
+            $paymentRequestData['customer']['shipping']['same_as_billing'] = 1;
+        }
+
+        return $paymentRequestData;
+    }
+
+    /**
+     * Returns with error message on failure cases
+     *
+     * @param  object  $order
+     * @param  array   $paymentResponse
+     * @param  string  $paymentName
+     * @param  string  $explicitErrorMessage
+     * @return none
+     */
+    public function redirectOnError(object $order, array $paymentResponse, string $paymentName, string $explicitErrorMessage = ''): void
+    {
+        // Set the error message from the payment response
+        $errorMsg = (!empty($paymentResponse['result']['status_text']) ? $paymentResponse['result']['status_text'] : $paymentResponse['status_text']);
+
+        // If the order has been created already and if the order has to be closed
+        if ($_SESSION['Zahlungsart']->nWaehrendBestellung == 0) {
+
+            // Building the transaction comments for the failure case
+            $transactionComments = $this->getTransactionInformation($order, $paymentResponse, $paymentName);
+
+            // Setting up the cancellation status in the database for the order
+            $this->novalnetPaymentHelper->performDbUpdateProcess('tbestellung', 'kBestellung', $order->kBestellung, ['cStatus' => \BESTELLUNG_STATUS_STORNO, 'cAbgeholt' => 'Y', 'cKommentar' => $transactionComments . \PHP_EOL . $errorMsg]);
+
+            $jtlPaymentmethod = Method::create($order->Zahlungsart->cModulId);
+
+            // Triggers cancellation mail template
+            $jtlPaymentmethod->sendMail($order->kBestellung, \MAILTEMPLATE_BESTELLUNG_STORNO);
+
+            // logs the details into novalnet db for failure
+            $this->insertOrderDetailsIntoNnDb($order, $paymentResponse, $paymentName);
+
+            // Clear the shop and novalnet session
+            Frontend::getInstance()->cleanUp(); // unset the shop session
+            unset($_SESSION['novalnet']); // unset novalnet session
+
+            // Redirecting to the order page in the account section
+            \header('Location:' . $order->BestellstatusURL);
+            exit;
+        }
+
+        // If the order has to be continued, we display the error in the payment page and the payment process is continued
+        $errorMessageToDisplay = !empty($explicitErrorMessage) ? $explicitErrorMessage : $errorMsg;
+
+        // Setting up the error message in the shop variable
+        $alertHelper = Shop::Container()->getAlertService();
+        $alertHelper->addAlert(Alert::TYPE_ERROR, $errorMessageToDisplay, 'display error on payment page', ['saveInSession' => true]);
+
+        // Redirecting to the checkout page
+        \header('Location:' . Shop::getURL() . '/Bestellvorgang?editVersandart=1');
+        exit;
+    }
+
+    /**
+     * Make CURL payment request to Novalnet server
+     *
+     * @param  array $paymentRequestData
+     * @param  string $paymentUrl
+     * @param  string $paymentAccessKey
+     * @return array
+     */
+    public function performServerCall(array $paymentRequestData, string $paymentUrl, string $paymentAccessKey = '')
+    {
+        // Based on the request type, retrieving the payment request URL to make the API call
+        $paymentUrl = $this->getApiRequestURL($paymentUrl);
+
+        // Payment Access Key that can be found in the backend is an imporant information that needs to be sent in header for merchant validation
+        $paymentAccessKey = !empty($paymentAccessKey) ? $paymentAccessKey : $this->novalnetPaymentHelper->getConfigurationValues('novalnet_private_key');
+
+        // Setting up the important information in the headers
+        $headers = [
+                     'Content-Type:application/json',
+                     'charset:utf-8',
+                     'X-NN-Access-Key:'. base64_encode($paymentAccessKey),
+                   ];
+
+        // Initialization of the cURL
+        $curl = curl_init();
+
+        curl_setopt($curl, CURLOPT_URL, $paymentUrl);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($curl, CURLOPT_POST, true);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($paymentRequestData));
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+
+        // Execute cURL
+        $paymentResponse = curl_exec($curl);
+
+        // Handle cURL error
+        if (curl_errno($curl)) {
+           $logger   = Shop::Container()->getLogService();
+           $logger->error('Request Error:' . curl_error($curl));
+        }
+
+        // Close cURL
+        curl_close($curl);
+
+        // Decoding the JSON string to array for further processing
+        return json_decode($paymentResponse, true);
+    }
+
+    /**
+     * Get payment request URL's based on the request type
+     *
+     * @param  string $apiType
+     * @return string
+     */
+    public function getApiRequestURL(string $apiType): string
+    {
+        // Novalnet's v2 interface base URL
+        $baseUrl = 'https://payport.novalnet.de/v2/';
+
+        // Adding up the suffix based on the request type
+        $suffixUrl = strpos($apiType, '_') !== false ? str_replace('_', '/', $apiType) : $apiType;
+
+        // Returning the payment URL for the API call
+        return $baseUrl . $suffixUrl;
+    }
+
+    /**
+     * Validates the novalnet payment response
+     *
+     * @param  object    $order
+     * @param  array     $paymentResponse
+     * @param  string    $paymentName
+     * @return none|bool
+     */
+    public function validatePaymentResponse(object $order, array $paymentResponse, string $paymentName): ?bool
+    {
+        // Building the failure transaction comments
+        $transactionComments = $this->getTransactionInformation($order, $paymentResponse, $paymentName);
+
+        // Routing if the result is a failure
+        if (!empty($paymentResponse['result']['status']) && $paymentResponse['result']['status'] != 'SUCCESS') {
+
+            if ($_SESSION['Zahlungsart']->nWaehrendBestellung == 0) {
+                // Logs the order details in Novalnet tables for failure
+                $this->novalnetPaymentHelper->performDbUpdateProcess('tbestellung', 'kBestellung', $order->kBestellung, ['cKommentar' => $transactionComments]);
+            }
+            $this->redirectOnError($order, $paymentResponse, $paymentName);
+
+        } else {
+			# Set the Novalnet transaction comments into session. It require for assign the comment into order object
+            $transactionDetails = $this->getTransactionInformation($order, $paymentResponse, $paymentName);
+            $_SESSION['novalnet']['comments'] = $transactionComments;
+            return true;
+        }
+    }
+
+    /**
+     * Process while handling handle_notification URL
+     *
+     * @param  object  $order
+     * @param  string $paymentName
+     * @param  string $sessionHash
+     * @return none
+     */
+    public function handlePaymentCompletion(object $order, string $paymentName, string $sessionHash): void
+    {
+        $paymentResponse = $_SESSION['novalnet']['payment_response'];
+        if (!empty($paymentResponse['result']['status'])) {
+
+            // Success result handling
+            if ($paymentResponse['result']['status'] == 'SUCCESS') {
+
+                // If the payment is already done and order created, we send update order email
+                if ($order->Zahlungsart->nWaehrendBestellung == 0) {
+                    $jtlPaymentmethod = Method::create($order->Zahlungsart->cModulId);
+
+                    // Triggers order update mail template
+                    $jtlPaymentmethod->sendMail($order->kBestellung, \MAILTEMPLATE_BESTELLUNG_AKTUALISIERT);
+
+                } else {
+                    $paymentRequestData = [];
+                    $paymentRequestData['transaction'] = [
+                                                            'tid' => $paymentResponse['transaction']['tid'],
+                                                            'order_no' => $order->cBestellNr
+                                                         ];
+                    $transactionUpdateResponse = $this->performServerCall($paymentRequestData, 'transaction_update');
+
+                    if ((in_array($transactionUpdateResponse['transaction']['payment_type'], array('INSTALMENT_INVOICE', 'GUARANTEED_INVOICE')) && in_array($transactionUpdateResponse['transaction']['status'], array('ON_HOLD', 'CONFIRMED'))) ||  in_array($transactionUpdateResponse['transaction']['payment_type'], array('INVOICE', 'PREPAYMENT'))) {
+                        $transactionDetails = $this->getTransactionInformation($order, $transactionUpdateResponse, $paymentName);
+                        $this->novalnetPaymentHelper->performDbUpdateProcess('tbestellung', 'kBestellung',  $order->kBestellung, ['cKommentar' => $transactionDetails]);
+                    }
+                }
+                // Inserting order details into Novalnet table
+                $this->insertOrderDetailsIntoNnDb($order, $paymentResponse, $paymentName);
+
+                $updateWawi = 'Y';
+
+                // Update the WAWI pickup status as 'Nein' for confirmed transaction
+                if ($paymentResponse['transaction']['status'] == 'CONFIRMED' || (in_array($paymentResponse['transaction']['payment_type'], ['INVOICE', 'PREPAYMENT', 'CASHPAYMENT', 'MULTIBANCO']) && $paymentResponse['transaction']['status'] == 'PENDING')) {
+                    $updateWawi = 'N';
+                }
+
+                // Updates the value into the database
+                $this->novalnetPaymentHelper->performDbUpdateProcess('tbestellung', 'kBestellung',  $order->kBestellung, ['cAbgeholt' => $updateWawi]);
+
+                // Unset the entire novalnet session on order completion
+                unset($_SESSION['novalnet']);
+
+                \header('Location: ' . Shop::Container()->getLinkService()->getStaticRoute('bestellabschluss.php') .
+                '?i=' . $sessionHash);
+                exit;
+            } else {
+                $this->redirectOnError($order,  $paymentResponse, $paymentName);
+            }
+        } else {
+            \header('Location:' . Shop::getURL() . '/Bestellvorgang?editVersandart=1');
+            exit;
+        }
+    }
+
+    /**
+     * Setting up the transaction details for storing in the order
+     *
+     * @param  object $order
+     * @param  array  $paymentResponse
+     * @param  string $paymentName
+     * @return string
+     */
+    public function getTransactionInformation(object $order, array $paymentResponse, string $paymentName): string
+    {
+        $transactionComments = '';
+
+        if(!empty($_SESSION['cPost_arr']['kommentar'])) {
+            $userComments = $_SESSION['cPost_arr']['kommentar'];
+        }
+
+        if(!empty($userComments)) {
+            $transactionComments .= $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_customer_comment') . $userComments . \PHP_EOL;
+        }
+
+        $transactionComments .= !empty($_SESSION['novalnet']['seamless_payment_form_response']['payment_details']['name']) ? $_SESSION['novalnet']['seamless_payment_form_response']['payment_details']['name'] : $order->cZahlungsartName;
+
+        // Set the Novalnet transaction id based on the response
+        $novalnetTxTid = !empty($paymentResponse['transaction']['tid']) ? $paymentResponse['transaction']['tid'] : $paymentResponse['tid'];
+
+        if (!empty($novalnetTxTid)) {
+            $transactionComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_transaction_tid') . $novalnetTxTid;
+        }
+
+        // Set the Novalnet transaction mode based on the response
+        $novalnetTxMode = !empty($paymentResponse['transaction']['test_mode']) ? $paymentResponse['transaction']['test_mode'] : '';
+
+        if (!empty($novalnetTxMode)) {
+            $transactionComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_test_order');
+        }
+
+        if ($paymentResponse['transaction']['status'] == 'CONFIRMED' && $paymentResponse['transaction']['amount'] == 0) {
+			$transactionComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_zero_amount_booking_text');
+		}
+
+        if (strpos($paymentName, 'guaranteed') !== false) {
+            $transactionComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_guarantee_text');
+        }
+
+        if (in_array($paymentName, ['guaranteed_invoice', 'instalment_invoice'])  && $paymentResponse['transaction']['status'] == 'PENDING') {
+            $transactionComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_guaranteed_invoice_pending_text');
+        }
+
+        if (in_array($paymentName, ['guaranteed_direct_debit_sepa', 'instalment_direct_debit_sepa']) && $paymentResponse['transaction']['status'] == 'PENDING') {
+            $transactionComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_guaranteed_sepa_pending_text');
+        }
+
+        // Collecting the bank details required for the Invoice payment methods
+        if ((in_array($paymentName, array('instalment_invoice', 'guaranteed_invoice')) && in_array($paymentResponse['transaction']['status'], array('ON_HOLD', 'CONFIRMED'))) ||  in_array($paymentName, array('invoice', 'prepayment'))) {
+            $transactionComments .= $this->getBankdetailsInformation($order, $paymentResponse);
+        }
+
+        // Collecting the store details
+        if (!empty($paymentResponse['transaction']['nearest_stores'])) {
+            $transactionComments .= $this->getStoreInformation($paymentResponse);
+        }
+
+        // Collecting the Multibanco reference details
+        if (!empty($paymentResponse['transaction']['partner_payment_reference'])) {
+            $transactionComments .= $this->getMultibancoReferenceInformation($order, $paymentResponse);
+        }
+
+        // Display the wallet card details
+        if (in_array($paymentName, array('googlepay', 'applepay')) && in_array($paymentResponse['transaction']['status'], array('ON_HOLD', 'CONFIRMED'))) {
+            $transactionComments .=  \PHP_EOL . sprintf($this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_wallet_text'), $order->cZahlungsartName, $paymentResponse['transaction']['payment_data']['card_brand'], $paymentResponse['transaction']['payment_data']['last_four']);
+        }
+
+        return $transactionComments;
+    }
+
+    /**
+     * Setting up the Invoice bank details for storing in the order
+     *
+     * @param  object      $order
+     * @param  array       $paymentResponse
+     * @param  string|null $lang
+     * @return string
+     */
+    public function getBankdetailsInformation(object $order, array $paymentResponse, ?string $lang = null): string
+    {
+        $amount = (!empty($paymentResponse['instalment']['cycle_amount'])) ? $paymentResponse['instalment']['cycle_amount'] : $paymentResponse['transaction']['amount'];
+		
+		$updateAmount = $this->convertCurrencyFormatter($order->kBestellung, $amount);
+
+        if ($paymentResponse['transaction']['status'] != 'ON_HOLD' && isset($paymentResponse['transaction']['due_date'])) {
+            $invoiceComments = \PHP_EOL . sprintf($this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_invoice_payment_transfer_duedate_comments', $lang), $updateAmount, $paymentResponse['transaction']['due_date']);
+        } else {
+            $invoiceComments = \PHP_EOL . sprintf($this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_invoice_payment_transfer_comment', $lang), $updateAmount);
+        }
+
+        $invoiceComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_invoice_payments_holder', $lang) . $paymentResponse['transaction']['bank_details']['account_holder'];
+        $invoiceComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_iban', $lang) . $paymentResponse['transaction']['bank_details']['iban'];
+        $invoiceComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_bic', $lang) . $paymentResponse['transaction']['bank_details']['bic'];
+        $invoiceComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_bank', $lang) . $paymentResponse['transaction']['bank_details']['bank_name'] . ' ' . $paymentResponse['transaction']['bank_details']['bank_place'];
+
+        // Adding the payment reference details
+        $invoiceComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_invoice_payments_single_reference_text', $lang);
+        $firstPaymentReference = (!empty($paymentResponse['instalment']['cycle_amount'])) ? 'jtl_novalnet_instalment_payment_reference' : 'jtl_novalnet_invoice_payments_first_reference';
+        $invoiceComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation($firstPaymentReference, $lang) . $paymentResponse['transaction']['tid'];
+        if (!empty($paymentResponse['transaction']['invoice_ref'])) {
+        $invoiceComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_invoice_payments_second_reference', $lang) . $paymentResponse['transaction']['invoice_ref'];
+        }
+        return $invoiceComments;
+    }
+
+    /**
+     * Setting up the Cashpayment store details for storing in the order
+     *
+     * @param  array $paymentResponse
+     * @return string
+     */
+    public function getStoreInformation(array $paymentResponse): string
+    {
+        $cashpaymentComments  = \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_cashpayment_expiry_date') . $paymentResponse['transaction']['due_date'] . \PHP_EOL;
+        $cashpaymentComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_cashpayment_nearest_store_details') . \PHP_EOL;
+
+        // There would be a maximum of three nearest stores for the billing address
+        $nearestStores = $paymentResponse['transaction']['nearest_stores'];
+
+        // We loop in each of them to print those store details
+        for ($storePos = 1; $storePos <= count($nearestStores); $storePos++) {
+            $cashpaymentComments .= \PHP_EOL . $nearestStores[$storePos]['store_name'];
+            $cashpaymentComments .= \PHP_EOL . mb_convert_encoding($nearestStores[$storePos]['street'], 'UTF-8', mb_detect_encoding($nearestStores[$storePos]['street']));
+            $cashpaymentComments .= \PHP_EOL . $nearestStores[$storePos]['city'];
+            $cashpaymentComments .= \PHP_EOL . $nearestStores[$storePos]['zip'];
+            $cashpaymentComments .= \PHP_EOL . $nearestStores[$storePos]['country_code'];
+            $cashpaymentComments .= \PHP_EOL;
+        }
+
+        return $cashpaymentComments;
+    }
+
+     /**
+     * Setting up the Multibanco reference details for storing in the order
+     *
+     * @param object $order
+     * @param array $paymentResponse
+     * @return string
+     */
+    public function getMultibancoReferenceInformation(object $order, array $paymentResponse): string
+    {
+		$multibancoAmount = $this->convertCurrencyFormatter($order->kBestellung, ($paymentResponse['transaction']['amount']));
+		
+        $multibancoComments  = \PHP_EOL . sprintf($this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_multibanco_reference_text'), $multibancoAmount);
+        $multibancoComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_multibanco_reference_one') . $paymentResponse['transaction']['partner_payment_reference'];
+        $multibancoComments .= \PHP_EOL . $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_multibanco_reference_two') . $paymentResponse['transaction']['service_supplier_id'];
+
+        return $multibancoComments;
+    }
+
+    /**
+     * To insert the order details into Novalnet tables
+     *
+     * @param  object $order
+     * @param  array  $paymentResponse
+     * @param  string $paymentName
+     * @return none
+     */
+    public function insertOrderDetailsIntoNnDb(object $order, array $paymentResponse, string $paymentName): void
+    {
+        $customerDetails = Frontend::getCustomer();
+
+        if((isset($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['payment_action']) && $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['payment_action'] == 'zero_amount') ||  ($paymentResponse['transaction']['status'] == 'CONFIRMED' && $paymentResponse['transaction']['amount'] == 0)) {
+			$zero_amount_booking = array ('zero_amount' => 1);
+		}
+        $insertOrder = new stdClass();
+        $insertOrder->cNnorderid         = $order->cBestellNr;
+        $insertOrder->nNntid             = !empty($paymentResponse['transaction']['tid']) ? $paymentResponse['transaction']['tid'] : $paymentResponse['tid'];
+        $insertOrder->cZahlungsmethode   = $paymentName;
+        $insertOrder->cMail              = $customerDetails->cMail;
+        $insertOrder->cStatuswert        = !empty($paymentResponse['transaction']['status']) ? $paymentResponse['transaction']['status'] : $paymentResponse['status'];
+        $insertOrder->nBetrag            = !empty($paymentResponse['transaction']['amount']) ? $paymentResponse['transaction']['amount'] : round($order->fGesamtsumme * 100, 2);
+        $insertOrder->cAdditionalInfo    = !empty($paymentResponse['instalment']) ? json_encode($paymentResponse['instalment']) : (!empty($zero_amount_booking) ? json_encode($zero_amount_booking) : '');
+        $insertOrder->nCallbackAmount    = !in_array($paymentName, ['invoice', 'prepayment', 'cashpayment', 'multibanco']) ? $paymentResponse['transaction']['amount'] : 0;
+
+        Shop::Container()->getDB()->insert('xplugin_novalnet_transaction_details', $insertOrder);
+    }
+
+    /**
+     * Complete the order
+     *
+     * @param  object $order
+     * @param  string $paymentName
+     * @param  string $sessionHash
+     * @return none
+     */
+    public function completeOrder(object $order, string $paymentName, string $sessionHash): void
+    {
+        $paymentResponse = $_SESSION['novalnet']['payment_response'];
+
+        if ($paymentResponse) {
+            // If the order is already complete, we do the appropriate action
+            if ($paymentResponse['result']['status'] == 'SUCCESS') {
+
+                // Unset the entire novalnet session on order completion
+                unset($_SESSION['novalnet']);
+
+                // Routing to the order page from my account for the order completion
+                \header('Location: ' . Shop::Container()->getLinkService()->getStaticRoute('bestellabschluss.php') . '?i=' . $sessionHash);
+                exit;
+            } else {
+                // Returns with error message on error
+                $this->redirectOnError($order, $paymentResponse, $paymentName);
+            }
+        }
+    }
+
+    /**
+     * Compare the checksum generated for redirection payments
+     *
+     * @param  object  $$order
+     * @param  array  $paymentResponse
+     * @param  string $paymentName
+     * @return array
+     */
+    public function checksumValidateAndPerformTxnStatusCall(object $order, array $paymentResponse, string $paymentName): ?array
+    {
+        if ($paymentResponse['status'] && $paymentResponse['status'] == 'SUCCESS') {
+
+            // Condition to check whether the payment is redirect
+            if (!empty($paymentResponse['checksum']) && !empty($paymentResponse['tid']) && !empty($_SESSION[$paymentName]['novalnet_txn_secret'])) {
+
+                $generatedChecksum = hash('sha256', $paymentResponse['tid'] . $_SESSION[$paymentName]['novalnet_txn_secret'] . $paymentResponse['status'] . strrev($this->novalnetPaymentHelper->getConfigurationValues('novalnet_private_key')));
+
+                // If the checksum isn't matching, there could be a possible manipulation in the data received
+                if ($generatedChecksum !== $paymentResponse['checksum']) {
+                    $explicitErrorMessage = $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_checksum_error');
+
+                    // Redirects to the error page
+                    $this->redirectOnError($order, $paymentResponse, $paymentName, $explicitErrorMessage);
+                }
+            }
+
+            $transactionDetailsRequest = [];
+            $transactionDetailsRequest['transaction']['tid'] = $paymentResponse['tid'];
+
+            return $this->performServerCall($transactionDetailsRequest, 'transaction_details');
+
+        } else {
+            // Redirects to the error page
+            $this->redirectOnError($order, $paymentResponse, $paymentName);
+        }
+    }
+
+       /**
+     * Retrieve the Instalment information from the database
+     *
+     * @param  mixed       $orderNo
+     * @param  string|null $lang
+     * @return array|null
+     */
+    public function getInstalmentInfoFromDb($orderNo, ?string $lang = null): ?array
+    {
+        $transactionDetails = Shop::Container()->getDB()->queryPrepared('SELECT nov.nNntid, nov.cStatuswert, nov.nBetrag, nov.cAdditionalInfo  FROM tbestellung ord JOIN xplugin_novalnet_transaction_details nov ON ord.cBestellNr = nov.cNnorderid WHERE cNnorderid = :cNnorderid and nov.cZahlungsmethode LIKE :instalment', [':cNnorderid' => $orderNo, ':instalment' => '%instalment%'], 1);
+
+        if (!empty($transactionDetails) && $transactionDetails->cStatuswert == 'CONFIRMED') {
+            $insAdditionalInfo = json_decode($transactionDetails->cAdditionalInfo, true);
+
+            $instalmentInfo = [];
+            $totalInstalments = count($insAdditionalInfo['cycle_dates']);
+            $insAdditionalInfo[1]['tid'] = $transactionDetails->nNntid;
+
+            foreach($insAdditionalInfo['cycle_dates'] as $key => $instalmentCycleDate) {
+                $instalmentCycle[$key] = $instalmentCycleDate;
+            }
+            $instalment_cycle_cancel = '';
+            // Instalment Status
+            if (isset($insAdditionalInfo['is_full_instalment_cancel'])) {
+                $instalment_cycle_cancel = $insAdditionalInfo['is_full_instalment_cancel'];
+            }
+            for($instalment=1;$instalment<=$totalInstalments;$instalment++) {
+                if($instalment != $totalInstalments) {
+                $instalmentInfo['insDetails'][$instalment]['cycle_amount'] = number_format($insAdditionalInfo['cycle_amount'] / 100 , 2, ',', '') .' '. Frontend::getCurrency()->gethtmlEntity() ;
+                } else {
+                    $cycleAmount = ($transactionDetails->nBetrag - ($insAdditionalInfo['cycle_amount'] * ($instalment - 1)));
+                    $instalmentInfo['insDetails'][$instalment]['cycle_amount'] = number_format($cycleAmount / 100 , 2, ',', '') .' '. Frontend::getCurrency()->gethtmlEntity();
+                }
+                $instalmentInfo['insDetails'][$instalment]['tid'] = !empty($insAdditionalInfo[$instalment]['tid']) ?  $insAdditionalInfo[$instalment]['tid'] : '-';
+                $instalmentInfo['insDetails'][$instalment]['payment_status'] = ($instalment_cycle_cancel == 'all_cycles') ? Shop::Lang()->get('statusCancelled', 'order') : (($instalmentInfo['insDetails'][$instalment]['tid'] != '-') ? Shop::Lang()->get('statusPaid', 'order') : ($instalment_cycle_cancel == 'remaining_cycles' ? Shop::Lang()->get('statusCancelled', 'order') : Shop::Lang()->get('statusPending', 'order')));
+                $instalmentInfo['insDetails'][$instalment]['future_instalment_date'] = date_format(date_create($instalmentCycle[$instalment]), 'F j, Y');
+            }
+
+            $instalmentInfo['lang'] = $this->novalnetPaymentHelper->getNnLanguageText(['jtl_novalnet_instalment_information', 'jtl_novalnet_serial_no', 'jtl_novalnet_instalment_future_date', 'jtl_novalnet_instalment_amount', 'jtl_novalnet_instalment_transaction_id', 'jtl_novalnet_order_status'], $lang);
+             $instalmentInfo['status'] = $transactionDetails->cStatuswert;
+
+            return $instalmentInfo;
+        }
+
+        return null;
+    }
+    
+    /**
+     * Get the mandatory paramters for the payments
+     *
+     * @param  array $paymentRequestData
+     * @return none
+     */
+    public function getMandatoryPaymentParameters(array &$paymentRequestData): void
+    {
+        // If the consumer has opted to pay with the saved account or card data, we use the token relavant to that
+        if(!empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['payment_ref_token'])) {
+            // Selected token is the key to the stored payment data
+            $paymentRequestData['transaction']['payment_data']['token'] = $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['payment_ref_token'];
+        } else {
+            // If the consumer has opted to save the account or card data for future purchases, we notify the server
+            if(!empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['create_token'])) {
+                $paymentRequestData['transaction']['create_token'] = 1;
+            }
+            // For Credit card payment
+            if(!empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['pan_hash'])) {
+                // Setting up the alternative card data to the server for card processing
+                $paymentRequestData['transaction']['payment_data'] = [
+                                                                        'pan_hash'   => $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['pan_hash'],
+                                                                        'unique_id'  => $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['unique_id']
+                                                                     ];
+
+                // If the enforced 3D option is enabled, we notify the server about the forced 3D handling
+                if(!empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['do_redirect'])) {
+                    $paymentRequestData['transaction']['payment_data']['enforce_3d'] = 1;
+                }
+            }
+            // For Direct debit SEPA payment
+            if(!empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['iban'])) {
+                // Setting up the account data to the server for SEPA processing
+                $paymentRequestData['transaction']['payment_data'] = [
+                                                                        'iban'       => $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['iban']
+                                                                     ];
+                if(!empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['bic'])) {
+                    $paymentRequestData['transaction']['payment_data']['bic'] = $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['bic'];
+                }
+            }
+        }
+        // Notify the server about period of instalment
+        if(!empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['cycle'])) {
+            $paymentRequestData['instalment']['cycles'] = $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['cycle'];
+        }
+        // Send the Birthday to server for the Guaranteed payments
+        if(!empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['birth_date'])) {
+            $paymentRequestData['customer']['birth_date'] = $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['birth_date'];
+            unset($paymentRequestData['customer']['billing']['company']);
+        }
+        // Send the wallet token to the server
+        if(!empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['wallet_token'])) {
+            // Setting up the account data to the server for SEPA processing
+            $paymentRequestData['transaction']['payment_data'] = [
+                                                                    'wallet_token'       => $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['wallet_token']
+                                                                 ];
+        }
+        // Send the due date tothe server
+        if(!empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['due_date'])) {
+            $configuredDueDate = $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['due_date'];
+            $paymentRequestData['transaction']['due_date'] = date('Y-m-d', strtotime('+' . $configuredDueDate . 'days'));
+        }
+        // Process the zero amount booking
+        if(isset($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['payment_action']) && $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['payment_action'] == 'zero_amount') {
+            $paymentRequestData['transaction']['amount'] = 0;
+        }
+        // Process the Direct Debit ACH
+        $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['account_holder'] = !empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['account_holder']) ? $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['account_holder'] : $paymentRequestData['customer']['first_name'] . ' ' . $paymentRequestData['customer']['last_name'];
+
+        if (!empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['account_holder']) && !empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['account_number']) && !empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['routing_number'])) {
+			$paymentRequestData['transaction']['payment_data'] = [
+																		'account_holder' => $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['account_holder'],
+                                                                        'account_number' => $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['account_number'],
+                                                                        'routing_number' => $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['routing_number']
+                                                                  ];
+		}
+		// Process the MB Way
+		$_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['mobile'] = !empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['mobile']) ? $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['mobile'] : (!empty($paymentRequestData['customer']['mobile']) ? $paymentRequestData['customer']['mobile'] : '');
+		if (!empty($_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['mobile'])) {
+			$paymentRequestData['customer']['mobile'] = $_SESSION['novalnet']['seamless_payment_form_response']['booking_details']['mobile'];
+		}
+    }
+
+    /**
+     * Form the cart details
+     *
+     * @param bool $isPaypalcart
+     * @return string|array
+     */
+	public function getBasketDetails($isPaypalcart = false)
+	{
+		// Get article details
+		$cartDetails = Frontend::getCart();
+		$currencyConversionFactor = Frontend::getCurrency()->getConversionFactor();
+		$taxAmount = $vatName = $totalProductAmount = $totalOrderAmount = $convertedShippingPrice = $couponAmount = 0;
+		$cartInfo = array();
+
+		// Load the line items
+		$positionArr = (array) $cartDetails->PositionenArr;
+		if (!empty($positionArr)) {
+			foreach($positionArr as $positionDetails) {
+				if (!empty($positionDetails->kArtikel)) {
+					$productName = !empty($positionDetails->Artikel->cName) ? html_entity_decode($positionDetails->Artikel->cName) : html_entity_decode($positionDetails->cName);
+					$productQuantity = !empty($positionDetails->Artikel->nAnzahl) ? $positionDetails->Artikel->nAnzahl : $positionDetails->nAnzahl;
+					$productDescription = !empty($positionDetails->Artikel->cKurzBeschreibung) ? html_entity_decode($positionDetails->Artikel->cKurzBeschreibung) : html_entity_decode($positionDetails->cKurzBeschreibung);
+					$perProductTaxAmount = ($positionDetails->Artikel->Preise->fVKNetto * ($positionDetails->Artikel->taxData['tax'] / 100));
+				    $productAmount = ($positionDetails->Artikel->Preise->fVKNetto + $perProductTaxAmount) * $productQuantity;
+				    $perProductAmount = ($positionDetails->Artikel->Preise->fVKNetto + $perProductTaxAmount);
+				    $totalProductAmount += round(($currencyConversionFactor * $productAmount) * 100);
+					if ($isPaypalcart) {
+						$cartInfo['line_items'][] = array (
+							'name' => $productName,
+							'price' => (int) strval(round(($currencyConversionFactor * $productAmount), 2) * 100),
+							'quantity' => 1,
+							'description' => $productDescription
+						);
+					} else {
+							$cartInfo[] = array (
+								'label' => '(' . $productQuantity . ' X ' . $perProductAmount . ') ' . $productName,
+								'amount' => (int) strval(round(($currencyConversionFactor * $productAmount), 2) * 100),
+								'type' => 'LINE_ITEM'
+							);
+					}
+				}
+			}
+		}
+
+		// Set the TAX amount
+		$taxDetails = Frontend::getCart()->gibSteuerpositionen();
+		if(!empty($taxDetails)) {
+			foreach($taxDetails as $taxDetail) {
+				$vatName = $taxDetail->cName;
+				$taxAmount += round((($currencyConversionFactor * $taxDetail->fBetrag) * 100));
+			}
+			if (!$isPaypalcart) {
+				$cartInfo[] = array('label' => $vatName, 'amount' => floatval($taxAmount), 'type' => 'SUBTOTAL');
+			}
+		}
+
+		// Set the Credit amount
+		if(!empty($_SESSION['Bestellung']->GutscheinLocalized)) {
+			$creditAmount 				= $_SESSION['Bestellung']->GutscheinLocalized;
+			$creditAmount 				= preg_replace('/[^0-9,.]/', '', $creditAmount);
+			$creditAmount 				= (float) str_replace(',', '.', $creditAmount);
+			$convertedCreditAmount 		=  strval(round($creditAmount, 2) * 100);
+			if ($isPaypalcart) {
+				$cartInfo['line_items'][] = array('name' => $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_credit_used'), 'price' => -( $convertedCreditAmount ), 'quantity' => 1);
+			} else {
+				$cartInfo[] = array('label' => $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_credit_used'), 'amount' => -( $convertedCreditAmount ), 'type' => 'SUBTOTAL');
+			}
+		}
+		
+		// Set the shipping method
+		if (!empty($_SESSION['Versandart']) || !empty($_SESSION['AktiveVersandart'])) {
+			$shippingMethod = Shop::Container()->getDB()->select('tversandart', 'kVersandart', $_SESSION['Versandart']->kVersandart);
+			$shippingName = $shippingMethod->cName;
+
+			if(isset($_SESSION['Versandart'])) {
+				$shippingName = ($_SESSION['cISOSprache'] == 'ger' && !empty($_SESSION['Versandart']->angezeigterName['ger'])) ? $_SESSION['Versandart']->angezeigterName['ger'] : ($_SESSION['cISOSprache'] == 'eng' && !empty($_SESSION['Versandart']->angezeigterName['eng']) ? $_SESSION['Versandart']->angezeigterName['eng'] : $shippingName);
+			}
+			$shippingMethodAmount = ($shippingMethod->eSteuer == 'netto') ? ((($taxDetails[0]->fUst/100) * $shippingMethod->fPreis) + $shippingMethod->fPreis) : ($shippingMethod->fPreis);
+			$convertedShippingPrice = (int) strval(round(($currencyConversionFactor * $shippingMethodAmount), 2) * 100);
+			if ($isPaypalcart) {
+				$cartInfo['items_shipping_price'] = $convertedShippingPrice ;
+			} else {
+				$cartInfo[] = array('label' => $shippingName, 'amount' => $convertedShippingPrice , 'type' => 'SUBTOTAL');
+			}
+		}
+
+		// Set the coupon information
+		$availableCoupons = ['Kupon', 'VersandKupon', 'NeukundenKupon'];
+		foreach($availableCoupons as $coupon) {
+			if(!empty($_SESSION[$coupon])) {
+				$couponName = !empty($_SESSION[$coupon]->translationList) ? ($_SESSION['cISOSprache'] == 'ger' ? $_SESSION[$coupon]->translationList['ger'] : $_SESSION[$coupon]->translationList['eng']) : $_SESSION[$coupon]->cName;
+				$couponAmount = (int) strval(round(($currencyConversionFactor * $_SESSION[$coupon]->fWert), 2) * 100);
+				if($_SESSION[$coupon]->cWertTyp == 'prozent') {
+						$couponAmount = (int) strval(round($totalProductAmount * ($_SESSION[$coupon]->fWert/100), 2));
+				}
+				if($_SESSION[$coupon] == 'VersandKupon') {
+					$couponAmount = (int) strval(round(($currencyConversionFactor * $_SESSION['Versandart']->fEndpreis), 2) * 100);
+				}
+				$couponAmount *= -1;
+				if ($isPaypalcart) {
+					$cartInfo['line_items'][] = array ('name' => $couponName, 'price' => $couponAmount, 'quantity' => 1);
+				} else {
+					$cartInfo[] = array('label' => $couponName, 'amount' => $couponAmount, 'type' => 'SUBTOTAL');
+				}
+			}
+		}
+
+		// Set the additional payment fee
+		if (!empty($_SESSION['Zahlungsart']) || !empty($_SESSION['AktiveZahlungsart'])) {
+			$paymentMethodId = !empty($_SESSION['AktiveZahlungsart']) ? $_SESSION['AktiveZahlungsart'] : $_SESSION['Zahlungsart']->kZahlungsart;
+			$paymentMethod = Shop::Container()->getDB()->select('tversandartzahlungsart', ['kVersandart', 'kZahlungsart'], [$_SESSION['Versandart']->kVersandart ,$paymentMethodId]);
+
+			if (!empty($paymentMethod->fAufpreis)) {
+				if($paymentMethod->cAufpreisTyp == 'prozent') {
+					$totalProductAmount = $totalProductAmount + $couponAmount;
+					$orderAmount = ($totalProductAmount + $convertedShippingPrice) / 100;
+					$additionalPaymentFee = $orderAmount * ($paymentMethod->fAufpreis / 100);
+				} else {
+					$additionalPaymentFee = $currencyConversionFactor * $paymentMethod->fAufpreis;
+				}
+
+				if ($isPaypalcart) {
+					$cartInfo['items_handling_price'] = (int) strval(round($additionalPaymentFee, 2) * 100);
+				} else {
+					$cartInfo[] = array('label' => $this->novalnetPaymentHelper->plugin->getLocalization()->getTranslation('jtl_novalnet_payment_charge'), 'amount' =>  (int) strval(round($additionalPaymentFee, 2) * 100), 'type' => 'SUBTOTAL');
+				}
+			}
+		}
+
+		if ($isPaypalcart) {
+			return $cartInfo;
+		} else {
+			foreach ($cartInfo as $cart) {
+				$totalOrderAmount += $cart['amount'];
+			}
+			$_SESSION['novalnet']['order_amount'] = (int) strval($totalOrderAmount - $taxAmount); // Reduce the tax amount because already added in product price
+			return json_encode($cartInfo);
+		}
+	}
+
+    /**
+	 * Set the System Version and Theme
+	 *
+	 * @param  bool $themeAvailable
+	 * @return string
+	 */
+	public function getSytemVersion($themeAvailable = false) {
+		$theme =  Version::parse(APPLICATION_VERSION)->getOriginalVersion();
+		if($themeAvailable) {
+			// Selected theme in the shop
+			$themeName = ucfirst(Shop::getSettings([CONF_TEMPLATE])['template']['theme']['theme_default']);
+			$theme .= '-NN13.1.1-NNTjtlshop_'.$themeName;
+		}
+		return $theme;
+	}
+	
+	/**
+	 * Set the Shop based Currency Convert
+	 *
+	 * @param  object $order
+	 * @param  int $amount
+	 * @return int
+	 */
+	public function convertCurrencyFormatter($kBestellung, string $amount) {
+		$amount = $amount / 100;
+		$orderObj  = new Bestellung($kBestellung, true, Shop::Container()->getDB());
+		$waehrung = new Currency((int)$orderObj->kWaehrung);
+		$totalAmount =  Preise::getLocalizedPriceWithoutFactor($amount, $waehrung, true);
+		return $totalAmount;
+	}
+}
diff --git a/paymentmethod/novalnet.png b/paymentmethod/novalnet.png
new file mode 100644
index 0000000..b69cd77
Binary files /dev/null and b/paymentmethod/novalnet.png differ
diff --git a/paymentmethod/template/novalnet_payment.tpl b/paymentmethod/template/novalnet_payment.tpl
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/paymentmethod/template/novalnet_payment.tpl
@@ -0,0 +1 @@
+
diff --git a/src/NovalnetPaymentHelper.php b/src/NovalnetPaymentHelper.php
new file mode 100644
index 0000000..36ff22f
--- /dev/null
+++ b/src/NovalnetPaymentHelper.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * This file is used for retrieve the details from the  shop instance
+ *
+ * @author      Novalnet
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+ * Script: NovalnetPaymentHelper.php
+ *
+*/
+
+namespace Plugin\jtl_novalnet\src;
+
+use Exception;
+use JTL\Plugin\PluginInterface;
+use JTL\Shop;
+use JTL\Session\Frontend;
+use JTL\Catalog\Currency;
+use JTL\Plugin\Helper;
+use JTL\Helpers\Request;
+
+/**
+ * Class NovalnetPaymentHelper
+ * @package Plugin\jtl_novalnet
+ */
+class NovalnetPaymentHelper
+{
+    /**
+     * @var object
+     */
+    public $plugin;
+
+    /**
+     * NovalnetPaymentHelper constructor.
+     */
+    public function __construct()
+    {
+        $this->plugin = $this->getNovalnetPluginObject();
+    }
+
+    /**
+     * Get plugin object
+     *
+     * @return object
+     */
+    public function getNovalnetPluginObject(): object
+    {
+        return Helper::getPluginById('jtl_novalnet');
+    }
+
+    /**
+     * Retrieve configuration values stored under Novalnet Plugin
+     *
+     * @param  string $configuration
+     * @return mixed
+     */
+    public function getConfigurationValues(string $configuration)
+    {
+        $configValue = trim($this->plugin->getConfig()->getValue($configuration));
+        if (!empty($configValue)) {
+
+            // Only for the tariff ID field, we extract the value which is separated by tariff value and type
+            if ($configuration == 'novalnet_tariffid') {
+                $tariffValue = trim($this->plugin->getConfig()->getValue('novalnet_tariffid'));
+                $tariffId = explode('-', $tariffValue);
+                return $tariffId[0];
+            }
+            return $configValue;
+        }
+        return null;
+    }
+
+    /**
+     * Building the required billing and shipping details from customer session
+     *
+     * @param  object $billingAddress
+     * @return array
+     */
+    public function getRequiredBillingShippingDetails(object $billingAddress): array
+    {
+        $billingShippingDetails['billing'] = $billingShippingDetails['shipping'] = [
+                                               'street'       => $billingAddress->cStrasse,
+                                               'house_no'     => $billingAddress->cHausnummer,
+                                               'city'         => $billingAddress->cOrt,
+                                               'zip'          => $billingAddress->cPLZ,
+                                               'country_code' => $billingAddress->cLand
+                                             ];
+
+        // Extracting the shipping address from the session object
+        if (($_SESSION['Lieferadresse']) != '') {
+
+        $shippingAddress = $_SESSION['Lieferadresse'];
+
+        $billingShippingDetails['shipping'] = [
+                                                'street'       => $shippingAddress->cStrasse,
+                                                'house_no'     => $shippingAddress->cHausnummer,
+                                                'city'         => $shippingAddress->cOrt,
+                                                'zip'          => $shippingAddress->cPLZ,
+                                                'country_code' => $shippingAddress->cLand
+                                              ];
+        }
+        return $billingShippingDetails;
+    }
+
+    /**
+     * Convert the order amount from decimal to integer
+     *
+     * @param  object $order
+     * @return int
+     */
+    public function getOrderAmount($order): int
+    {
+		$orderAmount = ((float)$order->fGesamtsumme * (float)$order->fWaehrungsFaktor)*100;
+		return $orderAmount;
+    }
+
+    /**
+     * Process the database update
+     *
+     * @param  string $tableName
+     * @param  string $keyName
+     * @param  string $keyValue
+     * @param  array $updateValues
+     * @return none
+     */
+    public function performDbUpdateProcess(string $tableName, string $keyName, string $keyValue, array $updateValues): void
+    {
+        Shop::Container()->getDB()->update($tableName , $keyName , $keyValue, (object) $updateValues);
+    }
+
+    /**
+     * Get language texts for the fields
+     *
+     * @param  array       $languages
+     * @param  string|null $langCode
+     * @return array
+     */
+    public function getNnLanguageText(array $languages, ?string $langCode = null): array
+    {
+        foreach($languages as $lang) {
+            $languageTexts[$lang] = $this->plugin->getLocalization()->getTranslation($lang, $langCode);
+        }
+        return $languageTexts;
+    }
+
+    /**
+     * Get translated text for the provided Novalnet text key
+     *
+     * @param  string      $key
+     * @param  string|null $langCode
+     * @return string
+     */
+    public function getNnLangTranslationText(string $key, ?string $langCode = null): string
+    {
+        return $this->plugin->getLocalization()->getTranslation($key, $langCode);
+    }
+
+    /**
+     * Get server or remote address from the global variable
+     *
+     * @param  string $addressType
+     * @return mixed
+     */
+    public function getNnIpAddress(string $addressType)
+    {
+        if ($addressType == 'REMOTE_ADDR') {
+            # Shop's core function that fetches the remote address
+            $remoteIp = Request::getRealIP();
+            $remoteAddress = ($remoteIp != '') ? $remoteIp : $_SERVER[$addressType];
+            return $remoteAddress;
+        }
+        return $_SERVER[$addressType];
+    }
+}
diff --git a/src/NovalnetWebhookHandler.php b/src/NovalnetWebhookHandler.php
new file mode 100644
index 0000000..ee9be4f
--- /dev/null
+++ b/src/NovalnetWebhookHandler.php
@@ -0,0 +1,1015 @@
+<?php 
+/**
+ * This file is used for post processing
+ *
+ * @author      Novalnet
+ * @copyright   Copyright (c) Novalnet
+ * @license     https://www.novalnet.de/payment-plugins/kostenlos/lizenz
+ *
+ * Script: NovalnetWebhookHandler.php
+ *
+*/
+
+namespace Plugin\jtl_novalnet\src;
+
+use JTL\Shop;
+use JTL\Plugin\Payment\Method;
+use JTL\Checkout\Bestellung;
+use JTL\Session\Frontend;
+use JTL\Helpers\Request;
+use JTL\DB\ReturnType;
+use PHPMailer\PHPMailer\PHPMailer;
+use JTL\Mail\Mail\Mail;
+use JTL\Mail\Mailer;
+use Plugin\jtl_novalnet\paymentmethod\NovalnetPaymentGateway;
+use JTL\Catalog\Product\Preise;
+use stdClass;
+
+/**
+ * Class NovalnetWebhookHandler
+ * @package Plugin\jtl_novalnet
+ */
+class NovalnetWebhookHandler
+{
+    /**
+     * @var eventData
+     */
+    protected $eventData = array();
+
+    /**
+     * @var eventType
+     */
+    protected $eventType;
+
+    /**
+     * @var eventTid
+     */
+    protected $eventTid;
+        
+    /**
+     * @var parentTid
+     */
+    protected $parentTid;
+    
+    /**
+     * @var NovalnetPaymentGateway
+     */
+    private $novalnetPaymentGateway;
+    
+    /**
+     * @var object
+     */
+    private $orderDetails;
+    
+    /**
+     * @var string
+     */
+    private $languageCode;
+    
+    /**
+     * NovalnetWebhookHandler constructor.
+     */
+    public function __construct()
+    {
+        $this->novalnetPaymentGateway = new NovalnetPaymentGateway();
+    }
+    
+    /**
+     * Process the webhook notifications
+     */
+    public function handleNovalnetWebhook() 
+    {
+        
+        try {
+            $this->eventData = json_decode(file_get_contents('php://input'), true);
+        } catch (Exception $e) {
+            $this->displayMessage('Received data is not in the JSON format' . $e);
+        }
+        
+        // validated the IP Address
+        $this->validateIpAddress();
+
+        // Validates the webhook params before processing
+        $this->validateEventParams();
+        
+        // Set Event data
+        $this->eventType = $this->eventData['event']['type'];
+        $this->parentTid = (isset($this->eventData['event']['parent_tid']) && $this->eventData['event']['parent_tid'] != '') ? $this->eventData['event']['parent_tid'] : $this->eventData['event']['tid'];
+        $this->eventTid  = $this->eventData['event']['tid'];
+        
+        // Retreiving the shop's order information based on the transaction 
+        $this->orderDetails = $this->getOrderReference();
+        
+        $this->languageCode = ($this->orderDetails->kSprache == 1) ? 'ger' : 'eng';
+        
+        if ($this->eventData['result']['status'] == 'SUCCESS') {
+            
+            switch ($this->eventType) {
+                case 'PAYMENT':
+                    if ($this->parentTid != $this->orderDetails->nNntid) {
+                        $this->handleNnZeroAmountBooking();
+                        break;
+                    }
+                    $this->displayMessage('The Payment has been received');
+                    break;
+                case 'TRANSACTION_CAPTURE':
+                case 'TRANSACTION_CANCEL':
+                    $this->handleNnTransactionCaptureCancel();
+                    break;
+                case 'TRANSACTION_UPDATE':
+                    $this->handleNnTransactionUpdate();
+                    break;
+                case 'TRANSACTION_REFUND':
+                    $this->handleNnTransactionRefund();
+                    break;
+                case 'CREDIT':
+                    $this->handleNnTransactionCredit();
+                    break;
+                case 'CHARGEBACK':
+                    $this->handleNnChargeback();
+                    break;
+                case 'INSTALMENT':
+                    $this->handleNnInstalment();
+                    break;
+                case 'INSTALMENT_CANCEL':
+                    $this->handleNnInstalmentCancel();
+                    break;
+                case 'PAYMENT_REMINDER_1':
+                case 'PAYMENT_REMINDER_2':
+                case 'SUBMISSION_TO_COLLECTION_AGENCY':
+                    $this->handleNnPaymentNotifications();
+                default:
+                    $this->displayMessage('The webhook notification has been received for the unhandled EVENT type ( ' . $this->eventType . ')' );
+            }
+        } else {
+            $this->displayMessage('Status is not valid...The webhook notification has been received for the unhandled EVENT type ( ' . $this->eventType . ')' );
+        }
+    }
+    
+    /**
+     * Display webhook notification message 
+     *
+     * @param  string $message
+     * @return none
+     */
+    public function displayMessage(string $message): void
+    {
+        print $message;
+        exit;
+    }
+    
+    /**
+     * Validate the IP control check
+     *
+     * @return none
+     */
+    public function validateIpAddress(): void
+    {
+        $realHostIp = gethostbyname('pay-nn.de');
+        
+        if (($realHostIp) == '') {
+            $this->displayMessage('Novalnet HOST IP missing');
+        }
+        
+        // Condition to check whether the callback is called from authorized IP
+        if ((Request::getRealIP() != $realHostIp) && ($this->novalnetPaymentGateway->novalnetPaymentHelper->getConfigurationValues('novalnet_webhook_testmode')) == '') {
+            $this->displayMessage('Unauthorised access from the IP ' . Request::getRealIP());
+        }
+    }
+    
+    /**
+     * Validates the event parameters
+     *
+     * @return none
+     */
+    public function validateEventParams(): void
+    {
+		if(!empty( $this->eventData ['custom'] ['shop_invoked'])) {
+			$this->displayMessage('Process already handled in the shop.');
+		}
+		
+        // Mandatory webhook params
+        $requiredParams = ['event' => ['type', 'checksum', 'tid'], 'result' => ['status']];
+                                
+        // Validate required parameters
+        foreach ($requiredParams as $category => $parameters) {
+            if (($this->eventData[$category]) == '') {
+                // Could be a possible manipulation in the notification data
+                $this->displayMessage('Required parameter category(' . $category. ') not received');
+            } elseif (($parameters) != '') {
+                foreach ($parameters as $parameter) {
+                    if (($this->eventData[$category][$parameter]) == '') {
+                       // Could be a possible manipulation in the notification data
+                       $this->displayMessage('Required parameter(' . $parameter . ') in the category (' . $category . ') not received');
+                    }
+                }
+            }
+        }
+
+        // Validate the received checksum.
+        $this->validateChecksum();
+    }
+    
+    /**
+     * Validate checksum
+     *
+     * @return none
+     */
+    public function validateChecksum(): void
+    {
+        $accessKey = $this->novalnetPaymentGateway->novalnetPaymentHelper->getConfigurationValues('novalnet_private_key'); 
+        $tokenString  = $this->eventData['event']['tid'] . $this->eventData['event']['type'] . $this->eventData['result']['status'];
+        
+        if (isset($this->eventData['transaction']['amount'])) {
+            $tokenString .= $this->eventData['transaction']['amount'];
+        }
+        
+        if (isset($this->eventData['transaction']['currency'])) {
+            $tokenString .= $this->eventData['transaction']['currency'];
+        }
+        
+        if (($accessKey) != '') {
+            $tokenString .= strrev($accessKey);
+        }
+        
+        $generatedChecksum = hash('sha256', $tokenString);      
+        if ($generatedChecksum !== $this->eventData['event']['checksum']) {
+            $this->displayMessage('While notifying some data has been changed. The hash check failed');
+        }
+    }
+    
+    /**
+     * Get order details from the shop's database
+     *
+     * @return object
+     */
+    public function getOrderReference(): object
+    {
+        // Looking into the Novalnet database if the transaction exists
+        $novalnetOrder = Shop::Container()->getDB()->queryPrepared('SELECT cNnorderid, cZahlungsmethode, cStatuswert, nBetrag, nNntid FROM xplugin_novalnet_transaction_details WHERE nNntid  = :nNntid', [':nNntid' => $this->parentTid,], ReturnType::SINGLE_OBJECT);
+        
+        // If both the order number from Novalnet and in shop is missing, then something is wrong
+        if (empty($this->eventData['transaction']['order_no']) && empty($novalnetOrder->cNnorderid)) {
+            $this->displayMessage('Order reference not found for the TID ' . $this->parentTid);
+        }
+        
+        $orderNumberToSearch = !empty($novalnetOrder->cNnorderid) ? $novalnetOrder->cNnorderid : $this->eventData['transaction']['order_no'];
+            
+        // If the order in the Novalnet server to the order number in Novalnet database doesn't match, then there is an issue
+        if (!empty($this->eventData['transaction']['order_no']) && !empty($novalnetOrder->cNnorderid) && (($this->eventData['transaction']['order_no']) != $novalnetOrder->cNnorderid)) {
+            $this->displayMessage('Order reference not matching for the order number ' . $orderNumberToSearch);
+        }        
+                
+        $shopOrder = Shop::Container()->getDB()->queryPrepared('SELECT kBestellung FROM tbestellung WHERE cBestellNr  = :cBestellNr', [':cBestellNr' => $orderNumberToSearch,], ReturnType::SINGLE_OBJECT);
+            
+        // Loads order object from shop 
+        $order = new Bestellung((int) $shopOrder->kBestellung); 
+        $order->fuelleBestellung(true, 0, false);
+        
+        // Assign if payment module id is not exist in the order object
+        if(empty($order->Zahlungsart)) {
+			$paymentMethodDetail = Shop::Container()->getDB()->queryPrepared('SELECT cModulId FROM tzahlungsart WHERE cModulId LIKE :novalnet', [':novalnet' => '%novalnet%'], ReturnType::SINGLE_OBJECT);
+			$order->Zahlungsart =  new stdClass();
+			$order->Zahlungsart->cModulId = $paymentMethodDetail->cModulId;
+		}
+		
+		// Check it may be zero amount process
+        $txAdditonalInfo = Shop::Container()->getDB()->queryPrepared('SELECT nNntid, cAdditionalInfo FROM xplugin_novalnet_transaction_details WHERE cNnorderid  = :cNnorderid', [':cNnorderid' => $orderNumberToSearch], ReturnType::SINGLE_OBJECT);
+        $isZeroAmountBooking = !empty($txAdditonalInfo->cAdditionalInfo) ? json_decode($txAdditonalInfo->cAdditionalInfo, true) : [];
+        if(!empty($isZeroAmountBooking['zero_amount'])) {
+			$novalnetOrder =  new stdClass();
+			$novalnetOrder->nNntid = $txAdditonalInfo->nNntid;
+		}
+        
+        // If the order is not found in Novalnet's database, it is communication failure
+        if (empty($novalnetOrder->cNnorderid) && empty($isZeroAmountBooking['zero_amount'])) {
+          
+            // We look into the shop's core database to create the order object for further handling
+            if (!empty($shopOrder->kBestellung)) {
+                // Handles communication failure scenario
+                $this->handleCommunicationBreak($order); 
+            } else {
+                $this->displayMessage('Transaction mapping failed ' . $orderNumberToSearch);    
+            }
+        }
+        return (object) array_merge((array) $order, (array) $novalnetOrder);
+    }
+    
+    /**
+     * Handling communication breakup
+     *
+     * @param  object $order
+     * @return none
+     */
+    public function handleCommunicationBreak(object $order): void
+    {      
+        $jtlPaymentmethod = Method::create($order->Zahlungsart->cModulId);
+        
+        $orderLanguage = ($order->kSprache == 1) ? 'ger' : 'eng';
+        
+        $webhookComments  = '';
+        
+        $webhookComments .= $order->cZahlungsartName;
+        
+        $webhookComments .= \PHP_EOL . $this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_transaction_tid', $orderLanguage) . $this->parentTid;
+            
+        if (!empty($this->eventData['transaction']['test_mode'])) {
+            $webhookComments .= \PHP_EOL . $this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_test_order', $orderLanguage);
+        }
+        
+        $isPaidNow = false;
+        
+        // Deactivating the WAWI synchronization 
+        $updateWawi = 'Y';
+        
+        if ($this->eventData['result']['status'] == 'SUCCESS') {
+            
+            if ($this->eventData['transaction']['status']) {    
+                                            
+                if ($this->eventData['transaction']['status'] == 'PENDING') {
+                    $orderStatus = \BESTELLUNG_STATUS_OFFEN;                    
+                } elseif ($this->eventData['transaction']['status'] == 'ON_HOLD') {
+                    $orderStatus = constant($this->novalnetPaymentGateway->novalnetPaymentHelper->getConfigurationValues('novalnet_onhold_order_status'));
+                } elseif ($this->eventData['transaction']['status'] == 'CONFIRMED') {
+                    // For the successful case, we enable the WAWI synchronization
+                    $updateWawi = 'N';                  
+                    $isPaidNow = true;
+
+                    $orderStatus = \BESTELLUNG_STATUS_BEZAHLT;
+                    
+                    // Handle the zero amount process
+                    if ($this->eventData['transaction']['amount'] == 0) {
+						$orderStatus = constant($this->novalnetPaymentGateway->novalnetPaymentHelper->getConfigurationValues('novalnet_onhold_order_status'));
+						$isPaidNow = false;
+						$webhookComments .= \PHP_EOL . $this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_zero_amount_booking_text', $orderLanguage);
+					}
+                    if ($this->eventData['transaction']['amount'] != 0) {
+						// Add the current transaction payment into db
+						$incomingPayment           = new stdClass();
+						$incomingPayment->fBetrag  = $order->fGesamtsummeKundenwaehrung;
+						$incomingPayment->cISO     = $order->Waehrung->cISO;
+						$incomingPayment->cHinweis = $this->parentTid;
+						$jtlPaymentmethod->name    = $order->cZahlungsartName;
+					
+						$jtlPaymentmethod->addIncomingPayment($order, $incomingPayment); 
+					}                           
+                } else {                
+                    $orderStatus = \BESTELLUNG_STATUS_STORNO;
+                     $webhookComments .= \PHP_EOL . $this->eventData['result']['status_text'];
+                }                               
+            }
+            
+            // Sending the order update mail here as due to the communcation failure, the update mail would not have reached
+            $jtlPaymentmethod->sendMail($order->kBestellung, MAILTEMPLATE_BESTELLUNG_AKTUALISIERT);
+                                
+        } else {
+            $orderStatus = \BESTELLUNG_STATUS_STORNO;
+            $webhookComments .= \PHP_EOL . $this->eventData['result']['status_text'];
+        }         
+            
+        // Entering the details into the Novalnet's transactions details for consistency and further operations
+        $this->novalnetPaymentGateway->insertOrderDetailsIntoNnDb($order, $this->eventData, strtolower($this->eventData['transaction']['payment_type']));               
+        
+        // Completing the callback notification 
+        $this->webhookFinalprocess($webhookComments, $orderStatus, $updateWawi, $isPaidNow);
+    }
+    
+    /**
+     * Handling the Novalnet transaction Zero amount booking process
+     *
+     * @return none
+     */
+    public function handleNnZeroAmountBooking(): void
+    {
+        $txAdditonalDetails = Shop::Container()->getDB()->queryPrepared('SELECT cAdditionalInfo FROM xplugin_novalnet_transaction_details WHERE cNnorderid  = :cNnorderid', [':cNnorderid' => $this->orderDetails->cBestellNr], ReturnType::SINGLE_OBJECT);
+        $txAdditonalInfo = !empty($txAdditonalDetails->cAdditionalInfo) ? json_decode($txAdditonalDetails->cAdditionalInfo, true) : [];
+        if(!empty($txAdditonalInfo['zero_amount'])) {
+            $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('xplugin_novalnet_transaction_details', 'cNnorderid', $this->orderDetails->cBestellNr, ['nNntid' => $this->parentTid, 'nBetrag' => $this->eventData['transaction']['amount'], 'cAdditionalInfo' => json_encode(array('tid' => $this->orderDetails->nNntid)), 'nCallbackAmount' =>  $this->eventData['transaction']['amount']]);
+        }
+        $zeroAmountBooking = $this->novalnetPaymentGateway->convertCurrencyFormatter($this->orderDetails->kBestellung, ($this->eventData['transaction']['amount']));
+        
+        $webhookComments = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_zero_amount_booking', $this->languageCode), $zeroAmountBooking, $this->parentTid);
+        
+        $this->addPaymentsToOrder($this->orderDetails, $this->orderDetails->nNntid);
+        $this->webhookFinalprocess($webhookComments, \BESTELLUNG_STATUS_BEZAHLT, 'N', true);
+    }
+    
+    /**
+     * Handling the Novalnet transaction authorization process
+     *
+     * @return none
+     */
+    public function handleNnTransactionCaptureCancel(): void
+    {
+        // Capturing or cancellation of a transaction occurs only when the transaction is found as ON_HOLD in the shop
+        if (in_array($this->orderDetails->cStatuswert, array('PENDING', 'ON_HOLD'))) {       
+
+            $isPaidNow = false;                 
+            
+            // If the transaction is captured, we update necessary alterations in DB        
+            if ($this->eventType == 'TRANSACTION_CAPTURE') {               
+            
+                // Activating the WAWI synchronization 
+                $updateWawi = 'N';
+            
+                $webhookComments = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_confirmation_text', $this->languageCode), date('d.m.Y'), date('H:i:s'));
+                
+                // Instalment payment methods cycle information  
+                if (!empty($this->eventData['instalment'])) { 
+                    $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('xplugin_novalnet_transaction_details', 'cNnorderid', $this->orderDetails->cBestellNr, ['cAdditionalInfo' => json_encode($this->eventData['instalment'])]);
+                }   
+                                                                                    
+                                                
+                // Only for the Invoice Payment type, we have to wait for the credit entry 
+                if ($this->eventData['transaction']['payment_type'] != 'INVOICE') {
+                    // Add payment to order
+                    $this->addPaymentsToOrder($this->orderDetails, $this->parentTid); 
+                    
+                    $isPaidNow = true;                    
+                }
+               
+                // Order status required to be changed for the payment type 
+                $orderStatus = ($this->eventData['transaction']['status'] == 'PENDING') ?  \BESTELLUNG_STATUS_OFFEN : \BESTELLUNG_STATUS_BEZAHLT;
+                
+                                                                 
+            } elseif($this->eventType == 'TRANSACTION_CANCEL') {
+                                            
+                $webhookComments = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_transaction_cancellation', $this->languageCode), date('d.m.Y'), date('H:i:s'));
+                
+                $orderStatus = \BESTELLUNG_STATUS_STORNO;  
+
+                // We do not want that cancelled orders picked up in WAWI 
+                $updateWawi = 'Y';
+            }    
+            
+            $this->eventData['transaction']['amount'] = ($this->eventData['transaction']['payment_type'] == 'INVOICE') ? 0 : $this->eventData['transaction']['amount'];                                      
+            $this->webhookFinalprocess($webhookComments, $orderStatus, $updateWawi, $isPaidNow);
+
+            
+        } else {
+            $this->displayMessage('Transaction already captured/cancelled');
+        }
+    }
+    
+    /**
+     * Handling the Novalnet transaction update process
+     *
+     * @return none
+     */
+    public function handleNnTransactionUpdate(): void
+    {  
+        // Paid is set to NULL
+        $isPaidNow = false;
+        
+        // orderStatus is set to empty
+        $orderStatus = '';
+        
+        // webhookComments is set to empty
+        $webhookComments = '';
+        
+        // Set the WAWI status
+        $updateWawi = ($this->eventData['transaction']['status'] == 'CONFIRMED') ? 'N' : 'Y';
+        
+        // Set the transaction amount
+        $amount = (strpos($this->eventData['transaction']['payment_type'], 'INSTALMENT') !== false) ? $this->eventData['instalment']['cycle_amount'] : $this->eventData['transaction']['amount'];
+        
+        if ($this->eventData['transaction']['update_type'] == 'STATUS') {
+            
+            if ($this->eventData['transaction']['status'] == 'DEACTIVATED') {
+                        
+                $webhookComments = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_transaction_cancellation', $this->languageCode), date('d.m.Y'), date('H:i:s'));
+                
+                // Cancellation of the order status 
+                $orderStatus = \BESTELLUNG_STATUS_STORNO;
+            
+            } else {
+                
+                if ($this->orderDetails->cStatuswert == 'PENDING' && in_array($this->eventData['transaction']['status'], ['ON_HOLD', 'CONFIRMED'])) {
+                
+                    $webhookComments = '';
+                
+                    if (in_array($this->eventData['transaction']['payment_type'], ['GUARANTEED_INVOICE', 'INSTALMENT_INVOICE'])) {
+                        $webhookComments = $this->novalnetPaymentGateway->getBankdetailsInformation($this->orderDetails, $this->eventData, $this->languageCode);
+                    }
+                    
+                    // For on-hold, we only update the order status 
+                    if ($this->eventData['transaction']['status'] == 'ON_HOLD') {
+                        // Building the onhold activation text 
+                        $webhookComments .= \PHP_EOL . \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_pending_to_onhold_status_change', $this->languageCode), $this->parentTid, date('d.m.Y'), date('H:i:s'));
+                        
+                        $orderStatus = constant($this->novalnetPaymentGateway->novalnetPaymentHelper->getConfigurationValues('novalnet_onhold_order_status'));
+                    } else {
+                        // Building the confirmation text 
+                        $webhookComments .= \PHP_EOL . \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_update_confirmation_text', $this->languageCode), $this->parentTid, $this->eventData['transaction']['amount'] / 100, $this->eventData['transaction']['currency'], date('d.m.Y'), date('H:i:s'));
+                        
+                        // Instalment payment methods cycle information  
+                        if (!empty($this->eventData['instalment'])) { 
+                            $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('xplugin_novalnet_transaction_details', 'cNnorderid', $this->orderDetails->cBestellNr, ['cAdditionalInfo' => json_encode($this->eventData['instalment'])]);
+                        }
+                        
+                        $orderStatus = \BESTELLUNG_STATUS_BEZAHLT;
+                        // Add payment to order
+                        $this->addPaymentsToOrder($this->orderDetails, $this->parentTid);
+                        // Paid is set to NULL
+                        $isPaidNow = true; 
+                                         
+                    }
+                }
+
+            }
+        } else {
+
+            $updateAmount = $this->novalnetPaymentGateway->convertCurrencyFormatter($this->orderDetails->kBestellung, ($this->eventData['transaction']['amount'] ));
+            
+            $dueDateUpdateMessage = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_duedate_update_message', $this->languageCode), $updateAmount, $this->eventData['transaction']['due_date']);
+
+            // Amount update process
+            if($amount != $this->orderDetails->nBetrag && !in_array($this->eventData['transaction']['payment_type'], array('INSTALMENT_INVOICE', 'INSTALMENT_SEPA'))) {
+                    $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('xplugin_novalnet_transaction_details', 'cNnorderid', $this->orderDetails->cBestellNr, ['nBetrag' => $amount]);
+            }
+            
+            $amountUpdateMessage = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_amount_update_message', $this->languageCode), $updateAmount, date('d.m.Y'), date('H:i:s'));
+            
+            $webhookComments .= (($this->eventData['transaction']['update_type'] == 'AMOUNT') ? $amountUpdateMessage : (($this->eventData['transaction']['update_type'] == 'DUE_DATE') ? $dueDateUpdateMessage : $dueDateUpdateMessage . $amountUpdateMessage));
+
+        }
+   
+			$this->webhookFinalprocess($webhookComments, $orderStatus, $updateWawi, $isPaidNow);        
+    }
+    
+    /**
+     * Handling the transaction refund process
+     *
+     * @return none
+     */
+    public function handleNnTransactionRefund(): void
+    {
+        if ($this->eventData['result']['status'] == 'SUCCESS') { 
+
+			$refundedAmount = $this->novalnetPaymentGateway->convertCurrencyFormatter($this->orderDetails->kBestellung, ($this->eventData['transaction']['refund']['amount'] ));
+
+			$webhookComments = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_refund_execution', $this->languageCode), $this->parentTid, $refundedAmount); 
+
+            if (!empty($this->eventData['transaction']['refund']['tid'])) {
+                $webhookComments .= \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_new_tid_refund_execution', $this->languageCode), $this->eventData['transaction']['refund']['tid']);
+            } 
+            
+            // In case of full refund, deactivation is processed 
+            if ($this->eventData['transaction']['status'] == 'DEACTIVATED') {
+                
+                // We do not send to webhookFinalprocess for update as it will cause problems with WAWI synchronization
+                $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('tbestellung', 'cBestellNr', $this->orderDetails->cBestellNr, ['cStatus' => \BESTELLUNG_STATUS_STORNO]);                               
+            }
+            
+            $txAdditonalDetails = Shop::Container()->getDB()->queryPrepared('SELECT cAdditionalInfo FROM xplugin_novalnet_transaction_details WHERE cNnorderid  = :cNnorderid', [':cNnorderid' => $this->orderDetails->cBestellNr], ReturnType::SINGLE_OBJECT);
+
+            $txAdditonalInfo = !empty($txAdditonalDetails->cAdditionalInfo) ? json_decode($txAdditonalDetails->cAdditionalInfo, true) : [];
+            
+            $txAdditonalInfo['refunded_amount'] = $this->eventData['transaction']['refunded_amount'] + $this->eventData['transaction']['refund']['amount'];
+            
+            $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('xplugin_novalnet_transaction_details', 'cNnorderid', $this->orderDetails->cBestellNr, ['cAdditionalInfo' => json_encode($txAdditonalInfo)]);
+            
+        }  else {
+			$webhookComments = PHP_EOL . $response['result']['status_text'];
+		}  
+        
+         $this->webhookFinalprocess($webhookComments);
+    }
+    
+    /**
+     * Handling the credit process
+     *
+     * @return none
+     */
+    public function handleNnTransactionCredit(): void
+    {
+		$creditAmount = $this->novalnetPaymentGateway->convertCurrencyFormatter($this->orderDetails->kBestellung, ($this->eventData['transaction']['amount'] ));
+		
+        $webhookComments = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_webhook_initial_execution', $this->languageCode), $this->parentTid, $creditAmount, date('d.m.Y'), date('H:i:s'), $this->eventTid);
+        
+        if (in_array($this->eventData['transaction']['payment_type'], ['INVOICE_CREDIT', 'CASHPAYMENT_CREDIT', 'ONLINE_TRANSFER_CREDIT', 'MULTIBANCO_CREDIT'])) {
+            
+            $callbackDetails = Shop::Container()->getDB()->queryPrepared('SELECT cAdditionalInfo, nCallbackAmount FROM xplugin_novalnet_transaction_details WHERE cNnorderid  = :cNnorderid', [':cNnorderid' => $this->orderDetails->cBestellNr], ReturnType::SINGLE_OBJECT);
+
+            $callbackDetails->nCallbackAmount = !empty($callbackDetails->nCallbackAmount) ? $callbackDetails->nCallbackAmount : 0;
+            
+            $orderPaidAmount = $callbackDetails->nCallbackAmount + $this->eventData['transaction']['amount'];            
+            $orderAmount = !empty($this->orderDetails->nBetrag) ? $this->orderDetails->nBetrag : ($this->orderDetails->fGesamtsumme * 100);
+            
+            $refundInfo = !empty($callbackDetails->cAdditionalInfo) ? json_decode($callbackDetails->cAdditionalInfo, true) : 0;
+            
+            $orderPaidAmount = $orderPaidAmount - (!empty($refundInfo['refunded_amount']) ? $refundInfo['refunded_amount'] : 0);
+            $orderAmount = $orderAmount - (!empty($refundInfo['refunded_amount']) ? $refundInfo['refunded_amount'] : 0);
+            $this->eventData['order_paid_amount'] = $orderPaidAmount;
+            if ($orderPaidAmount >= $orderAmount) {
+                $amount = ($orderPaidAmount == $orderAmount) ? ($orderAmount / 100) : ($this->eventData['transaction']['amount'] / 100);
+                // Add payment to order
+                $this->addPaymentsToOrder($this->orderDetails, $this->parentTid, $amount);
+                
+                // Update the order status
+                if ($this->eventData['transaction']['payment_type'] == 'ONLINE_TRANSFER_CREDIT') {                  
+                    $this->webhookFinalprocess($webhookComments, \BESTELLUNG_STATUS_BEZAHLT, 'N', true);
+                }
+                $this->webhookFinalprocess($webhookComments, \BESTELLUNG_STATUS_BEZAHLT);   
+            }                                                   
+        }
+        $this->webhookFinalprocess($webhookComments);
+    }
+    
+    /**
+     * Handling the chargeback process
+     *
+     * @return none
+     */
+    public function handleNnChargeback(): void
+    {
+		$chargeBackAmount = $this->novalnetPaymentGateway->convertCurrencyFormatter($this->orderDetails->kBestellung, ($this->eventData['transaction']['amount'] ));
+		
+        if ($this->eventData['transaction']['payment_type'] == 'RETURN_DEBIT_SEPA') {
+            $webhookComments = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_return_debit_execution_text', $this->languageCode), $this->parentTid, $chargeBackAmount, date('d.m.Y'), date('H:i:s'), $this->eventTid);
+
+        } elseif ($this->eventData['transaction']['payment_type'] == 'REVERSAL') {
+            $webhookComments = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_reversal_execution_text', $this->languageCode), $this->parentTid, $chargeBackAmount, date('d.m.Y'), date('H:i:s'), $this->eventTid);
+        } else {
+            $webhookComments = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_chargeback_execution_text', $this->languageCode), $this->parentTid, $chargeBackAmount, date('d.m.Y'), date('H:i:s'), $this->eventTid);
+        }
+        
+        $this->webhookFinalprocess($webhookComments);
+    }
+    
+    /**
+    * Handling the Instalment payment execution
+    *
+    * @return none
+    */
+    public function handleNnInstalment(): void
+    {
+        if ($this->eventData['transaction']['status'] == 'CONFIRMED' && !empty($this->eventData['instalment']['cycles_executed'])) {
+            $additionalInstalmentMsg = '';
+            
+            $installmentAmount = $this->novalnetPaymentGateway->convertCurrencyFormatter($this->orderDetails->kBestellung, ($this->eventData['instalment']['cycle_amount']));
+            
+            $webhookComments = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_instalment_payment_execution', $this->languageCode), $this->parentTid, $installmentAmount, date('d.m.Y'), date('H:i:s'), $this->eventTid);
+            
+            $additionalInfo = Shop::Container()->getDB()->queryPrepared('SELECT cAdditionalInfo FROM xplugin_novalnet_transaction_details WHERE cNnorderid  = :cNnorderid', [':cNnorderid' => $this->orderDetails->cBestellNr,], ReturnType::SINGLE_OBJECT);
+           
+            $instalmentCyclesInfo = json_decode($additionalInfo->cAdditionalInfo, true);
+            $insCycleCount = $this->eventData['instalment']['cycles_executed'];
+            $instalmentCyclesInfo[$insCycleCount]['tid'] = $this->eventTid;
+            
+            $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('xplugin_novalnet_transaction_details', 'cNnorderid', $this->orderDetails->cBestellNr, ['cAdditionalInfo' => json_encode($instalmentCyclesInfo)]);
+            
+            if (empty($this->eventData['instalment']['prepaid'])) {
+                if ($this->eventData['transaction']['payment_type'] == 'INSTALMENT_INVOICE') {
+                    $additionalInstalmentMsg = \PHP_EOL . $this->novalnetPaymentGateway->getBankdetailsInformation($this->orderDetails, $this->eventData, $this->languageCode);
+                    
+                }
+            }
+            
+            $instalmentInfo = $this->novalnetPaymentGateway->getInstalmentInfoFromDb($this->orderDetails->cBestellNr, $this->languageCode);
+            
+            $this->webhookFinalprocess($webhookComments);
+            
+            // Send mail notification to customer regarding the new instalment creation
+            $this->sendInstalmentMailNotification($instalmentInfo, $additionalInstalmentMsg);
+            
+           
+        }
+    }
+    
+    /**
+     * Handling the Instalment cancelation
+     *
+     * @return none
+     */
+    public function handleNnInstalmentCancel(): void
+    {
+        if ($this->eventData['transaction']['status'] == 'CONFIRMED' && $this->orderDetails->cStatuswert != 'DEACTIVATED') {
+            $additionalInfo = Shop::Container()->getDB()->queryPrepared('SELECT cAdditionalInfo FROM xplugin_novalnet_transaction_details WHERE cNnorderid  = :cNnorderid', [':cNnorderid' => $this->orderDetails->cBestellNr,], ReturnType::SINGLE_OBJECT);
+           
+            $instalmentCyclesInfo = json_decode($additionalInfo->cAdditionalInfo, true);
+            
+            $instalmentCyclesInfo['is_full_instalment_cancel'] = ($this->eventData['instalment']['cancel_type'] == 'ALL_CYCLES') ? 'all_cycles' : 'remaining_cycles';
+            
+            $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('xplugin_novalnet_transaction_details', 'cNnorderid', $this->orderDetails->cBestellNr, ['cAdditionalInfo' => json_encode($instalmentCyclesInfo)]);
+            
+            $webhookComments = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_instalment_cancellation', $this->languageCode), $this->parentTid, date('d.m.Y'), date('H:i:s'));             
+            
+            if ($instalmentCyclesInfo['is_full_instalment_cancel'] == 'all_cycles') {
+                $this->webhookFinalprocess($webhookComments, \BESTELLUNG_STATUS_STORNO, 'Y');
+                $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('xplugin_novalnet_transaction_details', 'cNnorderid', $this->orderDetails->cBestellNr, ['cStatuswert' => 'DEACTIVATED']);
+            } else {
+                $this->webhookFinalprocess($webhookComments);
+            }
+        }
+    }
+    
+    /**
+     * Handling the Payment notification process
+     *
+     * @return none
+     */
+    public function handleNnPaymentNotifications(): void
+    {
+        if(in_array($this->eventType, ['PAYMENT_REMINDER_1', 'PAYMENT_REMINDER_2'])) {
+            $reminderNumber = preg_replace("/[^0-9]/", '', $this->eventType);
+            $webhookComments = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_payment_reminder', $this->languageCode), $reminderNumber);  
+        } else {
+            $webhookComments = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_collection_submission', $this->languageCode), $this->eventData['collection']['reference']);  
+        }
+        $this->webhookFinalprocess($webhookComments);
+    }
+    
+    /**
+     * Create the payment to the Novalnet orders
+     *
+     * @param  object  $orderDetails
+     * @param  int  $tid
+     * @param  float|int  $amount
+     * @return none
+     */
+    public function addPaymentsToOrder(object $orderDetails, int $tid, $amount = 0): void
+    {
+        // Loads the order object
+        $order = new Bestellung((int) ($orderDetails->kBestellung)); 
+        $order->fuelleBestellung(true, 0, false);
+
+        // Add the incoming payments if the transaction was confirmed
+        $jtlPaymentmethod = Method::create($orderDetails->Zahlungsart->cModulId);
+        
+        $incomingPayment           = new stdClass();
+        $incomingPayment->fBetrag  = !empty($amount) ?  $amount : $orderDetails->fGesamtsummeKundenwaehrung;
+        $incomingPayment->cISO     = $orderDetails->Waehrung->cISO;
+        $incomingPayment->cHinweis = $tid;
+        $jtlPaymentmethod->name    = $orderDetails->cZahlungsartName;
+        
+        // Add the current transaction payment into db
+        $jtlPaymentmethod->addIncomingPayment($order, $incomingPayment);
+    }
+    
+    /**
+     * Performs final callback process
+     *
+     * @param  string  $webhookMessage
+     * @param  string  $orderStatusToUpdate
+     * @param  string  $updateWawiStatus
+     * @param  bool    $isPaidNow
+     * @return none
+     */
+    public function webhookFinalprocess(string $webhookMessage, string $orderStatusToUpdate = '', string $updateWawiStatus = 'N', bool $isPaidNow = false): void
+    {  
+        $oldTransactionComment = Shop::Container()->getDB()->queryPrepared('SELECT cKommentar, kSprache FROM tbestellung WHERE cBestellNr  = :cBestellNr', [':cBestellNr' => $this->orderDetails->cBestellNr,], ReturnType::SINGLE_OBJECT);
+        
+        if (strpos($this->eventData['transaction']['payment_type'], 'INVOICE') !== false) {
+            if($this->eventType == 'TRANSACTION_CAPTURE') {
+                if (strpos($oldTransactionComment->cKommentar, 'auf das folgende Konto') !== false && $oldTransactionComment->kSprache == 1) {
+                    $oldTransactionComment->cKommentar = str_replace('auf das folgende Konto', 'spätestens bis zum ' .$this->eventData['transaction']['due_date'] . ' auf das folgende Konto', $oldTransactionComment->cKommentar);
+                } else {
+                  $oldTransactionComment->cKommentar = str_replace('to the following account', 'to the following account on or before ' . $this->eventData['transaction']['due_date'] , $oldTransactionComment->cKommentar);   
+                }
+            }
+            
+            if(($this->eventType == 'INSTALMENT' || $this->eventType == 'TRANSACTION_UPDATE' && in_array($this->eventData['transaction']['update_type'], array('DUE_DATE', 'AMOUNT_DUE_DATE')))  && (preg_match('/before(.*)/', $oldTransactionComment->cKommentar, $matches) || preg_match('/zum(.*)/', $oldTransactionComment->cKommentar, $matches))) {
+                
+                    $oldTransactionComment->cKommentar = ($oldTransactionComment->kSprache == 1) ?  str_replace($matches[1], $this->eventData['transaction']['due_date'] . ' auf das folgende Konto', $oldTransactionComment->cKommentar) :  str_replace($matches[0], 'before ' . $this->eventData['transaction']['due_date'] , $oldTransactionComment->cKommentar);
+            }
+            
+                    
+            if ($this->eventType == 'INSTALMENT' && preg_match("/([0-9]{17})/s", $oldTransactionComment->cKommentar, $matches)) {
+                 if (strpos($oldTransactionComment->cKommentar, 'Novalnet-Transaktions-ID:') !== false && $oldTransactionComment->kSprache == 1) {
+                    $oldTransactionComment->cKommentar = str_replace('Novalnet-Transaktions-ID: ' . $matches[0], 'Novalnet-Transaktions-ID: ' . $this->eventTid, $oldTransactionComment->cKommentar);
+                    $oldTransactionComment->cKommentar = str_replace('Zahlungsreferenz: ' . $matches[0], 'Zahlungsreferenz: ' . $this->eventTid, $oldTransactionComment->cKommentar);
+                } else {
+                  $oldTransactionComment->cKommentar = str_replace('Novalnet transaction ID: ' . $matches[0], 'Novalnet transaction ID: ' . $this->eventTid, $oldTransactionComment->cKommentar);   
+                  $oldTransactionComment->cKommentar = str_replace('Payment Reference: ' . $matches[0], 'Payment Reference: ' . $this->eventTid, $oldTransactionComment->cKommentar);
+                }
+            }
+            
+           if(($this->eventType == 'INSTALMENT' || $this->eventType == 'TRANSACTION_UPDATE' && in_array($this->eventData['transaction']['update_type'], array('AMOUNT', 'AMOUNT_DUE_DATE')))  && (preg_match('/(.*)to the following/', $oldTransactionComment->cKommentar, $matches) || preg_match('/(.*)spätestens/', $oldTransactionComment->cKommentar, $matches))) {
+                $updatedOrderAmount = $this->eventType == 'INSTALMENT' ? $this->eventData['instalment']['cycle_amount'] : 
+                $this->eventData['transaction']['amount'];
+
+                $oldTransactionComment->cKommentar = ($oldTransactionComment->kSprache == 1) ? str_replace($matches[1], 'Bitte überweisen Sie den Betrag von ' . number_format($updatedOrderAmount / 100 , 2, ',', '') . ' '. $this->orderDetails->Waehrung->htmlEntity, $oldTransactionComment->cKommentar) :  str_replace($matches[1], 'Please transfer the amount of ' . number_format($updatedOrderAmount / 100 , 2, ',', '') . ' '. $this->orderDetails->Waehrung->htmlEntity , $oldTransactionComment->cKommentar);
+            } 
+        }
+        
+        $webhookComments = !empty($oldTransactionComment->cKommentar) ? ($oldTransactionComment->cKommentar . \PHP_EOL . $webhookMessage) : $webhookMessage;
+        
+        $orderNo = !empty($this->orderDetails->cBestellNr) ? ($this->orderDetails->cBestellNr) : $this->eventData['transaction']['order_no'];
+          
+        if (!empty($orderStatusToUpdate)) {
+            // Updating the necessary details into the core order table related to the webhook transaction
+            $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('tbestellung', 'cBestellNr', $orderNo, ['cKommentar' => $webhookComments, 'cStatus' => $orderStatusToUpdate, 'cAbgeholt' => $updateWawiStatus, 'dBezahltDatum' => ($isPaidNow ? 'NOW()' : '')]);
+        } else {
+            $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('tbestellung', 'cBestellNr', $orderNo, ['cKommentar' => $webhookComments, 'cAbgeholt' => $updateWawiStatus, 'dBezahltDatum' => ($isPaidNow ? 'NOW()' : '')]);
+        }
+        
+        // Set the order paid amount in the Novalnet transaction table
+        if (isset($this->eventData['order_paid_amount']) && !empty($this->eventData['order_paid_amount'])) {
+            $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('xplugin_novalnet_transaction_details', 'cNnorderid', $orderNo, ['nCallbackAmount' => $this->eventData['order_paid_amount']]);   
+        }
+        
+        // Updating in the Novalnet transaction table
+        $this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('xplugin_novalnet_transaction_details', 'cNnorderid', $orderNo, ['cStatuswert' => $this->eventData['transaction']['status']]);
+        
+        // Send the order update mail when the transaction has been confirmed or amount and due date update
+        if ($this->eventType == 'TRANSACTION_CAPTURE' || (isset($this->eventData['transaction']['update_type']) && ((in_array($this->eventData['transaction']['update_type'], array('AMOUNT', 'DUE_DATE', 'AMOUNT_DUE_DATE'))) || ($this->eventData['transaction']['update_type'] == 'STATUS' && $this->eventData['transaction']['status'] == 'CONFIRMED')))) {
+            $jtlPaymentmethod = Method::create($this->orderDetails->Zahlungsart->cModulId);
+
+            $jtlPaymentmethod->sendMail($this->orderDetails->kBestellung, MAILTEMPLATE_BESTELLUNG_AKTUALISIERT);
+        
+        }
+        
+        // Send mail for merchant
+        $this->sendMailNotification($webhookMessage);
+    }
+    
+    /**
+     * Triggers mail notification to the mail address specified
+     *
+     * @param  array $webhookMessage
+     * @return none
+     */
+    public function sendMailNotification(string $webhookMessage): void
+    {
+        // Looping in through the core plugin's mail templates
+        foreach ($this->novalnetPaymentGateway->novalnetPaymentHelper->plugin->getMailTemplates()->getTemplatesAssoc() as $mailTemplate) {
+            
+            if ($mailTemplate->cModulId == 'novalnetwebhookmail' && $mailTemplate->cAktiv == 'Y') {
+                
+                $adminDetails = Shop::Container()->getDB()->queryPrepared('SELECT cMail from tadminlogin LIMIT :one', [':one' => '1'], ReturnType::SINGLE_OBJECT);
+                
+                // Notification is sent only when the admin login email is configured 
+                if (!empty($adminDetails->cMail)) {                 
+                
+                    $data = new stdClass();
+                    $data->webhookMessage = nl2br($webhookMessage); 
+                    $data->tkunde = $this->orderDetails->oKunde;       
+
+                    // Constructing the mail object                     
+                    $mail = new Mail();
+                    $mail->setToMail($adminDetails->cMail);
+                    
+                    // Replacing the template variable with the webhook message 
+                    $mail = $mail->createFromTemplateID('kPlugin_' . $this->novalnetPaymentGateway->novalnetPaymentHelper->plugin->getID() . '_novalnetwebhookmail', $data);
+                    
+                    // Preparing the shop send email function for dispatching the custom email 
+                    $mailer = Shop::Container()->get(Mailer::class);
+                    $mailer->send($mail);
+                }
+                break;
+            }
+        }
+        $this->displayMessage($webhookMessage);
+    }
+    
+    
+    /**
+     * Triggers mail notification to the further instalment
+     *
+     * @param  array  $instalmentInfo
+     * @param  string $additionalInfo
+     * @return none
+     */
+    public function sendInstalmentMailNotification(array $instalmentInfo, string $additionalInfo): void
+    {
+        // Looping in through the core plugin's mail templates
+        foreach ($this->novalnetPaymentGateway->novalnetPaymentHelper->plugin->getMailTemplates()->getTemplatesAssoc() as $mailTemplate) {
+            
+            if ($mailTemplate->cModulId == 'novalnetinstalmentmail' && $mailTemplate->cAktiv == 'Y') {
+                 $instalmentMsg = \PHP_EOL . $this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_next_instalment_message', $this->languageCode);
+                 
+                 $instalmentMsg .= '<br><br>' . $this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_invoice_payments_order_number_reference', $this->languageCode) . $this->orderDetails->cBestellNr;
+                 $instalmentMsg .= '<br>' . $this->orderDetails->cZahlungsartName;
+
+                 $instalmentMsg .= nl2br($additionalInfo);
+                
+                 $webhookMessage =  '<h3>'.$this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_instalment_information', $this->languageCode).'</h3>
+                    <table id="nn_table">
+                       <thead>
+                          <style>#nn_table {
+                             font-family: Helvetica, Arial, sans-serif;
+                             border-collapse: collapse;
+                             width: 100%;
+                             }
+                             #nn_table td, #nn_table th {
+                             border: 1px solid #ddd;
+                             padding: 8px;
+                             }
+                             #nn_table tr:nth-child(odd){background-color: #f2f2f2;}
+                             #nn_table tr:hover {background-color: #ddd;}
+                             #nn_table th {
+                             padding-top: 12px;
+                             padding-bottom: 12px;
+                             text-align: left;
+                             background-color: #0080c9;
+                             color: white;
+                             }
+                          </style>
+                          <tr>
+                             <th>'. $this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_serial_no', $this->languageCode). '</th>
+                             <th>'.$this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_instalment_future_date', $this->languageCode).'</th>
+                             <th>' .$this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_transaction_tid', $this->languageCode).'</th> 
+                             <th>'.$this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_instalment_amount', $this->languageCode).'</th>
+                             <th>Status</th>
+                          </tr>
+                       </thead>
+                       <tbody>';
+                          foreach ($instalmentInfo['insDetails'] as $key => $instalment) {
+                            $status = ($instalment['tid'] != '-') ? ($this->languageCode == 'ger' ? 'Bezahlt' : 'Paid') : ($this->languageCode == 'ger' ? 'Offen' : 'Open');
+                          $webhookMessage .= '
+                          <tr>
+                             <td>'.$key.'</td>
+                             <td>'.$instalment['future_instalment_date'].'</td>
+                             <td>'.$instalment['tid'].'</td>
+                             <td>'.$instalment['cycle_amount'].'</td>
+                             <td>'.$status.'</td>
+                          </tr>';
+                          }
+                          $webhookMessage .= '
+                       </tbody>
+                    </table>';
+
+                    $data = new stdClass();
+                    $data->nextInstalmentMsg = $instalmentMsg;
+                    $data->instalmentMessage = $webhookMessage; 
+                    $data->tkunde = $this->orderDetails->oKunde; 
+
+                    // Constructing the mail object                     
+                    $mail = new Mail();
+                    $mail->setToMail($this->orderDetails->oKunde->cMail);
+                    
+                    // Replacing the template variable with the webhook message 
+                    $mail = $mail->createFromTemplateID('kPlugin_' . $this->novalnetPaymentGateway->novalnetPaymentHelper->plugin->getID() . '_novalnetinstalmentmail', $data);
+                    
+                    // Preparing the shop send email function for dispatching the custom email 
+                    $mailer = Shop::Container()->get(Mailer::class);
+                    $mailer->send($mail);
+            }
+        }
+    }
+    
+    /**
+     * Triggers refund process through the wawi workflow
+     *
+     * @return none
+     */
+    public function handleNovalnetRefund() {
+		// Get the order number from wawi
+		$getKeyValues = $_POST;
+		$orderNumber  = array_keys($getKeyValues);
+		// Get the amount, and TID from Database
+		$orderDetails = Shop::Container()->getDB()->queryPrepared('SELECT nBetrag, nNntid, cAdditionalInfo FROM xplugin_novalnet_transaction_details WHERE cNnorderid  = :cNnorderid', [':cNnorderid' => $orderNumber[0]], ReturnType::SINGLE_OBJECT);
+		
+		$oldTransactionComment = Shop::Container()->getDB()->queryPrepared('SELECT cKommentar, kSprache FROM tbestellung WHERE cBestellNr  = :cBestellNr', [':cBestellNr ' => $orderNumber[0]], ReturnType::SINGLE_OBJECT);
+		
+		$amount 				= json_decode($orderDetails->nBetrag, true);
+		$tid    				= json_decode($orderDetails->nNntid, true);
+		$txAdditonalDetails    	= json_decode($orderDetails->cAdditionalInfo, true);
+		$lang    				= json_decode($oldTransactionComment->kSprache, true);
+		$this->languageCode 	= $lang == 2 ? 'eng' : 'ger';
+		// Form the refund request Parameters
+		$data = [];
+		$data['transaction'] = 	[
+									'tid'    => $tid,
+									'amount' => $amount,
+								];
+		$data['custom'] = 	[
+								'lang'      	 => $lang == 2 ? 'EN' : 'DE',  
+								'shop_invoked' 	 => 1
+							];
+		// Do the refund call to Novalnet server
+		$response = $this->novalnetPaymentGateway->performServerCall($data, 'transaction_refund');
+
+		// Handling the refund success response
+		if ($response['result']['status'] == 'SUCCESS') {
+
+			// Form the refund new tid comments by the response
+			$refundedAmount = $this->novalnetPaymentGateway->convertCurrencyFormatter($this->orderDetails->kBestellung, ($this->eventData['transaction']['refund']['amount'] ));
+
+			$webhookComments = \PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_refund_execution', $this->languageCode), $this->parentTid, $refundedAmount); 
+			if (!empty($response['transaction']['refund']['tid'])) {
+				$webhookComments .= PHP_EOL . sprintf($this->novalnetPaymentGateway->novalnetPaymentHelper->getNnLangTranslationText('jtl_novalnet_new_tid_refund_execution', $this->languageCode), $response['transaction']['refund']['tid']);
+			} 
+			// Store the refunded amount details into the Database
+			$txAdditonalInfo = !empty($txAdditonalDetails) ? $txAdditonalDetails : [];
+			$txAdditonalInfo['refunded_amount'] = $response['transaction']['refunded_amount'];
+			$this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('xplugin_novalnet_transaction_details', 'cNnorderid', $orderNumber[0], ['cAdditionalInfo' => json_encode($txAdditonalInfo)]);
+		} else {
+			$webhookComments = PHP_EOL . $response['result']['status_text'];
+		}
+		// Store the refund comments into the Database
+		$webhookMessage = !empty($oldTransactionComment->cKommentar) ? ($oldTransactionComment->cKommentar . \PHP_EOL . $webhookComments) : $webhookComments;
+		$cKommentar = array('cKommentar' => $webhookMessage);
+		$cStatus    = [];
+		// In case of full refund, deactivation is processed
+		if ($response['transaction']['status'] == 'DEACTIVATED') {
+			// We do not send to webhookFinalprocess for update as it will cause problems with WAWI synchronization
+			$cStatus = array('cStatus' => \BESTELLUNG_STATUS_STORNO);
+		}
+		$updateValues = array_merge($cKommentar, $cStatus);
+		// Update comments and status into the Database
+		$this->novalnetPaymentGateway->novalnetPaymentHelper->performDbUpdateProcess('tbestellung', 'cBestellNr', $orderNumber[0], $updateValues);
+		
+	}
+}