diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..e69de29
diff --git a/.gitignore b/.gitignore
index 485dee6..1f1025f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .idea
+.DS_Store
\ No newline at end of file
diff --git a/paylikepayment.zip b/paylikepayment.zip
index 154d26d..2cd01ce 100644
Binary files a/paylikepayment.zip and b/paylikepayment.zip differ
diff --git a/paylikepayment/README.md b/paylikepayment/README.md
index 83ebc68..c2839f7 100644
--- a/paylikepayment/README.md
+++ b/paylikepayment/README.md
@@ -1 +1 @@
-# Paylike prestashop
+# Paylike prestashop
diff --git a/paylikepayment/api/Adapter.php b/paylikepayment/api/Adapter.php
index 623b235..5c892b4 100644
--- a/paylikepayment/api/Adapter.php
+++ b/paylikepayment/api/Adapter.php
@@ -1,87 +1,99 @@
-<?php
-namespace Paylike;
-/**
- * Class Adapter
- * @package PaylikePayment\Api
- * The adapter class taking care of the calls to the api.
- *
- * The purpose of this is to abstract the requests
- * so that this can be changed depending on the environment.
- *
- * @version    1.0.0
- */
-if ( ! class_exists( 'Paylike\\Adapter' ) ) {
-    class Adapter {
-
-        public $apiUrl = 'https://api.paylike.io';
-        private $apiKey;
-
-        /**
-         * Adapter constructor.
-         *
-         * @param $privateApiKey
-         */
-        public function __construct( $privateApiKey ) {
-            if ( $privateApiKey ) {
-                $this->setApiKey( $privateApiKey );
-            } else {
-                // trigger_error( 'Private Key is missing!', E_USER_ERROR );
-                return null;
-                // return array('error' => 1, 'message' => "Private Key is missing!");
-
-            }
-        }
-
-        /**
-         * @param $key
-         * set the api key.
-         */
-        public function setApiKey( $key ) {
-            $this->apiKey = $key;
-        }
-
-        /**
-         * @param $url this is required, do not use the full url,
-         * only prepend the params eg: transactions/' . $transactionId . '/captures'
-         * @param $data this is optional
-         * Actual call to the api via curl.
-         *
-         * @return bool|mixed
-         */
-        public function request( $url, $data = null, $httpVerb = 'post' ) {
-            $url = $this->apiUrl . '/' . $url;
-            $ch = curl_init();
-            curl_setopt( $ch, CURLOPT_URL, $url );
-            curl_setopt( $ch, CURLOPT_HEADER, false );
-            curl_setopt( $ch, CURLOPT_HTTPHEADER, array(
-                'Accept: application/json',
-                'Content-Type: application/json'
-            ) );
-            curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
-            curl_setopt( $ch, CURLOPT_USERPWD, ":" . $this->apiKey );
-            curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
-            switch ( $httpVerb ) {
-                case 'post':
-                    curl_setopt( $ch, CURLOPT_POST, true );
-                    if ( $data ) {
-                        $encoded = json_encode($data);
-                        curl_setopt( $ch, CURLOPT_POSTFIELDS, $encoded );
-                    }
-                    break;
-                case 'get':
-                    // can add args here for future use
-                    break;
-            }
-            $result   = curl_exec( $ch );
-            $httpCode = curl_getinfo( $ch, CURLINFO_HTTP_CODE );
-            curl_close( $ch );
-            $output = json_decode( $result, true );
-            if ( $httpCode >= 200 || $httpCode <= 299 ) {
-                return $output;
-            } else {
-                return false;
-            }
-        }
-
-    }
-}
+<?php
+/**
+ *
+ * @author    DerikonDevelopment <ionut@derikon.com>
+ * @copyright Copyright (c) permanent, DerikonDevelopment
+ * @license   Addons PrestaShop license limitation
+ * @version   1.0.0
+ * @link      http://www.derikon.com/
+ *
+ */
+
+namespace Paylike;
+
+/**
+ * Class Adapter
+ * @package PaylikePayment\Api
+ * The adapter class taking care of the calls to the api.
+ *
+ * The purpose of this is to abstract the requests
+ * so that this can be changed depending on the environment.
+ *
+ * @version    1.0.0
+ */
+if (!class_exists('Paylike\\Adapter')) {
+    class Adapter
+    {
+        public $apiUrl = 'https://api.paylike.io';
+        private $apiKey;
+
+        /**
+         * Adapter constructor.
+         *
+         * @param $privateApiKey
+         */
+        public function __construct($privateApiKey)
+        {
+            if ($privateApiKey) {
+                $this->setApiKey($privateApiKey);
+            } else {
+                // trigger_error( 'Private Key is missing!', E_USER_ERROR );
+                return null;
+                // return array('error' => 1, 'message' => "Private Key is missing!");
+            }
+        }
+
+        /**
+         * @param $key
+         * set the api key.
+         */
+        public function setApiKey($key)
+        {
+            $this->apiKey = $key;
+        }
+
+        /**
+         * @param $url this is required, do not use the full url,
+         * only prepend the params eg: transactions/' . $transactionId . '/captures'
+         * @param $data this is optional
+         * Actual call to the api via curl.
+         *
+         * @return bool|mixed
+         */
+        public function request($url, $data = null, $httpVerb = 'post')
+        {
+            $url = $this->apiUrl . '/' . $url;
+            $ch = curl_init();
+            curl_setopt($ch, CURLOPT_URL, $url);
+            curl_setopt($ch, CURLOPT_HEADER, false);
+            curl_setopt($ch, CURLOPT_HTTPHEADER, array(
+                'Accept: application/json',
+                'Content-Type: application/json'
+            ));
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_USERPWD, ":" . $this->apiKey);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            switch ($httpVerb) {
+                case 'post':
+                    curl_setopt($ch, CURLOPT_POST, true);
+                    if ($data) {
+                        $encoded = json_encode($data);
+                        curl_setopt($ch, CURLOPT_POSTFIELDS, $encoded);
+                    }
+                    break;
+                case 'get':
+                    // can add args here for future use
+                    break;
+            }
+            $result   = curl_exec($ch);
+            $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            curl_close($ch);
+            $output = json_decode($result, true);
+            if ($httpCode >= 200 || $httpCode <= 299) {
+                return $output;
+            } else {
+                return false;
+            }
+        }
+    }
+}
diff --git a/paylikepayment/api/Card.php b/paylikepayment/api/Card.php
index 9fc94af..a0330bb 100644
--- a/paylikepayment/api/Card.php
+++ b/paylikepayment/api/Card.php
@@ -1,32 +1,44 @@
-<?php
-namespace Paylike;
-/**
- * Class Card
- * @package Paylike
- * Handles card operations.
- *
- * @version    1.0.0
- */
-if ( ! class_exists( 'Paylike\\Card' ) ) {
-    class Card {
-
-        /**
-         * Fetches information about a card
-         *
-         * @link https://github.com/paylike/api-docs#create-a-transaction
-         *
-         * @param $cardId
-         *
-         * @return int|mixed
-         */
-        public static function fetch( $cardId ) {
-            $adapter = Client::getAdapter();
-            if ( ! $adapter ) {
-                // trigger_error( 'Adapter not set!', E_USER_ERROR );
-                return array('error' => 1, 'message' => "Adapter not set!");
-            }
-
-            return $adapter->request( 'cards/' . $cardId, $data = null, $httpVerb = 'get' );
-        }
-    }
-}
+<?php
+/**
+ *
+ * @author    DerikonDevelopment <ionut@derikon.com>
+ * @copyright Copyright (c) permanent, DerikonDevelopment
+ * @license   Addons PrestaShop license limitation
+ * @version   1.0.0
+ * @link      http://www.derikon.com/
+ *
+ */
+
+namespace Paylike;
+
+/**
+ * Class Card
+ * @package Paylike
+ * Handles card operations.
+ *
+ * @version    1.0.0
+ */
+if (!class_exists('Paylike\\Card')) {
+    class Card
+    {
+        /**
+         * Fetches information about a card
+         *
+         * @link https://github.com/paylike/api-docs#create-a-transaction
+         *
+         * @param $cardId
+         *
+         * @return int|mixed
+         */
+        public static function fetch($cardId)
+        {
+            $adapter = Client::getAdapter();
+            if (!$adapter) {
+                // trigger_error( 'Adapter not set!', E_USER_ERROR );
+                return array('error' => 1, 'message' => "Adapter not set!");
+            }
+
+            return $adapter->request('cards/' . $cardId, $data = null, $httpVerb = 'get');
+        }
+    }
+}
diff --git a/paylikepayment/api/Client.php b/paylikepayment/api/Client.php
index 057a4e7..ec3d023 100644
--- a/paylikepayment/api/Client.php
+++ b/paylikepayment/api/Client.php
@@ -1,51 +1,64 @@
-<?php
-namespace Paylike;
-include_once( 'Adapter.php' );
-include_once( 'Transaction.php' );
-include_once( 'Card.php' );
-
-/**
- * Class Client
- * @package Paylike
- * Manages the app creation.
- */
-if ( ! class_exists( 'Paylike\\Client' ) ) {
-    class Client {
-
-        /**
-         * @var
-         * This is the adapter, similar to a db engine,
-         * it can be changed with any class that has its capabilities,
-         * which are making requests to api. In the future the adapter
-         * will be extended from an interface.
-         */
-        private static $adapter = null;
-
-        /**
-         * @param $privateApiKey
-         * Set the api key for future calls
-         */
-        public static function setKey( $privateApiKey ) {
-            self::$adapter = new Adapter( $privateApiKey );
-        }
-
-        /**
-         * @param null $privateApiKey
-         * Returns the object that will be responsible for making the calls to the api
-         *
-         * @return bool|null|Adapter
-         */
-        public static function getAdapter( $privateApiKey = null ) {
-            if ( self::$adapter ) {
-                return self::$adapter;
-            } else {
-                if ( $privateApiKey ) {
-                    return new Adapter( $privateApiKey );
-                } else {
-                    return false;
-                }
-            }
-        }
-
-    }
-}
+<?php
+/**
+ *
+ * @author    DerikonDevelopment <ionut@derikon.com>
+ * @copyright Copyright (c) permanent, DerikonDevelopment
+ * @license   Addons PrestaShop license limitation
+ * @version   1.0.0
+ * @link      http://www.derikon.com/
+ *
+ */
+
+namespace Paylike;
+
+include_once('Adapter.php');
+include_once('Transaction.php');
+include_once('Card.php');
+
+/**
+ * Class Client
+ * @package Paylike
+ * Manages the app creation.
+ */
+if (!class_exists('Paylike\\Client')) {
+    class Client
+    {
+
+        /**
+         * @var
+         * This is the adapter, similar to a db engine,
+         * it can be changed with any class that has its capabilities,
+         * which are making requests to api. In the future the adapter
+         * will be extended from an interface.
+         */
+        private static $adapter = null;
+
+        /**
+         * @param $privateApiKey
+         * Set the api key for future calls
+         */
+        public static function setKey($privateApiKey)
+        {
+            self::$adapter = new Adapter($privateApiKey);
+        }
+
+        /**
+         * @param null $privateApiKey
+         * Returns the object that will be responsible for making the calls to the api
+         *
+         * @return bool|null|Adapter
+         */
+        public static function getAdapter($privateApiKey = null)
+        {
+            if (self::$adapter) {
+                return self::$adapter;
+            } else {
+                if ($privateApiKey) {
+                    return new Adapter($privateApiKey);
+                } else {
+                    return false;
+                }
+            }
+        }
+    }
+}
diff --git a/paylikepayment/api/Transaction.php b/paylikepayment/api/Transaction.php
index 084638c..8799022 100644
--- a/paylikepayment/api/Transaction.php
+++ b/paylikepayment/api/Transaction.php
@@ -1,111 +1,125 @@
-<?php
-namespace Paylike;
-/**
- * Class Transaction
- * @package Paylike
- * Handles transaction operations.
- *
- * @version    1.0.0
- */
-if ( ! class_exists( 'Paylike\\Transaction' ) ) {
-    class Transaction {
-
-
-        /**
-         * Creates a transaction based on a
-         * previous transaction
-         *
-         * @link https://github.com/paylike/api-docs#create-a-transaction
-         *
-         * @param $merchantId
-         * @param $data
-         *
-         * @return bool|mixed
-         */
-        public static function create( $merchantId, $data ) {
-            $adapter = Client::getAdapter();
-            if ( ! $adapter ) {
-                // trigger_error( 'Adapter not set!', E_USER_ERROR );
-                return array('error' => 1, 'message' => "Adapter not set!");
-            }
-
-            return $adapter->request( 'merchants/' . $merchantId . '/transactions', $data );
-        }
-
-        /**
-         * @param $transactionId
-         *
-         * @return int|mixed
-         * Return the transaction data
-         * @throws Exception
-         *
-         */
-        public static function fetch( $transactionId ) {
-            $adapter = Client::getAdapter();
-            if ( ! $adapter ) {
-                // trigger_error( 'Adapter not set!', E_USER_ERROR );
-                return array('error' => 1, 'message' => "Adapter not set!");
-            }
-
-            return $adapter->request( 'transactions/' . $transactionId, $data = null, $httpVerb = 'get' );
-        }
-
-        /**
-         * @param $transactionId
-         * Capture a transaction that has been authorized.
-         * This also returns the transaction data.
-         *
-         * @param $data
-         *
-         * @return bool|int|mixed
-         */
-        public static function capture( $transactionId, $data ) {
-            $adapter = Client::getAdapter();
-            if ( ! $adapter ) {
-                // trigger_error( 'Adapter not set!', E_USER_ERROR );
-                return array('error' => 1, 'message' => "Adapter not set!");
-            }
-
-            return $adapter->request( 'transactions/' . $transactionId . '/captures', $data );
-        }
-
-        /**
-         * @param $transactionId
-         * You can void a certain amount of a transaction that
-         * has been authorized but not captured.
-         *
-         * @param $data
-         *
-         * @return bool|int|mixed
-         */
-        public static function void( $transactionId, $data ) {
-            $adapter = Client::getAdapter();
-            if ( ! $adapter ) {
-                // trigger_error( 'Adapter not set!', E_USER_ERROR );
-                return array('error' => 1, 'message' => "Adapter not set!");
-            }
-
-            return $adapter->request( 'transactions/' . $transactionId . '/voids', $data );
-        }
-
-        /**
-         * @param $transactionId
-         * You can return a certain amount of a transaction
-         * that has been captured.
-         *
-         * @param $data
-         *
-         * @return bool|int|mixed
-         */
-        public static function refund( $transactionId, $data ) {
-            $adapter = Client::getAdapter();
-            if ( ! $adapter ) {
-                // trigger_error( 'Adapter not set!', E_USER_ERROR );
-                return array('error' => 1, 'message' => "Adapter not set!");
-            }
-
-            return $adapter->request( 'transactions/' . $transactionId . '/refunds', $data );
-        }
-
-    }
-}
+<?php
+/**
+ *
+ * @author    DerikonDevelopment <ionut@derikon.com>
+ * @copyright Copyright (c) permanent, DerikonDevelopment
+ * @license   Addons PrestaShop license limitation
+ * @version   1.0.0
+ * @link      http://www.derikon.com/
+ *
+ */
+
+namespace Paylike;
+
+/**
+ * Class Transaction
+ * @package Paylike
+ * Handles transaction operations.
+ *
+ * @version    1.0.0
+ */
+if (!class_exists('Paylike\\Transaction')) {
+    class Transaction
+    {
+        /**
+         * Creates a transaction based on a
+         * previous transaction
+         *
+         * @link https://github.com/paylike/api-docs#create-a-transaction
+         *
+         * @param $merchantId
+         * @param $data
+         *
+         * @return bool|mixed
+         */
+        public static function create($merchantId, $data)
+        {
+            $adapter = Client::getAdapter();
+            if (!$adapter) {
+                // trigger_error( 'Adapter not set!', E_USER_ERROR );
+                return array('error' => 1, 'message' => "Adapter not set!");
+            }
+
+            return $adapter->request('merchants/' . $merchantId . '/transactions', $data);
+        }
+
+        /**
+         * @param $transactionId
+         *
+         * @return int|mixed
+         * Return the transaction data
+         * @throws Exception
+         *
+         */
+        public static function fetch($transactionId)
+        {
+            $adapter = Client::getAdapter();
+            if (!$adapter) {
+                // trigger_error( 'Adapter not set!', E_USER_ERROR );
+                return array('error' => 1, 'message' => "Adapter not set!");
+            }
+
+            return $adapter->request('transactions/' . $transactionId, $data = null, $httpVerb = 'get');
+        }
+
+        /**
+         * @param $transactionId
+         * Capture a transaction that has been authorized.
+         * This also returns the transaction data.
+         *
+         * @param $data
+         *
+         * @return bool|int|mixed
+         */
+        public static function capture($transactionId, $data)
+        {
+            $adapter = Client::getAdapter();
+            if (!$adapter) {
+                // trigger_error( 'Adapter not set!', E_USER_ERROR );
+                return array('error' => 1, 'message' => "Adapter not set!");
+            }
+
+            return $adapter->request('transactions/' . $transactionId . '/captures', $data);
+        }
+
+        /**
+         * @param $transactionId
+         * You can void a certain amount of a transaction that
+         * has been authorized but not captured.
+         *
+         * @param $data
+         *
+         * @return bool|int|mixed
+         */
+        public static function void($transactionId, $data)
+        {
+            $adapter = Client::getAdapter();
+            if (!$adapter) {
+                // trigger_error( 'Adapter not set!', E_USER_ERROR );
+                return array('error' => 1, 'message' => "Adapter not set!");
+            }
+
+            return $adapter->request('transactions/' . $transactionId . '/voids', $data);
+        }
+
+        /**
+         * @param $transactionId
+         * You can return a certain amount of a transaction
+         * that has been captured.
+         *
+         * @param $data
+         *
+         * @return bool|int|mixed
+         */
+        public static function refund($transactionId, $data)
+        {
+            $adapter = Client::getAdapter();
+            if (!$adapter) {
+                // trigger_error( 'Adapter not set!', E_USER_ERROR );
+                return array('error' => 1, 'message' => "Adapter not set!");
+            }
+
+            return $adapter->request('transactions/' . $transactionId . '/refunds', $data);
+        }
+    }
+}
diff --git a/paylikepayment/api/index.php b/paylikepayment/api/index.php
index 2d4b752..086d6b5 100644
--- a/paylikepayment/api/index.php
+++ b/paylikepayment/api/index.php
@@ -1,35 +1,35 @@
-<?php
-/*
-* 2007-2015 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2015 PrestaShop SA
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
-exit;
+<?php
+/*
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
diff --git a/paylikepayment/config.xml b/paylikepayment/config.xml
deleted file mode 100644
index b5aee78..0000000
--- a/paylikepayment/config.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<module>
-	<name>paylike</name>
-	<displayName><![CDATA[Paylike]]></displayName>
-	<version><![CDATA[1.0.0]]></version>
-	<description><![CDATA[Receive payment with Paylike]]></description>
-	<author><![CDATA[Pravin]]></author>
-	<tab><![CDATA[payments_gateways]]></tab>
-	<confirmUninstall><![CDATA[Are you sure about removing Paylike?]]></confirmUninstall>
-	<is_configurable>1</is_configurable>
-	<need_instance>1</need_instance>
-	<limited_countries></limited_countries>
-</module>
diff --git a/paylikepayment/controllers/front/index.php b/paylikepayment/controllers/front/index.php
index 2d4b752..086d6b5 100644
--- a/paylikepayment/controllers/front/index.php
+++ b/paylikepayment/controllers/front/index.php
@@ -1,35 +1,35 @@
-<?php
-/*
-* 2007-2015 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2015 PrestaShop SA
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
-exit;
+<?php
+/*
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
diff --git a/paylikepayment/controllers/front/paymentreturn-old.php b/paylikepayment/controllers/front/paymentreturn-old.php
deleted file mode 100644
index 61b606b..0000000
--- a/paylikepayment/controllers/front/paymentreturn-old.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-if ( ! class_exists( 'Paylike\\Client' ) ) {
-    require_once('modules/paylikepayment/api/Client.php');
-}
-
-use Paylike;
-
-
-
-
-class PaylikepaymentPaymentReturnModuleFrontController extends ModuleFrontController
-{
-    public function __construct()
-    {
-        parent::__construct();
-        $this->display_column_right = false;
-        $this->display_column_left = false;
-        $this->context = Context::getContext();
-    }
-
-    public function init()
-    {
-        parent::init();
-        $cart = $this->context->cart;
-        if ($cart->id_customer == 0 || $cart->id_address_delivery == 0 || $cart->id_address_invoice == 0 || !$this->module->active)
-            Tools::redirect('index.php?controller=order&step=1');
-
-        $authorized = false;
-        foreach (Module::getPaymentModules() as $module)
-            if ($module['name'] == 'paylikepayment')
-            {
-                $authorized = true;
-                break;
-            }
-
-        if (!$authorized)
-            die($this->module->l('Paylike payment method is not available.', 'paymentreturn'));
-
-        $customer = new Customer($cart->id_customer);
-        if (!Validate::isLoadedObject($customer))
-            Tools::redirect('index.php?controller=order&step=1');
-
-        Paylike\Client::setKey(Configuration::get('PAYLIKE_SECRET_KEY'));
-        $total = $cart->getOrderTotal(true, Cart::BOTH);
-        $currency = new Currency((int)$cart->id_currency);
-        $amount = Tools::ps_round($total, 2) * 100;
-        //$status_paid = (int)Configuration::get('PAYLIKE_ORDER_STATUS');
-        //$status_paid = Configuration::get('PS_OS_PAYMENT');
-        $transactionid = Tools::getValue('transactionid');
-
-        $transaction_failed = false;
-
-        if (Configuration::get('PAYLIKE_CHECKOUT_MODE') == 'delayed') {
-            $fetch = Paylike\Transaction::fetch( $transactionid );
-
-            if(is_array($fetch) && isset($fetch['error']) && $fetch['error'] == 1) {
-                PrestaShopLogger::addLog($fetch['message']);
-                $this->context->smarty->assign(array(
-                    'paylike_order_error' => 1,
-                    'paylike_error_message' => $fetch['message']
-                ));
-                return $this->setTemplate('payment_error.tpl');
-
-            } 
-            //else if (is_array($fetch) && $fetch['transaction']['currency'] == $currency->iso_code && $fetch['transaction']['custom']['cartId'] == $cart->id && (int)$fetch['transaction']['amount'] == (int)$amount) {
-            else if (is_array($fetch) && $fetch['transaction']['currency'] == $currency->iso_code && $fetch['transaction']['custom']['cartId'] == $cart->id) {
-                $message = 'Trx ID: '.$transactionid.'
-                    Authorized Amount: '.($fetch['transaction']['amount'] / 100).'
-                    Captured Amount: '.($fetch['transaction']['capturedAmount'] / 100).'
-                    Order time: '.$fetch['transaction']['created'].'
-                    Currency code: '.$fetch['transaction']['currency'];
-                
-                //$status_paid = Configuration::get('PS_OS_PAYMENT');
-                $status_paid = 3; //Processing in progress
-
-                if ($this->module->validateOrder((int)$cart->id, $status_paid, $total, $this->module->displayName, $message, array(), null, false, $customer->secure_key)) {
-                    $this->module->storeTransactionID($transactionid, $this->module->currentOrder, $total, $captured='NO');
-                    Tools::redirectLink(__PS_BASE_URI__.'index.php?controller=order-confirmation&id_cart='.$cart->id.'&id_module='.$this->module->id.'&id_order='.$this->module->currentOrder.'&key='.$customer->secure_key);
-
-                } else {
-                    $transaction_failed = true;
-                    Paylike\Transaction::void($transactionid, ['amount' => $amount]); //Cancel Order
-                }
-
-            } else {
-                $transaction_failed = true;
-            }
-            
-
-        } else {
-            $status_paid = (int)Configuration::get('PAYLIKE_ORDER_STATUS');
-            
-            $validOrder = $this->module->validateOrder((int)$cart->id, $status_paid, $total, $this->module->displayName, null, array(), null, false, $customer->secure_key);
-
-            if ($validOrder) {
-                $data = [
-                    'currency' => $currency->iso_code,
-                    'descriptor' => "Order #".$this->module->currentOrder,
-                    'amount' => $amount,
-                ];
-
-                $capture = Paylike\Transaction::capture($transactionid, $data);
-
-                if(is_array($capture) && !empty($capture['error']) && $capture['error'] == 1) {
-                    PrestaShopLogger::addLog($capture['message']);
-                    $this->context->smarty->assign(array(
-                        'paylike_order_error' => 1,
-                        'paylike_error_message' => $capture['message']
-                    ));
-                    return $this->setTemplate('payment_error.tpl');
-
-                } else if(!empty($capture['transaction'])) {
-                    $message = 'Trx ID: '.$transactionid.'
-                        Authorized Amount: '.($capture['transaction']['amount'] / 100).'
-                        Captured Amount: '.($capture['transaction']['capturedAmount'] / 100).'
-                        Order time: '.$capture['transaction']['created'].'
-                        Currency code: '.$capture['transaction']['currency'];
-
-                    $msg = new Message();
-                    $message = strip_tags($message, '<br>');
-                    if (Validate::isCleanHtml($message))
-                    {
-                        $msg->message = $message;
-                        $msg->id_cart = (int)$cart->id;
-                        $msg->id_customer = (int)$cart->id_customer;
-                        $msg->id_order = (int)$this->module->currentOrder;
-                        $msg->private = 1;
-                        $msg->add();
-                    }
-
-                    $this->module->storeTransactionID($transactionid, $this->module->currentOrder, $total, $captured='YES');
-                    $redirectLink = __PS_BASE_URI__.'index.php?controller=order-confirmation&id_cart='.$cart->id.'&id_module='.$this->module->id.'&id_order='.$this->module->currentOrder.'&key='.$customer->secure_key;
-                    Tools::redirectLink($redirectLink);
-
-                } else
-                    $transaction_failed = true;
-
-            } else
-                $transaction_failed = true;
-        }
-
-        if ($transaction_failed) {
-            $this->context->smarty->assign('paylike_order_error', 1);
-            return $this->setTemplate('payment_error.tpl');
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/paylikepayment/controllers/front/paymentreturn.php b/paylikepayment/controllers/front/paymentreturn.php
index 46bdfcc..6956c8d 100644
--- a/paylikepayment/controllers/front/paymentreturn.php
+++ b/paylikepayment/controllers/front/paymentreturn.php
@@ -1,389 +1,257 @@
-<?php
-if ( ! class_exists( 'Paylike\\Client' ) ) {
-    require_once('modules/paylikepayment/api/Client.php');
-}
-
-use Paylike;
-
-
-
-
-class PaylikepaymentPaymentReturnModuleFrontController extends ModuleFrontController
-{
-    public function __construct()
-    {
-        parent::__construct();
-        $this->display_column_right = false;
-        $this->display_column_left = false;
-        $this->context = Context::getContext();
-    }
-
-    public function init()
-    {
-        parent::init();
-        $cart = $this->context->cart;
-        if ($cart->id_customer == 0 || $cart->id_address_delivery == 0 || $cart->id_address_invoice == 0 || !$this->module->active)
-            Tools::redirect('index.php?controller=order&step=1');
-
-        $authorized = false;
-        foreach (Module::getPaymentModules() as $module) {
-            if ($module['name'] == 'paylikepayment') {
-                $authorized = true;
-                break;
-            }
-        }
-
-        if (!$authorized)
-            die($this->module->l('Paylike payment method is not available.', 'paymentreturn'));
-        
-
-        if (Configuration::get('PAYLIKE_CHECKOUT_MODE') == 'delayed') {
-            $this->fetch();
-
-        } else {
-            $this->capture();
-
-        }
-
-    }
-
-    public function fetch() {
-        $cart = $this->context->cart;
-        $customer = new Customer($cart->id_customer);
-        if (!Validate::isLoadedObject($customer))
-            Tools::redirect('index.php?controller=order&step=1');
-
-        Paylike\Client::setKey(Configuration::get('PAYLIKE_SECRET_KEY'));
-        $total = $cart->getOrderTotal(true, Cart::BOTH);
-        $currency = new Currency((int)$cart->id_currency);
-        $amount = Tools::ps_round($total, 2) * 100;
-        //$status_paid = (int)Configuration::get('PAYLIKE_ORDER_STATUS');
-        //$status_paid = Configuration::get('PS_OS_PAYMENT');
-        $transactionid = Tools::getValue('transactionid');
-
-        $transaction_failed = false;
-
-        $fetch = Paylike\Transaction::fetch( $transactionid );
-        //print_r($fetch);
-
-        if(is_array($fetch) && isset($fetch['error']) && $fetch['error'] == 1) {
-            PrestaShopLogger::addLog($fetch['message']);
-            $this->context->smarty->assign(array(
-                'paylike_order_error' => 1,
-                'paylike_error_message' => $fetch['message']
-            ));
-            return $this->setTemplate('payment_error.tpl');
-
-        } else {
-            if (!empty($fetch['transaction'])) {
-                $transaction = $fetch['transaction'];
-                if ((string)$transaction['amount'] != (string)$amount || $transaction['currency'] != $currency->iso_code || $transaction['custom']['cartId'] != $cart->id) {
-
-                    PrestaShopLogger::addLog('Invalid transaction.');
-                    $this->context->smarty->assign(array(
-                        'paylike_order_error' => 1,
-                        'paylike_error_message' => 'Invalid transaction.'
-                    ));
-                    return $this->setTemplate('payment_error.tpl');
-                    
-                } else {
-
-                    $message = 'Trx ID: '.$transactionid.'
-                        Authorized Amount: '.($fetch['transaction']['amount'] / 100).'
-                        Captured Amount: '.($fetch['transaction']['capturedAmount'] / 100).'
-                        Order time: '.$fetch['transaction']['created'].'
-                        Currency code: '.$fetch['transaction']['currency'];
-                    
-                    //$status_paid = Configuration::get('PS_OS_PAYMENT');
-                    $status_paid = 3; //Processing in progress
-
-                    if ($this->module->validateOrder((int)$cart->id, $status_paid, $total, $this->module->displayName, $message, array(), null, false, $customer->secure_key)) {
-
-                        $this->module->storeTransactionID($transactionid, $this->module->currentOrder, $total, $captured='NO');
-                        
-                        $redirectLink = __PS_BASE_URI__.'index.php?controller=order-confirmation&id_cart='.$cart->id.'&id_module='.$this->module->id.'&id_order='.$this->module->currentOrder.'&key='.$customer->secure_key;
-                        Tools::redirectLink($redirectLink);
-
-                    } else {
-                        //Paylike\Transaction::void($transactionid, ['amount' => $amount]); //Cancel Order
-                        Paylike\Transaction::void($transactionid, ['amount' => $fetch['transaction']['amount']]); //Cancel Order
-                        
-                        PrestaShopLogger::addLog('Invalid transaction.');
-                        $this->context->smarty->assign(array(
-                            'paylike_order_error' => 1,
-                            'paylike_error_message' => 'Invalid transaction.'
-                        ));
-                        return $this->setTemplate('payment_error.tpl');
-                        
-                    }
-
-                }
-            } else {
-                if(!empty($fetch[0]['message'])) {
-                    PrestaShopLogger::addLog($fetch[0]['message']);
-                    $this->context->smarty->assign(array(
-                        'paylike_order_error' => 1,
-                        'paylike_error_message' => $fetch[0]['message']
-                    ));
-                    return $this->setTemplate('payment_error.tpl');
-                    
-                } else {
-                    PrestaShopLogger::addLog('Invalid transaction.');
-                    $this->context->smarty->assign(array(
-                        'paylike_order_error' => 1,
-                        'paylike_error_message' => 'Invalid transaction.'
-                    ));
-                    return $this->setTemplate('payment_error.tpl');
-                    
-                }
-            }
-        }
-    }
-
-    public function capture() {
-        
-        /*$cart = $this->context->cart;
-        $customer = new Customer($cart->id_customer);
-        if (!Validate::isLoadedObject($customer))
-            Tools::redirect('index.php?controller=order&step=1');
-        
-        $this->fetch(true);
-        
-        $paylike_tid = Tools::getValue('transactionid');
-        $paylike_admin = Db::getInstance()->getRow('SELECT * FROM '._DB_PREFIX_.'paylike_admin WHERE paylike_tid = '.(int)$paylike_tid);
-        $id_order = $paylike_admin['order_id'];
-        $transactionid = $paylike_admin['paylike_tid'];
-
-        if(!empty($paylike_admin) && $paylike_admin['captured'] == 'NO') {
-            Paylike\Client::setKey(Configuration::get('PAYLIKE_SECRET_KEY'));
-            $total = $cart->getOrderTotal(true, Cart::BOTH);
-            $currency = new Currency((int)$cart->id_currency);
-            $amount = Tools::ps_round($total, 2) * 100;
-            //$status_paid = (int)Configuration::get('PAYLIKE_ORDER_STATUS');
-            //$status_paid = Configuration::get('PS_OS_PAYMENT');
-            $status_paid = (int)Configuration::get('PAYLIKE_ORDER_STATUS');
-            
-            $validOrder = $this->module->validateOrder((int)$cart->id, $status_paid, $total, $this->module->displayName, null, array(), null, false, $customer->secure_key);
-
-            if ($validOrder) {
-                $data = [
-                    'currency' => $currency->iso_code,
-                    'descriptor' => "Order #".$this->module->currentOrder,
-                    'amount' => $amount,
-                ];
-
-                $capture = Paylike\Transaction::capture($transactionid, $data);
-                echo "<pre>";
-                print_r($capture);
-                echo "<pre>";
-                die();
-                if (is_array($capture) && !empty($capture['error']) && $capture['error'] == 1) {
-                    PrestaShopLogger::addLog($capture['message']);
-                    $this->context->smarty->assign(array(
-                        'paylike_order_error' => 1,
-                        'paylike_error_message' => $capture['message']
-                    ));
-                    return $this->setTemplate('payment_error.tpl');
-                    
-                } else { 
-                    if (!empty($capture['transaction'])) {
-                        //Update transaction details
-                        $fields = array(
-                            'captured' => 'YES',
-                        );
-                        $this->updateTransactionID($transactionid, (int)$id_order, $fields);
-
-                        //Set message
-                        $message = 'Trx ID: ' . $transactionid . '
-                        Authorized Amount: ' . ($capture['transaction']['amount'] / 100) . '
-                        Captured Amount: ' . ($capture['transaction']['capturedAmount'] / 100) . '
-                        Order time: ' . $capture['transaction']['created'] . '
-                        Currency code: ' . $capture['transaction']['currency'];
-
-                        $msg = new Message();
-                        $message = strip_tags($message, '<br>');
-                        if (Validate::isCleanHtml($message)) {
-                            $msg->message = $message;
-                            $msg->id_cart = (int)$order->id_cart;
-                            $msg->id_customer = (int)$order->id_customer;
-                            $msg->id_order = (int)$order->id;
-                            $msg->private = 1;
-                            $msg->add();
-                        }
-
-                        $redirectLink = __PS_BASE_URI__.'index.php?controller=order-confirmation&id_cart='.$cart->id.'&id_module='.$this->module->id.'&id_order='.$this->module->currentOrder.'&key='.$customer->secure_key;
-                        Tools::redirectLink($redirectLink);
-                        
-                    } else {
-                        if (!empty($capture[0]['message'])) {
-                            PrestaShopLogger::addLog($capture[0]['message']);
-                            $this->context->smarty->assign(array(
-                                'paylike_order_error' => 1,
-                                'paylike_error_message' => $capture[0]['message']
-                            ));
-                            return $this->setTemplate('payment_error.tpl');
-                            
-                        } else {
-                            PrestaShopLogger::addLog('Transaction failed.');
-                            $this->context->smarty->assign(array(
-                                'paylike_order_error' => 1,
-                                'paylike_error_message' => 'Transaction failed.'
-                            ));
-                            return $this->setTemplate('payment_error.tpl');
-                        }
-                        
-                    }
-                    
-                }
-                
-            } else {
-                PrestaShopLogger::addLog('Invalid transaction.');
-                $this->context->smarty->assign(array(
-                    'paylike_order_error' => 1,
-                    'paylike_error_message' => 'Invalid transaction.'
-                ));
-                return $this->setTemplate('payment_error.tpl');
-            }
-
-        } else if(!empty($paylike_admin) && $paylike_admin['captured'] == 'YES') {
-            PrestaShopLogger::addLog('Order already captured.');
-            $this->context->smarty->assign(array(
-                'paylike_order_error' => 1,
-                'paylike_error_message' => 'Order already captured.'
-            ));
-            return $this->setTemplate('payment_error.tpl');
-            
-        } else {
-            PrestaShopLogger::addLog('Invalid transaction.');
-            $this->context->smarty->assign(array(
-                'paylike_order_error' => 1,
-                'paylike_error_message' => 'Invalid transaction.'
-            ));
-            return $this->setTemplate('payment_error.tpl');
-            
-        }*/
-
-        $cart = $this->context->cart;
-        $customer = new Customer($cart->id_customer);
-        if (!Validate::isLoadedObject($customer))
-            Tools::redirect('index.php?controller=order&step=1');
-
-        Paylike\Client::setKey(Configuration::get('PAYLIKE_SECRET_KEY'));
-        $total = $cart->getOrderTotal(true, Cart::BOTH);
-        $currency = new Currency((int)$cart->id_currency);
-        $amount = Tools::ps_round($total, 2) * 100;
-        //$status_paid = (int)Configuration::get('PAYLIKE_ORDER_STATUS');
-        //$status_paid = Configuration::get('PS_OS_PAYMENT');
-        $transactionid = Tools::getValue('transactionid');
-
-        Paylike\Client::setKey(Configuration::get('PAYLIKE_SECRET_KEY'));
-        $fetch = Paylike\Transaction::fetch( $transactionid );
-
-        if(is_array($fetch) && isset($fetch['error']) && $fetch['error'] == 1) {
-            PrestaShopLogger::addLog($fetch['message']);
-            $this->context->smarty->assign(array(
-                'paylike_order_error' => 1,
-                'paylike_error_message' => $fetch['message']
-            ));
-            return $this->setTemplate('payment_error.tpl');
-
-        } else {
-            if (!empty($fetch['transaction'])) {
-                $transaction = $fetch['transaction'];
-                if ((string)$transaction['amount'] != (string)$amount || $transaction['currency'] != $currency->iso_code || $transaction['custom']['cartId'] != $cart->id) {
-
-                    PrestaShopLogger::addLog('Invalid transaction.');
-                    $this->context->smarty->assign(array(
-                        'paylike_order_error' => 1,
-                        'paylike_error_message' => 'Invalid transaction.'
-                    ));
-                    return $this->setTemplate('payment_error.tpl');
-                    
-                } else {
-                    $status_paid = (int)Configuration::get('PAYLIKE_ORDER_STATUS');
-                        
-                    $validOrder = $this->module->validateOrder((int)$cart->id, $status_paid, $total, $this->module->displayName, null, array(), null, false, $customer->secure_key);
-
-                    if ($validOrder) {
-                        $data = [
-                            'currency' => $currency->iso_code,
-                            'descriptor' => "Order #".$this->module->currentOrder,
-                            'amount' => $amount,
-                        ];
-
-                        $capture = Paylike\Transaction::capture($transactionid, $data);
-
-                        if(is_array($capture) && !empty($capture['error']) && $capture['error'] == 1) {
-                            PrestaShopLogger::addLog($capture['message']);
-                            $this->context->smarty->assign(array(
-                                'paylike_order_error' => 1,
-                                'paylike_error_message' => $capture['message']
-                            ));
-                            return $this->setTemplate('payment_error.tpl');
-
-                        } else if(!empty($capture['transaction'])) {
-                            $message = 'Trx ID: '.$transactionid.'
-                                Authorized Amount: '.($capture['transaction']['amount'] / 100).'
-                                Captured Amount: '.($capture['transaction']['capturedAmount'] / 100).'
-                                Order time: '.$capture['transaction']['created'].'
-                                Currency code: '.$capture['transaction']['currency'];
-
-                            $msg = new Message();
-                            $message = strip_tags($message, '<br>');
-                            if (Validate::isCleanHtml($message))
-                            {
-                                $msg->message = $message;
-                                $msg->id_cart = (int)$cart->id;
-                                $msg->id_customer = (int)$cart->id_customer;
-                                $msg->id_order = (int)$this->module->currentOrder;
-                                $msg->private = 1;
-                                $msg->add();
-                            }
-
-                            $this->module->storeTransactionID($transactionid, $this->module->currentOrder, $total, $captured='YES');
-                            $redirectLink = __PS_BASE_URI__.'index.php?controller=order-confirmation&id_cart='.$cart->id.'&id_module='.$this->module->id.'&id_order='.$this->module->currentOrder.'&key='.$customer->secure_key;
-                            Tools::redirectLink($redirectLink);
-
-                        } else {
-                            Paylike\Transaction::void($transactionid, ['amount' => $fetch['transaction']['amount']]); //Cancel Order
-                        
-                            PrestaShopLogger::addLog('Invalid transaction.');
-                            $this->context->smarty->assign(array(
-                                'paylike_order_error' => 1,
-                                'paylike_error_message' => 'Invalid transaction.'
-                            ));
-                            return $this->setTemplate('payment_error.tpl');
-                        }
-
-                    } else {
-                        PrestaShopLogger::addLog('Invalid transaction.');
-                        $this->context->smarty->assign(array(
-                            'paylike_order_error' => 1,
-                            'paylike_error_message' => 'Invalid transaction.'
-                        ));
-                        return $this->setTemplate('payment_error.tpl');
-                    }
-                }
-            } else {
-                if(!empty($fetch[0]['message'])) {
-                    PrestaShopLogger::addLog($fetch[0]['message']);
-                    $this->context->smarty->assign(array(
-                        'paylike_order_error' => 1,
-                        'paylike_error_message' => $fetch[0]['message']
-                    ));
-                    return $this->setTemplate('payment_error.tpl');
-                    
-                } else {
-                    PrestaShopLogger::addLog('Invalid transaction.');
-                    $this->context->smarty->assign(array(
-                        'paylike_order_error' => 1,
-                        'paylike_error_message' => 'Invalid transaction.'
-                    ));
-                    return $this->setTemplate('payment_error.tpl');
-                    
-                }
-            }
-        }
-    }
-
-}
\ No newline at end of file
+<?php
+/**
+ *
+ * @author    DerikonDevelopment <ionut@derikon.com>
+ * @copyright Copyright (c) permanent, DerikonDevelopment
+ * @license   Addons PrestaShop license limitation
+ * @version   1.0.2
+ * @link      http://www.derikon.com/
+ *
+ */
+
+if (!class_exists('Paylike\\Client')) {
+    require_once('modules/paylikepayment/api/Client.php');
+}
+
+// use Paylike;
+
+class PaylikepaymentPaymentReturnModuleFrontController extends ModuleFrontController
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->display_column_right = false;
+        $this->display_column_left = false;
+        $this->context = Context::getContext();
+    }
+
+    public function init()
+    {
+        parent::init();
+        $cart = $this->context->cart;
+        if ($cart->id_customer == 0 || $cart->id_address_delivery == 0 || $cart->id_address_invoice == 0 || !$this->module->active) {
+            Tools::redirect('index.php?controller=order&step=1');
+        }
+
+        $authorized = false;
+        foreach (Module::getPaymentModules() as $module) {
+            if ($module['name'] == 'paylikepayment') {
+                $authorized = true;
+                break;
+            }
+        }
+
+        if (!$authorized) {
+            die($this->module->l('Paylike payment method is not available.', 'paymentreturn'));
+        }
+        
+
+        if (Configuration::get('PAYLIKE_CHECKOUT_MODE') == 'delayed') {
+            $this->fetch();
+        } else {
+            $this->capture();
+        }
+    }
+
+    public function fetch()
+    {
+        $cart = $this->context->cart;
+        $customer = new Customer($cart->id_customer);
+        if (!Validate::isLoadedObject($customer)) {
+            Tools::redirect('index.php?controller=order&step=1');
+        }
+
+        Paylike\Client::setKey(Configuration::get('PAYLIKE_SECRET_KEY'));
+        $total = $cart->getOrderTotal(true, Cart::BOTH);
+        $currency = new Currency((int)$cart->id_currency);
+        $decimals = (int)$currency->decimals * _PS_PRICE_COMPUTE_PRECISION_;
+        $currency_multiplier = $this->module->getPaylikeCurrencyMultiplier($currency->iso_code);
+        $amount = ceil(Tools::ps_round($total, $decimals) * $currency_multiplier);
+        $transactionid = Tools::getValue('transactionid');
+
+        $transaction_failed = false;
+
+        $fetch = Paylike\Transaction::fetch($transactionid);
+        //print_r($fetch);
+
+        if (is_array($fetch) && isset($fetch['error']) && $fetch['error'] == 1) {
+            PrestaShopLogger::addLog($fetch['message']);
+            $this->context->smarty->assign(array(
+                'paylike_order_error' => 1,
+                'paylike_error_message' => $fetch['message']
+            ));
+            return $this->setTemplate('payment_error.tpl');
+        } else {
+            if (!empty($fetch['transaction'])) {
+                $transaction = $fetch['transaction'];
+                if ((string)$transaction['amount'] != (string)$amount || $transaction['currency'] != $currency->iso_code) {
+                    PrestaShopLogger::addLog('Invalid transaction.');
+                    $this->context->smarty->assign(array(
+                        'paylike_order_error' => 1,
+                        'paylike_error_message' => 'Invalid transaction.'
+                    ));
+                    return $this->setTemplate('payment_error.tpl');
+                } else {
+                    $message = 'Trx ID: '.$transactionid.'
+                        Authorized Amount: '.($fetch['transaction']['amount'] / $currency_multiplier).'
+                        Captured Amount: '.($fetch['transaction']['capturedAmount'] / $currency_multiplier).'
+                        Order time: '.$fetch['transaction']['created'].'
+                        Currency code: '.$fetch['transaction']['currency'];
+                    
+                    //$status_paid = Configuration::get('PS_OS_PAYMENT');
+                    $status_paid = 3; //Processing in progress
+
+                    if ($this->module->validateOrder((int)$cart->id, $status_paid, $total, $this->module->displayName, $message, array(), null, false, $customer->secure_key)) {
+                        $this->module->storeTransactionID($transactionid, $this->module->currentOrder, $total, $captured = 'NO');
+                        
+                        $redirectLink = __PS_BASE_URI__.'index.php?controller=order-confirmation&id_cart='.$cart->id.'&id_module='.$this->module->id.'&id_order='.$this->module->currentOrder.'&key='.$customer->secure_key;
+                        Tools::redirectLink($redirectLink);
+                    } else {
+                        //Paylike\Transaction::void($transactionid, ['amount' => $amount]); //Cancel Order
+                        Paylike\Transaction::void($transactionid, array('amount' => $fetch['transaction']['amount'])); //Cancel Order
+                        
+                        PrestaShopLogger::addLog('Invalid transaction.');
+                        $this->context->smarty->assign(array(
+                            'paylike_order_error' => 1,
+                            'paylike_error_message' => 'Invalid transaction.'
+                        ));
+                        return $this->setTemplate('payment_error.tpl');
+                    }
+                }
+            } else {
+                if (!empty($fetch[0]['message'])) {
+                    PrestaShopLogger::addLog($fetch[0]['message']);
+                    $this->context->smarty->assign(array(
+                        'paylike_order_error' => 1,
+                        'paylike_error_message' => $fetch[0]['message']
+                    ));
+                    return $this->setTemplate('payment_error.tpl');
+                } else {
+                    PrestaShopLogger::addLog('Invalid transaction.');
+                    $this->context->smarty->assign(array(
+                        'paylike_order_error' => 1,
+                        'paylike_error_message' => 'Invalid transaction.'
+                    ));
+                    return $this->setTemplate('payment_error.tpl');
+                }
+            }
+        }
+    }
+
+    public function capture()
+    {
+        $cart = $this->context->cart;
+        $customer = new Customer($cart->id_customer);
+        if (!Validate::isLoadedObject($customer)) {
+            Tools::redirect('index.php?controller=order&step=1');
+        }
+
+        Paylike\Client::setKey(Configuration::get('PAYLIKE_SECRET_KEY'));
+        $total = $cart->getOrderTotal(true, Cart::BOTH);
+        $currency = new Currency((int)$cart->id_currency);
+        $decimals = (int)$currency->decimals * _PS_PRICE_COMPUTE_PRECISION_;
+        $currency_multiplier = $this->module->getPaylikeCurrencyMultiplier($currency->iso_code);
+        $amount = ceil(Tools::ps_round($total, $decimals) * $currency_multiplier);
+        //$status_paid = (int)Configuration::get('PAYLIKE_ORDER_STATUS');
+        //$status_paid = Configuration::get('PS_OS_PAYMENT');
+        $transactionid = Tools::getValue('transactionid');
+
+        Paylike\Client::setKey(Configuration::get('PAYLIKE_SECRET_KEY'));
+        $fetch = Paylike\Transaction::fetch($transactionid);
+
+        if (is_array($fetch) && isset($fetch['error']) && $fetch['error'] == 1) {
+            PrestaShopLogger::addLog($fetch['message']);
+            $this->context->smarty->assign(array(
+                'paylike_order_error' => 1,
+                'paylike_error_message' => $fetch['message']
+            ));
+            return $this->setTemplate('payment_error.tpl');
+        } else {
+            if (!empty($fetch['transaction'])) {
+                $transaction = $fetch['transaction'];
+                if ((string)$transaction['amount'] != (string)$amount || $transaction['currency'] != $currency->iso_code ) {
+                    PrestaShopLogger::addLog('Invalid transaction.');
+                    $this->context->smarty->assign(array(
+                        'paylike_order_error' => 1,
+                        'paylike_error_message' => 'Invalid transaction.'
+                    ));
+                    return $this->setTemplate('payment_error.tpl');
+                } else {
+                    $status_paid = (int)Configuration::get('PAYLIKE_ORDER_STATUS');
+
+                    $validOrder = $this->module->validateOrder((int)$cart->id, $status_paid, $total, $this->module->displayName, null, array(), null, false, $customer->secure_key);
+
+                    if ($validOrder) {
+                        $data = array(
+                            'currency' => $currency->iso_code,
+                            'amount' => $amount,
+                        );
+
+                        $capture = Paylike\Transaction::capture($transactionid, $data);
+
+                        if (is_array($capture) && !empty($capture['error']) && $capture['error'] == 1) {
+                            PrestaShopLogger::addLog($capture['message']);
+                            $this->context->smarty->assign(array(
+                                'paylike_order_error' => 1,
+                                'paylike_error_message' => $capture['message']
+                            ));
+                            return $this->setTemplate('payment_error.tpl');
+                        } else if (!empty($capture['transaction'])) {
+                            $message = 'Trx ID: '.$transactionid.'
+                                Authorized Amount: '.($capture['transaction']['amount'] / $currency_multiplier).'
+                                Captured Amount: '.($capture['transaction']['capturedAmount'] / $currency_multiplier).'
+                                Order time: '.$capture['transaction']['created'].'
+                                Currency code: '.$capture['transaction']['currency'];
+
+                            $msg = new Message();
+                            $message = strip_tags($message, '<br>');
+                            if (Validate::isCleanHtml($message)) {
+                                $msg->message = $message;
+                                $msg->id_cart = (int)$cart->id;
+                                $msg->id_customer = (int)$cart->id_customer;
+                                $msg->id_order = (int)$this->module->currentOrder;
+                                $msg->private = 1;
+                                $msg->add();
+                            }
+
+                            $this->module->storeTransactionID($transactionid, $this->module->currentOrder, $total, $captured = 'YES');
+                            $redirectLink = __PS_BASE_URI__.'index.php?controller=order-confirmation&id_cart='.$cart->id.'&id_module='.$this->module->id.'&id_order='.$this->module->currentOrder.'&key='.$customer->secure_key;
+                            Tools::redirectLink($redirectLink);
+                        } else {
+                            Paylike\Transaction::void($transactionid, array('amount' => $fetch['transaction']['amount'])); //Cancel Order
+                            PrestaShopLogger::addLog('Invalid transaction.');
+                            $this->context->smarty->assign(array(
+                                'paylike_order_error' => 1,
+                                'paylike_error_message' => 'Invalid transaction.'
+                            ));
+                            return $this->setTemplate('payment_error.tpl');
+                        }
+                    } else {
+                        PrestaShopLogger::addLog('Invalid transaction.');
+                        $this->context->smarty->assign(array(
+                            'paylike_order_error' => 1,
+                            'paylike_error_message' => 'Invalid transaction.'
+                        ));
+                        return $this->setTemplate('payment_error.tpl');
+                    }
+                }
+            } else {
+                if (!empty($fetch[0]['message'])) {
+                    PrestaShopLogger::addLog($fetch[0]['message']);
+                    $this->context->smarty->assign(array(
+                        'paylike_order_error' => 1,
+                        'paylike_error_message' => $fetch[0]['message']
+                    ));
+                    return $this->setTemplate('payment_error.tpl');
+                } else {
+                    PrestaShopLogger::addLog('Invalid transaction.');
+                    $this->context->smarty->assign(array(
+                        'paylike_order_error' => 1,
+                        'paylike_error_message' => 'Invalid transaction.'
+                    ));
+                    return $this->setTemplate('payment_error.tpl');
+                }
+            }
+        }
+    }
+}
diff --git a/paylikepayment/controllers/index.php b/paylikepayment/controllers/index.php
index 2d4b752..086d6b5 100644
--- a/paylikepayment/controllers/index.php
+++ b/paylikepayment/controllers/index.php
@@ -1,35 +1,35 @@
-<?php
-/*
-* 2007-2015 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2015 PrestaShop SA
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
-exit;
+<?php
+/*
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
diff --git a/paylikepayment/index.php b/paylikepayment/index.php
new file mode 100644
index 0000000..086d6b5
--- /dev/null
+++ b/paylikepayment/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
diff --git a/paylikepayment/paylikepayment.php b/paylikepayment/paylikepayment.php
index a82fa3b..6fd1eee 100644
--- a/paylikepayment/paylikepayment.php
+++ b/paylikepayment/paylikepayment.php
@@ -1,1277 +1,2268 @@
-<?php
-if (!defined('_PS_VERSION_'))
-    exit;
-
-if ( ! class_exists( 'Paylike\\Client' ) ) {
-    require_once('api/Client.php');
-}
-//use Paylike;
-
-class PaylikePayment extends PaymentModule
-{
-    private $_html = '';
-    protected $statuses_array = array();
-
-    public function __construct()
-    {
-        $this->name = 'paylikepayment';
-        $this->tab = 'payments_gateways';
-        $this->version = '1.0.0';
-        $this->author = 'Pravin';
-        $this->bootstrap = true;
-
-        $this->currencies = true;
-        $this->currencies_mode = 'checkbox';
-
-        parent::__construct();
-
-        $this->displayName = $this->l('Paylike');
-        $this->description = $this->l('Receive payment with Paylike');
-        $this->confirmUninstall = $this->l('Are you sure about removing Paylike?');
-        $popupDescription = $this->l('Secure payment with credit card via © Paylike');
-    }
-
-    public function install()
-    {
-        $popup_title = (!empty(Configuration::get('PS_SHOP_NAME'))) ? Configuration::get('PS_SHOP_NAME') : 'Payment';
-        $language_code = $this->context->language->iso_code;
-
-        Configuration::updateValue('PAYLIKE_LANGUAGE_CODE', $language_code);
-        Configuration::updateValue($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE', 'Credit card');
-        Configuration::updateValue('PAYLIKE_PAYMENT_METHOD_LOGO', 'visa.svg');
-        Configuration::updateValue($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC', 'Secure payment with credit card via © Paylike');
-        Configuration::updateValue($language_code.'_PAYLIKE_POPUP_TITLE', $popup_title);
-        Configuration::updateValue('PAYLIKE_SHOW_POPUP_DESC', 'no');
-        Configuration::updateValue($language_code.'_PAYLIKE_POPUP_DESC', '');
-        Configuration::updateValue('PAYLIKE_TRANSACTION_MODE', 'test');
-        Configuration::updateValue('PAYLIKE_TEST_PUBLIC_KEY', '');
-        Configuration::updateValue('PAYLIKE_TEST_SECRET_KEY', '');
-        Configuration::updateValue('PAYLIKE_LIVE_PUBLIC_KEY', '');
-        Configuration::updateValue('PAYLIKE_LIVE_SECRET_KEY', '');
-        Configuration::updateValue('PAYLIKE_CHECKOUT_MODE', 'delayed');
-        Configuration::updateValue('PAYLIKE_ORDER_STATUS', Configuration::get('PAYLIKE_ORDER_STATUS'));
-        Configuration::updateValue('PAYLIKE_STATUS', 'enabled');
-        Configuration::updateValue('PAYLIKE_SECRET_KEY', '');
-        return (parent::install()
-            && $this->registerHook('header')
-            && $this->registerHook('payment')
-            && $this->registerHook('paymentReturn')
-            && $this->registerHook('DisplayAdminOrder')
-            && $this->registerHook('BackOfficeHeader')
-            && $this->installDb());
-    }
-
-    public function installDb()
-    {
-        return (
-            Db::getInstance()->Execute('CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'paylike_admin` (
-                `id`				int(11) NOT NULL AUTO_INCREMENT,
-                `paylike_tid`		varchar(255) NOT NULL,
-                `order_id`			int(11) NOT NULL,
-                `payed_at`			datetime NOT NULL,
-                `payed_amount`		DECIMAL(20,6) NOT NULL,
-                `refunded_amount`	DECIMAL(20,6) NOT NULL,
-                `captured`		    varchar(255) NOT NULL,
-                PRIMARY KEY			(`id`)
-                ) ENGINE=InnoDB		DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;')
-
-            && Db::getInstance()->Execute('CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'paylike_logos` (
-                `id` int(11) NOT NULL AUTO_INCREMENT,
-                `name` varchar(255) NOT NULL,
-                `slug` varchar(255) NOT NULL,
-                `file_name` varchar(255) NOT NULL,
-                `default_logo` int(11) NOT NULL DEFAULT 1 COMMENT "1=Default",
-                `created_at` datetime NOT NULL,
-                PRIMARY KEY (`id`)
-                ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;')
-
-            && Db::getInstance()->insert('paylike_logos', array(
-                    array(
-                        'id' => 1,
-                        'name' => pSQL('VISA'),
-                        'slug' => pSQL('visa'),
-                        'file_name' => pSQL('visa.svg'),
-                        'created_at' => date('Y-m-d H:i:s'),
-                    ),
-                    array(
-                        'id' => 2,
-                        'name' => pSQL('VISA Electron'),
-                        'slug' => pSQL('visa-electron'),
-                        'file_name' => pSQL('visa-electron.svg'),
-                        'created_at' => date('Y-m-d H:i:s'),
-                    ),
-                    array(
-                        'id' => 3,
-                        'name' => pSQL('Mastercard'),
-                        'slug' => pSQL('mastercard'),
-                        'file_name' => pSQL('mastercard.svg'),
-                        'created_at' => date('Y-m-d H:i:s'),
-                    ),
-                    array(
-                        'id' => 4,
-                        'name' => pSQL('Mastercard Maestro'),
-                        'slug' => pSQL('mastercard-maestro'),
-                        'file_name' => pSQL('mastercard-maestro.svg'),
-                        'created_at' => date('Y-m-d H:i:s'),
-                    ),
-                )
-            )
-        );
-    }
-
-    public function uninstall()
-    {
-        //$sql = 'SELECT * FROM `'._DB_PREFIX_.'paylike_logos`';
-        $sql = new DbQuery();
-        $sql->select('*');
-        $sql->from('paylike_logos', 'PL');
-        $sql->where('PL.default_logo != 1');
-        $logos = Db::getInstance()->executes($sql);
-
-        foreach($logos as $logo) {
-            if( file_exists(__DIR__.'/logos/'.$logo['file_name']) ) {
-                unlink(__DIR__.'/logos/'.$logo['file_name']);
-            }
-        }
-
-        //Fetch all languages and delete Paylike configurations which has language iso_code as prefix
-        $languages = Language::getLanguages(true, $this->context->shop->id);
-        foreach($languages as $language) {
-            $language_code = $language['iso_code'];
-            Configuration::deleteByName($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE');
-            Configuration::deleteByName($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC');
-            Configuration::deleteByName($language_code.'_PAYLIKE_POPUP_TITLE');
-            Configuration::deleteByName($language_code.'_PAYLIKE_POPUP_DESC');
-        }
-
-        return (
-            parent::uninstall()
-            && Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'paylike_admin`')
-            && Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'paylike_logos`')
-            && Configuration::deleteByName('PAYLIKE_PAYMENT_METHOD_TITLE')
-            && Configuration::deleteByName('PAYLIKE_PAYMENT_METHOD_LOGO')
-            && Configuration::deleteByName('PAYLIKE_PAYMENT_METHOD_DESC')
-            && Configuration::deleteByName('PAYLIKE_POPUP_TITLE')
-            && Configuration::deleteByName('PAYLIKE_SHOW_POPUP_DESC')
-            && Configuration::deleteByName('PAYLIKE_POPUP_DESC')
-            && Configuration::deleteByName('PAYLIKE_TRANSACTION_MODE')
-            && Configuration::deleteByName('PAYLIKE_TEST_PUBLIC_KEY')
-            && Configuration::deleteByName('PAYLIKE_TEST_SECRET_KEY')
-            && Configuration::deleteByName('PAYLIKE_LIVE_PUBLIC_KEY')
-            && Configuration::deleteByName('PAYLIKE_LIVE_SECRET_KEY')
-            && Configuration::deleteByName('PAYLIKE_CHECKOUT_MODE')
-            && Configuration::deleteByName('PAYLIKE_ORDER_STATUS')
-            && Configuration::deleteByName('PAYLIKE_STATUS')
-            && Configuration::deleteByName('PAYLIKE_SECRET_KEY')
-        );
-    }
-
-    public function getContent()
-    {
-        $this->_html = '';
-        if (Tools::isSubmit('submitPaylike'))
-        {
-            $language_code = Configuration::get('PAYLIKE_LANGUAGE_CODE');
-            $valid = true;
-
-            $PAYLIKE_PAYMENT_METHOD_TITLE = !empty(Tools::getvalue($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE')) ? Tools::getvalue($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE') : '';
-            $PAYLIKE_PAYMENT_METHOD_DESC = !empty(Tools::getvalue($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC')) ? Tools::getvalue($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC') : '';
-            $PAYLIKE_POPUP_TITLE = (!empty(Tools::getvalue($language_code.'_PAYLIKE_POPUP_TITLE'))) ? Tools::getvalue($language_code.'_PAYLIKE_POPUP_TITLE') : '';
-            $_PAYLIKE_POPUP_DESC = (!empty(Tools::getvalue($language_code.'_PAYLIKE_POPUP_DESC'))) ? Tools::getvalue($language_code.'_PAYLIKE_POPUP_DESC') : '';
-
-            if( empty($PAYLIKE_PAYMENT_METHOD_TITLE) ) {
-                $this->context->controller->errors[$language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE'] = $this->l('Payment method title required!');
-                $PAYLIKE_PAYMENT_METHOD_TITLE = (!empty(Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE'))) ? Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE') : '';
-                $valid = false;
-            }
-
-            if(count(Tools::getvalue('PAYLIKE_PAYMENT_METHOD_CREDITCARD_LOGO')) > 1){
-                $creditCardLogo = implode(',', Tools::getvalue('PAYLIKE_PAYMENT_METHOD_CREDITCARD_LOGO'));
-            } else {
-                $creditCardLogo = Tools::getvalue('PAYLIKE_PAYMENT_METHOD_CREDITCARD_LOGO');
-            }
-
-
-            if (Tools::getvalue('PAYLIKE_TRANSACTION_MODE') == 'test') {
-                if(!Tools::getvalue('PAYLIKE_TEST_PUBLIC_KEY')) {
-                    $this->context->controller->errors['PAYLIKE_TEST_PUBLIC_KEY'] = $this->l('Test mode Public Key required!');
-                    $PAYLIKE_TEST_PUBLIC_KEY = (!empty(Configuration::get('PAYLIKE_TEST_PUBLIC_KEY'))) ? Configuration::get('PAYLIKE_TEST_PUBLIC_KEY') : '';
-                    $valid = false;
-                } else {
-                    $PAYLIKE_TEST_PUBLIC_KEY = (!empty(Tools::getvalue('PAYLIKE_TEST_PUBLIC_KEY'))) ? Tools::getvalue('PAYLIKE_TEST_PUBLIC_KEY') : '';
-                }
-
-                if(!Tools::getvalue('PAYLIKE_TEST_SECRET_KEY')) {
-                    $this->context->controller->errors['PAYLIKE_TEST_SECRET_KEY'] = $this->l('Test mode App Key required!');
-                    $PAYLIKE_TEST_SECRET_KEY = (!empty(Configuration::get('PAYLIKE_TEST_SECRET_KEY'))) ? Configuration::get('PAYLIKE_TEST_SECRET_KEY') : '';
-                    $valid = false;
-                } else {
-                    $PAYLIKE_TEST_SECRET_KEY = (!empty(Tools::getvalue('PAYLIKE_TEST_SECRET_KEY'))) ? Tools::getvalue('PAYLIKE_TEST_SECRET_KEY') : '';
-                }
-
-            } else if (Tools::getvalue('PAYLIKE_TRANSACTION_MODE') == 'live') {
-                if(!Tools::getvalue('PAYLIKE_LIVE_PUBLIC_KEY')) {
-                    $this->context->controller->errors['PAYLIKE_LIVE_PUBLIC_KEY'] = $this->l('Live mode Public Key required!');
-                    $PAYLIKE_LIVE_PUBLIC_KEY = (!empty(Configuration::get('PAYLIKE_LIVE_PUBLIC_KEY'))) ? Configuration::get('PAYLIKE_LIVE_PUBLIC_KEY') : '';
-                    $valid = false;
-                } else {
-                    $PAYLIKE_LIVE_PUBLIC_KEY = (!empty(Tools::getvalue('PAYLIKE_LIVE_PUBLIC_KEY'))) ? Tools::getvalue('PAYLIKE_LIVE_PUBLIC_KEY') : '';
-                }
-
-                if(!Tools::getvalue('PAYLIKE_LIVE_SECRET_KEY')) {
-                    $this->context->controller->errors['PAYLIKE_LIVE_SECRET_KEY'] = $this->l('Live mode App Key required!');
-                    $PAYLIKE_LIVE_SECRET_KEY = (!empty(Configuration::get('PAYLIKE_LIVE_SECRET_KEY'))) ? Configuration::get('PAYLIKE_LIVE_SECRET_KEY') : '';
-                    $valid = false;
-                } else {
-                    $PAYLIKE_LIVE_SECRET_KEY = (!empty(Tools::getvalue('PAYLIKE_LIVE_SECRET_KEY'))) ? Tools::getvalue('PAYLIKE_LIVE_SECRET_KEY') : '';
-                }
-            }
-
-            Configuration::updateValue('PAYLIKE_TRANSACTION_MODE', $language_code);
-            Configuration::updateValue($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE', $PAYLIKE_PAYMENT_METHOD_TITLE);
-            Configuration::updateValue('PAYLIKE_PAYMENT_METHOD_LOGO', $creditCardLogo);
-            Configuration::updateValue($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC', $PAYLIKE_PAYMENT_METHOD_DESC);
-            Configuration::updateValue($language_code.'_PAYLIKE_POPUP_TITLE', $PAYLIKE_POPUP_TITLE);
-            Configuration::updateValue('PAYLIKE_SHOW_POPUP_DESC', Tools::getvalue('PAYLIKE_SHOW_POPUP_DESC'));
-            Configuration::updateValue($language_code.'_PAYLIKE_POPUP_DESC', $_PAYLIKE_POPUP_DESC);
-            Configuration::updateValue('PAYLIKE_TRANSACTION_MODE', Tools::getvalue('PAYLIKE_TRANSACTION_MODE'));
-            Configuration::updateValue('PAYLIKE_TEST_PUBLIC_KEY', $PAYLIKE_TEST_PUBLIC_KEY);
-            Configuration::updateValue('PAYLIKE_TEST_SECRET_KEY', $PAYLIKE_TEST_SECRET_KEY);
-            Configuration::updateValue('PAYLIKE_LIVE_PUBLIC_KEY', $PAYLIKE_LIVE_PUBLIC_KEY);
-            Configuration::updateValue('PAYLIKE_LIVE_SECRET_KEY', Tools::getvalue('PAYLIKE_LIVE_SECRET_KEY'));
-            Configuration::updateValue('PAYLIKE_CHECKOUT_MODE', Tools::getValue('PAYLIKE_CHECKOUT_MODE'));
-            Configuration::updateValue('PAYLIKE_ORDER_STATUS', Tools::getValue('PAYLIKE_ORDER_STATUS'));
-            Configuration::updateValue('PAYLIKE_STATUS', Tools::getValue('PAYLIKE_STATUS'));
-
-            if($valid) {
-                $this->context->controller->confirmations[] = $this->l('Settings saved successfully');
-            }
-        }
-
-        //Set style for some fields of configuration form
-        $style = '<style>
-            .help-icon {
-                font-size: 14px;
-                float: right;
-                width: 14px;
-                height: 14px;
-                margin-top: 2px;
-                margin-left: 4px;
-                color: #1E91CF;
-            }
-            .creditcard-logo {
-                display: inline-block !important;
-            }
-            .add-more-btn {
-                display: inline-block !important;
-                text-decoration: none !important;
-            }
-        </style>';
-        $this->_html .= $style;
-
-        //Get configuration form
-        $this->_html .= $this->renderForm();
-
-        //Set script for configuration form
-        $script = '<script>
-            $(document).ready(function(){
-                var html = \'<a href="#" class="add-more-btn" data-toggle="modal" data-target="#logoModal"><i class="process-icon-plus" data-toggle="tooltip" title="Add your own logo"></i></a>\';
-                $(\'select[name="PAYLIKE_PAYMENT_METHOD_CREDITCARD_LOGO[]"]\').parent(\'div\').append(html);
-
-                $(\'[data-toggle="tooltip"]\').tooltip();
-
-                $(\'.paylike-config\').each(function(index, item){
-                    if( $(item).hasClass(\'has-error\') ) {
-                        $(item).parents(\'.form-group\').addClass(\'has-error\');
-                    }
-                });
-
-                //$(\'.form-group\').addClass(\'has-error\');
-
-                $(\'.paylike-language\').bind(\'change\', paylikeLanguageChange);
-            });
-
-            function paylikeLanguageChange(e){
-                var lang_code = $(e.currentTarget).val();
-                window.location = "'.$this->context->link->getAdminLink('AdminOrders', false)."&change_language&lang_code=".'"+lang_code;
-            }
-        </script>';
-        $this->_html .= $script;
-
-        $this->_html .= $this->getModalForAddMoreLogo();
-
-        return $this->_html;
-    }
-
-    public function renderForm()
-    {
-        $this->languages_array = array();
-        $this->statuses_array = array();
-        $this->logos_array = array();
-
-        $language_code = Configuration::get('PAYLIKE_LANGUAGE_CODE');
-
-        //Fetch all active languages
-        $languages = Language::getLanguages(true, $this->context->shop->id);
-        foreach($languages as $language) {
-            $data = array(
-                'id_option' => $language['iso_code'],
-                'name' => $language['name']
-            );
-            array_push($this->languages_array, $data);
-        }
-
-        //Fetch Status list
-        $valid_statuses = array('2','3','4','5','12');
-        $statuses = OrderState::getOrderStates((int)$this->context->language->id);
-        foreach ($statuses as $status) {
-            //$this->statuses_array[$status['id_order_state']] = $status['name'];
-            if(in_array($status['id_order_state'], $valid_statuses)) {
-                $data = array(
-                    'id_option' => $status['id_order_state'],
-                    'name' => $status['name']
-                );
-                array_push($this->statuses_array, $data);
-            }
-        }
-
-        //$sql = 'SELECT * FROM `'._DB_PREFIX_.'paylike_logos`';
-        $sql = new DbQuery();
-        $sql->select('*');
-        $sql->from('paylike_logos');
-        $logos = Db::getInstance()->executes($sql);
-
-        foreach($logos as $logo) {
-            $data = array(
-                'id_option' => $logo['file_name'],
-                'name' => $logo['name']
-            );
-            array_push($this->logos_array, $data);
-        }
-
-        //Set configuration form fields
-        $fields_form = array(
-            'form' => array(
-                'legend' => array(
-                    'title' => $this->l('Paylike Payments Settings'),
-                    'icon' => 'icon-cogs'
-                ),
-                'input' => array(
-                    /*array(
-                        'type' => 'select',
-                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Language').'">'.$this->l('Language').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'name' => 'PAYLIKE_LANGUAGE_CODE',
-                        'class' => 'paylike-config paylike-language',
-                        'options' => array(
-                            'query' => $this->languages_array,
-                            'id' => 'id_option',
-                            'name' => 'name'
-                        ),
-                    ),*/
-                    array(
-                        'type' => 'text',
-                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Payment method title').'">'.$this->l('Payment method title').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'name' => $language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE',
-                        'class' => 'paylike-config',
-                        'required' => true
-                    ),
-                    array(
-                        'type' => 'select',
-                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Choose a logo to show in frontend checkout page.').'">'.$this->l('Payment method credit card logos').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'name' => 'PAYLIKE_PAYMENT_METHOD_CREDITCARD_LOGO[]',
-                        'class' => 'paylike-config creditcard-logo',
-                        'multiple' => true,
-                        'options' => array(
-                            'query' => $this->logos_array,
-                            'id' => 'id_option',
-                            'name' => 'name'
-                        ),
-                    ),
-                    array(
-                        'type' => 'textarea',
-                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Payment method description').'">'.$this->l('Payment method description').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'name' => $language_code.'_PAYLIKE_PAYMENT_METHOD_DESC',
-                        'class' => 'paylike-config',
-                        //'required' => true
-                    ),
-                    array(
-                        'type' => 'text',
-                        'label' => '<span data-toggle="tooltip" title="'.$this->l('The text shown in the popup where the customer inserts the card details').'">'.$this->l('Payment popup title').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'name' => $language_code.'_PAYLIKE_POPUP_TITLE',
-                        'class' => 'paylike-config',
-                        //'required' => true
-                    ),
-                    array(
-                        'type' => 'select',
-                        'lang' => true,
-                        'label' => '<span data-toggle="tooltip" title="'.$this->l('If this is set to no the product list will be shown').'">'.$this->l('Show payment popup description').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'name' => 'PAYLIKE_SHOW_POPUP_DESC',
-                        'class' => 'paylike-config',
-                        'options' => array(
-                            'query' => array(
-                                array(
-                                    'id_option' => 'yes',
-                                    'name' => 'Yes'
-                                ),
-                                array(
-                                    'id_option' => 'no',
-                                    'name' => 'No'
-                                ),
-                            ),
-                            'id' => 'id_option',
-                            'name' => 'name'
-                        )
-                    ),
-                    array(
-                        'type' => 'text',
-                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Text description that shows up on the payment popup.').'">'.$this->l('Popup description').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'name' => $language_code.'_PAYLIKE_POPUP_DESC',
-                        'class' => 'paylike-config'
-                    ),
-                    array(
-                        'type' => 'select',
-                        'lang' => true,
-                        'label' => '<span data-toggle="tooltip" title="'.$this->l('In test mode, you can create a successful transaction with the card number 4100 0000 0000 0000 with any CVC and a valid expiration date.').'">'.$this->l('Transaction mode').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'name' => 'PAYLIKE_TRANSACTION_MODE',
-                        'class' => 'paylike-config',
-                        'options' => array(
-                            'query' => array(
-                                array(
-                                    'id_option' => 'test',
-                                    'name' => 'Test'
-                                ),
-                                array(
-                                    'id_option' => 'live',
-                                    'name' => 'Live'
-                                ),
-                            ),
-                            'id' => 'id_option',
-                            'name' => 'name'
-                        ),
-                        'required' => true
-                    ),
-                    array(
-                        'type' => 'text',
-                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Get it from your Paylike dashboard').'">'.$this->l('Test mode Public Key').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'name' => 'PAYLIKE_TEST_PUBLIC_KEY',
-                        'class' => 'paylike-config',
-                        'required' => true
-                    ),
-                    array(
-                        'type' => 'text',
-                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Get it from your Paylike dashboard').'">'.$this->l('Test mode App Key').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'name' => 'PAYLIKE_TEST_SECRET_KEY',
-                        'class' => 'paylike-config',
-                        'required' => true
-                    ),
-                    array(
-                        'type' => 'text',
-                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Get it from your Paylike dashboard').'">'.$this->l('Live mode Public Key').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'name' => 'PAYLIKE_LIVE_PUBLIC_KEY',
-                        'class' => 'paylike-config',
-                        'required' => true
-                    ),
-                    array(
-                        'type' => 'text',
-                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Get it from your Paylike dashboard').'">'.$this->l('Live mode App Key').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'name' => 'PAYLIKE_LIVE_SECRET_KEY',
-                        'class' => 'paylike-config',
-                        'required' => true
-                    ),
-                    array(
-                        'type' => 'select',
-                        'lang' => true,
-                        'label' => '<span data-toggle="tooltip" title="'.$this->l('If you deliver your product instantly (e.g. a digital product), choose Instant mode. If not, use Delayed').'">'.$this->l('Capture mode').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'name' => 'PAYLIKE_CHECKOUT_MODE',
-                        'class' => 'paylike-config',
-                        'options' => array(
-                            'query' => array(
-                                array(
-                                    'id_option' => 'delayed',
-                                    'name' => $this->l('Delayed')
-                                ),
-                                array(
-                                    'id_option' => 'instant',
-                                    'name' => $this->l('Instant')
-                                ),
-                            ),
-                            'id' => 'id_option',
-                            'name' => 'name'
-                        ),
-                        'required' => true,
-                        // 'desc' => $this->l('Instant capture: Amount is captured as soon as the order is confirmed by customer.').'<br>'.$this->l('Delayed capture: Amount is captured after order status is changed to shipped.')
-                    ),
-                    array(
-                        'type' => 'select',
-                        'lang' => true,
-                        //'label' => '<span data-toggle="tooltip" title="'.$this->l('The transaction will be captured once the order has the chosen status').'">'.$this->l('Capture on order status (delayed mode)').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'label' => '<span data-toggle="tooltip" title="'.$this->l('The status on which the order will be set once it gets the payment captured').'">'.$this->l('Order status after capture').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
-                        'name' => 'PAYLIKE_ORDER_STATUS',
-                        'class' => 'paylike-config',
-                        'options' => array(
-                            'query' => $this->statuses_array,
-                            'id' => 'id_option',
-                            'name' => 'name'
-                        )
-                    ),
-                    array(
-                        'type' => 'select',
-                        'lang' => true,
-                        'name' => 'PAYLIKE_STATUS',
-                        'label' => $this->l('Status'),
-                        'class' => 'paylike-config',
-                        'options' => array(
-                            'query' => array(
-                                array(
-                                    'id_option' => 'enabled',
-                                    'name' => 'Enabled'
-                                ),
-                                array(
-                                    'id_option' => 'disabled',
-                                    'name' => 'Disabled'
-                                ),
-                            ),
-                            'id' => 'id_option',
-                            'name' => 'name'
-                        )
-                    ),
-                ),
-                'submit' => array(
-                    'title' => $this->l('Save'),
-                )
-            ),
-        );
-
-        $helper = new HelperForm();
-        $helper->show_toolbar = false;
-        $helper->table = $this->table;
-        $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
-        $helper->default_form_language = $lang->id;
-        $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
-        $this->fields_form = array();
-
-        $helper->identifier = $this->identifier;
-        $helper->submit_action = 'submitPaylike';
-        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
-        $helper->token = Tools::getAdminTokenLite('AdminModules');
-        $helper->tpl_vars = array(
-            'fields_value' => $this->getConfigFieldsValues(),
-            'languages' => $this->context->controller->getLanguages(),
-            'id_language' => $this->context->language->id
-        );
-
-        $errors = $this->context->controller->errors;
-        foreach($fields_form['form']['input'] as $key => $field) {
-            if( array_key_exists($field['name'], $errors) ) {
-                $fields_form['form']['input'][$key]['class'] = !empty($fields_form['form']['input'][$key]['class']) ? $fields_form['form']['input'][$key]['class'].' has-error': 'has-error';
-            }
-        }
-
-        return $helper->generateForm(array($fields_form));
-    }
-
-    public function getConfigFieldsValues()
-    {
-        $language_code = Configuration::get('PAYLIKE_LANGUAGE_CODE');
-
-        $creditCardLogo = explode(',', Configuration::get('PAYLIKE_PAYMENT_METHOD_LOGO'));
-
-        $payment_method_title = (!empty(Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE'))) ? Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE') : (!empty(Configuration::get('en_PAYLIKE_PAYMENT_METHOD_TITLE')) ? Configuration::get('en_PAYLIKE_PAYMENT_METHOD_TITLE') : '');
-        $payment_method_desc = (!empty(Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC'))) ? Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC') : (!empty(Configuration::get('en_PAYLIKE_PAYMENT_METHOD_DESC')) ? Configuration::get('en_PAYLIKE_PAYMENT_METHOD_DESC') : '');
-        $popup_title = (!empty(Configuration::get($language_code.'_PAYLIKE_POPUP_TITLE'))) ? Configuration::get($language_code.'_PAYLIKE_POPUP_TITLE') : (!empty(Configuration::get('en_PAYLIKE_POPUP_TITLE')) ? Configuration::get('en_PAYLIKE_POPUP_TITLE') : '');
-        $popup_description = (!empty(Configuration::get($language_code.'_PAYLIKE_POPUP_DESC'))) ? Configuration::get($language_code.'_PAYLIKE_POPUP_DESC') : (!empty(Configuration::get('en_PAYLIKE_POPUP_DESC')) ? Configuration::get('en_PAYLIKE_POPUP_DESC') : '');
-
-        if( empty($payment_method_title) ) {
-            $this->context->controller->errors[$language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE'] = $this->l('Payment method title required!');
-        }
-
-        if (Configuration::get('PAYLIKE_TRANSACTION_MODE') == 'test') {
-            if(!Configuration::get('PAYLIKE_TEST_PUBLIC_KEY')) {
-                $this->context->controller->errors['PAYLIKE_TEST_PUBLIC_KEY'] = $this->l('Test mode Public Key required!');
-            }
-            if(!Configuration::get('PAYLIKE_TEST_SECRET_KEY')) {
-                $this->context->controller->errors['PAYLIKE_TEST_SECRET_KEY'] = $this->l('Test mode App Key required!');
-            }
-        } else if (Configuration::get('PAYLIKE_TRANSACTION_MODE') == 'live') {
-            if(!Configuration::get('PAYLIKE_LIVE_PUBLIC_KEY')) {
-                $this->context->controller->errors['PAYLIKE_LIVE_PUBLIC_KEY'] = $this->l('Live mode Public Key required!');
-            }
-            if(!Configuration::get('PAYLIKE_LIVE_SECRET_KEY')) {
-                $this->context->controller->errors['PAYLIKE_LIVE_SECRET_KEY'] = $this->l('Livemode App Key required!');
-            }
-        }
-        //print_r($this->context->controller->errors);
-        //die(Configuration::get('PAYLIKE_TRANSACTION_MODE'));
-
-        return array(
-            'PAYLIKE_LANGUAGE_CODE' => Configuration::get('PAYLIKE_LANGUAGE_CODE'),
-            $language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE' => $payment_method_title,
-            'PAYLIKE_PAYMENT_METHOD_CREDITCARD_LOGO[]' => $creditCardLogo,
-            $language_code.'_PAYLIKE_PAYMENT_METHOD_DESC' => $payment_method_desc,
-            $language_code.'_PAYLIKE_POPUP_TITLE' => $popup_title,
-            'PAYLIKE_SHOW_POPUP_DESC' => Configuration::get('PAYLIKE_SHOW_POPUP_DESC'),
-            $language_code.'_PAYLIKE_POPUP_DESC' => $popup_description,
-            'PAYLIKE_TRANSACTION_MODE' => Configuration::get('PAYLIKE_TRANSACTION_MODE'),
-            'PAYLIKE_TEST_PUBLIC_KEY' => Configuration::get('PAYLIKE_TEST_PUBLIC_KEY'),
-            'PAYLIKE_TEST_SECRET_KEY' => Configuration::get('PAYLIKE_TEST_SECRET_KEY'),
-            'PAYLIKE_LIVE_PUBLIC_KEY' => Configuration::get('PAYLIKE_LIVE_PUBLIC_KEY'),
-            'PAYLIKE_LIVE_SECRET_KEY' => Configuration::get('PAYLIKE_LIVE_SECRET_KEY'),
-            'PAYLIKE_CHECKOUT_MODE' => Configuration::get('PAYLIKE_CHECKOUT_MODE'),
-            'PAYLIKE_ORDER_STATUS' => Configuration::get('PAYLIKE_ORDER_STATUS'),
-            'PAYLIKE_STATUS' => Configuration::get('PAYLIKE_STATUS'),
-        );
-    }
-
-    public function getModalForAddMoreLogo()
-    {
-        $html = '';
-        $html .= '<script>
-            $(\'document\').ready(function(){
-                $(\'#logo_form\').on(\'submit\', ajaxSaveLogo);
-            });
-
-            function ajaxSaveLogo(e) {
-                e.preventDefault();
-                $(\'#save_logo\').button(\'loading\');
-                $(\'#alert\').html("").hide();
-                var url = $(\'#logo_form\').attr(\'action\');
-                console.log(url);
-                //grab all form data
-                var formData = new FormData($(this)[0]);
-                $.ajax({
-                    url : url,
-                    type : \'POST\',
-                    data : formData,
-                    dataType : \'json\',
-                    async: false,
-                    cache: false,
-                    contentType: false,
-                    processData: false,
-                    success : function(response) {
-                        console.log(response);
-                        $(\'#save_logo\').button(\'reset\');
-                        if(response.status == 0) {
-                            var html = "<strong>Error !</strong> " + response.message;
-                            $(\'#alert\').html(html)
-                                .show()
-                                .removeClass(\'alert-success\')
-                                .removeClass(\'alert-danger\')
-                                .addClass(\'alert-danger\');
-                        } else if(response.status == 1) {
-                            var html = "<strong>Seccess !</strong> " + response.message;
-                            $(\'#alert\').html(html)
-                                .show()
-                                .removeClass(\'alert-success\')
-                                .removeClass(\'alert-danger\')
-                                .addClass(\'alert-success\');
-
-                            window.location = window.location;
-                        }
-                    },
-                    error : function(response) {
-                        console.log(response);
-                    },
-                });
-
-                return false;
-            }
-        </script>';
-
-        $html .= '<div id="logoModal" class="modal fade" role="dialog">
-            <div class="modal-dialog">
-                <!-- Modal content-->
-                <div class="modal-content">
-                    <form id="logo_form" name="logo_form" action="'.$this->context->link->getAdminLink('AdminOrders', false).'&upload_logo" method="post" enctype="multipart/form-data">
-                        <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal">&times;</button>
-                            <h4 class="modal-title">New logo</h4>
-                        </div>
-                        <div class="modal-body">
-                            <div class="alert alert-success" id="alert" style="display:none;"></div>
-                            <div class="form-group">
-                                <label for="logo_name" class="control-label required">Logo name</label>
-                                <input type="text" class="form-control" id="logo_name" name="logo_name" placeholder="Enter logo name">
-                            </div>
-                            <div class="form-group">
-                                <input type="file" class="form-control" id="logo_file" name="logo_file">
-                            </div>
-                        </div>
-                        <div class="modal-footer">
-                            <button type="submit" class="btn btn-default" id="save_logo" data-loading-text="Saving logo ...">Save</button>
-                            <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>';
-
-        return $html;
-    }
-
-    public function hookHeader()
-    {
-        /*if(Configuration::get('PAYLIKE_STATUS') == 'enabled' && $this->context->controller->php_self == 'order') {
-            $this->context->controller->addJs('https://sdk.paylike.io/3.js');
-        }*/
-    }
-
-    public function hookPayment($params)
-    {
-        $language_code = Configuration::get('PAYLIKE_LANGUAGE_CODE');
-
-        //ensure paylike key is set
-        if (Configuration::get('PAYLIKE_TRANSACTION_MODE') == 'test') {
-            if(!Configuration::get('PAYLIKE_TEST_PUBLIC_KEY') || !Configuration::get('PAYLIKE_TEST_SECRET_KEY')) {
-                return false;
-            }else {
-                $PAYLIKE_PUBLIC_KEY = Configuration::get('PAYLIKE_TEST_PUBLIC_KEY');
-                Configuration::updateValue('PAYLIKE_SECRET_KEY', Configuration::get('PAYLIKE_TEST_SECRET_KEY'));
-            }
-        }
-
-        if (Configuration::get('PAYLIKE_TRANSACTION_MODE') == 'live') {
-            if(!Configuration::get('PAYLIKE_LIVE_PUBLIC_KEY') || !Configuration::get('PAYLIKE_LIVE_SECRET_KEY')) {
-                return false;
-            }else {
-                $PAYLIKE_PUBLIC_KEY = Configuration::get('PAYLIKE_LIVE_PUBLIC_KEY');
-                Configuration::updateValue('PAYLIKE_SECRET_KEY', Configuration::get('PAYLIKE_LIVE_SECRET_KEY'));
-            }
-        }
-
-        if (!Configuration::get('PAYLIKE_TEST_PUBLIC_KEY') && !Configuration::get('PAYLIKE_TEST_SECRET_KEY') && !Configuration::get('PAYLIKE_LIVE_PUBLIC_KEY') && !Configuration::get('PAYLIKE_LIVE_SECRET_KEY')) {
-            return false;
-        }
-
-        $products = $params['cart']->getProducts();
-        $products_array = array();
-        $products_label = array();
-        $p = 0;
-        foreach ($products as $product)
-        {
-            $products_array[] = array(
-                $this->l('ID') => $product['id_product'],
-                $this->l('Name') => $product['name'],
-                $this->l('Quantity') => $product['cart_quantity']
-            );
-            $products_label[$p] = $product['quantity'].'x '.$product['name'];
-            $p++;
-        }
-
-        $payment_method_title = (!empty(Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE'))) ? Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE') : (!empty(Configuration::get('en_PAYLIKE_PAYMENT_METHOD_TITLE')) ? Configuration::get('en_PAYLIKE_PAYMENT_METHOD_TITLE') : '');
-        $payment_method_desc = (!empty(Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC'))) ? Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC') : (!empty(Configuration::get('en_PAYLIKE_PAYMENT_METHOD_DESC')) ? Configuration::get('en_PAYLIKE_PAYMENT_METHOD_DESC') : '');
-        $popup_title = (!empty(Configuration::get($language_code.'_PAYLIKE_POPUP_TITLE'))) ? Configuration::get($language_code.'_PAYLIKE_POPUP_TITLE') : (!empty(Configuration::get('en_PAYLIKE_POPUP_TITLE')) ? Configuration::get('en_PAYLIKE_POPUP_TITLE') : '');
-
-        if(Configuration::get('PAYLIKE_SHOW_POPUP_DESC') == 'yes') {
-            $popup_description = (!empty(Configuration::get($language_code.'_PAYLIKE_POPUP_DESC'))) ? Configuration::get($language_code.'_PAYLIKE_POPUP_DESC') : (!empty(Configuration::get('en_PAYLIKE_POPUP_DESC')) ? Configuration::get('en_PAYLIKE_POPUP_DESC') : '');
-        } else {
-            $popup_description = implode(", & ", $products_label);
-        }
-
-        $cart = $this->context->cart;
-        $total = $cart->getOrderTotal(true, Cart::BOTH);
-        echo "Total : ".$total;
-        //die();
-        $amount = $params['cart']->getOrderTotal() * 100;//paid amounts with 100 to handle paylike's decimals
-        $currency = new Currency((int)$params['cart']->id_currency);
-        $currency_code = $currency->iso_code;
-        $customer = new Customer((int)$params['cart']->id_customer);
-        $name = $customer->firstname . ' ' . $customer->lastname;
-        $email = $customer->email;
-        $customer_address = new Address((int)($params['cart']->id_address_delivery));
-        $telephone = !empty($customer_address->phone) ? $customer_address->phone : !empty($customer_address->phone_mobile) ? $customer_address->phone_mobile : '';
-        $address = $customer_address->address1.', '.$customer_address->address2.', '.$customer_address->city.', '.$customer_address->country.' - '.$customer_address->postcode;
-        $ip = Tools::getRemoteAddr();
-        $locale = $this->context->language->iso_code;
-        $platform_version = _PS_VERSION_;
-        $ecommerce = 'prestashop';
-        $module_version = $this->version;
-
-        $redirect_url = $this->context->link->getModuleLink('paylikepayment', 'paymentreturn', [], true, (int)$this->context->language->id);
-
-        if (Configuration::get('PS_REWRITING_SETTINGS') == 1)
-            $redirect_url = Tools::strReplaceFirst('&', '?', $redirect_url);
-
-        $this->context->smarty->assign(array(
-            'PAYLIKE_PUBLIC_KEY'	            => $PAYLIKE_PUBLIC_KEY,
-            'PS_SSL_ENABLED'		            => (Configuration::get('PS_SSL_ENABLED') ? 'https' : 'http'),
-            'http_host'				            => Tools::getHttpHost(),
-            'shop_name'				            => $this->context->shop->name,
-            'payment_method_title'              => $payment_method_title,
-            'payment_method_creditcard_logo'    => explode(',', Configuration::get('PAYLIKE_PAYMENT_METHOD_LOGO')),
-            'payment_method_desc'               => $payment_method_desc,
-            'paylike_status'                    => Configuration::get('PAYLIKE_STATUS'),
-            'popup_title'			            => $popup_title,
-            'popup_description'		            => $popup_description,
-            'currency_code'			            => $currency_code,
-            'amount'				            => $amount,
-            'id_cart'				            => Tools::jsonEncode($params['cart']->id),
-            'products'	                        => Tools::jsonEncode($products_array),
-            'name'                              => $name,
-            'email'                             => $email,
-            'telephone'                         => $telephone,
-            'address'                           => $address,
-            'ip'                                => $ip,
-            'locale'                            => $locale,
-            'platform_version'                  => $platform_version,
-            'ecommerce'                         => $ecommerce,
-            'module_version'                    => $module_version,
-            'redirect_url'			            => $redirect_url,
-            'qry_str'				            => (Configuration::get('PS_REWRITING_SETTINGS')? '?' : '&'),
-            'base_uri'				            => __PS_BASE_URI__,
-            'this_path_paylike'                 => $this->_path,
-        ));
-        return $this->display(__FILE__, 'views/templates/hook/payment.tpl');
-    }
-
-    public function hookpaymentReturn($params)
-    {
-        if (!$this->active || !isset($params['objOrder']) || $params['objOrder']->module != $this->name)
-            return false;
-
-        if (isset($params['objOrder']) && Validate::isLoadedObject($params['objOrder']) && isset($params['objOrder']->valid) && isset($params['objOrder']->reference))
-        {
-            $this->smarty->assign(
-                'paylike_order', array(
-                    'id' => $params['objOrder']->id,
-                    'reference' => $params['objOrder']->reference,
-                    'valid' => $params['objOrder']->valid
-                )
-            );
-
-            return $this->display(__FILE__, 'views/templates/hook/payment-return.tpl');
-        }
-    }
-
-    public function storeTransactionID($paylike_id_transaction, $order_id, $total, $captured='NO')
-    {
-        $query = 'INSERT INTO '._DB_PREFIX_.'paylike_admin (`paylike_tid`, `order_id`, `payed_amount`, `payed_at`, `captured`) VALUES ("'.pSQL($paylike_id_transaction).'", "'.pSQL($order_id).'", "'.pSQL($total).'" , NOW(), "'.pSQL($captured).'")';
-
-        return Db::getInstance()->Execute($query);
-    }
-
-    public function updateTransactionID($paylike_id_transaction, $order_id, $fields=array())
-    {
-        if($paylike_id_transaction && $order_id && !empty($fields)) {
-            $fieldsStr = '';
-            $fieldCount = count($fields);
-            $counter = 0;
-
-            foreach($fields as $field => $value) {
-                $counter++;
-                $fieldsStr .= '`' . $field . '` = "'.pSQL($value) . '"';
-
-                if($counter < $fieldCount) {
-                    $fieldsStr .= ', ';
-                }
-            }
-
-            $query = 'UPDATE ' . _DB_PREFIX_ . 'paylike_admin SET ' . $fieldsStr . ' WHERE `paylike_tid`="' . $paylike_id_transaction . '" AND `order_id`="' . $order_id . '"';
-            return Db::getInstance()->Execute($query);
-
-        } else
-            return false;
-    }
-
-    public function hookDisplayAdminOrder($params)
-    {
-        $id_order = $params['id_order'];
-        $order = new Order((int)$id_order);
-        if ($order->module == $this->name)
-        {
-            $order_token = Tools::getAdminToken('AdminOrders'.(int)Tab::getIdFromClassName('AdminOrders').(int)$this->context->employee->id);
-            $payliketransaction = Db::getInstance()->getRow('SELECT * FROM '._DB_PREFIX_.'paylike_admin WHERE order_id = '.(int)$id_order);
-            $this->context->smarty->assign(array(
-                'ps_version' => _PS_VERSION_,
-                'id_order' => $id_order,
-                'order_token' => $order_token,
-                'payliketransaction' => $payliketransaction
-            ));
-            return $this->display(__FILE__, 'views/templates/hook/admin-order.tpl');
-        }
-    }
-
-    public function hookBackOfficeHeader()
-    {
-        if (Tools::getIsset('vieworder') && Tools::getIsset('id_order') && Tools::getIsset('paylike_action')) {
-            $paylike_action = Tools::getValue('paylike_action');
-            $id_order = (int)Tools::getValue('id_order');
-            $order = new Order((int)$id_order);
-            $payliketransaction = Db::getInstance()->getRow('SELECT * FROM '._DB_PREFIX_.'paylike_admin WHERE order_id = '.(int)$id_order);
-            $transactionid = $payliketransaction['paylike_tid'];
-            Paylike\Client::setKey(Configuration::get('PAYLIKE_SECRET_KEY'));
-            $fetch = Paylike\Transaction::fetch( $transactionid );
-
-            switch ( $paylike_action ) {
-                case "capture":
-                    if($payliketransaction['captured'] == 'YES') {
-                        $response = array(
-                            'warning' => 1,
-                            'message' => Tools::displayError('Transaction already Captured.'),
-                        );
-
-                    } else if (isset($payliketransaction)) {
-                        $amount = (!empty($fetch['transaction']['pendingAmount'])) ? (int) $fetch['transaction']['pendingAmount'] : 0;
-                        $currency = new Currency((int)$order->id_currency);
-                        if($amount) {
-                            //Capture transaction
-                            $data = [
-                                'currency' => $currency->iso_code,
-                                'descriptor' => "Order #" . (int)$id_order,
-                                'amount' => $amount,
-                            ];
-                            $capture = Paylike\Transaction::capture($transactionid, $data);
-
-                            if (is_array($capture) && !empty($capture['error']) && $capture['error'] == 1) {
-                                PrestaShopLogger::addLog($capture['message']);
-                                $response = array(
-                                    'error' => 1,
-                                    'message' => Tools::displayError($capture['message']),
-                                );
-
-                            } else {
-                                if (!empty($capture['transaction'])) {
-                                    //Update order status
-                                    //$status_paid = (int)Configuration::get('PS_OS_PAYMENT');
-                                    $status_paid = (int)Configuration::get('PAYLIKE_ORDER_STATUS');
-                                    $order->setCurrentState($status_paid, $this->context->employee->id);
-
-                                    //Update transaction details
-                                    $fields = array(
-                                        'captured' => 'YES',
-                                    );
-                                    $this->updateTransactionID($transactionid, (int)$id_order, $fields);
-
-                                    //Set message
-                                    $message = 'Trx ID: ' . $transactionid . '
-                                    Authorized Amount: ' . ($capture['transaction']['amount'] / 100) . '
-                                    Captured Amount: ' . ($capture['transaction']['capturedAmount'] / 100) . '
-                                    Order time: ' . $capture['transaction']['created'] . '
-                                    Currency code: ' . $capture['transaction']['currency'];
-
-                                    $msg = new Message();
-                                    $message = strip_tags($message, '<br>');
-                                    if (Validate::isCleanHtml($message)) {
-                                        $msg->message = $message;
-                                        $msg->id_cart = (int)$order->id_cart;
-                                        $msg->id_customer = (int)$order->id_customer;
-                                        $msg->id_order = (int)$order->id;
-                                        $msg->private = 1;
-                                        $msg->add();
-                                    }
-
-                                    //Set response
-                                    $response = array(
-                                        'success' => 1,
-                                        'message' => Tools::displayError('Transaction successfully Captured.'),
-                                    );
-
-                                } else {
-                                    if(!empty($capture[0]['message'])) {
-                                        $response = array(
-                                            'warning' => 1,
-                                            'message' => Tools::displayError($capture[0]['message']),
-                                        );
-                                    } else {
-                                        $response = array(
-                                            'error' => 1,
-                                            'message' => Tools::displayError('Opps! An error occured while Capture.'),
-                                        );
-                                    }
-                                }
-                            }
-
-                        } else {
-                            $response = array(
-                                'error' => 1,
-                                'message' => Tools::displayError('Invalid amount to Capture.'),
-                            );
-                        }
-
-                    } else {
-                        $response = array(
-                            'error' => 1,
-                            'message' => Tools::displayError('Invalid Paylike Transaction.'),
-                        );
-                    }
-
-                    break;
-
-                case "refund":
-                    if($payliketransaction['captured'] == 'NO') {
-                        $response = array(
-                            'warning' => 1,
-                            'message' => Tools::displayError('You need to Captured Transaction prior to Refund.'),
-                        );
-
-                    }
-                    else if (isset($payliketransaction)) {
-                        $paylike_amount_to_refund = Tools::getValue('paylike_amount_to_refund');
-                        $paylike_refund_reason = Tools::getValue('paylike_refund_reason');
-
-                        if (!Validate::isPrice($paylike_amount_to_refund)) {
-                            $response = array(
-                                'error' => 1,
-                                'message' => Tools::displayError('Invalid amount to Refund.'),
-                            );
-
-                        } else {
-                            //Refund transaction
-                            $amount = Tools::ps_round($paylike_amount_to_refund, 2) * 100;
-                            $data = [
-                                'descriptor' => $paylike_refund_reason,
-                                'amount' => $amount,
-                            ];
-                            $refund = Paylike\Transaction::refund( $transactionid, $data );
-
-                            if (is_array($refund) && !empty($refund['error']) && $refund['error'] == 1) {
-                                PrestaShopLogger::addLog($refund['message']);
-                                $response = array(
-                                    'error' => 1,
-                                    'message' => Tools::displayError($refund['message']),
-                                );
-
-                            } else {
-                                if (!empty($refund['transaction'])) {
-                                    //Update order status
-                                    $order->setCurrentState((int)Configuration::get('PS_OS_REFUND'), $this->context->employee->id);
-
-                                    //Update transaction details
-                                    $fields = array(
-                                        'refunded_amount' => $payliketransaction['refunded_amount'] + $paylike_amount_to_refund,
-                                    );
-                                    $this->updateTransactionID($transactionid, (int)$id_order, $fields);
-
-                                    //Set message
-                                    $message = 'Trx ID: ' . $transactionid . '
-                                        Authorized Amount: ' . ($refund['transaction']['amount'] / 100) . '
-                                        Refunded Amount: ' . ($refund['transaction']['refundedAmount'] / 100) . '
-                                        Order time: ' . $refund['transaction']['created'] . '
-                                        Currency code: ' . $refund['transaction']['currency'];
-
-                                    $msg = new Message();
-                                    $message = strip_tags($message, '<br>');
-                                    if (Validate::isCleanHtml($message)) {
-                                        $msg->message = $message;
-                                        $msg->id_cart = (int)$order->id_cart;
-                                        $msg->id_customer = (int)$order->id_customer;
-                                        $msg->id_order = (int)$order->id;
-                                        $msg->private = 1;
-                                        $msg->add();
-                                    }
-
-                                    //Set response
-                                    $response = array(
-                                        'success' => 1,
-                                        'message' => Tools::displayError('Transaction successfully Refunded.'),
-                                    );
-
-                                } else {
-                                    if (!empty($refund[0]['message'])) {
-                                        $response = array(
-                                            'warning' => 1,
-                                            'message' => Tools::displayError($refund[0]['message']),
-                                        );
-                                    } else {
-                                        $response = array(
-                                            'error' => 1,
-                                            'message' => Tools::displayError('Opps! An error occured while Refund.'),
-                                        );
-                                    }
-                                }
-                            }
-                        }
-
-                    } else {
-                        $response = array(
-                            'error' => 1,
-                            'message' => Tools::displayError('Invalid Paylike Transaction.'),
-                        );
-                    }
-
-                    break;
-
-                case "void":
-                    if($payliketransaction['captured'] == 'YES') {
-                        $response = array(
-                            'warning' => 1,
-                            'message' => Tools::displayError('You can\'t Void transaction now . It\'s already Captured, try to Refund.'),
-                        );
-
-                    } else if (isset($payliketransaction)) {
-                        //Void transaction
-                        $amount = (int) $fetch['transaction']['amount'] - $fetch['transaction']['refundedAmount'];
-                        $data = [
-                            'amount' => $amount,
-                        ];
-                        $void = Paylike\Transaction::void( $transactionid, $data );
-
-                        if (is_array($void) && !empty($void['error']) && $void['error'] == 1) {
-                            PrestaShopLogger::addLog($void['message']);
-                            $response = array(
-                                'error' => 1,
-                                'message' => Tools::displayError($void['message']),
-                            );
-
-                        } else {
-                            if (!empty($void['transaction'])) {
-                                //Update order status
-                                $order->setCurrentState((int)Configuration::get('PS_OS_CANCEL'), $this->context->employee->id);
-
-                                //Set message
-                                $message = 'Trx ID: ' . $transactionid . '
-                                        Authorized Amount: ' . ($void['transaction']['amount'] / 100) . '
-                                        Refunded Amount: ' . ($void['transaction']['refundedAmount'] / 100) . '
-                                        Order time: ' . $void['transaction']['created'] . '
-                                        Currency code: ' . $void['transaction']['currency'];
-
-                                $msg = new Message();
-                                $message = strip_tags($message, '<br>');
-                                if (Validate::isCleanHtml($message)) {
-                                    $msg->message = $message;
-                                    $msg->id_cart = (int)$order->id_cart;
-                                    $msg->id_customer = (int)$order->id_customer;
-                                    $msg->id_order = (int)$order->id;
-                                    $msg->private = 1;
-                                    $msg->add();
-                                }
-
-                                //Set response
-                                $response = array(
-                                    'success' => 1,
-                                    'message' => Tools::displayError('Transaction successfully Voided.'),
-                                );
-
-                            } else {
-                                if (!empty($void[0]['message'])) {
-                                    $response = array(
-                                        'warning' => 1,
-                                        'message' => Tools::displayError($void[0]['message']),
-                                    );
-                                } else {
-                                    $response = array(
-                                        'error' => 1,
-                                        'message' => Tools::displayError('Opps! An error occured while refund.'),
-                                    );
-                                }
-                            }
-                        }
-
-                    } else {
-                        $response = array(
-                            'error' => 1,
-                            'message' => Tools::displayError('Invalid paylike transaction.'),
-                        );
-                    }
-
-                    break;
-            }
-
-            die(Tools::jsonEncode($response));
-        }
-
-        if (Tools::getIsset('upload_logo')) {
-            $logo_name = Tools::getValue('logo_name');
-
-            if(empty($logo_name)) {
-                $response = array(
-                    'status' => 0,
-                    'message' => 'Please give logo name.'
-                );
-                die(Tools::jsonEncode($response));
-            }
-
-            $logo_slug = strtolower(str_replace(' ','-',$logo_name));
-            $sql = new DbQuery();
-            $sql->select('*');
-            $sql->from('paylike_logos', 'PL');
-            $sql->where('PL.slug = "'. $logo_slug .'"');
-            $logos = Db::getInstance()->executes($sql);
-            if(!empty($logos)) {
-                $response = array(
-                    'status' => 0,
-                    'message' => 'This name already exists.'
-                );
-                die(Tools::jsonEncode($response));
-            }
-
-            if (!empty($_FILES['logo_file']['name'])) {
-                $target_dir = __DIR__.'/logos/';
-                $name = basename($_FILES['logo_file']["name"]);
-                $path_parts = pathinfo($name);
-                $extension = $path_parts['extension'];
-                $file_name = $logo_slug . '.' . $extension;
-                $target_file = $target_dir . basename($file_name);
-                $imageFileType = pathinfo($target_file,PATHINFO_EXTENSION);
-
-                /*$check = getimagesize($_FILES['logo_file']["tmp_name"]);
-                if($check === false) {
-                    $response = array(
-                        'status' => 0,
-                        'message' => 'File is not an image. Please upload JPG, JPEG, PNG or GIF file.'
-                    );
-                    die(Tools::jsonEncode($response));
-                }*/
-
-                // Check if file already exists
-                if (file_exists($target_file)) {
-                    $response = array(
-                        'status' => 0,
-                        'message' => 'Sorry, file already exists.'
-                    );
-                    die(Tools::jsonEncode($response));
-                }
-
-                // Allow certain file formats
-                if($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg"
-                    && $imageFileType != "gif" && $imageFileType != "svg" ) {
-                    $response = array(
-                        'status' => 0,
-                        'message' => 'Sorry, only JPG, JPEG, PNG, GIF & SVG files are allowed.'
-                    );
-                    die(Tools::jsonEncode($response));
-                }
-
-                if (move_uploaded_file($_FILES['logo_file']["tmp_name"], $target_file)) {
-                    $query = 'INSERT INTO '._DB_PREFIX_.'paylike_logos (`name`, `slug`, `file_name`, `default_logo`, `created_at`) VALUES ("'.pSQL($logo_name).'", "'.pSQL($logo_slug).'", "'.pSQL($file_name).'", 0, NOW())';
-                    if( Db::getInstance()->Execute($query) ) {
-                        $response = array(
-                            'status' => 1,
-                            'message' => "The file " . basename($file_name) . " has been uploaded."
-                        );
-                        //Configuration::updateValue('PAYLIKE_PAYMENT_METHOD_CREDITCARD_LOGO', basename($file_name));
-                        die(Tools::jsonEncode($response));
-                    } else {
-                        unlink($target_file);
-                        $response = array(
-                            'status' => 0,
-                            'message' => "Oops! An error occured while save logo."
-                        );
-                        die(Tools::jsonEncode($response));
-                    }
-
-                } else {
-                    $response = array(
-                        'status' => 0,
-                        'message' => 'Sorry, there was an error uploading your file.'
-                    );
-                    die(Tools::jsonEncode($response));
-                }
-            } else {
-                $response = array(
-                    'status' => 0,
-                    'message' => 'Please select a file for upload.'
-                );
-                die(Tools::jsonEncode($response));
-            }
-        }
-
-        if (Tools::getIsset('change_language')) {
-            $language_code = (!empty(Tools::getvalue('lang_code'))) ? Tools::getvalue('lang_code') : Configuration::get('PAYLIKE_LANGUAGE_CODE');;
-            Configuration::updateValue('PAYLIKE_LANGUAGE_CODE', $language_code);
-            $token = Tools::getAdminToken('AdminModules'.(int)Tab::getIdFromClassName('AdminModules').(int)$this->context->employee->id);
-            $link = $this->context->link->getAdminLink('AdminModules').'&token='.$token.'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
-            Tools::redirectAdmin($link);
-        }
-    }
-
-}
\ No newline at end of file
+<?php
+/**
+ *
+ * @author    DerikonDevelopment <ionut@derikon.com>
+ * @copyright Copyright (c) permanent, DerikonDevelopment
+ * @license   Addons PrestaShop license limitation
+ * @version   1.0.2
+ * @link      http://www.derikon.com/
+ *
+ */
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+if (!class_exists('Paylike\\Client')) {
+    require_once('api/Client.php');
+}
+//use Paylike;
+
+class PaylikePayment extends PaymentModule
+{
+    private $html = '';
+    protected $statuses_array = array();
+
+    public function __construct()
+    {
+        $this->name = 'paylikepayment';
+        $this->tab = 'payments_gateways';
+        $this->version = '1.0.2';
+        $this->author = 'DerikonDevelopment';
+        $this->bootstrap = true;
+        $this->module_key = '1d083bab290f652fb6fb7ae35f9f0942';
+
+        $this->currencies = true;
+        $this->currencies_mode = 'checkbox';
+
+        parent::__construct();
+        $this->displayName = $this->l('Paylike');
+        $this->description = $this->l('Receive payment via Paylike');
+        $this->confirmUninstall = $this->l('Are you sure about removing Paylike?');
+    }
+
+    public function install()
+    {
+        $popup_title = (!empty(Configuration::get('PS_SHOP_NAME'))) ? Configuration::get('PS_SHOP_NAME') : 'Payment';
+        $language_code = $this->context->language->iso_code;
+
+        Configuration::updateValue('PAYLIKE_LANGUAGE_CODE', $language_code);
+        Configuration::updateValue($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE', 'Credit card');
+        Configuration::updateValue('PAYLIKE_PAYMENT_METHOD_LOGO', 'visa.svg');
+        Configuration::updateValue($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC', 'Secure payment with credit card via © Paylike');
+        Configuration::updateValue($language_code.'_PAYLIKE_POPUP_TITLE', $popup_title);
+        Configuration::updateValue('PAYLIKE_SHOW_POPUP_DESC', 'no');
+        Configuration::updateValue($language_code.'_PAYLIKE_POPUP_DESC', '');
+        Configuration::updateValue('PAYLIKE_TRANSACTION_MODE', 'test');
+        Configuration::updateValue('PAYLIKE_TEST_PUBLIC_KEY', '');
+        Configuration::updateValue('PAYLIKE_TEST_SECRET_KEY', '');
+        Configuration::updateValue('PAYLIKE_LIVE_PUBLIC_KEY', '');
+        Configuration::updateValue('PAYLIKE_LIVE_SECRET_KEY', '');
+        Configuration::updateValue('PAYLIKE_CHECKOUT_MODE', 'delayed');
+        Configuration::updateValue('PAYLIKE_ORDER_STATUS', Configuration::get('PAYLIKE_ORDER_STATUS'));
+        Configuration::updateValue('PAYLIKE_STATUS', 'enabled');
+        Configuration::updateValue('PAYLIKE_SECRET_KEY', '');
+        return (parent::install()
+            && $this->registerHook('header')
+            && $this->registerHook('payment')
+            && $this->registerHook('paymentReturn')
+            && $this->registerHook('DisplayAdminOrder')
+            && $this->registerHook('BackOfficeHeader')
+            && $this->installDb());
+    }
+
+    public function installDb()
+    {
+        return (
+            Db::getInstance()->Execute('CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'paylike_admin` (
+                `id`				int(11) NOT NULL AUTO_INCREMENT,
+                `paylike_tid`		varchar(255) NOT NULL,
+                `order_id`			int(11) NOT NULL,
+                `payed_at`			datetime NOT NULL,
+                `payed_amount`		DECIMAL(20,6) NOT NULL,
+                `refunded_amount`	DECIMAL(20,6) NOT NULL,
+                `captured`		    varchar(255) NOT NULL,
+                PRIMARY KEY			(`id`)
+                ) ENGINE=InnoDB		DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;')
+
+            && Db::getInstance()->Execute('CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'paylike_logos` (
+                `id` int(11) NOT NULL AUTO_INCREMENT,
+                `name` varchar(255) NOT NULL,
+                `slug` varchar(255) NOT NULL,
+                `file_name` varchar(255) NOT NULL,
+                `default_logo` int(11) NOT NULL DEFAULT 1 COMMENT "1=Default",
+                `created_at` datetime NOT NULL,
+                PRIMARY KEY (`id`)
+                ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;')
+
+            && Db::getInstance()->insert(
+                'paylike_logos',
+                array(
+                    array(
+                        'id' => 1,
+                        'name' => pSQL('VISA'),
+                        'slug' => pSQL('visa'),
+                        'file_name' => pSQL('visa.svg'),
+                        'created_at' => date('Y-m-d H:i:s'),
+                    ),
+                    array(
+                        'id' => 2,
+                        'name' => pSQL('VISA Electron'),
+                        'slug' => pSQL('visa-electron'),
+                        'file_name' => pSQL('visa-electron.svg'),
+                        'created_at' => date('Y-m-d H:i:s'),
+                    ),
+                    array(
+                        'id' => 3,
+                        'name' => pSQL('Mastercard'),
+                        'slug' => pSQL('mastercard'),
+                        'file_name' => pSQL('mastercard.svg'),
+                        'created_at' => date('Y-m-d H:i:s'),
+                    ),
+                    array(
+                        'id' => 4,
+                        'name' => pSQL('Mastercard Maestro'),
+                        'slug' => pSQL('mastercard-maestro'),
+                        'file_name' => pSQL('mastercard-maestro.svg'),
+                        'created_at' => date('Y-m-d H:i:s'),
+                    ),
+                )
+            )
+        );
+    }
+
+    public function uninstall()
+    {
+        //$sql = 'SELECT * FROM `'._DB_PREFIX_.'paylike_logos`';
+        $sql = new DbQuery();
+        $sql->select('*');
+        $sql->from('paylike_logos', 'PL');
+        $sql->where('PL.default_logo != 1');
+        $logos = Db::getInstance()->executes($sql);
+
+        foreach ($logos as $logo) {
+            if (file_exists(_PS_MODULE_DIR_.$this->name.'/views/img/'.$logo['file_name'])) {
+                unlink(_PS_MODULE_DIR_.$this->name.'/views/img/'.$logo['file_name']);
+            }
+        }
+
+        //Fetch all languages and delete Paylike configurations which has language iso_code as prefix
+        $languages = Language::getLanguages(true, $this->context->shop->id);
+        foreach ($languages as $language) {
+            $language_code = $language['iso_code'];
+            Configuration::deleteByName($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE');
+            Configuration::deleteByName($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC');
+            Configuration::deleteByName($language_code.'_PAYLIKE_POPUP_TITLE');
+            Configuration::deleteByName($language_code.'_PAYLIKE_POPUP_DESC');
+        }
+
+        return (
+            parent::uninstall()
+            && Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'paylike_admin`')
+            && Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'paylike_logos`')
+            && Configuration::deleteByName('PAYLIKE_PAYMENT_METHOD_TITLE')
+            && Configuration::deleteByName('PAYLIKE_PAYMENT_METHOD_LOGO')
+            && Configuration::deleteByName('PAYLIKE_PAYMENT_METHOD_DESC')
+            && Configuration::deleteByName('PAYLIKE_POPUP_TITLE')
+            && Configuration::deleteByName('PAYLIKE_SHOW_POPUP_DESC')
+            && Configuration::deleteByName('PAYLIKE_POPUP_DESC')
+            && Configuration::deleteByName('PAYLIKE_TRANSACTION_MODE')
+            && Configuration::deleteByName('PAYLIKE_TEST_PUBLIC_KEY')
+            && Configuration::deleteByName('PAYLIKE_TEST_SECRET_KEY')
+            && Configuration::deleteByName('PAYLIKE_LIVE_PUBLIC_KEY')
+            && Configuration::deleteByName('PAYLIKE_LIVE_SECRET_KEY')
+            && Configuration::deleteByName('PAYLIKE_CHECKOUT_MODE')
+            && Configuration::deleteByName('PAYLIKE_ORDER_STATUS')
+            && Configuration::deleteByName('PAYLIKE_STATUS')
+            && Configuration::deleteByName('PAYLIKE_SECRET_KEY')
+        );
+    }
+
+    public function getContent()
+    {
+        $this->html = '';
+        if (Tools::isSubmit('submitPaylike')) {
+            $language_code = Configuration::get('PAYLIKE_LANGUAGE_CODE');
+            $valid = true;
+
+            $PAYLIKE_PAYMENT_METHOD_TITLE = !empty(Tools::getvalue($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE')) ? Tools::getvalue($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE') : '';
+            $PAYLIKE_PAYMENT_METHOD_DESC = !empty(Tools::getvalue($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC')) ? Tools::getvalue($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC') : '';
+            $PAYLIKE_POPUP_TITLE = (!empty(Tools::getvalue($language_code.'_PAYLIKE_POPUP_TITLE'))) ? Tools::getvalue($language_code.'_PAYLIKE_POPUP_TITLE') : '';
+            $_PAYLIKE_POPUP_DESC = (!empty(Tools::getvalue($language_code.'_PAYLIKE_POPUP_DESC'))) ? Tools::getvalue($language_code.'_PAYLIKE_POPUP_DESC') : '';
+
+            if (empty($PAYLIKE_PAYMENT_METHOD_TITLE)) {
+                $this->context->controller->errors[$language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE'] = $this->l('Payment method title required!');
+                $PAYLIKE_PAYMENT_METHOD_TITLE = (!empty(Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE'))) ? Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE') : '';
+                $valid = false;
+            }
+
+            if (count(Tools::getvalue('PAYLIKE_PAYMENT_METHOD_CREDITCARD_LOGO')) > 1) {
+                $creditCardLogo = implode(',', Tools::getvalue('PAYLIKE_PAYMENT_METHOD_CREDITCARD_LOGO'));
+            } else {
+                $creditCardLogo = Tools::getvalue('PAYLIKE_PAYMENT_METHOD_CREDITCARD_LOGO');
+            }
+
+
+            if (Tools::getvalue('PAYLIKE_TRANSACTION_MODE') == 'test') {
+                if (!Tools::getvalue('PAYLIKE_TEST_PUBLIC_KEY')) {
+                    $this->context->controller->errors['PAYLIKE_TEST_PUBLIC_KEY'] = $this->l('Test mode Public Key is required!');
+                    $PAYLIKE_TEST_PUBLIC_KEY = (!empty(Configuration::get('PAYLIKE_TEST_PUBLIC_KEY'))) ? Configuration::get('PAYLIKE_TEST_PUBLIC_KEY') : '';
+                    $valid = false;
+                } else {
+                    $PAYLIKE_TEST_PUBLIC_KEY = (!empty(Tools::getvalue('PAYLIKE_TEST_PUBLIC_KEY'))) ? Tools::getvalue('PAYLIKE_TEST_PUBLIC_KEY') : '';
+                }
+
+                if (!Tools::getvalue('PAYLIKE_TEST_SECRET_KEY')) {
+                    $this->context->controller->errors['PAYLIKE_TEST_SECRET_KEY'] = $this->l('Test mode App Key is required!');
+                    $PAYLIKE_TEST_SECRET_KEY = (!empty(Configuration::get('PAYLIKE_TEST_SECRET_KEY'))) ? Configuration::get('PAYLIKE_TEST_SECRET_KEY') : '';
+                    $valid = false;
+                } else {
+                    $PAYLIKE_TEST_SECRET_KEY = (!empty(Tools::getvalue('PAYLIKE_TEST_SECRET_KEY'))) ? Tools::getvalue('PAYLIKE_TEST_SECRET_KEY') : '';
+                }
+            } else if (Tools::getvalue('PAYLIKE_TRANSACTION_MODE') == 'live') {
+                if (!Tools::getvalue('PAYLIKE_LIVE_PUBLIC_KEY')) {
+                    $this->context->controller->errors['PAYLIKE_LIVE_PUBLIC_KEY'] = $this->l('Live mode Public Key is required!');
+                    $PAYLIKE_LIVE_PUBLIC_KEY = (!empty(Configuration::get('PAYLIKE_LIVE_PUBLIC_KEY'))) ? Configuration::get('PAYLIKE_LIVE_PUBLIC_KEY') : '';
+                    $valid = false;
+                } else {
+                    $PAYLIKE_LIVE_PUBLIC_KEY = (!empty(Tools::getvalue('PAYLIKE_LIVE_PUBLIC_KEY'))) ? Tools::getvalue('PAYLIKE_LIVE_PUBLIC_KEY') : '';
+                }
+
+                if (!Tools::getvalue('PAYLIKE_LIVE_SECRET_KEY')) {
+                    $this->context->controller->errors['PAYLIKE_LIVE_SECRET_KEY'] = $this->l('Live mode App Key is required!');
+                    $PAYLIKE_LIVE_SECRET_KEY = (!empty(Configuration::get('PAYLIKE_LIVE_SECRET_KEY'))) ? Configuration::get('PAYLIKE_LIVE_SECRET_KEY') : '';
+                    $valid = false;
+                } else {
+                    $PAYLIKE_LIVE_SECRET_KEY = (!empty(Tools::getvalue('PAYLIKE_LIVE_SECRET_KEY'))) ? Tools::getvalue('PAYLIKE_LIVE_SECRET_KEY') : '';
+                }
+            }
+
+            Configuration::updateValue('PAYLIKE_TRANSACTION_MODE', $language_code);
+            Configuration::updateValue($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE', $PAYLIKE_PAYMENT_METHOD_TITLE);
+            Configuration::updateValue('PAYLIKE_PAYMENT_METHOD_LOGO', $creditCardLogo);
+            Configuration::updateValue($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC', $PAYLIKE_PAYMENT_METHOD_DESC);
+            Configuration::updateValue($language_code.'_PAYLIKE_POPUP_TITLE', $PAYLIKE_POPUP_TITLE);
+            Configuration::updateValue('PAYLIKE_SHOW_POPUP_DESC', Tools::getvalue('PAYLIKE_SHOW_POPUP_DESC'));
+            Configuration::updateValue($language_code.'_PAYLIKE_POPUP_DESC', $_PAYLIKE_POPUP_DESC);
+            Configuration::updateValue('PAYLIKE_TRANSACTION_MODE', Tools::getvalue('PAYLIKE_TRANSACTION_MODE'));
+            if (Tools::getvalue('PAYLIKE_TRANSACTION_MODE') == 'test') {
+                Configuration::updateValue('PAYLIKE_TEST_PUBLIC_KEY', $PAYLIKE_TEST_PUBLIC_KEY);
+                Configuration::updateValue('PAYLIKE_TEST_SECRET_KEY', $PAYLIKE_TEST_SECRET_KEY);
+            } else if (Tools::getvalue('PAYLIKE_TRANSACTION_MODE') == 'live') {
+                Configuration::updateValue('PAYLIKE_LIVE_PUBLIC_KEY', $PAYLIKE_LIVE_PUBLIC_KEY);
+                Configuration::updateValue('PAYLIKE_LIVE_SECRET_KEY', $PAYLIKE_LIVE_SECRET_KEY);
+            }
+            Configuration::updateValue('PAYLIKE_CHECKOUT_MODE', Tools::getValue('PAYLIKE_CHECKOUT_MODE'));
+            Configuration::updateValue('PAYLIKE_ORDER_STATUS', Tools::getValue('PAYLIKE_ORDER_STATUS'));
+            Configuration::updateValue('PAYLIKE_STATUS', Tools::getValue('PAYLIKE_STATUS'));
+
+            if ($valid) {
+                $this->context->controller->confirmations[] = $this->l('Settings saved successfully');
+            }
+        }
+
+        //Get configuration form
+        $this->html .= $this->renderForm();
+
+        $this->html .= $this->getModalForAddMoreLogo();
+
+        return $this->html;
+    }
+
+    public function renderForm()
+    {
+        $this->languages_array = array();
+        $this->statuses_array = array();
+        $this->logos_array = array();
+
+        $language_code = Configuration::get('PAYLIKE_LANGUAGE_CODE');
+
+        //Fetch all active languages
+        $languages = Language::getLanguages(true, $this->context->shop->id);
+        foreach ($languages as $language) {
+            $data = array(
+                'id_option' => $language['iso_code'],
+                'name' => $language['name']
+            );
+            array_push($this->languages_array, $data);
+        }
+
+        //Fetch Status list
+        $valid_statuses = array('2','3','4','5','12');
+        $statuses = OrderState::getOrderStates((int)$this->context->language->id);
+        foreach ($statuses as $status) {
+            //$this->statuses_array[$status['id_order_state']] = $status['name'];
+            if (in_array($status['id_order_state'], $valid_statuses)) {
+                $data = array(
+                    'id_option' => $status['id_order_state'],
+                    'name' => $status['name']
+                );
+                array_push($this->statuses_array, $data);
+            }
+        }
+
+        //$sql = 'SELECT * FROM `'._DB_PREFIX_.'paylike_logos`';
+        $sql = new DbQuery();
+        $sql->select('*');
+        $sql->from('paylike_logos');
+        $logos = Db::getInstance()->executes($sql);
+
+        foreach ($logos as $logo) {
+            $data = array(
+                'id_option' => $logo['file_name'],
+                'name' => $logo['name']
+            );
+            array_push($this->logos_array, $data);
+        }
+
+        //Set configuration form fields
+        $fields_form = array(
+            'form' => array(
+                'legend' => array(
+                    'title' => $this->l('Paylike Payments Settings'),
+                    'icon' => 'icon-cogs'
+                ),
+                'input' => array(
+                    /*array(
+                        'type' => 'select',
+                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Language').'">'.$this->l('Language').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'name' => 'PAYLIKE_LANGUAGE_CODE',
+                        'class' => 'paylike-config paylike-language',
+                        'options' => array(
+                            'query' => $this->languages_array,
+                            'id' => 'id_option',
+                            'name' => 'name'
+                        ),
+                    ),*/
+                    array(
+                        'type' => 'text',
+                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Payment method title').'">'.$this->l('Payment method title').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'name' => $language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE',
+                        'class' => 'paylike-config',
+                        'required' => true
+                    ),
+                    array(
+                        'type' => 'select',
+                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Choose logo\s you want to have right next to the payment method on checkout page.').'">'.$this->l('Payment method credit card logo\'s').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'name' => 'PAYLIKE_PAYMENT_METHOD_CREDITCARD_LOGO[]',
+                        'class' => 'paylike-config creditcard-logo',
+                        'multiple' => true,
+                        'options' => array(
+                            'query' => $this->logos_array,
+                            'id' => 'id_option',
+                            'name' => 'name'
+                        ),
+                    ),
+                    array(
+                        'type' => 'textarea',
+                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Payment method description').'">'.$this->l('Payment method description').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'name' => $language_code.'_PAYLIKE_PAYMENT_METHOD_DESC',
+                        'class' => 'paylike-config',
+                        //'required' => true
+                    ),
+                    array(
+                        'type' => 'text',
+                        'label' => '<span data-toggle="tooltip" title="'.$this->l('The text shown in the popup where the customer inserts the card details').'">'.$this->l('Payment popup title').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'name' => $language_code.'_PAYLIKE_POPUP_TITLE',
+                        'class' => 'paylike-config',
+                        //'required' => true
+                    ),
+                    array(
+                        'type' => 'select',
+                        'lang' => true,
+                        'label' => '<span data-toggle="tooltip" title="'.$this->l('If this is set to no the product list will be shown').'">'.$this->l('Show payment popup description').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'name' => 'PAYLIKE_SHOW_POPUP_DESC',
+                        'class' => 'paylike-config',
+                        'options' => array(
+                            'query' => array(
+                                array(
+                                    'id_option' => 'yes',
+                                    'name' => 'Yes'
+                                ),
+                                array(
+                                    'id_option' => 'no',
+                                    'name' => 'No'
+                                ),
+                            ),
+                            'id' => 'id_option',
+                            'name' => 'name'
+                        )
+                    ),
+                    array(
+                        'type' => 'text',
+                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Text description that shows up on the payment popup.').'">'.$this->l('Popup description').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'name' => $language_code.'_PAYLIKE_POPUP_DESC',
+                        'class' => 'paylike-config'
+                    ),
+                    array(
+                        'type' => 'select',
+                        'lang' => true,
+                        'label' => '<span data-toggle="tooltip" title="'.$this->l('In test mode, you can create a successful transaction with the card number 4100 0000 0000 0000 with any CVC and a valid expiration date.').'">'.$this->l('Transaction mode').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'name' => 'PAYLIKE_TRANSACTION_MODE',
+                        'class' => 'paylike-config',
+                        'options' => array(
+                            'query' => array(
+                                array(
+                                    'id_option' => 'test',
+                                    'name' => 'Test'
+                                ),
+                                array(
+                                    'id_option' => 'live',
+                                    'name' => 'Live'
+                                ),
+                            ),
+                            'id' => 'id_option',
+                            'name' => 'name'
+                        ),
+                        'required' => true
+                    ),
+                    array(
+                        'type' => 'text',
+                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Get it from your Paylike dashboard').'">'.$this->l('Test mode Public Key').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'name' => 'PAYLIKE_TEST_PUBLIC_KEY',
+                        'class' => 'paylike-config',
+                        'required' => true
+                    ),
+                    array(
+                        'type' => 'text',
+                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Get it from your Paylike dashboard').'">'.$this->l('Test mode App Key').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'name' => 'PAYLIKE_TEST_SECRET_KEY',
+                        'class' => 'paylike-config',
+                        'required' => true
+                    ),
+                    array(
+                        'type' => 'text',
+                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Get it from your Paylike dashboard').'">'.$this->l('Live mode Public Key').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'name' => 'PAYLIKE_LIVE_PUBLIC_KEY',
+                        'class' => 'paylike-config',
+                        'required' => true
+                    ),
+                    array(
+                        'type' => 'text',
+                        'label' => '<span data-toggle="tooltip" title="'.$this->l('Get it from your Paylike dashboard').'">'.$this->l('Live mode App Key').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'name' => 'PAYLIKE_LIVE_SECRET_KEY',
+                        'class' => 'paylike-config',
+                        'required' => true
+                    ),
+                    array(
+                        'type' => 'select',
+                        'lang' => true,
+                        'label' => '<span data-toggle="tooltip" title="'.$this->l('If you deliver your product instantly (e.g. a digital product), choose Instant mode. If not, use Delayed').'">'.$this->l('Capture mode').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'name' => 'PAYLIKE_CHECKOUT_MODE',
+                        'class' => 'paylike-config',
+                        'options' => array(
+                            'query' => array(
+                                array(
+                                    'id_option' => 'delayed',
+                                    'name' => $this->l('Delayed')
+                                ),
+                                array(
+                                    'id_option' => 'instant',
+                                    'name' => $this->l('Instant')
+                                ),
+                            ),
+                            'id' => 'id_option',
+                            'name' => 'name'
+                        ),
+                        'required' => true,
+                        // 'desc' => $this->l('Instant capture: Amount is captured as soon as the order is confirmed by customer.').'<br>'.$this->l('Delayed capture: Amount is captured after order status is changed to shipped.')
+                    ),
+                    array(
+                        'type' => 'select',
+                        'lang' => true,
+                        //'label' => '<span data-toggle="tooltip" title="'.$this->l('The transaction will be captured once the order has the chosen status').'">'.$this->l('Capture on order status (delayed mode)').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'label' => '<span data-toggle="tooltip" title="'.$this->l('The status on which the order will be set once it gets the payment captured').'">'.$this->l('Order status after capture').'<i class="process-icon-help-new help-icon" aria-hidden="true"></i></span>',
+                        'name' => 'PAYLIKE_ORDER_STATUS',
+                        'class' => 'paylike-config',
+                        'options' => array(
+                            'query' => $this->statuses_array,
+                            'id' => 'id_option',
+                            'name' => 'name'
+                        )
+                    ),
+                    array(
+                        'type' => 'select',
+                        'lang' => true,
+                        'name' => 'PAYLIKE_STATUS',
+                        'label' => $this->l('Status'),
+                        'class' => 'paylike-config',
+                        'options' => array(
+                            'query' => array(
+                                array(
+                                    'id_option' => 'enabled',
+                                    'name' => 'Enabled'
+                                ),
+                                array(
+                                    'id_option' => 'disabled',
+                                    'name' => 'Disabled'
+                                ),
+                            ),
+                            'id' => 'id_option',
+                            'name' => 'name'
+                        )
+                    ),
+                ),
+                'submit' => array(
+                    'title' => $this->l('Save'),
+                )
+            ),
+        );
+
+        $helper = new HelperForm();
+        $helper->show_toolbar = false;
+        $helper->table = $this->table;
+        $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
+        $helper->default_form_language = $lang->id;
+        $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
+        $this->fields_form = array();
+
+        $helper->identifier = $this->identifier;
+        $helper->submit_action = 'submitPaylike';
+        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
+        $helper->token = Tools::getAdminTokenLite('AdminModules');
+        $helper->tpl_vars = array(
+            'fields_value' => $this->getConfigFieldsValues(),
+            'languages' => $this->context->controller->getLanguages(),
+            'id_language' => $this->context->language->id
+        );
+
+        $errors = $this->context->controller->errors;
+        foreach ($fields_form['form']['input'] as $key => $field) {
+            if (array_key_exists($field['name'], $errors)) {
+                $fields_form['form']['input'][$key]['class'] = !empty($fields_form['form']['input'][$key]['class']) ? $fields_form['form']['input'][$key]['class'].' has-error': 'has-error';
+            }
+        }
+
+        return $helper->generateForm(array($fields_form));
+    }
+
+    public function getConfigFieldsValues()
+    {
+        $language_code = Configuration::get('PAYLIKE_LANGUAGE_CODE');
+
+        $creditCardLogo = explode(',', Configuration::get('PAYLIKE_PAYMENT_METHOD_LOGO'));
+
+        $payment_method_title = (!empty(Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE'))) ? Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE') : (!empty(Configuration::get('en_PAYLIKE_PAYMENT_METHOD_TITLE')) ? Configuration::get('en_PAYLIKE_PAYMENT_METHOD_TITLE') : '');
+        $payment_method_desc = (!empty(Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC'))) ? Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC') : (!empty(Configuration::get('en_PAYLIKE_PAYMENT_METHOD_DESC')) ? Configuration::get('en_PAYLIKE_PAYMENT_METHOD_DESC') : '');
+        $popup_title = (!empty(Configuration::get($language_code.'_PAYLIKE_POPUP_TITLE'))) ? Configuration::get($language_code.'_PAYLIKE_POPUP_TITLE') : (!empty(Configuration::get('en_PAYLIKE_POPUP_TITLE')) ? Configuration::get('en_PAYLIKE_POPUP_TITLE') : '');
+        $popup_description = (!empty(Configuration::get($language_code.'_PAYLIKE_POPUP_DESC'))) ? Configuration::get($language_code.'_PAYLIKE_POPUP_DESC') : (!empty(Configuration::get('en_PAYLIKE_POPUP_DESC')) ? Configuration::get('en_PAYLIKE_POPUP_DESC') : '');
+
+        if (empty($payment_method_title)) {
+            $this->context->controller->errors[$language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE'] = $this->l('Payment method title is required!');
+        }
+
+        if (Configuration::get('PAYLIKE_TRANSACTION_MODE') == 'test') {
+            if (!Configuration::get('PAYLIKE_TEST_PUBLIC_KEY')) {
+                $this->context->controller->errors['PAYLIKE_TEST_PUBLIC_KEY'] = $this->l('Test mode Public Key is required!');
+            }
+            if (!Configuration::get('PAYLIKE_TEST_SECRET_KEY')) {
+                $this->context->controller->errors['PAYLIKE_TEST_SECRET_KEY'] = $this->l('Test mode App Key is required!');
+            }
+        } else if (Configuration::get('PAYLIKE_TRANSACTION_MODE') == 'live') {
+            if (!Configuration::get('PAYLIKE_LIVE_PUBLIC_KEY')) {
+                $this->context->controller->errors['PAYLIKE_LIVE_PUBLIC_KEY'] = $this->l('Live mode Public Key is required!');
+            }
+            if (!Configuration::get('PAYLIKE_LIVE_SECRET_KEY')) {
+                $this->context->controller->errors['PAYLIKE_LIVE_SECRET_KEY'] = $this->l('Livemode App Key is required!');
+            }
+        }
+        //print_r($this->context->controller->errors);
+        //die(Configuration::get('PAYLIKE_TRANSACTION_MODE'));
+
+        return array(
+            'PAYLIKE_LANGUAGE_CODE' => Configuration::get('PAYLIKE_LANGUAGE_CODE'),
+            $language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE' => $payment_method_title,
+            'PAYLIKE_PAYMENT_METHOD_CREDITCARD_LOGO[]' => $creditCardLogo,
+            $language_code.'_PAYLIKE_PAYMENT_METHOD_DESC' => $payment_method_desc,
+            $language_code.'_PAYLIKE_POPUP_TITLE' => $popup_title,
+            'PAYLIKE_SHOW_POPUP_DESC' => Configuration::get('PAYLIKE_SHOW_POPUP_DESC'),
+            $language_code.'_PAYLIKE_POPUP_DESC' => $popup_description,
+            'PAYLIKE_TRANSACTION_MODE' => Configuration::get('PAYLIKE_TRANSACTION_MODE'),
+            'PAYLIKE_TEST_PUBLIC_KEY' => Configuration::get('PAYLIKE_TEST_PUBLIC_KEY'),
+            'PAYLIKE_TEST_SECRET_KEY' => Configuration::get('PAYLIKE_TEST_SECRET_KEY'),
+            'PAYLIKE_LIVE_PUBLIC_KEY' => Configuration::get('PAYLIKE_LIVE_PUBLIC_KEY'),
+            'PAYLIKE_LIVE_SECRET_KEY' => Configuration::get('PAYLIKE_LIVE_SECRET_KEY'),
+            'PAYLIKE_CHECKOUT_MODE' => Configuration::get('PAYLIKE_CHECKOUT_MODE'),
+            'PAYLIKE_ORDER_STATUS' => Configuration::get('PAYLIKE_ORDER_STATUS'),
+            'PAYLIKE_STATUS' => Configuration::get('PAYLIKE_STATUS'),
+        );
+    }
+
+    public function getModalForAddMoreLogo()
+    {
+        $this->context->smarty->assign(array(
+            'request_uri' => $this->context->link->getAdminLink('AdminOrders', false)
+        ));
+
+        return $this->display(__FILE__, 'views/templates/admin/modal.tpl');
+    }
+
+    public function hookHeader()
+    {
+        /*if(Configuration::get('PAYLIKE_STATUS') == 'enabled' && $this->context->controller->php_self == 'order') {
+            $this->context->controller->addJs('https://sdk.paylike.io/3.js');
+        }*/
+    }
+
+    public function hookPayment($params)
+    {
+        $language_code = Configuration::get('PAYLIKE_LANGUAGE_CODE');
+
+        //ensure paylike key is set
+        if (Configuration::get('PAYLIKE_TRANSACTION_MODE') == 'test') {
+            if (!Configuration::get('PAYLIKE_TEST_PUBLIC_KEY') || !Configuration::get('PAYLIKE_TEST_SECRET_KEY')) {
+                return false;
+            } else {
+                $PAYLIKE_PUBLIC_KEY = Configuration::get('PAYLIKE_TEST_PUBLIC_KEY');
+                Configuration::updateValue('PAYLIKE_SECRET_KEY', Configuration::get('PAYLIKE_TEST_SECRET_KEY'));
+            }
+        }
+
+        if (Configuration::get('PAYLIKE_TRANSACTION_MODE') == 'live') {
+            if (!Configuration::get('PAYLIKE_LIVE_PUBLIC_KEY') || !Configuration::get('PAYLIKE_LIVE_SECRET_KEY')) {
+                return false;
+            } else {
+                $PAYLIKE_PUBLIC_KEY = Configuration::get('PAYLIKE_LIVE_PUBLIC_KEY');
+                Configuration::updateValue('PAYLIKE_SECRET_KEY', Configuration::get('PAYLIKE_LIVE_SECRET_KEY'));
+            }
+        }
+
+        if (!Configuration::get('PAYLIKE_TEST_PUBLIC_KEY') && !Configuration::get('PAYLIKE_TEST_SECRET_KEY') && !Configuration::get('PAYLIKE_LIVE_PUBLIC_KEY') && !Configuration::get('PAYLIKE_LIVE_SECRET_KEY')) {
+            return false;
+        }
+
+        $products = $params['cart']->getProducts();
+        $products_array = array();
+        $products_label = array();
+        $p = 0;
+        foreach ($products as $product) {
+            $products_array[] = array(
+                $this->l('ID') => $product['id_product'],
+                $this->l('Name') => $product['name'],
+                $this->l('Quantity') => $product['cart_quantity']
+            );
+            $products_label[$p] = $product['quantity'].'x '.$product['name'];
+            $p++;
+        }
+
+        $payment_method_title = (!empty(Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE'))) ? Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_TITLE') : (!empty(Configuration::get('en_PAYLIKE_PAYMENT_METHOD_TITLE')) ? Configuration::get('en_PAYLIKE_PAYMENT_METHOD_TITLE') : '');
+        $payment_method_desc = (!empty(Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC'))) ? Configuration::get($language_code.'_PAYLIKE_PAYMENT_METHOD_DESC') : (!empty(Configuration::get('en_PAYLIKE_PAYMENT_METHOD_DESC')) ? Configuration::get('en_PAYLIKE_PAYMENT_METHOD_DESC') : '');
+        $popup_title = (!empty(Configuration::get($language_code.'_PAYLIKE_POPUP_TITLE'))) ? Configuration::get($language_code.'_PAYLIKE_POPUP_TITLE') : (!empty(Configuration::get('en_PAYLIKE_POPUP_TITLE')) ? Configuration::get('en_PAYLIKE_POPUP_TITLE') : '');
+
+        if (Configuration::get('PAYLIKE_SHOW_POPUP_DESC') == 'yes') {
+            $popup_description = (!empty(Configuration::get($language_code.'_PAYLIKE_POPUP_DESC'))) ? Configuration::get($language_code.'_PAYLIKE_POPUP_DESC') : (!empty(Configuration::get('en_PAYLIKE_POPUP_DESC')) ? Configuration::get('en_PAYLIKE_POPUP_DESC') : '');
+        } else {
+            $popup_description = implode(", & ", $products_label);
+        }
+
+        $cart = $this->context->cart;
+        $total = $cart->getOrderTotal(true, Cart::BOTH);
+        // echo "Total : ".$total;
+        //die();
+        $currency = new Currency((int)$params['cart']->id_currency);
+        $decimals = (int)$currency->decimals * _PS_PRICE_COMPUTE_PRECISION_;
+        $currency_multiplier = $this->getPaylikeCurrencyMultiplier($currency->iso_code);
+        $amount = ceil(Tools::ps_round($params['cart']->getOrderTotal(), $decimals) * $currency_multiplier); //paid amounts with 100 to handle
+        $currency_code = $currency->iso_code;
+        $customer = new Customer((int)$params['cart']->id_customer);
+        $name = $customer->firstname . ' ' . $customer->lastname;
+        $email = $customer->email;
+        $customer_address = new Address((int)($params['cart']->id_address_delivery));
+        $telephone = !empty($customer_address->phone) ? $customer_address->phone : !empty($customer_address->phone_mobile) ? $customer_address->phone_mobile : '';
+        $address = $customer_address->address1.', '.$customer_address->address2.', '.$customer_address->city.', '.$customer_address->country.' - '.$customer_address->postcode;
+        $ip = Tools::getRemoteAddr();
+        $locale = $this->context->language->iso_code;
+        $platform_version = _PS_VERSION_;
+        $ecommerce = 'prestashop';
+        $module_version = $this->version;
+
+        $redirect_url = $this->context->link->getModuleLink('paylikepayment', 'paymentreturn', array(), true, (int)$this->context->language->id);
+
+        if (Configuration::get('PS_REWRITING_SETTINGS') == 1) {
+            $redirect_url = Tools::strReplaceFirst('&', '?', $redirect_url);
+        }
+
+        $this->context->smarty->assign(array(
+            'PAYLIKE_PUBLIC_KEY'                => $PAYLIKE_PUBLIC_KEY,
+            'PS_SSL_ENABLED'                    => (Configuration::get('PS_SSL_ENABLED') ? 'https' : 'http'),
+            'http_host'                         => Tools::getHttpHost(),
+            'shop_name'                         => $this->context->shop->name,
+            'payment_method_title'              => $payment_method_title,
+            'payment_method_creditcard_logo'    => explode(',', Configuration::get('PAYLIKE_PAYMENT_METHOD_LOGO')),
+            'payment_method_desc'               => $payment_method_desc,
+            'paylike_status'                    => Configuration::get('PAYLIKE_STATUS'),
+            'popup_title'                       => $popup_title,
+            'popup_description'                 => $popup_description,
+            'currency_code'                     => $currency_code,
+            'amount'                            => $amount,
+            'id_cart'                           => Tools::jsonEncode($params['cart']->id),
+            'products'                          => Tools::jsonEncode($products_array),
+            'name'                              => $name,
+            'email'                             => $email,
+            'telephone'                         => $telephone,
+            'address'                           => $address,
+            'ip'                                => $ip,
+            'locale'                            => $locale,
+            'platform_version'                  => $platform_version,
+            'ecommerce'                         => $ecommerce,
+            'module_version'                    => $module_version,
+            'redirect_url'                      => $redirect_url,
+            'qry_str'                           => (Configuration::get('PS_REWRITING_SETTINGS')? '?' : '&'),
+            'base_uri'                          => __PS_BASE_URI__,
+            'this_path_paylike'                 => $this->_path,
+        ));
+        return $this->display(__FILE__, 'views/templates/hook/payment.tpl');
+    }
+
+    public function hookpaymentReturn($params)
+    {
+        if (!$this->active || !isset($params['objOrder']) || $params['objOrder']->module != $this->name) {
+            return false;
+        }
+
+        if (isset($params['objOrder']) && Validate::isLoadedObject($params['objOrder']) && isset($params['objOrder']->valid) && isset($params['objOrder']->reference)) {
+            $this->smarty->assign(
+                'paylike_order',
+                array(
+                    'id' => $params['objOrder']->id,
+                    'reference' => $params['objOrder']->reference,
+                    'valid' => $params['objOrder']->valid
+                )
+            );
+
+            return $this->display(__FILE__, 'views/templates/hook/payment-return.tpl');
+        }
+    }
+
+    public function storeTransactionID($paylike_id_transaction, $order_id, $total, $captured = 'NO')
+    {
+        $query = 'INSERT INTO '._DB_PREFIX_.'paylike_admin (`paylike_tid`, `order_id`, `payed_amount`, `payed_at`, `captured`) VALUES ("'.pSQL($paylike_id_transaction).'", "'.pSQL($order_id).'", "'.pSQL($total).'" , NOW(), "'.pSQL($captured).'")';
+
+        return Db::getInstance()->Execute($query);
+    }
+
+    public function updateTransactionID($paylike_id_transaction, $order_id, $fields = array())
+    {
+        if ($paylike_id_transaction && $order_id && !empty($fields)) {
+            $fieldsStr = '';
+            $fieldCount = count($fields);
+            $counter = 0;
+
+            foreach ($fields as $field => $value) {
+                $counter++;
+                $fieldsStr .= '`' . pSQL($field) . '` = "'.pSQL($value) . '"';
+
+                if ($counter < $fieldCount) {
+                    $fieldsStr .= ', ';
+                }
+            }
+            $query = 'UPDATE ' . _DB_PREFIX_ . 'paylike_admin SET ' . $fieldsStr . ' WHERE `paylike_tid`="' . pSQL($paylike_id_transaction) . '" AND `order_id`="' . pSQL($order_id) . '"';
+            return Db::getInstance()->Execute($query);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Return the number that should be used to compute cents from the total amount
+     *
+     * @param $currency_iso_code
+     *
+     * @return int|number
+     */
+    public function getPaylikeCurrencyMultiplier($currency_iso_code)
+    {
+        $currency = $this->getPaylikeCurrency($currency_iso_code);
+        if (isset($currency['exponent'])) {
+            return pow(10, $currency['exponent']);
+        } else {
+            return pow(10, 2);
+        }
+    }
+
+    public function getPaylikeCurrency($currency_iso_code)
+    {
+        $currencies = array(
+            'AED' =>
+                array(
+                    'code'     => 'AED',
+                    'currency' => 'United Arab Emirates dirham',
+                    'numeric'  => '784',
+                    'exponent' => 2,
+                ),
+            'AFN' =>
+                array(
+                    'code'     => 'AFN',
+                    'currency' => 'Afghan afghani',
+                    'numeric'  => '971',
+                    'exponent' => 2,
+                ),
+            'ALL' =>
+                array(
+                    'code'     => 'ALL',
+                    'currency' => 'Albanian lek',
+                    'numeric'  => '008',
+                    'exponent' => 2,
+                ),
+            'AMD' =>
+                array(
+                    'code'     => 'AMD',
+                    'currency' => 'Armenian dram',
+                    'numeric'  => '051',
+                    'exponent' => 2,
+                ),
+            'ANG' =>
+                array(
+                    'code'     => 'ANG',
+                    'currency' => 'Netherlands Antillean guilder',
+                    'numeric'  => '532',
+                    'exponent' => 2,
+                ),
+            'AOA' =>
+                array(
+                    'code'     => 'AOA',
+                    'currency' => 'Angolan kwanza',
+                    'numeric'  => '973',
+                    'exponent' => 2,
+                ),
+            'ARS' =>
+                array(
+                    'code'     => 'ARS',
+                    'currency' => 'Argentine peso',
+                    'numeric'  => '032',
+                    'exponent' => 2,
+                ),
+            'AUD' =>
+                array(
+                    'code'     => 'AUD',
+                    'currency' => 'Australian dollar',
+                    'numeric'  => '036',
+                    'exponent' => 2,
+                ),
+            'AWG' =>
+                array(
+                    'code'     => 'AWG',
+                    'currency' => 'Aruban florin',
+                    'numeric'  => '533',
+                    'exponent' => 2,
+                ),
+            'AZN' =>
+                array(
+                    'code'     => 'AZN',
+                    'currency' => 'Azerbaijani manat',
+                    'numeric'  => '944',
+                    'exponent' => 2,
+                ),
+            'BAM' =>
+                array(
+                    'code'     => 'BAM',
+                    'currency' => 'Bosnia and Herzegovina convertible mark',
+                    'numeric'  => '977',
+                    'exponent' => 2,
+                ),
+            'BBD' =>
+                array(
+                    'code'     => 'BBD',
+                    'currency' => 'Barbados dollar',
+                    'numeric'  => '052',
+                    'exponent' => 2,
+                ),
+            'BDT' =>
+                array(
+                    'code'     => 'BDT',
+                    'currency' => 'Bangladeshi taka',
+                    'numeric'  => '050',
+                    'exponent' => 2,
+                ),
+            'BGN' =>
+                array(
+                    'code'     => 'BGN',
+                    'currency' => 'Bulgarian lev',
+                    'numeric'  => '975',
+                    'exponent' => 2,
+                ),
+            'BHD' =>
+                array(
+                    'code'     => 'BHD',
+                    'currency' => 'Bahraini dinar',
+                    'numeric'  => '048',
+                    'exponent' => 3,
+                ),
+            'BIF' =>
+                array(
+                    'code'     => 'BIF',
+                    'currency' => 'Burundian franc',
+                    'numeric'  => '108',
+                    'exponent' => 0,
+                ),
+            'BMD' =>
+                array(
+                    'code'     => 'BMD',
+                    'currency' => 'Bermudian dollar',
+                    'numeric'  => '060',
+                    'exponent' => 2,
+                ),
+            'BND' =>
+                array(
+                    'code'     => 'BND',
+                    'currency' => 'Brunei dollar',
+                    'numeric'  => '096',
+                    'exponent' => 2,
+                ),
+            'BOB' =>
+                array(
+                    'code'     => 'BOB',
+                    'currency' => 'Boliviano',
+                    'numeric'  => '068',
+                    'exponent' => 2,
+                ),
+            'BRL' =>
+                array(
+                    'code'     => 'BRL',
+                    'currency' => 'Brazilian real',
+                    'numeric'  => '986',
+                    'exponent' => 2,
+                ),
+            'BSD' =>
+                array(
+                    'code'     => 'BSD',
+                    'currency' => 'Bahamian dollar',
+                    'numeric'  => '044',
+                    'exponent' => 2,
+                ),
+            'BTN' =>
+                array(
+                    'code'     => 'BTN',
+                    'currency' => 'Bhutanese ngultrum',
+                    'numeric'  => '064',
+                    'exponent' => 2,
+                ),
+            'BWP' =>
+                array(
+                    'code'     => 'BWP',
+                    'currency' => 'Botswana pula',
+                    'numeric'  => '072',
+                    'exponent' => 2,
+                ),
+            'BYR' =>
+                array(
+                    'code'     => 'BYR',
+                    'currency' => 'Belarusian ruble',
+                    'numeric'  => '974',
+                    'exponent' => 0,
+                ),
+            'BZD' =>
+                array(
+                    'code'     => 'BZD',
+                    'currency' => 'Belize dollar',
+                    'numeric'  => '084',
+                    'exponent' => 2,
+                ),
+            'CAD' =>
+                array(
+                    'code'     => 'CAD',
+                    'currency' => 'Canadian dollar',
+                    'numeric'  => '124',
+                    'exponent' => 2,
+                ),
+            'CDF' =>
+                array(
+                    'code'     => 'CDF',
+                    'currency' => 'Congolese franc',
+                    'numeric'  => '976',
+                    'exponent' => 2,
+                ),
+            'CHF' =>
+                array(
+                    'code'     => 'CHF',
+                    'currency' => 'Swiss franc',
+                    'numeric'  => '756',
+                    'funding'  => true,
+                    'exponent' => 2,
+                ),
+            'CLP' =>
+                array(
+                    'code'     => 'CLP',
+                    'currency' => 'Chilean peso',
+                    'numeric'  => '152',
+                    'exponent' => 2,
+                ),
+            'CNY' =>
+                array(
+                    'code'     => 'CNY',
+                    'currency' => 'Chinese yuan',
+                    'numeric'  => '156',
+                    'exponent' => 2,
+                ),
+            'COP' =>
+                array(
+                    'code'     => 'COP',
+                    'currency' => 'Colombian peso',
+                    'numeric'  => '170',
+                    'exponent' => 2,
+                ),
+            'CRC' =>
+                array(
+                    'code'     => 'CRC',
+                    'currency' => 'Costa Rican colon',
+                    'numeric'  => '188',
+                    'exponent' => 2,
+                ),
+            'CUP' =>
+                array(
+                    'code'     => 'CUP',
+                    'currency' => 'Cuban peso',
+                    'numeric'  => '192',
+                    'exponent' => 2,
+                ),
+            'CVE' =>
+                array(
+                    'code'     => 'CVE',
+                    'currency' => 'Cape Verde escudo',
+                    'numeric'  => '132',
+                    'exponent' => 2,
+                ),
+            'CZK' =>
+                array(
+                    'code'     => 'CZK',
+                    'currency' => 'Czech koruna',
+                    'numeric'  => '203',
+                    'exponent' => 2,
+                ),
+            'DJF' =>
+                array(
+                    'code'     => 'DJF',
+                    'currency' => 'Djiboutian franc',
+                    'numeric'  => '262',
+                    'exponent' => 0,
+                ),
+            'DKK' =>
+                array(
+                    'code'     => 'DKK',
+                    'currency' => 'Danish krone',
+                    'numeric'  => '208',
+                    'funding'  => true,
+                    'exponent' => 2,
+                ),
+            'DOP' =>
+                array(
+                    'code'     => 'DOP',
+                    'currency' => 'Dominican peso',
+                    'numeric'  => '214',
+                    'exponent' => 2,
+                ),
+            'DZD' =>
+                array(
+                    'code'     => 'DZD',
+                    'currency' => 'Algerian dinar',
+                    'numeric'  => '012',
+                    'exponent' => 2,
+                ),
+            'EGP' =>
+                array(
+                    'code'     => 'EGP',
+                    'currency' => 'Egyptian pound',
+                    'numeric'  => '818',
+                    'exponent' => 2,
+                ),
+            'ERN' =>
+                array(
+                    'code'     => 'ERN',
+                    'currency' => 'Eritrean nakfa',
+                    'numeric'  => '232',
+                    'exponent' => 2,
+                ),
+            'ETB' =>
+                array(
+                    'code'     => 'ETB',
+                    'currency' => 'Ethiopian birr',
+                    'numeric'  => '230',
+                    'exponent' => 2,
+                ),
+            'EUR' =>
+                array(
+                    'code'     => 'EUR',
+                    'currency' => 'Euro',
+                    'numeric'  => '978',
+                    'funding'  => true,
+                    'exponent' => 2,
+                ),
+            'FJD' =>
+                array(
+                    'code'     => 'FJD',
+                    'currency' => 'Fiji dollar',
+                    'numeric'  => '242',
+                    'exponent' => 2,
+                ),
+            'FKP' =>
+                array(
+                    'code'     => 'FKP',
+                    'currency' => 'Falkland Islands pound',
+                    'numeric'  => '238',
+                    'exponent' => 2,
+                ),
+            'GBP' =>
+                array(
+                    'code'     => 'GBP',
+                    'currency' => 'Pound sterling',
+                    'numeric'  => '826',
+                    'funding'  => true,
+                    'exponent' => 2,
+                ),
+            'GEL' =>
+                array(
+                    'code'     => 'GEL',
+                    'currency' => 'Georgian lari',
+                    'numeric'  => '981',
+                    'exponent' => 2,
+                ),
+            'GHS' =>
+                array(
+                    'code'     => 'GHS',
+                    'currency' => 'Ghanaian cedi',
+                    'numeric'  => '936',
+                    'exponent' => 2,
+                ),
+            'GIP' =>
+                array(
+                    'code'     => 'GIP',
+                    'currency' => 'Gibraltar pound',
+                    'numeric'  => '292',
+                    'exponent' => 2,
+                ),
+            'GMD' =>
+                array(
+                    'code'     => 'GMD',
+                    'currency' => 'Gambian dalasi',
+                    'numeric'  => '270',
+                    'exponent' => 2,
+                ),
+            'GNF' =>
+                array(
+                    'code'     => 'GNF',
+                    'currency' => 'Guinean franc',
+                    'numeric'  => '324',
+                    'exponent' => 0,
+                ),
+            'GTQ' =>
+                array(
+                    'code'     => 'GTQ',
+                    'currency' => 'Guatemalan quetzal',
+                    'numeric'  => '320',
+                    'exponent' => 2,
+                ),
+            'GYD' =>
+                array(
+                    'code'     => 'GYD',
+                    'currency' => 'Guyanese dollar',
+                    'numeric'  => '328',
+                    'exponent' => 2,
+                ),
+            'HKD' =>
+                array(
+                    'code'     => 'HKD',
+                    'currency' => 'Hong Kong dollar',
+                    'numeric'  => '344',
+                    'exponent' => 2,
+                ),
+            'HNL' =>
+                array(
+                    'code'     => 'HNL',
+                    'currency' => 'Honduran lempira',
+                    'numeric'  => '340',
+                    'exponent' => 2,
+                ),
+            'HRK' =>
+                array(
+                    'code'     => 'HRK',
+                    'currency' => 'Croatian kuna',
+                    'numeric'  => '191',
+                    'exponent' => 2,
+                ),
+            'HTG' =>
+                array(
+                    'code'     => 'HTG',
+                    'currency' => 'Haitian gourde',
+                    'numeric'  => '332',
+                    'exponent' => 2,
+                ),
+            'HUF' =>
+                array(
+                    'code'     => 'HUF',
+                    'currency' => 'Hungarian forint',
+                    'numeric'  => '348',
+                    'funding'  => true,
+                    'exponent' => 2,
+                ),
+            'IDR' =>
+                array(
+                    'code'     => 'IDR',
+                    'currency' => 'Indonesian rupiah',
+                    'numeric'  => '360',
+                    'exponent' => 2,
+                ),
+            'ILS' =>
+                array(
+                    'code'     => 'ILS',
+                    'currency' => 'Israeli new shekel',
+                    'numeric'  => '376',
+                    'exponent' => 2,
+                ),
+            'INR' =>
+                array(
+                    'code'     => 'INR',
+                    'currency' => 'Indian rupee',
+                    'numeric'  => '356',
+                    'exponent' => 2,
+                ),
+            'IQD' =>
+                array(
+                    'code'     => 'IQD',
+                    'currency' => 'Iraqi dinar',
+                    'numeric'  => '368',
+                    'exponent' => 3,
+                ),
+            'IRR' =>
+                array(
+                    'code'     => 'IRR',
+                    'currency' => 'Iranian rial',
+                    'numeric'  => '364',
+                    'exponent' => 2,
+                ),
+            'ISK' =>
+                array(
+                    'code'     => 'ISK',
+                    'currency' => 'Icelandic króna',
+                    'numeric'  => '352',
+                    'exponent' => 2,
+                ),
+            'JMD' =>
+                array(
+                    'code'     => 'JMD',
+                    'currency' => 'Jamaican dollar',
+                    'numeric'  => '388',
+                    'exponent' => 2,
+                ),
+            'JOD' =>
+                array(
+                    'code'     => 'JOD',
+                    'currency' => 'Jordanian dinar',
+                    'numeric'  => '400',
+                    'exponent' => 3,
+                ),
+            'JPY' =>
+                array(
+                    'code'     => 'JPY',
+                    'currency' => 'Japanese yen',
+                    'numeric'  => '392',
+                    'exponent' => 0,
+                ),
+            'KES' =>
+                array(
+                    'code'     => 'KES',
+                    'currency' => 'Kenyan shilling',
+                    'numeric'  => '404',
+                    'exponent' => 2,
+                ),
+            'KGS' =>
+                array(
+                    'code'     => 'KGS',
+                    'currency' => 'Kyrgyzstani som',
+                    'numeric'  => '417',
+                    'exponent' => 2,
+                ),
+            'KHR' =>
+                array(
+                    'code'     => 'KHR',
+                    'currency' => 'Cambodian riel',
+                    'numeric'  => '116',
+                    'exponent' => 2,
+                ),
+            'KMF' =>
+                array(
+                    'code'     => 'KMF',
+                    'currency' => 'Comoro franc',
+                    'numeric'  => '174',
+                    'exponent' => 0,
+                ),
+            'KPW' =>
+                array(
+                    'code'     => 'KPW',
+                    'currency' => 'North Korean won',
+                    'numeric'  => '408',
+                    'exponent' => 2,
+                ),
+            'KRW' =>
+                array(
+                    'code'     => 'KRW',
+                    'currency' => 'South Korean won',
+                    'numeric'  => '410',
+                    'exponent' => 0,
+                ),
+            'KWD' =>
+                array(
+                    'code'     => 'KWD',
+                    'currency' => 'Kuwaiti dinar',
+                    'numeric'  => '414',
+                    'exponent' => 3,
+                ),
+            'KYD' =>
+                array(
+                    'code'     => 'KYD',
+                    'currency' => 'Cayman Islands dollar',
+                    'numeric'  => '136',
+                    'exponent' => 2,
+                ),
+            'KZT' =>
+                array(
+                    'code'     => 'KZT',
+                    'currency' => 'Kazakhstani tenge',
+                    'numeric'  => '398',
+                    'exponent' => 2,
+                ),
+            'LAK' =>
+                array(
+                    'code'     => 'LAK',
+                    'currency' => 'Lao kip',
+                    'numeric'  => '418',
+                    'exponent' => 2,
+                ),
+            'LBP' =>
+                array(
+                    'code'     => 'LBP',
+                    'currency' => 'Lebanese pound',
+                    'numeric'  => '422',
+                    'exponent' => 2,
+                ),
+            'LKR' =>
+                array(
+                    'code'     => 'LKR',
+                    'currency' => 'Sri Lankan rupee',
+                    'numeric'  => '144',
+                    'exponent' => 2,
+                ),
+            'LRD' =>
+                array(
+                    'code'     => 'LRD',
+                    'currency' => 'Liberian dollar',
+                    'numeric'  => '430',
+                    'exponent' => 2,
+                ),
+            'LSL' =>
+                array(
+                    'code'     => 'LSL',
+                    'currency' => 'Lesotho loti',
+                    'numeric'  => '426',
+                    'exponent' => 2,
+                ),
+            'MAD' =>
+                array(
+                    'code'     => 'MAD',
+                    'currency' => 'Moroccan dirham',
+                    'numeric'  => '504',
+                    'exponent' => 2,
+                ),
+            'MDL' =>
+                array(
+                    'code'     => 'MDL',
+                    'currency' => 'Moldovan leu',
+                    'numeric'  => '498',
+                    'exponent' => 2,
+                ),
+            'MGA' =>
+                array(
+                    'code'     => 'MGA',
+                    'currency' => 'Malagasy ariary',
+                    'numeric'  => '969',
+                    'exponent' => 2,
+                ),
+            'MKD' =>
+                array(
+                    'code'     => 'MKD',
+                    'currency' => 'Macedonian denar',
+                    'numeric'  => '807',
+                    'exponent' => 2,
+                ),
+            'MMK' =>
+                array(
+                    'code'     => 'MMK',
+                    'currency' => 'Myanmar kyat',
+                    'numeric'  => '104',
+                    'exponent' => 2,
+                ),
+            'MNT' =>
+                array(
+                    'code'     => 'MNT',
+                    'currency' => 'Mongolian tögrög',
+                    'numeric'  => '496',
+                    'exponent' => 2,
+                ),
+            'MOP' =>
+                array(
+                    'code'     => 'MOP',
+                    'currency' => 'Macanese pataca',
+                    'numeric'  => '446',
+                    'exponent' => 2,
+                ),
+            'MRO' =>
+                array(
+                    'code'     => 'MRO',
+                    'currency' => 'Mauritanian ouguiya',
+                    'numeric'  => '478',
+                    'exponent' => 2,
+                ),
+            'MUR' =>
+                array(
+                    'code'     => 'MUR',
+                    'currency' => 'Mauritian rupee',
+                    'numeric'  => '480',
+                    'exponent' => 2,
+                ),
+            'MVR' =>
+                array(
+                    'code'     => 'MVR',
+                    'currency' => 'Maldivian rufiyaa',
+                    'numeric'  => '462',
+                    'exponent' => 2,
+                ),
+            'MWK' =>
+                array(
+                    'code'     => 'MWK',
+                    'currency' => 'Malawian kwacha',
+                    'numeric'  => '454',
+                    'exponent' => 2,
+                ),
+            'MXN' =>
+                array(
+                    'code'     => 'MXN',
+                    'currency' => 'Mexican peso',
+                    'numeric'  => '484',
+                    'exponent' => 2,
+                ),
+            'MYR' =>
+                array(
+                    'code'     => 'MYR',
+                    'currency' => 'Malaysian ringgit',
+                    'numeric'  => '458',
+                    'exponent' => 2,
+                ),
+            'MZN' =>
+                array(
+                    'code'     => 'MZN',
+                    'currency' => 'Mozambican metical',
+                    'numeric'  => '943',
+                    'exponent' => 2,
+                ),
+            'NAD' =>
+                array(
+                    'code'     => 'NAD',
+                    'currency' => 'Namibian dollar',
+                    'numeric'  => '516',
+                    'exponent' => 2,
+                ),
+            'NGN' =>
+                array(
+                    'code'     => 'NGN',
+                    'currency' => 'Nigerian naira',
+                    'numeric'  => '566',
+                    'exponent' => 2,
+                ),
+            'NIO' =>
+                array(
+                    'code'     => 'NIO',
+                    'currency' => 'Nicaraguan córdoba',
+                    'numeric'  => '558',
+                    'exponent' => 2,
+                ),
+            'NOK' =>
+                array(
+                    'code'     => 'NOK',
+                    'currency' => 'Norwegian krone',
+                    'numeric'  => '578',
+                    'funding'  => true,
+                    'exponent' => 2,
+                ),
+            'NPR' =>
+                array(
+                    'code'     => 'NPR',
+                    'currency' => 'Nepalese rupee',
+                    'numeric'  => '524',
+                    'exponent' => 2,
+                ),
+            'NZD' =>
+                array(
+                    'code'     => 'NZD',
+                    'currency' => 'New Zealand dollar',
+                    'numeric'  => '554',
+                    'exponent' => 2,
+                ),
+            'OMR' =>
+                array(
+                    'code'     => 'OMR',
+                    'currency' => 'Omani rial',
+                    'numeric'  => '512',
+                    'exponent' => 3,
+                ),
+            'PAB' =>
+                array(
+                    'code'     => 'PAB',
+                    'currency' => 'Panamanian balboa',
+                    'numeric'  => '590',
+                    'exponent' => 2,
+                ),
+            'PEN' =>
+                array(
+                    'code'     => 'PEN',
+                    'currency' => 'Peruvian Sol',
+                    'numeric'  => '604',
+                    'exponent' => 2,
+                ),
+            'PGK' =>
+                array(
+                    'code'     => 'PGK',
+                    'currency' => 'Papua New Guinean kina',
+                    'numeric'  => '598',
+                    'exponent' => 2,
+                ),
+            'PHP' =>
+                array(
+                    'code'     => 'PHP',
+                    'currency' => 'Philippine peso',
+                    'numeric'  => '608',
+                    'exponent' => 2,
+                ),
+            'PKR' =>
+                array(
+                    'code'     => 'PKR',
+                    'currency' => 'Pakistani rupee',
+                    'numeric'  => '586',
+                    'exponent' => 2,
+                ),
+            'PLN' =>
+                array(
+                    'code'     => 'PLN',
+                    'currency' => 'Polish złoty',
+                    'numeric'  => '985',
+                    'funding'  => true,
+                    'exponent' => 2,
+                ),
+            'PYG' =>
+                array(
+                    'code'     => 'PYG',
+                    'currency' => 'Paraguayan guaraní',
+                    'numeric'  => '600',
+                    'exponent' => 0,
+                ),
+            'QAR' =>
+                array(
+                    'code'     => 'QAR',
+                    'currency' => 'Qatari riyal',
+                    'numeric'  => '634',
+                    'exponent' => 2,
+                ),
+            'RON' =>
+                array(
+                    'code'     => 'RON',
+                    'currency' => 'Romanian leu',
+                    'numeric'  => '946',
+                    'funding'  => true,
+                    'exponent' => 2,
+                ),
+            'RSD' =>
+                array(
+                    'code'     => 'RSD',
+                    'currency' => 'Serbian dinar',
+                    'numeric'  => '941',
+                    'exponent' => 2,
+                ),
+            'RUB' =>
+                array(
+                    'code'     => 'RUB',
+                    'currency' => 'Russian ruble',
+                    'numeric'  => '643',
+                    'exponent' => 2,
+                ),
+            'RWF' =>
+                array(
+                    'code'     => 'RWF',
+                    'currency' => 'Rwandan franc',
+                    'numeric'  => '646',
+                    'exponent' => 0,
+                ),
+            'SAR' =>
+                array(
+                    'code'     => 'SAR',
+                    'currency' => 'Saudi riyal',
+                    'numeric'  => '682',
+                    'exponent' => 2,
+                ),
+            'SBD' =>
+                array(
+                    'code'     => 'SBD',
+                    'currency' => 'Solomon Islands dollar',
+                    'numeric'  => '090',
+                    'exponent' => 2,
+                ),
+            'SCR' =>
+                array(
+                    'code'     => 'SCR',
+                    'currency' => 'Seychelles rupee',
+                    'numeric'  => '690',
+                    'exponent' => 2,
+                ),
+            'SDG' =>
+                array(
+                    'code'     => 'SDG',
+                    'currency' => 'Sudanese pound',
+                    'numeric'  => '938',
+                    'exponent' => 2,
+                ),
+            'SEK' =>
+                array(
+                    'code'     => 'SEK',
+                    'currency' => 'Swedish krona',
+                    'numeric'  => '752',
+                    'funding'  => true,
+                    'exponent' => 2,
+                ),
+            'SGD' =>
+                array(
+                    'code'     => 'SGD',
+                    'currency' => 'Singapore dollar',
+                    'numeric'  => '702',
+                    'exponent' => 2,
+                ),
+            'SHP' =>
+                array(
+                    'code'     => 'SHP',
+                    'currency' => 'Saint Helena pound',
+                    'numeric'  => '654',
+                    'exponent' => 2,
+                ),
+            'SLL' =>
+                array(
+                    'code'     => 'SLL',
+                    'currency' => 'Sierra Leonean leone',
+                    'numeric'  => '694',
+                    'exponent' => 2,
+                ),
+            'SOS' =>
+                array(
+                    'code'     => 'SOS',
+                    'currency' => 'Somali shilling',
+                    'numeric'  => '706',
+                    'exponent' => 2,
+                ),
+            'SRD' =>
+                array(
+                    'code'     => 'SRD',
+                    'currency' => 'Surinamese dollar',
+                    'numeric'  => '968',
+                    'exponent' => 2,
+                ),
+            'STD' =>
+                array(
+                    'code'     => 'STD',
+                    'currency' => 'São Tomé and Príncipe dobra',
+                    'numeric'  => '678',
+                    'exponent' => 2,
+                ),
+            'SYP' =>
+                array(
+                    'code'     => 'SYP',
+                    'currency' => 'Syrian pound',
+                    'numeric'  => '760',
+                    'exponent' => 2,
+                ),
+            'SZL' =>
+                array(
+                    'code'     => 'SZL',
+                    'currency' => 'Swazi lilangeni',
+                    'numeric'  => '748',
+                    'exponent' => 2,
+                ),
+            'THB' =>
+                array(
+                    'code'     => 'THB',
+                    'currency' => 'Thai baht',
+                    'numeric'  => '764',
+                    'exponent' => 2,
+                ),
+            'TJS' =>
+                array(
+                    'code'     => 'TJS',
+                    'currency' => 'Tajikistani somoni',
+                    'numeric'  => '972',
+                    'exponent' => 2,
+                ),
+            'TMT' =>
+                array(
+                    'code'     => 'TMT',
+                    'currency' => 'Turkmenistani manat',
+                    'numeric'  => '934',
+                    'exponent' => 2,
+                ),
+            'TND' =>
+                array(
+                    'code'     => 'TND',
+                    'currency' => 'Tunisian dinar',
+                    'numeric'  => '788',
+                    'exponent' => 3,
+                ),
+            'TOP' =>
+                array(
+                    'code'     => 'TOP',
+                    'currency' => 'Tongan paʻanga',
+                    'numeric'  => '776',
+                    'exponent' => 2,
+                ),
+            'TRY' =>
+                array(
+                    'code'     => 'TRY',
+                    'currency' => 'Turkish lira',
+                    'numeric'  => '949',
+                    'exponent' => 2,
+                ),
+            'TTD' =>
+                array(
+                    'code'     => 'TTD',
+                    'currency' => 'Trinidad and Tobago dollar',
+                    'numeric'  => '780',
+                    'exponent' => 2,
+                ),
+            'TWD' =>
+                array(
+                    'code'     => 'TWD',
+                    'currency' => 'New Taiwan dollar',
+                    'numeric'  => '901',
+                    'exponent' => 2,
+                ),
+            'TZS' =>
+                array(
+                    'code'     => 'TZS',
+                    'currency' => 'Tanzanian shilling',
+                    'numeric'  => '834',
+                    'exponent' => 2,
+                ),
+            'UAH' =>
+                array(
+                    'code'     => 'UAH',
+                    'currency' => 'Ukrainian hryvnia',
+                    'numeric'  => '980',
+                    'exponent' => 2,
+                ),
+            'UGX' =>
+                array(
+                    'code'     => 'UGX',
+                    'currency' => 'Ugandan shilling',
+                    'numeric'  => '800',
+                    'exponent' => 2,
+                ),
+            'USD' =>
+                array(
+                    'code'     => 'USD',
+                    'currency' => 'United States dollar',
+                    'numeric'  => '840',
+                    'funding'  => true,
+                    'exponent' => 2,
+                ),
+            'UYU' =>
+                array(
+                    'code'     => 'UYU',
+                    'currency' => 'Uruguayan peso',
+                    'numeric'  => '858',
+                    'exponent' => 2,
+                ),
+            'UZS' =>
+                array(
+                    'code'     => 'UZS',
+                    'currency' => 'Uzbekistan som',
+                    'numeric'  => '860',
+                    'exponent' => 2,
+                ),
+            'VEF' =>
+                array(
+                    'code'     => 'VEF',
+                    'currency' => 'Venezuelan bolívar',
+                    'numeric'  => '937',
+                    'exponent' => 2,
+                ),
+            'VND' =>
+                array(
+                    'code'     => 'VND',
+                    'currency' => 'Vietnamese dong',
+                    'numeric'  => '704',
+                    'exponent' => 0,
+                ),
+            'VUV' =>
+                array(
+                    'code'     => 'VUV',
+                    'currency' => 'Vanuatu vatu',
+                    'numeric'  => '548',
+                    'exponent' => 0,
+                ),
+            'WST' =>
+                array(
+                    'code'     => 'WST',
+                    'currency' => 'Samoan tala',
+                    'numeric'  => '882',
+                    'exponent' => 2,
+                ),
+            'XAF' =>
+                array(
+                    'code'     => 'XAF',
+                    'currency' => 'CFA franc BEAC',
+                    'numeric'  => '950',
+                    'exponent' => 0,
+                ),
+            'XCD' =>
+                array(
+                    'code'     => 'XCD',
+                    'currency' => 'East Caribbean dollar',
+                    'numeric'  => '951',
+                    'exponent' => 2,
+                ),
+            'XOF' =>
+                array(
+                    'code'     => 'XOF',
+                    'currency' => 'CFA franc BCEAO',
+                    'numeric'  => '952',
+                    'exponent' => 0,
+                ),
+            'XPF' =>
+                array(
+                    'code'     => 'XPF',
+                    'currency' => 'CFP franc',
+                    'numeric'  => '953',
+                    'exponent' => 0,
+                ),
+            'YER' =>
+                array(
+                    'code'     => 'YER',
+                    'currency' => 'Yemeni rial',
+                    'numeric'  => '886',
+                    'exponent' => 2,
+                ),
+            'ZAR' =>
+                array(
+                    'code'     => 'ZAR',
+                    'currency' => 'South African rand',
+                    'numeric'  => '710',
+                    'exponent' => 2,
+                ),
+            'ZMK' =>
+                array(
+                    'code'     => 'ZMK',
+                    'currency' => 'Zambian kwacha',
+                    'numeric'  => '894',
+                    'exponent' => 2,
+                ),
+            'ZWL' =>
+                array(
+                    'code'     => 'ZWL',
+                    'currency' => 'Zimbabwean dollar',
+                    'numeric'  => '716',
+                    'exponent' => 2,
+                ),
+        );
+        if (isset($currencies[$currency_iso_code])) {
+            return $currencies[$currency_iso_code];
+        } else {
+            return null;
+        }
+    }
+
+    public function hookDisplayAdminOrder($params)
+    {
+        $id_order = $params['id_order'];
+        $order = new Order((int)$id_order);
+        if ($order->module == $this->name) {
+            $order_token = Tools::getAdminToken('AdminOrders'.(int)Tab::getIdFromClassName('AdminOrders').(int)$this->context->employee->id);
+            $payliketransaction = Db::getInstance()->getRow('SELECT * FROM '._DB_PREFIX_.'paylike_admin WHERE order_id = '.(int)$id_order);
+            $this->context->smarty->assign(array(
+                'ps_version' => _PS_VERSION_,
+                'id_order' => $id_order,
+                'order_token' => $order_token,
+                'payliketransaction' => $payliketransaction
+            ));
+            return $this->display(__FILE__, 'views/templates/hook/admin-order.tpl');
+        }
+    }
+
+    public function hookBackOfficeHeader()
+    {
+        if (Tools::getIsset('vieworder') && Tools::getIsset('id_order') && Tools::getIsset('paylike_action')) {
+            $paylike_action = Tools::getValue('paylike_action');
+            $id_order = (int)Tools::getValue('id_order');
+            $order = new Order((int)$id_order);
+            $payliketransaction = Db::getInstance()->getRow('SELECT * FROM '._DB_PREFIX_.'paylike_admin WHERE order_id = '.(int)$id_order);
+            $transactionid = $payliketransaction['paylike_tid'];
+            Paylike\Client::setKey(Configuration::get('PAYLIKE_SECRET_KEY'));
+            $fetch = Paylike\Transaction::fetch($transactionid);
+
+            switch ($paylike_action) {
+                case "capture":
+                    if ($payliketransaction['captured'] == 'YES') {
+                        $response = array(
+                            'warning' => 1,
+                            'message' => Tools::displayError('Transaction was already captured.You can only capture once.'),
+                        );
+                    } else if (isset($payliketransaction)) {
+                        $amount = (!empty($fetch['transaction']['pendingAmount'])) ? (int) $fetch['transaction']['pendingAmount'] : 0;
+                        $currency = new Currency((int)$order->id_currency);
+                        $currency_multiplier = $this->getPaylikeCurrencyMultiplier($currency->iso_code);
+                        if ($amount) {
+                            //Capture transaction
+                            $data = array(
+                                'currency' => $currency->iso_code,
+                                'amount' => $amount,
+                            );
+                            $capture = Paylike\Transaction::capture($transactionid, $data);
+
+                            if (is_array($capture) && !empty($capture['error']) && $capture['error'] == 1) {
+                                PrestaShopLogger::addLog($capture['message']);
+                                $response = array(
+                                    'error' => 1,
+                                    'message' => Tools::displayError($capture['message']),
+                                );
+                            } else {
+                                if (!empty($capture['transaction'])) {
+                                    //Update order status
+                                    //$status_paid = (int)Configuration::get('PS_OS_PAYMENT');
+                                    $status_paid = (int)Configuration::get('PAYLIKE_ORDER_STATUS');
+                                    $order->setCurrentState($status_paid, $this->context->employee->id);
+
+                                    //Update transaction details
+                                    $fields = array(
+                                        'captured' => 'YES',
+                                    );
+                                    $this->updateTransactionID($transactionid, (int)$id_order, $fields);
+
+                                    //Set message
+                                    $message = 'Trx ID: ' . $transactionid . '
+                                    Authorized Amount: ' . ($capture['transaction']['amount'] / $currency_multiplier) . '
+                                    Captured Amount: ' . ($capture['transaction']['capturedAmount'] / $currency_multiplier) . '
+                                    Order time: ' . $capture['transaction']['created'] . '
+                                    Currency code: ' . $capture['transaction']['currency'];
+
+                                    $msg = new Message();
+                                    $message = strip_tags($message, '<br>');
+                                    if (Validate::isCleanHtml($message)) {
+                                        $msg->message = $message;
+                                        $msg->id_cart = (int)$order->id_cart;
+                                        $msg->id_customer = (int)$order->id_customer;
+                                        $msg->id_order = (int)$order->id;
+                                        $msg->private = 1;
+                                        $msg->add();
+                                    }
+
+                                    //Set response
+                                    $response = array(
+                                        'success' => 1,
+                                        'message' => Tools::displayError('Transaction was successfully captured.'),
+                                    );
+                                } else {
+                                    if (!empty($capture[0]['message'])) {
+                                        $response = array(
+                                            'warning' => 1,
+                                            'message' => Tools::displayError($capture[0]['message']),
+                                        );
+                                    } else {
+                                        $response = array(
+                                            'error' => 1,
+                                            'message' => Tools::displayError('Oops! An error has occurred while capturing the payment.'),
+                                        );
+                                    }
+                                }
+                            }
+                        } else {
+                            $response = array(
+                                'error' => 1,
+                                'message' => Tools::displayError('The amount is not valid for capturing. Please double check the format.'),
+                            );
+                        }
+                    } else {
+                        $response = array(
+                            'error' => 1,
+                            'message' => Tools::displayError('The paylike transaction is not valid.'),
+                        );
+                    }
+
+                    break;
+
+                case "refund":
+                    if ($payliketransaction['captured'] == 'NO') {
+                        $response = array(
+                            'warning' => 1,
+                            'message' => Tools::displayError('You need to capture the transaction before refunding.'),
+                        );
+                    } else if (isset($payliketransaction)) {
+                        $paylike_amount_to_refund = Tools::getValue('paylike_amount_to_refund');
+                        $paylike_refund_reason = Tools::getValue('paylike_refund_reason');
+
+                        if (!Validate::isPrice($paylike_amount_to_refund)) {
+                            $response = array(
+                                'error' => 1,
+                                'message' => Tools::displayError('The amount is not valid for refunding. Please double check the format.'),
+                            );
+                        } else {
+                            $currency = new Currency((int)$order->id_currency);
+                            $currency_multiplier = $this->getPaylikeCurrencyMultiplier($currency->iso_code);
+                            //Refund transaction
+                            $amount = ceil(Tools::ps_round($paylike_amount_to_refund, 2) * $currency_multiplier);
+                            $data = array(
+                                'descriptor' => $paylike_refund_reason,
+                                'amount' => $amount,
+                            );
+                            $refund = Paylike\Transaction::refund($transactionid, $data);
+
+                            if (is_array($refund) && !empty($refund['error']) && $refund['error'] == 1) {
+                                PrestaShopLogger::addLog($refund['message']);
+                                $response = array(
+                                    'error' => 1,
+                                    'message' => Tools::displayError($refund['message']),
+                                );
+                            } else {
+                                if (!empty($refund['transaction'])) {
+                                    //Update order status
+                                    $order->setCurrentState((int)Configuration::get('PS_OS_REFUND'), $this->context->employee->id);
+
+                                    //Update transaction details
+                                    $fields = array(
+                                        'refunded_amount' => $payliketransaction['refunded_amount'] + $paylike_amount_to_refund,
+                                    );
+                                    $this->updateTransactionID($transactionid, (int)$id_order, $fields);
+
+                                    //Set message
+                                    $message = 'Trx ID: ' . $transactionid . '
+                                        Authorized Amount: ' . ($refund['transaction']['amount'] / $currency_multiplier) . '
+                                        Refunded Amount: ' . ($refund['transaction']['refundedAmount'] / $currency_multiplier) . '
+                                        Order time: ' . $refund['transaction']['created'] . '
+                                        Currency code: ' . $refund['transaction']['currency'];
+
+                                    $msg = new Message();
+                                    $message = strip_tags($message, '<br>');
+                                    if (Validate::isCleanHtml($message)) {
+                                        $msg->message = $message;
+                                        $msg->id_cart = (int)$order->id_cart;
+                                        $msg->id_customer = (int)$order->id_customer;
+                                        $msg->id_order = (int)$order->id;
+                                        $msg->private = 1;
+                                        $msg->add();
+                                    }
+
+                                    //Set response
+                                    $response = array(
+                                        'success' => 1,
+                                        'message' => Tools::displayError('The transaction was successfully refunded.'),
+                                    );
+                                } else {
+                                    if (!empty($refund[0]['message'])) {
+                                        $response = array(
+                                            'warning' => 1,
+                                            'message' => Tools::displayError($refund[0]['message']),
+                                        );
+                                    } else {
+                                        $response = array(
+                                            'error' => 1,
+                                            'message' => Tools::displayError('Oops! An error occurred during the refund operation.'),
+                                        );
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        $response = array(
+                            'error' => 1,
+                            'message' => Tools::displayError('The paylike transaction is not valid.'),
+                        );
+                    }
+
+                    break;
+
+                case "void":
+                    if ($payliketransaction['captured'] == 'YES') {
+                        $response = array(
+                            'warning' => 1,
+                            'message' => Tools::displayError('The transaction can no longer be voided. It has already been captured. The only allowed operation is refund.'),
+                        );
+                    } else if (isset($payliketransaction)) {
+                        //Void transaction
+                        $amount = (int) $fetch['transaction']['amount'] - $fetch['transaction']['refundedAmount'];
+                        $data = array(
+                            'amount' => $amount,
+                        );
+                        $void = Paylike\Transaction::void($transactionid, $data);
+
+                        if (is_array($void) && !empty($void['error']) && $void['error'] == 1) {
+                            PrestaShopLogger::addLog($void['message']);
+                            $response = array(
+                                'error' => 1,
+                                'message' => Tools::displayError($void['message']),
+                            );
+                        } else {
+                            if (!empty($void['transaction'])) {
+                                //Update order status
+                                $order->setCurrentState((int)Configuration::get('PS_OS_CANCEL'), $this->context->employee->id);
+                                
+                                $currency = new Currency((int)$order->id_currency);
+                                $currency_multiplier = $this->getPaylikeCurrencyMultiplier($currency->iso_code);
+                                //Set message
+                                $message = 'Trx ID: ' . $transactionid . '
+                                        Authorized Amount: ' . ($void['transaction']['amount'] / $currency_multiplier) . '
+                                        Refunded Amount: ' . ($void['transaction']['refundedAmount'] / $currency_multiplier) . '
+                                        Order time: ' . $void['transaction']['created'] . '
+                                        Currency code: ' . $void['transaction']['currency'];
+
+                                $msg = new Message();
+                                $message = strip_tags($message, '<br>');
+                                if (Validate::isCleanHtml($message)) {
+                                    $msg->message = $message;
+                                    $msg->id_cart = (int)$order->id_cart;
+                                    $msg->id_customer = (int)$order->id_customer;
+                                    $msg->id_order = (int)$order->id;
+                                    $msg->private = 1;
+                                    $msg->add();
+                                }
+
+                                //Set response
+                                $response = array(
+                                    'success' => 1,
+                                    'message' => Tools::displayError('The transaction has been successfully voided.'),
+                                );
+                            } else {
+                                if (!empty($void[0]['message'])) {
+                                    $response = array(
+                                        'warning' => 1,
+                                        'message' => Tools::displayError($void[0]['message']),
+                                    );
+                                } else {
+                                    $response = array(
+                                        'error' => 1,
+                                        'message' => Tools::displayError('Oops! An error occurred during the refund operation.'),
+                                    );
+                                }
+                            }
+                        }
+                    } else {
+                        $response = array(
+                            'error' => 1,
+                            'message' => Tools::displayError('The paylike transaction is not valid.'),
+                        );
+                    }
+
+                    break;
+            }
+
+            die(Tools::jsonEncode($response));
+        }
+
+        if (Tools::getIsset('upload_logo')) {
+            $logo_name = Tools::getValue('logo_name');
+
+            if (empty($logo_name)) {
+                $response = array(
+                    'status' => 0,
+                    'message' => 'The logo name is mandatory. Please add it.'
+                );
+                die(Tools::jsonEncode($response));
+            }
+
+            $logo_slug = Tools::strtolower(str_replace(' ', '-', $logo_name));
+            $sql = new DbQuery();
+            $sql->select('*');
+            $sql->from('paylike_logos', 'PL');
+            $sql->where('PL.slug = "'. pSQL($logo_slug) .'"');
+            $logos = Db::getInstance()->executes($sql);
+            if (!empty($logos)) {
+                $response = array(
+                    'status' => 0,
+                    'message' => 'This logo name already exists. Please change it and try again.'
+                );
+                die(Tools::jsonEncode($response));
+            }
+
+            if (!empty($_FILES['logo_file']['name'])) {
+                $target_dir = _PS_MODULE_DIR_.$this->name.'/views/img/';
+                $name = basename($_FILES['logo_file']["name"]);
+                $path_parts = pathinfo($name);
+                $extension = $path_parts['extension'];
+                $file_name = $logo_slug . '.' . $extension;
+                $target_file = $target_dir . basename($file_name);
+                $imageFileType = pathinfo($target_file, PATHINFO_EXTENSION);
+
+                /*$check = getimagesize($_FILES['logo_file']["tmp_name"]);
+                if($check === false) {
+                    $response = array(
+                        'status' => 0,
+                        'message' => 'File is not an image. Please upload JPG, JPEG, PNG or GIF file.'
+                    );
+                    die(Tools::jsonEncode($response));
+                }*/
+
+                // Check if file already exists
+                if (file_exists($target_file)) {
+                    $response = array(
+                        'status' => 0,
+                        'message' => 'Sorry, it seems that the file already exists. Please load a file with a different name.'
+                    );
+                    die(Tools::jsonEncode($response));
+                }
+
+                // Allow certain file formats
+                if ($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg"
+                    && $imageFileType != "gif" && $imageFileType != "svg" ) {
+                    $response = array(
+                        'status' => 0,
+                        'message' => 'Sorry, only JPG, JPEG, PNG, GIF & SVG files are allowed.'
+                    );
+                    die(Tools::jsonEncode($response));
+                }
+
+                if (move_uploaded_file($_FILES['logo_file']["tmp_name"], $target_file)) {
+                    $query = 'INSERT INTO '._DB_PREFIX_.'paylike_logos (`name`, `slug`, `file_name`, `default_logo`, `created_at`) VALUES ("'.pSQL($logo_name).'", "'.pSQL($logo_slug).'", "'.pSQL($file_name).'", 0, NOW())';
+                    if (Db::getInstance()->Execute($query)) {
+                        $response = array(
+                            'status' => 1,
+                            'message' => "The file " . pSQL(basename($file_name)) . " has been uploaded."
+                        );
+                        //Configuration::updateValue('PAYLIKE_PAYMENT_METHOD_CREDITCARD_LOGO', basename($file_name));
+                        die(Tools::jsonEncode($response));
+                    } else {
+                        unlink($target_file);
+                        $response = array(
+                            'status' => 0,
+                            'message' => "Oops! An error occurred while saving the logo."
+                        );
+                        die(Tools::jsonEncode($response));
+                    }
+                } else {
+                    $response = array(
+                        'status' => 0,
+                        'message' => 'Sorry, there was an error uploading your file. Please try again.'
+                    );
+                    die(Tools::jsonEncode($response));
+                }
+            } else {
+                $response = array(
+                    'status' => 0,
+                    'message' => 'Please select a file for upload.'
+                );
+                die(Tools::jsonEncode($response));
+            }
+        }
+
+        if (Tools::getIsset('change_language')) {
+            $language_code = (!empty(Tools::getvalue('lang_code'))) ? Tools::getvalue('lang_code') : Configuration::get('PAYLIKE_LANGUAGE_CODE');
+            Configuration::updateValue('PAYLIKE_LANGUAGE_CODE', $language_code);
+            $token = Tools::getAdminToken('AdminModules'.(int)Tab::getIdFromClassName('AdminModules').(int)$this->context->employee->id);
+            $link = $this->context->link->getAdminLink('AdminModules').'&token='.$token.'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
+            Tools::redirectAdmin($link);
+        }
+
+        if (Tools::getValue('configure') == $this->name) {
+            $this->context->controller->addCSS($this->_path . 'views/css/backoffice.css');
+            $this->context->controller->addJS($this->_path . 'views/js/backoffice.js');
+        }
+    }
+}
diff --git a/paylikepayment/views/css/backoffice.css b/paylikepayment/views/css/backoffice.css
new file mode 100644
index 0000000..6982764
--- /dev/null
+++ b/paylikepayment/views/css/backoffice.css
@@ -0,0 +1,16 @@
+.help-icon {
+    font-size: 14px;
+    float: right;
+    width: 14px;
+    height: 14px;
+    margin-top: 2px;
+    margin-left: 4px;
+    color: #1E91CF;
+}
+.creditcard-logo {
+    display: inline-block !important;
+}
+.add-more-btn {
+    display: inline-block !important;
+    text-decoration: none !important;
+}
\ No newline at end of file
diff --git a/paylikepayment/views/css/index.php b/paylikepayment/views/css/index.php
new file mode 100644
index 0000000..086d6b5
--- /dev/null
+++ b/paylikepayment/views/css/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
diff --git a/paylikepayment/views/img/index.php b/paylikepayment/views/img/index.php
new file mode 100644
index 0000000..086d6b5
--- /dev/null
+++ b/paylikepayment/views/img/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
diff --git a/paylikepayment/logos/mastercard-maestro.svg b/paylikepayment/views/img/mastercard-maestro.svg
similarity index 100%
rename from paylikepayment/logos/mastercard-maestro.svg
rename to paylikepayment/views/img/mastercard-maestro.svg
diff --git a/paylikepayment/logos/mastercard.svg b/paylikepayment/views/img/mastercard.svg
similarity index 100%
rename from paylikepayment/logos/mastercard.svg
rename to paylikepayment/views/img/mastercard.svg
diff --git a/paylikepayment/logos/svg-test-2.svg b/paylikepayment/views/img/svg-test-2.svg
similarity index 100%
rename from paylikepayment/logos/svg-test-2.svg
rename to paylikepayment/views/img/svg-test-2.svg
diff --git a/paylikepayment/logos/test-svg.svg b/paylikepayment/views/img/test-svg.svg
similarity index 100%
rename from paylikepayment/logos/test-svg.svg
rename to paylikepayment/views/img/test-svg.svg
diff --git a/paylikepayment/logos/visa-electron.svg b/paylikepayment/views/img/visa-electron.svg
similarity index 100%
rename from paylikepayment/logos/visa-electron.svg
rename to paylikepayment/views/img/visa-electron.svg
diff --git a/paylikepayment/logos/visa.svg b/paylikepayment/views/img/visa.svg
similarity index 100%
rename from paylikepayment/logos/visa.svg
rename to paylikepayment/views/img/visa.svg
diff --git a/paylikepayment/views/index.php b/paylikepayment/views/index.php
new file mode 100644
index 0000000..086d6b5
--- /dev/null
+++ b/paylikepayment/views/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
diff --git a/paylikepayment/views/js/backoffice.js b/paylikepayment/views/js/backoffice.js
new file mode 100644
index 0000000..372ea29
--- /dev/null
+++ b/paylikepayment/views/js/backoffice.js
@@ -0,0 +1,76 @@
+/**
+ *
+ * @author    DerikonDevelopment <ionut@derikon.com>
+ * @copyright Copyright (c) permanent, DerikonDevelopment
+ * @license   Addons PrestaShop license limitation
+ * @version   1.0.0
+ * @link      http://www.derikon.com/
+ *
+ */
+
+$(document).ready(function(){
+    var html = '<a href="#" class="add-more-btn" data-toggle="modal" data-target="#logoModal"><i class="process-icon-plus" data-toggle="tooltip" title="Add your own logo"></i></a>';
+    $('select[name="PAYLIKE_PAYMENT_METHOD_CREDITCARD_LOGO[]"]').parent('div').append(html);
+    $('[data-toggle="tooltip"]').tooltip();
+
+    $('.paylike-config').each(function(index, item){
+        if( $(item).hasClass('has-error') ) {
+            $(item).parents('.form-group').addClass('has-error');
+        }
+    });
+
+    $('.paylike-language').bind('change', paylikeLanguageChange);
+
+    $('#logo_form').on('submit', ajaxSaveLogo);
+});
+
+function paylikeLanguageChange(e){
+    var lang_code = $(e.currentTarget).val();
+    window.location = admin_orders_uri + "&change_language&lang_code="+lang_code;
+}
+
+function ajaxSaveLogo(e) {
+    e.preventDefault();
+    $('#save_logo').button('loading');
+    $('#alert').html("").hide();
+    var url = $('#logo_form').attr('action');
+    console.log(url);
+    //grab all form data
+    var formData = new FormData($(this)[0]);
+    $.ajax({
+        url : url,
+        type : 'POST',
+        data : formData,
+        dataType : 'json',
+        async: false,
+        cache: false,
+        contentType: false,
+        processData: false,
+        success : function(response) {
+            console.log(response);
+            $('#save_logo').button('reset');
+            if(response.status == 0) {
+                var html = "<strong>Error !</strong> " + response.message;
+                $('#alert').html(html)
+                    .show()
+                    .removeClass('alert-success')
+                    .removeClass('alert-danger')
+                    .addClass('alert-danger');
+            } else if(response.status == 1) {
+                var html = "<strong>Seccess !</strong> " + response.message;
+                $('#alert').html(html)
+                    .show()
+                    .removeClass('alert-success')
+                    .removeClass('alert-danger')
+                    .addClass('alert-success');
+
+                window.location = window.location;
+            }
+        },
+        error : function(response) {
+            console.log(response);
+        },
+    });
+
+    return false;
+}
\ No newline at end of file
diff --git a/paylikepayment/views/js/index.php b/paylikepayment/views/js/index.php
new file mode 100644
index 0000000..086d6b5
--- /dev/null
+++ b/paylikepayment/views/js/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
diff --git a/paylikepayment/views/templates/admin/index.php b/paylikepayment/views/templates/admin/index.php
new file mode 100644
index 0000000..086d6b5
--- /dev/null
+++ b/paylikepayment/views/templates/admin/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
diff --git a/paylikepayment/views/templates/admin/modal.tpl b/paylikepayment/views/templates/admin/modal.tpl
new file mode 100644
index 0000000..e6aba25
--- /dev/null
+++ b/paylikepayment/views/templates/admin/modal.tpl
@@ -0,0 +1,40 @@
+{**
+ *
+ * @author    DerikonDevelopment <ionut@derikon.com>
+ * @copyright Copyright (c) permanent, DerikonDevelopment
+ * @license   Addons PrestaShop license limitation
+ * @version   1.0.0
+ * @link      http://www.derikon.com/
+ *
+ *}
+
+<script type="text/javascript">
+    var admin_orders_uri = '{$request_uri}';
+</script>
+<div id="logoModal" class="modal fade" role="dialog">
+    <div class="modal-dialog">
+        <!-- Modal content-->
+        <div class="modal-content">
+            <form id="logo_form" name="logo_form" action="{$request_uri}&upload_logo" method="post" enctype="multipart/form-data">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    <h4 class="modal-title">{l s='New logo' mod='paylikepayment'}</h4>
+                </div>
+                <div class="modal-body">
+                    <div class="alert alert-success" id="alert" style="display:none;"></div>
+                    <div class="form-group">
+                        <label for="logo_name" class="control-label required">{l s='Logo name' mod='paylikepayment'}Logo name</label>
+                        <input type="text" class="form-control" id="logo_name" name="logo_name" placeholder="{l s='Input logo\'s name' mod='paylikepayment'}">
+                    </div>
+                    <div class="form-group">
+                        <input type="file" class="form-control" id="logo_file" name="logo_file">
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" class="btn btn-default" id="save_logo" data-loading-text="{l s='Saving the logo ...' mod='paylikepayment'}">{l s='Save' mod='paylikepayment'}</button>
+                    <button type="button" class="btn btn-danger" data-dismiss="modal">{l s='Close' mod='paylikepayment'}</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/paylikepayment/views/templates/front/index.php b/paylikepayment/views/templates/front/index.php
index 2d4b752..086d6b5 100644
--- a/paylikepayment/views/templates/front/index.php
+++ b/paylikepayment/views/templates/front/index.php
@@ -1,35 +1,35 @@
-<?php
-/*
-* 2007-2015 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2015 PrestaShop SA
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
-exit;
+<?php
+/*
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
diff --git a/paylikepayment/views/templates/front/payment_error.tpl b/paylikepayment/views/templates/front/payment_error.tpl
index f577d8a..2e93ae2 100644
--- a/paylikepayment/views/templates/front/payment_error.tpl
+++ b/paylikepayment/views/templates/front/payment_error.tpl
@@ -1,18 +1,18 @@
-{*
-* Team Paylike
-*
-*  @author     Team Paylike
-*  @copyright  Team Paylike
-*  @license    MIT license: https://opensource.org/licenses/MIT
-*}
-
-{if $paylike_order_error == 1}
-	<div class="error alert alert-danger">
-		{l s='Unfortunately, an error occurred while processing the transaction.' mod='paylikepayment'}<br /><br />
-		{if !empty($paylike_error_message) }
-			{l s='ERROR : "' mod='paylikepayment'}{l s={$paylike_error_message} mod='paylikepayment'}{l s='"' mod='paylikepayment'}<br /><br />
-		{/if}
-		{l s='Your order cannot be created. If you think this is an error, feel free to contact our' mod='paylikepayment'}
-		<a href="{$link->getPageLink('contact', true)|escape:'htmlall':'UTF-8'}">{l s='customer support team' mod='paylikepayment'}</a>
-	</div>
-{/if}
+{*
+* Team Paylike
+*
+*  @author     Team Paylike
+*  @copyright  Team Paylike
+*  @license    MIT license: https://opensource.org/licenses/MIT
+*}
+
+{if $paylike_order_error == 1}
+	<div class="error alert alert-danger">
+		{l s='Unfortunately, an error occurred while processing the transaction.' mod='paylikepayment'}<br /><br />
+		{if !empty($paylike_error_message) }
+			{l s='ERROR : "' mod='paylikepayment'}{l s={$paylike_error_message} mod='paylikepayment'}{l s='"' mod='paylikepayment'}<br /><br />
+		{/if}
+		{l s='Your order cannot be created. If you think this is an error, feel free to contact our' mod='paylikepayment'}
+		<a href="{$link->getPageLink('contact', true)|escape:'htmlall':'UTF-8'}">{l s='customer support team' mod='paylikepayment'}</a>
+	</div>
+{/if}
diff --git a/paylikepayment/views/templates/hook/admin-order.tpl b/paylikepayment/views/templates/hook/admin-order.tpl
index a004c2d..78632fb 100644
--- a/paylikepayment/views/templates/hook/admin-order.tpl
+++ b/paylikepayment/views/templates/hook/admin-order.tpl
@@ -1,160 +1,160 @@
-{*
-* Team Paylike
-*
-*  @author     Team Paylike
-*  @copyright  Team Paylike
-*  @license    MIT license: https://opensource.org/licenses/MIT
-*}
-
-<script type="text/javascript">
-$(document).ready(function() {
-	var appendEl;
-	appendEl = $('select[name=id_order_state]').parents('form').after($('<div/>'));
-	$("#paylike").appendTo(appendEl);
-
-    $('#paylike_action').bind('change', paylikeActionChangeHandler);
-    $('#submit_paylike_action').bind('click', submitPaylikeActionClickHandler);
-});
-
-    function paylikeActionChangeHandler(e) {
-        var option_value = $('#paylike_action option:selected').val();
-        if(option_value == 'refund') {
-            $('input[name="paylike_amount_to_refund"]').show();
-            $('input[name="paylike_refund_reason"]').show();
-        } else {
-            $('input[name="paylike_amount_to_refund"]').hide();
-            $('input[name="paylike_refund_reason"]').hide();
-        }
-    }
-
-    function submitPaylikeActionClickHandler(e) {
-        e.preventDefault();
-        $('#alert').hide();
-        var paylike_action = $('#paylike_action').val();
-        var errorFlag = false;
-
-        if(paylike_action == '') {
-            var html = '<strong>Warning!</strong> Please select an action.';
-            errorFlag = true;
-
-        } else if(paylike_action == 'refund') {
-            var refund_amount = $('input[name="paylike_amount_to_refund"]').val();
-            var refund_reason = $('input[name="paylike_refund_reason"]').val();
-            var html = '';
-
-            if(refund_amount == '' && refund_reason == '') {
-                var html = '<strong>Warning!</strong> Please give both refund amount and refund reason.';
-                errorFlag = true;
-
-            } else if(refund_amount == '') {
-                var html = '<strong>Warning!</strong> Please give refund amount.';
-                errorFlag = true;
-
-            } else if(refund_reason == '') {
-                var html = '<strong>Warning!</strong> Please give refund reason.';
-                errorFlag = true;
-            }
-        }
-
-        if(errorFlag) {
-            $('#alert').html(html);
-            $('#alert').removeClass('alert-success')
-                    .removeClass('alert-info')
-                    .removeClass('alert-warning')
-                    .removeClass('alert-danger')
-                    .addClass('alert-warning');
-            $('#alert').show();
-            return false;
-        }
-
-        //Make an AJAX call for Paylike action
-        $(e.currentTarget).button('loading');
-        var url = $('#paylike_form').attr('action');
-        $.ajax({
-            url: url,
-            type: 'POST',
-            data: $('#paylike_form').serializeArray(),
-            dataType: 'JSON',
-            success: function(response) {
-                $(e.currentTarget).button('reset');
-                //console.log(response);
-
-                if(response.hasOwnProperty('success') && response.hasOwnProperty('message')) {
-                    var message = response.message;
-                    var html = '<strong>Success!</strong> ' + message;
-                    $('#alert').html(html);
-                    $('#alert').removeClass('alert-success')
-                            .removeClass('alert-info')
-                            .removeClass('alert-warning')
-                            .removeClass('alert-danger')
-                            .addClass('alert-success');
-                    $('#alert').show();
-                    window.location = window.location;
-
-                } else if(response.hasOwnProperty('warning') && response.hasOwnProperty('message')) {
-                    var message = response.message;
-                    var html = '<strong>Warning!</strong> ' + message;
-                    $('#alert').html(html);
-                    $('#alert').removeClass('alert-success')
-                            .removeClass('alert-info')
-                            .removeClass('alert-warning')
-                            .removeClass('alert-danger')
-                            .addClass('alert-warning');
-                    $('#alert').show();
-
-                } else if(response.hasOwnProperty('error') && response.hasOwnProperty('message')) {
-                    var message = response.message;
-                    var html = '<strong>Error!</strong> ' + message;
-                    $('#alert').html(html);
-                    $('#alert').removeClass('alert-success')
-                            .removeClass('alert-info')
-                            .removeClass('alert-warning')
-                            .removeClass('alert-danger')
-                            .addClass('alert-danger');
-                    $('#alert').show();
-                }
-            },
-            error: function(response) {
-                console.log(response);
-            }
-        });
-
-    }
-</script>
-<div id="paylike" class="row" style="margin-top:5%;">
-	<div class="panel">
-		<form id="paylike_form" action="{$link->getAdminLink('AdminOrders', false)|escape:'htmlall':'UTF-8'}&amp;id_order={$id_order|escape:'htmlall':'UTF-8'}&amp;vieworder&amp;token={$order_token|escape:'htmlall':'UTF-8'}" method="post">
-			<fieldset {if $ps_version < 1.5}style="width: 400px;"{/if}>
-				<legend class="panel-heading">
-                    <img src="../img/admin/money.gif" alt="" />{l s='Process Paylike Payment' mod='paylikepayment'}
-                </legend>
-                <div id="alert" class="alert" style="display: none;"></div>
-				<div class="form-group margin-form">
-					<select class="form-control" id="paylike_action" name="paylike_action">
-						<option value="">{l s='-- Select Paylike Action --' mod='paylikepayment'}</option>
-                        {if $payliketransaction['captured'] == "NO"}
-						    <option value="capture">{l s='Capture' mod='paylikepayment'}</option>
-                        {/if}
-						<option value="refund">{l s='Refund' mod='paylikepayment'}</option>
-                        {if $payliketransaction['captured'] == "NO"}
-						    <option value="void">{l s='Void' mod='paylikepayment'}</option>
-                        {/if}
-					</select>
-				</div>
-
-				<div class="form-group margin-form">
-					<div class="col-md-6">
-						<input class="form-control" name="paylike_amount_to_refund" style="display: none;" placeholder="{l s='Amount to refund' mod='paylikepayment'}" type="text"/>
-					</div>
-					<div class="col-md-6">
-						<input class="form-control" name="paylike_refund_reason" style="display: none;" placeholder="{l s='Refund reason' mod='paylikepayment'}" type="text"/>
-					</div>
-				</div>
-
-				<div class="form-group margin-form">
-					<input class="pull-right btn btn-default" name="submit_paylike_action" id="submit_paylike_action" type="submit" class="btn btn-primary" value="{l s='Process Action' mod='paylikepayment'}"/>
-				</div>
-			</fieldset>
-		</form>
-	</div>
-</div>
+{*
+* Team Paylike
+*
+*  @author     Team Paylike
+*  @copyright  Team Paylike
+*  @license    MIT license: https://opensource.org/licenses/MIT
+*}
+
+<script type="text/javascript">
+$(document).ready(function() {
+	var appendEl;
+	appendEl = $('select[name=id_order_state]').parents('form').after($('<div/>'));
+	$("#paylike").appendTo(appendEl);
+
+    $('#paylike_action').bind('change', paylikeActionChangeHandler);
+    $('#submit_paylike_action').bind('click', submitPaylikeActionClickHandler);
+});
+
+    function paylikeActionChangeHandler(e) {
+        var option_value = $('#paylike_action option:selected').val();
+        if(option_value == 'refund') {
+            $('input[name="paylike_amount_to_refund"]').show();
+            $('input[name="paylike_refund_reason"]').show();
+        } else {
+            $('input[name="paylike_amount_to_refund"]').hide();
+            $('input[name="paylike_refund_reason"]').hide();
+        }
+    }
+
+    function submitPaylikeActionClickHandler(e) {
+        e.preventDefault();
+        $('#alert').hide();
+        var paylike_action = $('#paylike_action').val();
+        var errorFlag = false;
+
+        if(paylike_action == '') {
+            var html = '<strong>Warning!</strong> Please select an action.';
+            errorFlag = true;
+
+        } else if(paylike_action == 'refund') {
+            var refund_amount = $('input[name="paylike_amount_to_refund"]').val();
+            var refund_reason = $('input[name="paylike_refund_reason"]').val();
+            var html = '';
+
+            if(refund_amount == '' && refund_reason == '') {
+                var html = '<strong>Warning!</strong> Refund requires an amount and an refund reason.';
+                errorFlag = true;
+
+            } else if(refund_amount == '') {
+                var html = '<strong>Warning!</strong> Please provide the refund amount.';
+                errorFlag = true;
+
+            } else if(refund_reason == '') {
+                var html = '<strong>Warning!</strong> Please provide the refund reason.';
+                errorFlag = true;
+            }
+        }
+
+        if(errorFlag) {
+            $('#alert').html(html);
+            $('#alert').removeClass('alert-success')
+                    .removeClass('alert-info')
+                    .removeClass('alert-warning')
+                    .removeClass('alert-danger')
+                    .addClass('alert-warning');
+            $('#alert').show();
+            return false;
+        }
+
+        //Make an AJAX call for Paylike action
+        $(e.currentTarget).button('loading');
+        var url = $('#paylike_form').attr('action');
+        $.ajax({
+            url: url,
+            type: 'POST',
+            data: $('#paylike_form').serializeArray(),
+            dataType: 'JSON',
+            success: function(response) {
+                $(e.currentTarget).button('reset');
+                //console.log(response);
+
+                if(response.hasOwnProperty('success') && response.hasOwnProperty('message')) {
+                    var message = response.message;
+                    var html = '<strong>Success!</strong> ' + message;
+                    $('#alert').html(html);
+                    $('#alert').removeClass('alert-success')
+                            .removeClass('alert-info')
+                            .removeClass('alert-warning')
+                            .removeClass('alert-danger')
+                            .addClass('alert-success');
+                    $('#alert').show();
+                    window.location = window.location;
+
+                } else if(response.hasOwnProperty('warning') && response.hasOwnProperty('message')) {
+                    var message = response.message;
+                    var html = '<strong>Warning!</strong> ' + message;
+                    $('#alert').html(html);
+                    $('#alert').removeClass('alert-success')
+                            .removeClass('alert-info')
+                            .removeClass('alert-warning')
+                            .removeClass('alert-danger')
+                            .addClass('alert-warning');
+                    $('#alert').show();
+
+                } else if(response.hasOwnProperty('error') && response.hasOwnProperty('message')) {
+                    var message = response.message;
+                    var html = '<strong>Error!</strong> ' + message;
+                    $('#alert').html(html);
+                    $('#alert').removeClass('alert-success')
+                            .removeClass('alert-info')
+                            .removeClass('alert-warning')
+                            .removeClass('alert-danger')
+                            .addClass('alert-danger');
+                    $('#alert').show();
+                }
+            },
+            error: function(response) {
+                console.log(response);
+            }
+        });
+
+    }
+</script>
+<div id="paylike" class="row" style="margin-top:5%;">
+	<div class="panel">
+		<form id="paylike_form" action="{$link->getAdminLink('AdminOrders', false)|escape:'htmlall':'UTF-8'}&amp;id_order={$id_order|escape:'htmlall':'UTF-8'}&amp;vieworder&amp;token={$order_token|escape:'htmlall':'UTF-8'}" method="post">
+			<fieldset {if $ps_version < 1.5}style="width: 400px;"{/if}>
+				<legend class="panel-heading">
+                    <img src="../img/admin/money.gif" alt="" />{l s='Process Paylike Payment' mod='paylikepayment'}
+                </legend>
+                <div id="alert" class="alert" style="display: none;"></div>
+				<div class="form-group margin-form">
+					<select class="form-control" id="paylike_action" name="paylike_action">
+						<option value="">{l s='-- Select Paylike Action --' mod='paylikepayment'}</option>
+                        {if $payliketransaction['captured'] == "NO"}
+						    <option value="capture">{l s='Capture' mod='paylikepayment'}</option>
+                        {/if}
+						<option value="refund">{l s='Refund' mod='paylikepayment'}</option>
+                        {if $payliketransaction['captured'] == "NO"}
+						    <option value="void">{l s='Void' mod='paylikepayment'}</option>
+                        {/if}
+					</select>
+				</div>
+
+				<div class="form-group margin-form">
+					<div class="col-md-6">
+						<input class="form-control" name="paylike_amount_to_refund" style="display: none;" placeholder="{l s='Input refund amount' mod='paylikepayment'}" type="text"/>
+					</div>
+					<div class="col-md-6">
+						<input class="form-control" name="paylike_refund_reason" style="display: none;" placeholder="{l s='Input refund reason' mod='paylikepayment'}" type="text"/>
+					</div>
+				</div>
+
+				<div class="form-group margin-form">
+					<input class="pull-right btn btn-default" name="submit_paylike_action" id="submit_paylike_action" type="submit" class="btn btn-primary" value="{l s='Process Action' mod='paylikepayment'}"/>
+				</div>
+			</fieldset>
+		</form>
+	</div>
+</div>
diff --git a/paylikepayment/views/templates/hook/index.php b/paylikepayment/views/templates/hook/index.php
index 2d4b752..086d6b5 100644
--- a/paylikepayment/views/templates/hook/index.php
+++ b/paylikepayment/views/templates/hook/index.php
@@ -1,35 +1,35 @@
-<?php
-/*
-* 2007-2015 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2015 PrestaShop SA
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
-exit;
+<?php
+/*
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
diff --git a/paylikepayment/views/templates/hook/payment-return.tpl b/paylikepayment/views/templates/hook/payment-return.tpl
index 35cf812..fe76981 100644
--- a/paylikepayment/views/templates/hook/payment-return.tpl
+++ b/paylikepayment/views/templates/hook/payment-return.tpl
@@ -1,19 +1,19 @@
-{*
-* Team Paylike
-*
-*  @author     Team Paylike
-*  @copyright  Team Paylike
-*  @license    MIT license: https://opensource.org/licenses/MIT
-*}
-
-{if $paylike_order.valid == 1}
-	<div class="conf alert alert-success">
-		{l s='Congratulations, your payment has been approved' mod='paylikepayment'}</div>
-	</div>
-{else}
-	<div class="error alert alert-danger">
-		{l s='Unfortunately, an error occurred while processing the transaction.' mod='paylikepayment'}<br /><br />
-		{l s='We noticed a problem with your order. If you think this is an error, feel free to contact our' mod='paylikepayment'}
-		<a href="{$link->getPageLink('contact', true)|escape:'htmlall':'UTF-8'}">{l s='customer support team' mod='paylikepayment'}</a>.
-	</div>
-{/if}
+{*
+* Team Paylike
+*
+*  @author     Team Paylike
+*  @copyright  Team Paylike
+*  @license    MIT license: https://opensource.org/licenses/MIT
+*}
+
+{if $paylike_order.valid == 1}
+	<div class="conf alert alert-success">
+		{l s='Congratulations, your payment has been approved' mod='paylikepayment'}</div>
+	</div>
+{else}
+	<div class="error alert alert-danger">
+		{l s='Unfortunately, an error occurred while processing the transaction.' mod='paylikepayment'}<br /><br />
+		{l s='We noticed a problem with your order. If you think this is an error, feel free to contact our' mod='paylikepayment'}
+		<a href="{$link->getPageLink('contact', true)|escape:'htmlall':'UTF-8'}">{l s='customer support team' mod='paylikepayment'}</a>.
+	</div>
+{/if}
diff --git a/paylikepayment/views/templates/hook/payment.tpl b/paylikepayment/views/templates/hook/payment.tpl
index f6f2c18..8129ba3 100644
--- a/paylikepayment/views/templates/hook/payment.tpl
+++ b/paylikepayment/views/templates/hook/payment.tpl
@@ -1,126 +1,132 @@
-{*
-* Team Paylike
-*
-*  @author    Team Paylike
-*  @copyright Team Paylike
-*  @license   MIT license: https://opensource.org/licenses/MIT
-*}
-{if $paylike_status == 'enabled'}
-    <style type="text/css">
-        .cards{
-            display: inline-flex;
-        }
-        .cards li img {
-            vertical-align: middle; 
-            margin-right: 10px;
-            width: 37px;
-            height: 27px;
-        }
-    </style>
-    <script type="text/javascript" src="https://sdk.paylike.io/3.js"></script>
-    <script>
-        var PAYLIKE_PUBLIC_KEY 	= "{$PAYLIKE_PUBLIC_KEY|escape:'htmlall':'UTF-8'}";
-        var paylike 			= Paylike(PAYLIKE_PUBLIC_KEY);
-        var shop_name 			= "{$shop_name|escape:'htmlall':'UTF-8'}";
-        var PS_SSL_ENABLED 		= "{$PS_SSL_ENABLED|escape:'htmlall':'UTF-8'}";
-        var host 				= "{$http_host|escape:'htmlall':'UTF-8'}";
-        var BASE_URI 			= "{$base_uri|escape:'htmlall':'UTF-8'}";
-        var popup_title 	    = "{$popup_title|escape:'htmlall':'UTF-8'}";
-        var popup_description 	= "{$popup_description}";
-        var currency_code 		= "{$currency_code|escape:'htmlall':'UTF-8'}";
-        var amount              = "{$amount|escape:'htmlall':'UTF-8'}";
-        var id_cart 			= {$id_cart}; //html variable can not be escaped;
-        var products            = {$products}; //html variable can not be escaped;
-        var name 				= "{$name|escape:'htmlall':'UTF-8'}";
-        var email 				= "{$email|escape:'htmlall':'UTF-8'}";
-        var telephone 			= "{$telephone|escape:'htmlall':'UTF-8'}";
-        var address 			= "{$address|escape:'htmlall':'UTF-8'}";
-        var ip 			        = "{$ip|escape:'htmlall':'UTF-8'}";
-        var locale 			    = "{$locale|escape:'htmlall':'UTF-8'}";
-        var platform_version 	= "{$platform_version|escape:'htmlall':'UTF-8'}";
-        var ecommerce 	        = "{$ecommerce|escape:'htmlall':'UTF-8'}";
-        var module_version 	    = "{$module_version|escape:'htmlall':'UTF-8'}";
-        var url_controller 		= "{$redirect_url|escape:'htmlall':'UTF-8'}";
-        var qry_str				= "{$qry_str}";
-
-        function pay()
-        {
-            paylike.popup({
-                        currency    : currency_code,
-                        amount      : amount,
-                        title       : popup_title,
-                        description : popup_description,
-                        custom      : {
-                            cartId              : id_cart,
-                            products            : products,
-                            name                : name,
-                            email               : email,
-                            telephone           : telephone,
-                            address             : address,
-                            customerIp          : ip
-                        },
-                        locale              : locale,
-                        platform_version    : platform_version,
-                        ecommerce           : ecommerce,
-                        version             : module_version
-
-                    },
-                    function(err , r)
-                    {
-                        if (typeof r !== 'undefined')
-                        {
-                            var return_url = url_controller + qry_str + 'transactionid=' + r.transaction.id;
-                            if (err)
-                            {
-                                return console.warn(err);
-                            }
-                            location.href = htmlDecode(return_url);
-                        }
-                    });
-        }
-
-        function htmlDecode(url)
-        {
-            return String(url).replace(/&amp;/g, '&');
-        }
-    </script>
-    {*<div class="row">
-        <div class="col-xs-12">
-            <p class="payment_module paylike" onclick="pay();">
-                <span class="paylike_text">{l s='Pay with credit card' mod='paylikepayment'}</span>
-            </p>
-        </div>
-    </div>*}
-    <div class="row">
-        <div class="col-xs-12 col-md-12">
-            <div class="payment_module paylike-payment clearfix" style="border: 1px solid #d6d4d4;
-            border-radius: 4px;
-            color: #333333;
-            display: block;
-            font-size: 17px;
-            font-weight: bold;
-            letter-spacing: -1px;
-            line-height: 23px;
-            padding: 20px 20px;
-            position: relative;
-            cursor:pointer;
-            margin-top: 10px;
-            " onclick="pay();" >
-                <input style="float:left;" id="paylike-btn" type="image" name="submit" src="{$this_path_paylike}logo.png" alt="" style="vertical-align: middle; margin-right: 10px; width:57px; height:57px;" />
-                <div style="float:left; margin-left:10px;">
-                    <span style="margin-right: 10px;">{l s={$payment_method_title} mod='paylikepayment'}</span>
-                    <span>
-                        <ul class="cards">
-                            {foreach from=$payment_method_creditcard_logo item=logo}
-                                <li>
-                                    <img src="{$this_path_paylike}/logos/{$logo}" title="{$logo}" alt="{$logo}"/>
-                                </li>
-                            {/foreach}
-                        </ul>
-                    </span>
-                    <small style="font-size: 12px; display: block; font-weight: normal; letter-spacing: 1px;">{l s={$payment_method_desc} mod='paylikepayment'}</small>
-                </div>
-            </div>
-        </div>
-    </div>
-{/if}
+{*
+* Team Paylike
+*
+*  @author    Team Paylike
+*  @copyright Team Paylike
+*  @license   MIT license: https://opensource.org/licenses/MIT
+*}
+{if $paylike_status == 'enabled'}
+    <style type="text/css">
+        .cards {
+            display: inline-flex;
+        }
+
+        .cards li img {
+            vertical-align: middle;
+            margin-right: 10px;
+            width: 37px;
+            height: 27px;
+        }
+    </style>
+    <script type="text/javascript" src="https://sdk.paylike.io/3.js"></script>
+    <script>
+        var PAYLIKE_PUBLIC_KEY = "{$PAYLIKE_PUBLIC_KEY|escape:'htmlall':'UTF-8'}";
+        var paylike = Paylike(PAYLIKE_PUBLIC_KEY);
+        var shop_name = "{$shop_name|escape:'htmlall':'UTF-8'}";
+        var PS_SSL_ENABLED = "{$PS_SSL_ENABLED|escape:'htmlall':'UTF-8'}";
+        var host = "{$http_host|escape:'htmlall':'UTF-8'}";
+        var BASE_URI = "{$base_uri|escape:'htmlall':'UTF-8'}";
+        var popup_title = "{$popup_title|escape:'htmlall':'UTF-8'}";
+        var popup_description = "{$popup_description nofilter}"; //html variable can not be escaped;
+        var currency_code = "{$currency_code|escape:'htmlall':'UTF-8'}";
+        var amount = "{$amount|escape:'htmlall':'UTF-8'}";
+        var id_cart = {$id_cart}; //html variable can not be escaped;
+        var products = {$products}; //html variable can not be escaped;
+        var name = "{$name|escape:'htmlall':'UTF-8'}";
+        var email = "{$email|escape:'htmlall':'UTF-8'}";
+        var telephone = "{$telephone|escape:'htmlall':'UTF-8'}";
+        var address = "{$address|escape:'htmlall':'UTF-8'}";
+        var ip = "{$ip|escape:'htmlall':'UTF-8'}";
+        var locale = "{$locale|escape:'htmlall':'UTF-8'}";
+        var platform_version = "{$platform_version|escape:'htmlall':'UTF-8'}";
+        var ecommerce = "{$ecommerce|escape:'htmlall':'UTF-8'}";
+        var module_version = "{$module_version|escape:'htmlall':'UTF-8'}";
+        var url_controller = "{$redirect_url|escape:'htmlall':'UTF-8'}";
+        var qry_str = "{$qry_str}"; //html variable can not be escaped;
+
+        function pay() {
+            paylike.popup({
+                    currency: currency_code,
+                    amount: amount,
+                    title: popup_title,
+                    description: popup_description,
+                    custom: {
+                        orderId: id_cart,
+                        products: products,
+                        customer: {
+                            name: name,
+                            email: email,
+                            telephone: telephone,
+                            address: address,
+                            customerIp: ip
+                        },
+                        platform:{
+                            version: platform_version,
+                            name: ecommerce
+                        },
+                        ecommerce:{
+                            version: platform_version,
+                            name: ecommerce
+                        },
+                        version: module_version
+
+                    },
+
+                },
+                function (err, r) {
+                    if (typeof r !== 'undefined') {
+                        var return_url = url_controller + qry_str + 'transactionid=' + r.transaction.id;
+                        if (err) {
+                            return console.warn(err);
+                        }
+                        location.href = htmlDecode(return_url);
+                    }
+                });
+        }
+
+        function htmlDecode(url) {
+            return String(url).replace(/&amp;/g, '&');
+        }
+    </script>
+    {*<div class="row">
+        <div class="col-xs-12">
+            <p class="payment_module paylike" onclick="pay();">
+                <span class="paylike_text">{l s='Pay with credit card' mod='paylikepayment'}</span>
+            </p>
+        </div>
+    </div>*}
+    <div class="row">
+        <div class="col-xs-12 col-md-12">
+            <div class="payment_module paylike-payment clearfix" style="border: 1px solid #d6d4d4;
+            border-radius: 4px;
+            color: #333333;
+            display: block;
+            font-size: 17px;
+            font-weight: bold;
+            letter-spacing: -1px;
+            line-height: 23px;
+            padding: 20px 20px;
+            position: relative;
+            cursor:pointer;
+            margin-top: 10px;
+            " onclick="pay();">
+                <input style="float:left;" id="paylike-btn" type="image" name="submit"
+                       src="{$this_path_paylike}logo.png" alt=""
+                       style="vertical-align: middle; margin-right: 10px; width:57px; height:57px;"/>
+                <div style="float:left; margin-left:10px;">
+                    <span style="margin-right: 10px;">{l s={$payment_method_title} mod='paylikepayment'}</span>
+                    <span>
+                        <ul class="cards">
+                            {foreach from=$payment_method_creditcard_logo item=logo}
+                                <li>
+                                    <img src="{$this_path_paylike}/views/img/{$logo}" title="{$logo}" alt="{$logo}"/>
+                                </li>
+                            {/foreach}
+                        </ul>
+                    </span>
+                    <small style="font-size: 12px; display: block; font-weight: normal; letter-spacing: 1px;">{l s={$payment_method_desc} mod='paylikepayment'}</small>
+                </div>
+            </div>
+        </div>
+    </div>
+{/if}
diff --git a/paylikepayment/views/templates/index.php b/paylikepayment/views/templates/index.php
index 2d4b752..086d6b5 100644
--- a/paylikepayment/views/templates/index.php
+++ b/paylikepayment/views/templates/index.php
@@ -1,35 +1,35 @@
-<?php
-/*
-* 2007-2015 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2015 PrestaShop SA
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-
-header("Location: ../");
-exit;
+<?php
+/*
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;