diff --git a/.DS_Store b/.DS_Store
old mode 100755
new mode 100644
diff --git a/CHANGELOG.md b/CHANGELOG.md
old mode 100755
new mode 100644
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/composer.json b/composer.json
old mode 100755
new mode 100644
diff --git a/conektapaymentsprestashop.php b/conektapaymentsprestashop.php
old mode 100755
new mode 100644
index 604860809..a9ce0f9eb
--- a/conektapaymentsprestashop.php
+++ b/conektapaymentsprestashop.php
@@ -1,20 +1,21 @@
 <?php
 /**
- * 2007-2017 PrestaShop
+ * 2007-2019 PrestaShop
  *
  * NOTICE OF LICENSE
  * Title   : Conekta Card Payment Gateway for Prestashop
  * Author  : Conekta.io
  * URL     : https://www.conekta.io/es/docs/plugins/prestashop.
- * 
+ * PHP Version 7.0.0
+ *
  * ConektaPaymentsPrestashop File Doc Comment
- * 
+ *
  * @category  ConektaPaymentsPrestashop
  * @package   ConektaPaymentsPrestashop
  * @author    Conekta <support@conekta.io>
- * @copyright 2012-2017 Conekta
- * @license   http://opensourec.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- * @version   v 1.1.0
+ * @copyright 2012-2019 Conekta
+ * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @version   GIT: @1.1.0@
  * @link      https://conekta.com/
  */
 
@@ -28,74 +29,107 @@
     exit;
 }
 
+define("METADATA_LIMIT", 12);
+
 /**
  * ConektaPaymentsPrestashop Class Doc Comment
  *
  * @category Class
  * @package  ConektaPaymentsPrestashop
  * @author   Conekta <support@conekta.io>
- * @license  http://opensourec.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @license  http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  * @link     https://conekta.com/
  */
 
-class ConektaPaymentsPrestashop extends PaymentModule {
-    protected $html = '', $postErrors = array();
-    public $details ,$owner,$address, $extra_mail_vars;
-
-    public function __construct() {
-        $this->name                   = 'conektapaymentsprestashop';
-        $this->tab                    = 'payments_gateways';
-        $this->version                = '1.1.0';
-        $this->ps_versions_compliancy = array( 'min' => '1.7', 'max' => _PS_VERSION_ );
-        $this->author                 = 'Conekta';
-        $this->module_key             = 'db59557d5fe73f63180043679985c8c4';
-        $this->displayName            = $this->l('Conekta Prestashop');
-        $this->description            = $this->l('Accept payments by Credit and Debit Card with Conekta (Visa, Mastercard, Amex)');
-        $this->controllers            = array( 'validation' );
-        $this->is_eu_compatible       = 1;
-        $this->currencies             = true;
-        $this->currencies_mode        = 'checkbox';
-        $this->cash                   = true;
-
-        $config = Configuration::getMultiple(
-            array(
-                'PAYEE_NAME',
-                'PAYEE_ADDRESS',
-                'MODE',
-                'WEB_HOOK',
-                'PAYMENT_METHS_CARD',
-                'PAYMENT_METHS_INSTALLMET',
-                'PAYMENT_METHS_CASH',
-                'PAYMENT_METHS_SPEI',
-                'EXPIRATION_DATE_TYPE',
-                'EXPIRATION_DATE_LIMIT',
-                'TEST_PRIVATE_KEY',
-                'TEST_PUBLIC_KEY',
-                'LIVE_PRIVATE_KEY',
-                'LIVE_PUBLIC_KEY'
-            )
+class ConektaPaymentsPrestashop extends PaymentModule
+{
+    protected $html = '';
+    protected $postErrors = array();
+
+    public $details;
+    public $owner;
+    public $address;
+    public $extra_mail_vars;
+
+    /**
+     * Implement the configuration of the Conekta Prestashop module
+     */
+    public function __construct()
+    {
+        $this->name = 'conektapaymentsprestashop';
+        $this->tab = 'payments_gateways';
+        $this->version = '1.1.0';
+        $this->ps_versions_compliancy = array(
+            'min' => '1.7',
+            'max' => _PS_VERSION_
         );
+        $this->author = 'Conekta';
+        $this->module_key = 'db59557d5fe73f63180043679985c8c4';
+        $this->displayName = $this->l('Conekta Prestashop');
+        $this->description = $this->l('Accept payments by Credit and Debit Card with Conekta (Visa, Mastercard, Amex)');
+        $this->controllers = array( 'validation' );
+        $this->is_eu_compatible = 1;
+        $this->currencies = true;
+        $this->currencies_mode = 'checkbox';
+        $this->cash = true;
+        $this->amount_min = 2000;
+
+        $settings = array(
+            'PAYEE_NAME',
+            'PAYEE_ADDRESS',
+            'MODE',
+            'WEB_HOOK',
+            'PAYMENT_METHS_CARD',
+            'PAYMENT_METHS_INSTALLMET',
+            'PAYMENT_METHS_CASH',
+            'PAYMENT_METHS_SPEI',
+            'EXPIRATION_DATE_TYPE',
+            'EXPIRATION_DATE_LIMIT',
+            'TEST_PRIVATE_KEY',
+            'TEST_PUBLIC_KEY',
+            'LIVE_PRIVATE_KEY',
+            'LIVE_PUBLIC_KEY',
+            'CHARGE_ON_DEMAND_ENABLE',
+            '3DS_FORCE'
+        );
+        $order_elements = array_keys(get_class_vars('Cart'));
+        foreach ($order_elements as $element) {
+            $settings[] = 'ORDER_'.strtoupper($element);
+        }
+        $product_elements = self::CART_PRODUCT_ATTR;
+        foreach ($product_elements as $element) {
+            $settings[] = 'PRODUCT_'.strtoupper($element);
+        }
+
+        $config = Configuration::getMultiple($settings);
+
         if (isset($config['PAYEE_NAME'])) {
             $this->checkName = $config['PAYEE_NAME'];
         }
         if (isset($config['PAYEE_ADDRESS'])) {
             $this->address = $config['PAYEE_ADDRESS'];
         }
+
         if (isset($config['MODE'])) {
             $this->mode = $config['MODE'];
+            $this->conekta_mode = ($this->mode) ? 'live' : 'test';
         }
         if (isset($config['WEB_HOOK'])) {
             $this->web_hook = $config['WEB_HOOK'];
         }
+
         if (isset($config['PAYMENT_METHS_CARD'])) {
             $this->paymnt_method_card = $config['PAYMENT_METHS_CARD'];
         }
+
         if (isset($config['PAYMENT_METHS_INSTALLMET'])) {
             $this->payment_method_installment = $config['PAYMENT_METHS_INSTALLMET'];
         }
+
         if (isset($config['PAYMENT_METHS_CASH'])) {
             $this->payment_method_cash = $config['PAYMENT_METHS_CASH'];
         }
+
         if (isset($config['PAYMENT_METHS_SPEI'])) {
             $this->payment_method_spei = $config['PAYMENT_METHS_SPEI'];
         }
@@ -108,15 +142,27 @@ public function __construct() {
         if (isset($config['TEST_PRIVATE_KEY'])) {
             $this->test_private_key = $config['TEST_PRIVATE_KEY'];
         }
+
         if (isset($config['TEST_PUBLIC_KEY'])) {
             $this->test_public_key = $config['TEST_PUBLIC_KEY'];
         }
+
         if (isset($config['LIVE_PRIVATE_KEY'])) {
             $this->live_private_key = $config['LIVE_PRIVATE_KEY'];
         }
+
         if (isset($config['LIVE_PUBLIC_KEY'])) {
             $this->live_public_key = $config['LIVE_PUBLIC_KEY'];
         }
+
+        if (isset($config['CHARGE_ON_DEMAND_ENABLE'])) {
+            $this->charge_on_demand = $config['CHARGE_ON_DEMAND_ENABLE'];
+        }
+
+        if (isset($config['3DS_FORCE'])) {
+            $this->charge_on_demand = $config['3DS_FORCE'];
+        }
+
         $this->bootstrap = true;
         parent::__construct();
 
@@ -125,7 +171,14 @@ public function __construct() {
         }
     }
 
-    public function install() {
+    /**
+     * Install configuration, create table in database and register hooks
+     *
+     * @return boolean
+     */
+    public function install()
+    {
+
         $updateConfig = array(
             'PS_OS_CHEQUE' => 1,
             'PS_OS_PAYMENT' => 2,
@@ -140,6 +193,7 @@ public function install() {
             'PS_OS_PAYPAL' => 11,
             'PS_OS_WS_PAYMENT' => 12
         );
+
         foreach ($updateConfig as $u => $v) {
             if (!Configuration::get($u) || (int) Configuration::get($u) < 1) {
                 if (defined('_' . $u . '_') && (int) constant('_' . $u . '_') > 0) {
@@ -160,14 +214,23 @@ public function install() {
             && Configuration::updateValue('PAYMENT_METHS_CASH', 1)
             && Configuration::updateValue('PAYMENT_METHS_SPEI', 1)
             && Configuration::updateValue('MODE', 0) || !Database::installDb()
-            ) {
+            || !Database::createTableConektaOrder()
+            || !Database::createTableMetaData()
+        ) {
             return false;
         }
+
         Configuration::updateValue('CONEKTA_PRESTASHOP_VERSION', $this->version);
         return true;
     }
 
-    public function uninstall() {
+    /**
+     * Delete configuration and drop table in database.
+     *
+     * @return boolean
+     */
+    public function uninstall()
+    {
         return parent::uninstall()
         && Configuration::deleteByName('CONEKTA_PRESTASHOP_VERSION')
         && Configuration::deleteByName('CONEKTA_MSI')
@@ -188,17 +251,32 @@ public function uninstall() {
         && Configuration::deleteByName('CONEKTA_WEBHOOK_FAILED_URL')
         && Db::getInstance()->Execute(
             'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'conekta_transaction`'
+        )
+        && Db::getInstance()->Execute(
+            'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'conekta_metadata`'
+        )
+        && Db::getInstance()->Execute(
+            'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'conekta_order_checkout`'
         );
     }
 
-    public function hookPaymentReturn($params) {
+    /**
+     * Returns the order confirmation checkout
+     *
+     * @param array $params payment information parameter
+     *
+     * @return template
+     */
+    public function hookPaymentReturn($params)
+    {
         if ($params['order'] && Validate::isLoadedObject($params['order'])) {
-            $id_order                    = (int) $params['order']->id;
+            $id_order = (int) $params['order']->id;
             $conekta_tran_details = Database::getOrderById($id_order);
             if ($conekta_tran_details['barcode']) {
                 $this->smarty->assign('cash', true);
                 $this->smarty->assign(
-                    'conekta_order', array(
+                    'conekta_order',
+                    array(
                         'barcode' => $conekta_tran_details['reference'],
                         'type' => 'cash',
                         'barcode_url' => $conekta_tran_details['barcode'],
@@ -210,7 +288,8 @@ public function hookPaymentReturn($params) {
                 if (strpos($conekta_tran_details['reference'], '6461801118') !== false) {
                     $this->smarty->assign('spei', true);
                     $this->smarty->assign(
-                        'conekta_order', array(
+                        'conekta_order',
+                        array(
                             'receiving_account_number' => $conekta_tran_details['reference'],
                             'amount' => $conekta_tran_details['amount'],
                             'currency' => $conekta_tran_details['currency']
@@ -220,7 +299,8 @@ public function hookPaymentReturn($params) {
             } else {
                 $this->smarty->assign('card', true);
                 $this->smarty->assign(
-                    'conekta_order', array(
+                    'conekta_order',
+                    array(
                         'type' => 'card',
                         'reference' => isset($params['order']->reference) ?
                                                 $params['order']->reference :
@@ -230,15 +310,25 @@ public function hookPaymentReturn($params) {
                 );
             }
         }
+
         return $this->fetchTemplate('checkout-confirmation-all.tpl');
     }
 
-    public function hookUpdateOrderStatus($params) { 
+    /**
+     * The order is refunded
+     *
+     * @param array $params Information of order to update it.
+     *
+     * @return void
+     */
+    public function hookUpdateOrderStatus($params)
+    {
         if ($params['newOrderStatus']->id == 7) {
             //order refunded
             $key = Configuration::get('CONEKTA_MODE') ?
-            Configuration::get('CONEKTA_PRIVATE_KEY_LIVE') :
-            Configuration::get('CONEKTA_PRIVATE_KEY_TEST');
+                Configuration::get('CONEKTA_PRIVATE_KEY_LIVE') :
+                Configuration::get('CONEKTA_PRIVATE_KEY_TEST');
+
             $iso_code = $this->context->language->iso_code;
 
             \Conekta\Conekta::setApiKey($key);
@@ -249,20 +339,25 @@ public function hookUpdateOrderStatus($params) {
 
             $id_order = (int) $params['id_order'];
             $conekta_tran_details = Database::getOrderById($id_order);
+
             //only credit card refund
-            if (!$conekta_tran_details['barcode'] 
-            && !(isset($conekta_tran_details['reference']) 
-            && !empty($conekta_tran_details['reference']))
+            if (!$conekta_tran_details['barcode']
+                && !(isset($conekta_tran_details['reference'])
+                && !empty($conekta_tran_details['reference']))
             ) {
-
                 $order = \Conekta\Order::find($conekta_tran_details['id_conekta_order']);
                 $order->refund(['reason' => 'requested_by_client']);
-            }      
+            }
         }
-        
     }
 
-    private function createPendingCashState() {
+    /**
+     * Create pending chash state
+     *
+     * @return boolean
+     */
+    private function createPendingCashState()
+    {
         $state     = new OrderState();
         $languages = Language::getLanguages();
         $names     = array();
@@ -270,6 +365,7 @@ private function createPendingCashState() {
         foreach ($languages as $lang) {
             $names[$lang['id_lang']] = 'En espera de pago';
         }
+
         $state->name        = $names;
         $state->color       = '#4169E1';
         $state->send_email  = true;
@@ -279,6 +375,7 @@ private function createPendingCashState() {
         foreach ($languages as $lang) {
             $templ[$lang['id_lang']] = 'conektaefectivo';
         }
+
         $state->template = $templ;
 
         if ($state->save()) {
@@ -289,6 +386,7 @@ private function createPendingCashState() {
                     if (is_dir($directory.$file) && $file[0] != '.') {
                         $new_html_file = _PS_MODULE_DIR_ . $this->name . '/mails/' . $file . '/conektaefectivo.html';
                         $new_txt_file  = _PS_MODULE_DIR_ . $this->name . '/mails/' . $file . '/conektaefectivo.txt';
+
                         $html_folder = $directory . $file . '/conektaefectivo.html';
                         $txt_folder  = $directory . $file . '/conektaefectivo.txt';
 
@@ -311,7 +409,13 @@ private function createPendingCashState() {
         return true;
     }
 
-    private function createPendingSpeiState() {
+    /**
+     * Create pending spei state
+     *
+     * @return boolean
+     */
+    private function createPendingSpeiState()
+    {
         $state     = new OrderState();
         $languages = Language::getLanguages();
         $names     = array();
@@ -319,6 +423,7 @@ private function createPendingSpeiState() {
         foreach ($languages as $lang) {
             $names[$lang['id_lang']] = 'En espera de pago';
         }
+
         $state->name        = $names;
         $state->color       = '#4169E1';
         $state->send_email  = true;
@@ -338,6 +443,7 @@ private function createPendingSpeiState() {
                     if (is_dir($directory.$file) && $file[0] != '.') {
                         $new_html_file = _PS_MODULE_DIR_ . $this->name . '/mails/' . $file . '/conektaspei.html';
                         $new_txt_file  = _PS_MODULE_DIR_ . $this->name . '/mails/' . $file . '/conektaspei.txt';
+
                         $html_folder = $directory . $file . '/conektaspei.html';
                         $txt_folder  = $directory . $file . '/conektaspei.txt';
 
@@ -360,10 +466,27 @@ private function createPendingSpeiState() {
         return true;
     }
 
-    public function hookHeader() {
-        if (Tools::getValue('controller') != 'order-opc' && (!(filter_input(INPUT_SERVER, 'PHP_SELF') == __PS_BASE_URI__ . 'order.php' || filter_input(INPUT_SERVER, 'PHP_SELF') == __PS_BASE_URI__ . 'order-opc.php' || Tools::getValue('controller') == 'order' || Tools::getValue('controller') == 'orderopc' || Tools::getValue('step') == 3))) {
+    /**
+     * Generate method payment and checkout conekta
+     *
+     * @return template
+     */
+    public function hookHeader()
+    {
+        $key = Configuration::get('CONEKTA_MODE') ? Configuration::get('CONEKTA_PRIVATE_KEY_LIVE') : Configuration::get('CONEKTA_PRIVATE_KEY_TEST');
+        $iso_code = $this->context->language->iso_code;
+        \Conekta\Conekta::setApiKey($key);
+        \Conekta\Conekta::setPlugin("Prestashop1.7");
+        \Conekta\Conekta::setApiVersion("2.0.0");
+
+        if (Tools::getValue('controller') != 'order-opc' && (!($_SERVER['PHP_SELF'] == __PS_BASE_URI__ . 'order.php' || $_SERVER['PHP_SELF'] == __PS_BASE_URI__ . 'order-opc.php' || Tools::getValue('controller') == 'order' || Tools::getValue('controller') == 'orderopc' || Tools::getValue('step') == 3))) {
             return;
         }
+        Media::addJsDef(
+            array(
+                "ajax_link" => $this->_path .'ajax.php'
+            )
+        );
         $this->context->controller->addCSS($this->_path . 'views/css/conekta-prestashop.css');
 
         if (Configuration::get('MODE')) {
@@ -371,20 +494,272 @@ public function hookHeader() {
         } else {
             $this->smarty->assign("api_key", addslashes(Configuration::get('TEST_PUBLIC_KEY')));
         }
+
         $this->smarty->assign("path", $this->_path);
+
+        $cart = $this->context->cart;
+        $customer = $this->context->customer;
+        $payment_options = array();
+
+        if (Configuration::get('PAYMENT_METHS_SPEI')) {
+            array_push($payment_options, 'bank_transfer');
+        }
+
+        if (Configuration::get('PAYMENT_METHS_CASH')) {
+            array_push($payment_options, 'cash');
+        }
+
+        if (Configuration::get('PAYMENT_METHS_CARD')) {
+            array_push($payment_options, 'card');
+        }
+
+        $msi = false;
+        $force_3ds = false;
+        $on_demand_enabled = false;
+        $address_delivery = new Address((int) $cart->id_address_delivery);
+        $state            = State::getNameById($address_delivery->id_state);
+        $country          = Country::getIsoById($address_delivery->id_country);
+        $carrier          = new Carrier((int) $cart->id_carrier);
+        $shp_price        = $cart->getTotalShippingCost();
+        $shp_carrier      = "other";
+        $shp_service      = "other";
+        $discounts        = $cart->getCartRules();
+        $items            = $cart->getProducts();
+        $shippingLines = null;
+        $shippingContact = null;
+        
+        if (isset($carrier)) {
+            if ($carrier->name != null) {
+                $shp_carrier = $carrier->name;
+                $shp_service = implode(",", $carrier->delay);
+                $shippingLines =  Config::getShippingLines($shp_service, $shp_carrier, $shp_price);
+            }
+        }
+       
+        $shippingContact = Config::getShippingContact($customer, $address_delivery, $state, $country);
+        $customerInfo = Config::getCustomerInfo($customer, $address_delivery);
+
+        $result = Database::getConektaMetadata($customer->id, $this->conekta_mode, "conekta_customer_id");
+
+        if (count($payment_options) > 0 && !empty($shippingContact['address']['postal_code']) && !empty($shippingLines)) {
+            $order_details = array();
+            $taxlines = array();
+
+            if (empty($result['meta_value'])) {
+                $customer_id = $this->createCustomer($customer, $customerInfo);
+            } else {
+                $customer_id = $result['meta_value'];
+                $customerConekta = \Conekta\Customer::find($customer_id);
+                $customerConekta->update($customerInfo);
+            }
+
+            if ((Configuration::get('PAYMENT_METHS_INSTALLMET'))) {
+                $msi = true;
+            }
+    
+            if (Configuration::get('CHARGE_ON_DEMAND_ENABLE')) {
+                $on_demand_enabled = true;
+            }
+
+            if (Configuration::get('3DS_FORCE')) {
+                $force_3ds = true;
+            }
+           
+            $taxlines = Config::getTaxLines($items);
+
+            $order_details = [
+                'currency' => $this->context->currency->iso_code,
+                'line_items' => Config::getLineItems($items),
+                'customer_info' => array("customer_id" => $customer_id),
+                'discount_lines' => Config::getDiscountLines($discounts),
+                'shipping_lines' => array(),
+                'shipping_contact' => $shippingContact,
+                'tax_lines' => array(),
+                'metadata' => [
+                    "plugin" => "Prestashop",
+                    "plugin_version" => _PS_VERSION_,
+                    "reference_id" => $this->context->cart->id
+                ],
+                'checkout' => [
+                    "type" => 'Integration',
+                    "allowed_payment_methods" => $payment_options,
+                    "on_demand_enabled" => $on_demand_enabled,
+                    "force_3ds_flow" => Configuration::get('CONEKTA_MODE') ? $force_3ds : false
+                ]
+
+            ];
+
+            $order_elements = array_keys(get_class_vars('Cart'));
+            foreach ($order_elements as $element) {
+                if (!empty(Configuration::get('ORDER_'.strtoupper($element))) && property_exists($this->context->cart, $element)) {
+                    $order_details['metadata'][$element] = $this->context->cart->$element;
+                }
+            }
+
+            $product_elements = self::CART_PRODUCT_ATTR;
+            foreach ($items as $item) {
+                $index ='product-'.$item['id_product'];
+                $order_details['metadata'][$index] = '';
+                foreach ($product_elements as $element) {
+                    if (!empty(Configuration::get('PRODUCT_'.strtoupper($element)))
+                        && array_key_exists($element, $item)
+                    ) {
+                        $order_details['metadata'][$index] .= $this->buildRecursiveMetadata($item[$element], $element);
+                    }
+                }
+                $order_details['metadata'][$index] = substr($order_details['metadata'][$index], 0, -2);
+            }
+
+            $amount = 0;
+
+            if (isset($shippingLines)) {
+                foreach ($shippingLines as $shipping) {
+                    array_push(
+                        $order_details['shipping_lines'],
+                        array (
+                            'amount' => $shipping['amount'],
+                            'tracking_number' => $this->removeSpecialCharacter($shipping['tracking_number']),
+                            'carrier' => $this->removeSpecialCharacter($shipping['carrier']),
+                            'method' => $this->removeSpecialCharacter($shipping['method'])
+                        )
+                    );
+                    $amount = $amount + $shipping['amount'];
+                }
+            }
+           
+            if (isset($taxlines)) {
+                foreach ($taxlines as $tax) {
+                    array_push(
+                        $order_details['tax_lines'],
+                        array (
+                            'description' => $this->removeSpecialCharacter($tax['description']),
+                            'amount' => $tax['amount']
+                        )
+                    );
+                    $amount = $amount + $tax['amount'];
+                }
+            }
+
+            foreach ($order_details['line_items'] as $item) {
+                $amount = $amount + ($item['quantity'] * $item['unit_price']);
+            }
+    
+            if (isset($order_details['discount_lines'])) {
+                foreach ($order_details['discount_lines'] as $discount) {
+                    $amount = $amount - $discount['amount'];
+                }
+            }
+
+            $result = Database::getConektaOrder($customer->id, $this->conekta_mode, $this->context->cart->id);
+
+            try {
+                if ($order_details['currency'] == 'MXN' && $amount < $this->amount_min) {
+                    $message = "El monto minimo de compra con Conekta tiene que ser mayor a $20.00 ";
+                    $this->context->smarty->assign(
+                        array(
+                            'message' =>  $message,
+                        )
+                    );
+                    return false;
+                }
+                if (isset($result) && $result['status'] == 'unpaid') {
+                    $order = \Conekta\Order::find($result['id_conekta_order']);
+    
+                    if (isset($order->charges[0]->status) && $order->charges[0]->status == 'paid') {
+                        Database::updateConektaOrder($customer->id, $this->context->cart->id, $this->conekta_mode, $order->id, $order->charges[0]->status);
+                    }
+                }
+
+                if (empty($order)) {
+                    $order = \Conekta\Order::create($order_details);
+                    Database::updateConektaOrder($customer->id, $this->context->cart->id, $this->conekta_mode, $order->id, 'unpaid');
+                } elseif (empty($order->charges[0]->status) || $order->charges[0]->status != 'paid') {
+                    unset($order_details['customer_info']);
+                    $order->update($order_details);
+                } else {
+                    $order = \Conekta\Order::create($order_details);
+                    Database::updateConektaOrder($customer->id, $this->context->cart->id, $this->conekta_mode, $order->id, 'unpaid');
+                }
+            } catch (\Exception $e) {
+                $log_message = $e->getMessage() . ' ';
+    
+                if (class_exists('Logger')) {
+                    Logger::addLog($this->l('Payment transaction failed') . ' ' . $log_message, 2, null, 'Cart', (int) $this->context->cart->id, true);
+                }
+    
+                $message = $e->getMessage() . ' ';
+
+                $this->context->smarty->assign("message", $message);
+            }
+        }
+        if (isset($order)) {
+            $this->smarty->assign("orderID", $order->id);
+            $this->smarty->assign("checkoutRequestId", $order->checkout['id']);
+        } else {
+            $this->smarty->assign("checkoutRequestId", "");
+            $this->smarty->assign("orderID", "");
+        }
         return $this->fetchTemplate("hook-header.tpl");
     }
 
-    public function hookAdminOrder($params) {
+    /**
+     * Generates the metadata of the order attributes.
+     *
+     * @param array  $data_object Object to generate metadata
+     * @param string $key         Key the data_object
+     *
+     * @return string
+     */
+    public function buildRecursiveMetadata($data_object, $key)
+    {
+        $string = '';
+        if (gettype($data_object) == 'array') {
+            foreach (array_keys($data_object) as $data_key) {
+                $key_concat = strval($key).'-'.strval($data_key);
+                if (empty($data_object[$data_key])) {
+                    $string .= strval($key_concat) . ': NULL | ';
+                } else {
+                    $string .= $this->buildRecursiveMetadata($data_object[$data_key], $key_concat);
+                }
+            }
+        } else {
+            if (empty($data_object)) {
+                $string .= strval($key) . ': NULL | ';
+            } else {
+                $string .= strval($key) . ': ' . strval($data_object) . ' | ';
+            }
+        }
+        return $string;
+    }
+
+    /**
+     * Returns the order information.
+     *
+     * @param array $params The order info
+     *
+     * @return template
+     */
+    public function hookAdminOrder($params)
+    {
         $id_order = (int) $params['id_order'];
         $status   = $this->getTransactionStatus($id_order);
+
         return $status;
     }
 
-    public function hookPaymentOptions($params) {
+    /**
+     * The different payment methods are added.
+     *
+     * @param array $params Payment options
+     *
+     * @return array
+     */
+    public function hookPaymentOptions($params)
+    {
         if (!$this->active) {
             return;
         }
+
         if (!$this->checkCurrency($params['cart'])) {
             return;
         }
@@ -395,21 +770,40 @@ public function hookPaymentOptions($params) {
         );
         $payment_options = array();
 
-        if (Configuration::get('PAYMENT_METHS_SPEI')) {
-            array_push($payment_options, $this->getSpeiPaymentOption());
-        }
-        if (Configuration::get('PAYMENT_METHS_CASH')) {
-            array_push($payment_options, $this->getOxxoPaymentOption());
-        }
-        if (Configuration::get('PAYMENT_METHS_CARD')) {
-            array_push($payment_options, $this->getCardPaymentOption());
+        if (Configuration::get('PAYMENT_METHS_CARD')
+            || Configuration::get('PAYMENT_METHS_CASH')
+            || Configuration::get('PAYMENT_METHS_SPEI')
+        ) {
+            array_push($payment_options, $this->getConektaPaymentOption());
         }
         return $payment_options;
     }
 
-    public function checkCurrency($cart) {
+    /**
+     * Remove special character
+     *
+     * @param string $param character string
+     *
+     * @return string
+     */
+    public function removeSpecialCharacter($param)
+    {
+        $param =  str_replace(['#', '-', '_', '.', '/', '(', ')', '[', ']', '!', '¡', '%'], ' ', $param);
+        return $param;
+    }
+
+    /**
+     * Check if the currency is correct
+     *
+     * @param array $cart payment cart
+     *
+     * @return boolean
+     */
+    public function checkCurrency($cart)
+    {
         $currency_order    = new Currency($cart->id_currency);
         $currencies_module = $this->getCurrency($cart->id_currency);
+
         if (is_array($currencies_module)) {
             foreach ($currencies_module as $currency_module) {
                 if ($currency_order->id == $currency_module['id_currency']) {
@@ -417,49 +811,41 @@ public function checkCurrency($cart) {
                 }
             }
         }
-        return false;
-    }
 
-    public function getSpeiPaymentOption() {
-        $offlineOption = new PaymentOption();
-        $offlineOption->setCallToActionText($this->l('Pago por medio de '))->setAction($this->context->link->getModuleLink(
-            $this->name, 'validation', array(
-                'type' => 'spei'
-                ), true)
-            )->setLogo(Media::getMediaPath(_PS_MODULE_DIR_ . $this->name . '/views/img/spei.png'));
-        return $offlineOption;
-    }
-
-    public function getOxxoPaymentOption() {
-        $offlineOption = new PaymentOption();
-        $offlineOption->setCallToActionText($this->l('Pago en Efectivo con '))->setAction($this->context->link->getModuleLink(
-            $this->name, 'validation', array(
-                'type' => 'cash'
-                ), true)
-            )->setLogo(Media::getMediaPath(_PS_MODULE_DIR_ . $this->name . '/views/img/oxxo.png'));
-        return $offlineOption;
+        return false;
     }
 
-    public function getCardPaymentOption() {
+    /**
+     * Add conekta payment method
+     *
+     * @return PaymentOption
+     */
+    public function getConektaPaymentOption()
+    {
         $embeddedOption = new PaymentOption();
-        $embeddedOption->setModuleName($this->name)->setCallToActionText($this->l('Pago por medio de '))->setAction($this->context->link->getModuleLink($this->name, 'validation', array(), true))->setForm($this->generateCardPaymentForm())->setLogo(Media::getMediaPath(_PS_MODULE_DIR_ . $this->name . '/views/img/cards2.png'));
+        $embeddedOption->setModuleName($this->name)->setCallToActionText($this->l('Pago por medio de Conekta '))->setAction($this->context->link->getModuleLink($this->name, 'validation', array(), true))->setForm($this->generateCardPaymentForm())->setLogo(Media::getMediaPath(_PS_MODULE_DIR_ . $this->name . '/views/img/cards2.png'));
+
         return $embeddedOption;
     }
 
-    private function postValidation() {
+    /**
+     * Validate the fields saved in the conekta module
+     *
+     * @return void
+     */
+    private function postValidation()
+    {
         if (Tools::isSubmit('btnSubmit')) {
-
             if (!Tools::getValue('PAYEE_NAME')) {
                 $this->postErrors[] = $this->trans('The "Payee" field is required.', array(), 'Modules.ConektaPaymentsPrestashop.Admin');
             } elseif (!Tools::getValue('PAYEE_ADDRESS')) {
                 $this->postErrors[] = $this->trans('The "Address" field is required.', array(), 'Modules.ConektaPaymentsPrestashop.Admin');
             }
+
             if (!Tools::getValue('WEB_HOOK')) {
                 $this->postErrors[] = $this->trans('The "Web Hook" field is required.', array(), 'Modules.ConektaPaymentsPrestashop.Admin');
             }
-            if (!Tools::getValue('WEB_HOOK')) {
-                $this->postErrors[] = $this->trans('The "Web Hook" field is required.', array(), 'Modules.ConektaPaymentsPrestashop.Admin');
-            }
+            
             if (Tools::getValue('PAYMENT_METHS_CASH') && !Tools::getValue('EXPIRATION_DATE_LIMIT')) {
                 $this->postErrors[] = $this->trans('The "Expiration date limit" field is required.', array(), 'Modules.ConektaPaymentsPrestashop.Admin');
             }
@@ -469,22 +855,53 @@ private function postValidation() {
             if (Tools::getValue('PAYMENT_METHS_CASH') && !is_numeric(Tools::getValue('EXPIRATION_DATE_LIMIT'))) {
                 $this->postErrors[] = $this->trans('The "Expiration date limit" must be a number.', array(), 'Modules.ConektaPaymentsPrestashop.Admin');
             }
+
+            $order_elements = array_keys(get_class_vars('Cart'));
+            $i = 0;
+            $attributes_count = 0;
+            while ($i < count($order_elements) && $attributes_count <= METADATA_LIMIT) {
+                if (!empty(Tools::getValue('ORDER_'.strtoupper($order_elements[$i])))) {
+                    $attributes_count++;
+                }
+                $i++;
+            }
+            $i = 0;
+            $product_elements = self::CART_PRODUCT_ATTR;
+            while ($i < count($product_elements) && $attributes_count <= METADATA_LIMIT) {
+                if (!empty(Tools::getValue('PRODUCT_'.strtoupper($product_elements[$i])))) {
+                    $attributes_count++;
+                }
+                $i++;
+            }
+            if ($attributes_count > METADATA_LIMIT) {
+                $this->postErrors[] = $this->trans('No more than 12 attributes can be sent as metadata', array(), 'Modules.ConektaPaymentsPrestashop.Admin');
+            }
+
             if (!Tools::getValue('TEST_PRIVATE_KEY')) {
                 $this->postErrors[] = $this->trans('The "Test Private Key" field is required.', array(), 'Modules.ConektaPaymentsPrestashop.Admin');
             }
+
             if (!Tools::getValue('TEST_PUBLIC_KEY')) {
                 $this->postErrors[] = $this->trans('The "Test Public Key" field is required.', array(), 'Modules.ConektaPaymentsPrestashop.Admin');
             }
+
             if (Tools::getValue('LIVE_PRIVATE_KEY') && !Tools::getValue('LIVE_PUBLIC_KEY')) {
                 $this->postErrors[] = $this->trans('The "Live Public Key" field is required.', array(), 'Modules.ConektaPaymentsPrestashop.Admin');
             }
+
             if (!Tools::getValue('LIVE_PRIVATE_KEY') && Tools::getValue('LIVE_PUBLIC_KEY')) {
                 $this->postErrors[] = $this->trans('The "Live Private Key" field is required.', array(), 'Modules.ConektaPaymentsPrestashop.Admin');
             }
         }
     }
 
-    private function postProcess() {
+    /**
+     * Update value and notify
+     *
+     * @return void
+     */
+    private function postProcess()
+    {
         if (Tools::isSubmit('btnSubmit') && Tools::getValue('TEST_PUBLIC_KEY') && Tools::getValue('TEST_PRIVATE_KEY')) {
             Configuration::updateValue('PAYEE_NAME', Tools::getValue('PAYEE_NAME'));
             Configuration::updateValue('PAYEE_ADDRESS', Tools::getValue('PAYEE_ADDRESS'));
@@ -501,15 +918,40 @@ private function postProcess() {
             Configuration::updateValue('TEST_PUBLIC_KEY', Tools::getValue('TEST_PUBLIC_KEY'));
             Configuration::updateValue('LIVE_PRIVATE_KEY', Tools::getValue('LIVE_PRIVATE_KEY'));
             Configuration::updateValue('LIVE_PUBLIC_KEY', Tools::getValue('LIVE_PUBLIC_KEY'));
+            Configuration::updateValue('CHARGE_ON_DEMAND_ENABLE', Tools::getValue('CHARGE_ON_DEMAND_ENABLE'));
+            Configuration::updateValue('3DS_FORCE', Tools::getValue('3DS_FORCE'));
+
+            $order_elements = array_keys(get_class_vars('Cart'));
+            foreach ($order_elements as $element) {
+                Configuration::updateValue('ORDER_'.strtoupper($element), Tools::getValue('ORDER_'.strtoupper($element)));
+            }
+            $product_elements = self::CART_PRODUCT_ATTR;
+            foreach ($product_elements as $element) {
+                Configuration::updateValue('PRODUCT_'.strtoupper($element), Tools::getValue('PRODUCT_'.strtoupper($element)));
+            }
         }
+
         $this->html .= $this->displayConfirmation($this->trans('Settings updated', array(), 'Admin.Notifications.Success'));
     }
-    private function displayCheck() {
+
+    /**
+     * Display check
+     *
+     * @return template
+     */
+    private function displayCheck()
+    {
         return $this->display(__FILE__, './views/templates/hook/infos.tpl');
     }
 
-    public function getConfigFieldsValues() {
-        return array(
+    /**
+     * Returns the values of the fields in the configuration
+     *
+     * @return array
+     */
+    public function getConfigFieldsValues()
+    {
+        $ret = array(
             'PAYEE_NAME' => Tools::getValue('PAYEE_NAME', Configuration::get('PAYEE_NAME')),
             'PAYEE_ADDRESS' => Tools::getValue('PAYEE_ADDRESS', Configuration::get('PAYEE_ADDRESS')),
             'MODE' => Tools::getValue('MODE', Configuration::get('MODE')),
@@ -524,12 +966,52 @@ public function getConfigFieldsValues() {
             'TEST_PRIVATE_KEY' => Tools::getValue('TEST_PRIVATE_KEY', Configuration::get('TEST_PRIVATE_KEY')),
             'TEST_PUBLIC_KEY' => Tools::getValue('TEST_PUBLIC_KEY', Configuration::get('TEST_PUBLIC_KEY')),
             'LIVE_PRIVATE_KEY' => Tools::getValue('LIVE_PRIVATE_KEY', Configuration::get('LIVE_PRIVATE_KEY')),
-            'LIVE_PUBLIC_KEY' => Tools::getValue('LIVE_PUBLIC_KEY', Configuration::get('LIVE_PUBLIC_KEY'))
+            'LIVE_PUBLIC_KEY' => Tools::getValue('LIVE_PUBLIC_KEY', Configuration::get('LIVE_PUBLIC_KEY')),
+            'CHARGE_ON_DEMAND_ENABLE' => Tools::getValue('CHARGE_ON_DEMAND_ENABLE', Configuration::get('CHARGE_ON_DEMAND_ENABLE')),
+            '3DS_FORCE' => Tools::getValue('3DS_FORCE', Configuration::get('3DS_FORCE'))
         );
+        $order_elements = array_keys(get_class_vars('Cart'));
+        foreach ($order_elements as $element) {
+            $ret['ORDER_'.strtoupper($element)] = Configuration::get('ORDER_'.strtoupper($element));
+        }
+        $product_elements = self::CART_PRODUCT_ATTR;
+        foreach ($product_elements as $element) {
+            $ret['PRODUCT_'.strtoupper($element)] = Configuration::get('PRODUCT_'.strtoupper($element));
+        }
+        
+        return $ret;
     }
 
-    public function buildAdminContent() {
+    private const CART_PRODUCT_ATTR = array("id_product_attribute", "id_product", "cart_quantity", "id_shop", "id_customization", "name", "is_virtual", "description_short", "available_now", "available_later", "id_category_default", "id_supplier", "id_manufacturer", "manufacturer_name", "on_sale", "ecotax", "additional_shipping_cost", "available_for_order", "show_price", "price", "active", "unity", "unit_price_ratio", "quantity_available", "width", "height", "depth", "out_of_stock", "weight", "available_date", "date_add", "date_upd", "quantity", "link_rewrite", "category", "unique_id", "id_address_delivery", "advanced_stock_management", "supplier_reference", "customization_quantity", "price_attribute", "ecotax_attr", "reference", "weight_attribute", "ean13", "isbn", "upc", "minimal_quantity", "wholesale_price", "id_image", "legend", "reduction_type", "is_gift", "reduction", "reduction_without_tax", "price_without_reduction", "attributes", "attributes_small", "rate", "tax_name", "stock_quantity", "price_without_reduction_without_tax", "price_with_reduction", "price_with_reduction_without_tax", "total", "total_wt", "price_wt", "reduction_applies", "quantity_discount_applies", "allow_oosp");
+
+    /**
+     * Build Admin Content
+     *
+     * @return array
+     */
+    public function buildAdminContent()
+    {
         $this->context->controller->addJS($this->_path . 'views/js/functions.js');
+        $order_elements = array_keys(array_diff_key(get_class_vars('Cart'), array('definition' => '', 'htmlFields' => '')));
+        sort($order_elements);
+        $order_meta =  array();
+        foreach ($order_elements as $val) {
+            $order_meta[] = array(
+                "id" => strtoupper($val),
+                "name" => $val,
+                "val" => $val
+            );
+        }
+        $product_elements = self::CART_PRODUCT_ATTR;
+        sort($product_elements);
+        $product_meta =  array();
+        foreach ($product_elements as $val) {
+            $product_meta[] = array(
+                "id" => strtoupper($val),
+                "name" => $val,
+                "val" => $val
+            );
+        }
         $fields_form = array(
             'form' => array(
                 'legend' => array(
@@ -589,7 +1071,7 @@ public function buildAdminContent() {
                             'show' => array( 'text' => $this->l('show'), 'icon' => 'plus-sign-alt' ),
                             'hide' => array( 'text' => $this->l('hide'), 'icon' => 'minus-sign-alt' )
                         )
-                    ),                    
+                    ),
                     array(
                         'type' => 'radio',
                         'label' => $this->l('Expiration date type'),
@@ -605,7 +1087,7 @@ public function buildAdminContent() {
                         'type' => 'text',
                         'label' => $this->trans('Expiration date limit', array(), 'Modules.ConektaPaymentsPrestashop.Admin'),
                         'name' => 'EXPIRATION_DATE_LIMIT',
-                    ),       
+                    ),
                     array(
                         'type' => 'text',
                         'label' => $this->trans('Test Private Key', array(), 'Modules.ConektaPaymentsPrestashop.Admin'),
@@ -629,17 +1111,99 @@ public function buildAdminContent() {
                         'label' => $this->trans('Live Public Key', array(), 'Modules.ConektaPaymentsPrestashop.Admin'),
                         'name' => 'LIVE_PUBLIC_KEY',
                         'required' => true
+                    ),
+                    array(
+                        'type' => 'checkbox',
+                        'label' => $this->l('Additional Order Metadata'),
+                        'name' => 'ORDER',
+                        'values' => array(
+                            'query' => $order_meta,
+                            'id' => 'id',
+                            'name' => 'name'
+                        ),
+                        'expand' => array(
+                            'print_total' => count($order_meta),
+                            'default' => 'show',
+                            'show' => array(
+                                'text' => $this->l('show'),
+                                'icon' => 'plus-sign-alt'
+                            ),
+                            'hide' => array(
+                                'text' => $this->l('hide'),
+                                'icon' => 'minus-sign-alt'
+                            )
+                        )
+                    ),
+                    array(
+                        'type' => 'checkbox',
+                        'label' => $this->l('Additional Product Metadata'),
+                        'name' => 'PRODUCT',
+                        'values' => array(
+                            'query' => $product_meta,
+                            'id' => 'id',
+                            'name' => 'name'
+                        ),
+                        'expand' => array(
+                            'print_total' => count($product_meta),
+                            'default' => 'show',
+                            'show' => array(
+                                'text' => $this->l('show'),
+                                'icon' => 'plus-sign-alt'
+                            ),
+                            'hide' => array(
+                                'text' => $this->l('hide'),
+                                'icon' => 'minus-sign-alt'
+                            )
+                        )
+                    ),
+                    array(
+                        'type' => 'checkbox',
+                        'label' => $this->l('Charge on Demand'),
+                        'name' => 'CHARGE_ON_DEMAND',
+                        'values' => array(
+                            'query' => array(
+                                array(
+                                    'id' => 'ENABLE',
+                                    'name' => $this->l('Enable card save'),
+                                    'val' => 'charge_on_demand_enabled'
+                                ),
+                            ),
+                            'id' => 'id',
+                            'name' => 'name',
+                        )
+                    ),
+                    array(
+                        'type' => 'checkbox',
+                        'label' => $this->l('3DS'),
+                        'name' => '3DS',
+                        'values' => array(
+                            'query' => array(
+                                array(
+                                    'id' => 'FORCE',
+                                    'name' => $this->l('Activar 3DS'),
+                                    'val' => 'force_3ds'
+                                ),
+                            ),
+                            'id' => 'id',
+                            'name' => 'name',
+                        )
                     )
                 ),
                 'submit' => array(
                     'title' => $this->trans('Save', array(), 'Admin.Actions')
                 )
             )
-        );                 
+        );
         return $fields_form;
     }
 
-    public function renderForm() {
+    /**
+     * Render form
+     *
+     * @return HelperForm
+     */
+    public function renderForm()
+    {
         $fields_form           = $this->buildAdminContent();
         $helper                = new HelperForm();
         $helper->show_toolbar  = false;
@@ -653,10 +1217,19 @@ public function renderForm() {
         return $helper->generateForm(array( $fields_form ));
     }
 
-    public function checkSettings($mode = 'global') {
+    /**
+     * Check settings key conekta
+     *
+     * @param $mode configuration type
+     *
+     * @return boolean
+     */
+    public function checkSettings($mode = 'global')
+    {
         if ($mode === 'global') {
             $mode = Configuration::get('CONEKTA_MODE');
         }
+
         $valid = false;
 
         if ($mode) {
@@ -664,31 +1237,43 @@ public function checkSettings($mode = 'global') {
         } else {
             $valid = Configuration::get('CONEKTA_PUBLIC_KEY_TEST') != '' && Configuration::get('CONEKTA_PRIVATE_KEY_TEST') != '';
         }
+
         return $valid;
     }
 
-    public function checkRequirements() {
+    /**
+     * Check requirements
+     *
+     * @return boolean
+     */
+    public function checkRequirements()
+    {
         $tests = array(
             'result' => true
         );
+
         $tests['curl'] = array(
             'name' => $this->l('PHP cURL extension must be enabled on your server'),
             'result' => (integer) function_exists('curl_init')
         );
+
         if (Configuration::get('CONEKTA_MODE')) {
             $tests['ssl'] = array(
                 'name' => $this->l('SSL must be enabled on your store (before entering Live mode)'),
                 'result' => (integer) Configuration::get('PS_SSL_ENABLED') || (!empty(filter_input(INPUT_SERVER, 'HTTPS')) && Tools::strtolower(filter_input(INPUT_SERVER, 'HTTPS')) != 'off')
             );
         }
+
         $tests['php52'] = array(
             'name' => $this->l('Your server must run PHP 5.2 or greater'),
             'result' => (integer) version_compare(PHP_VERSION, '5.2.0', '>=')
         );
+
         $tests['configuration'] = array(
             'name' => $this->l('You must sign-up for CONEKTA and configure your account settings in the module'),
             'result' => (integer) $this->checkSettings()
         );
+
         if (version_compare(_PS_VERSION_, '1.5', '<')) {
             $tests['backward'] = array(
                 'name' => $this->l('You are using the backward compatibility module'),
@@ -696,16 +1281,25 @@ public function checkRequirements() {
                 'resolution' => $this->backward_error
             );
         }
+
         foreach ($tests as $k => $test) {
             if ($k != 'result' && !$test['result']) {
                 $tests['result'] = false;
             }
         }
+
         return $tests;
     }
 
-    public function getContent() {
+    /**
+     * Returns the template's HTML content.
+     *
+     * @return string HTML content
+     */
+    public function getContent()
+    {
         //CODE FOR WEBHOOK VALIDATION UNTESTED DONT ERASE
+
         $this->smarty->assign("base_uri", __PS_BASE_URI__);
         $this->smarty->assign("mode", Configuration::get('MODE'));
         $url = Configuration::get('WEB_HOOK');
@@ -713,6 +1307,7 @@ public function getContent() {
         if (empty($url)) {
             $url = _PS_BASE_URL_ . __PS_BASE_URI__ . "modules/conektapaymentsprestashop/notification.php";
         }
+
         if (Tools::isSubmit('btnSubmit') && Tools::getValue('TEST_PUBLIC_KEY') && Tools::getValue('TEST_PRIVATE_KEY')) {
             $configuration_values = array(
                 'CONEKTA_MODE' => Tools::getValue('MODE'),
@@ -726,32 +1321,36 @@ public function getContent() {
                 'PAYMENT_METHS_SPEI' => rtrim(Tools::getValue('PAYMENT_METHS_SPEI')),
                 'EXPIRATION_DATE_LIMIT' => rtrim(Tools::getValue('EXPIRATION_DATE_LIMIT')),
                 'EXPIRATION_DATE_TYPE' => rtrim(Tools::getValue('EXPIRATION_DATE_TYPE')),
-                
             );
+
             foreach ($configuration_values as $configuration_key => $configuration_value) {
                 Configuration::updateValue($configuration_key, $configuration_value);
             }
             $this->createWebhook();
+
             $webhook_message = Configuration::get('CONEKTA_WEBHOOK_ERROR_MESSAGE');
 
             if (empty($webhook_message)) {
                 $webhook_message = false;
             }
+
             $this->smarty->assign("error_webhook_message", Configuration::get('CONEKTA_WEBHOOK_ERROR_MESSAGE'));
         } else {
             $this->smarty->assign("error_webhook_message", false);
         }
+
         $requirements = $this->checkRequirements();
         $this->smarty->assign("_path", $this->_path);
         $this->smarty->assign("requirements", $requirements);
         $this->smarty->assign("config_check", $requirements['result']);
-
         if ($requirements['result']) {
             $this->smarty->assign("msg_show", $this->l('All the checks were successfully performed. You can now start using your module.'));
         } else {
             $this->smarty->assign("msg_show", $this->l('Please resolve the following errors:'));
         }
+
         $this->html = '';
+
         if (Tools::isSubmit('btnSubmit')) {
             $this->postValidation();
             if (!count($this->postErrors)) {
@@ -762,15 +1361,44 @@ public function getContent() {
                 }
             }
         }
+
         $this->html .= $this->displayCheck();
         $this->html .= $this->renderForm();
-
+        
         return $this->html;
     }
 
-    private function createWebhook() {
+    /**
+     * Create customer of Conekta
+     *
+     * @param $customer Info user in Prestashop
+     * @param $params   Info of user
+     *
+     * @return string
+     */
+    public function createCustomer($customer, $params)
+    {
+        try {
+            $customerConekta = \Conekta\Customer::create($params);
+
+            Database::updateConektaMetadata($customer->id, $this->conekta_mode, "conekta_customer_id", $customerConekta->id);
+
+            return $customerConekta->id;
+        } catch (\Exception $e) {
+            return null;
+        }
+    }
+
+    /**
+     * Create Webhook ok conekta
+     *
+     * @return void
+     */
+    private function createWebhook()
+    {
         $key      = Configuration::get('CONEKTA_MODE') ? Configuration::get('CONEKTA_PRIVATE_KEY_LIVE') : Configuration::get('CONEKTA_PRIVATE_KEY_TEST');
         $iso_code = $this->context->language->iso_code;
+
         \Conekta\Conekta::setApiKey($key);
         \Conekta\Conekta::setPlugin("Prestashop1.7");
         \Conekta\Conekta::setApiVersion("2.0.0");
@@ -783,8 +1411,11 @@ private function createWebhook() {
                 "order.expired",
             )
         );
+
         $url = Tools::safeOutput(Tools::getValue('WEB_HOOK'));
+
         Configuration::deleteByName('CONEKTA_WEBHOOK_ERROR_MESSAGE');
+
         // Obtain stored value
         $config_url      = Tools::safeOutput(Configuration::get('CONEKTA_WEBHOOK'));
         $is_valid_url    = !empty($url) && !filter_var($url, FILTER_VALIDATE_URL) === false;
@@ -794,7 +1425,9 @@ private function createWebhook() {
         if ($is_valid_url && ($config_url != $url) && ($failed_attempts < 5 && $url != Configuration::get('CONEKTA_WEBHOOK_FAILED_URL'))) {
             try {
                 $webhooks = \Conekta\Webhook::where();
+
                 $urls = array();
+
                 foreach ($webhooks as $webhook) {
                     array_push($urls, $webhook->webhook_url);
                 }
@@ -813,12 +1446,15 @@ private function createWebhook() {
                             array(
                                 "url" => $url
                             ),
-                            $mode, $events
+                            $mode,
+                            $events
                         )
                     );
 
                     Configuration::updateValue('CONEKTA_WEBHOOK', $url);
+
                     // delete error variables
+
                     Configuration::deleteByName('CONEKTA_WEBHOOK_FAILED_ATTEMPTS');
                     Configuration::deleteByName('CONEKTA_WEBHOOK_FAILED_URL');
                     Configuration::deleteByName('CONEKTA_WEBHOOK_ERROR_MESSAGE');
@@ -846,23 +1482,35 @@ private function createWebhook() {
         }
     }
 
-    public function getJumps($total, $jumps) {
+    /**
+     * Insert monthly fees
+     *
+     * @param $total Total price of order
+     * @param $jumps monthly fees
+     *
+     * @return array
+     */
+    public function getJumps($total, $jumps)
+    {
         if ($total >= 300 && $total < 600) {
             $jumps[0] = array(1,3);
-
         } elseif ($total >= 600 && $total < 900) {
             $jumps[0] = array(1,3,6);
-
         } elseif ($total >= 900 && $total < 1200) {
             $jumps[0] = array(1,3,6,9);
-
         } elseif ($total >= 1200) {
             $jumps[0] = array(1,3,6,9,12);
         }
         return $jumps;
     }
 
-    protected function generateCardPaymentForm() {
+    /**
+     * Generate Payment form
+     *
+     * @return string HTML generate payment form
+     */
+    protected function generateCardPaymentForm()
+    {
         //value by default
         $msi   = 0;
         $jumps = array( 1 );
@@ -875,10 +1523,12 @@ protected function generateCardPaymentForm() {
         for ($i = 1; $i <= 12; $i++) {
             $months[] = sprintf("%02d", $i);
         }
+
         $years = array();
         for ($i = 0; $i <= 10; $i++) {
             $years[] = date('Y', strtotime('+' . $i . ' years'));
         }
+
         $this->context->smarty->assign(
             array(
                 'action' => $this->context->link->getModuleLink($this->name, 'validation', array(), true),
@@ -886,14 +1536,24 @@ protected function generateCardPaymentForm() {
                 'years' => $years,
                 'msi' => $msi,
                 'msi_jumps' => $jumps[0],
-                'test_private_key' => Configuration::get('TEST_PRIVATE_KEY')
+                'test_private_key' => Configuration::get('TEST_PRIVATE_KEY'),
+                'charge_on_demand' => $this->charge_on_demand,
+                'path' => $this->_path
             )
         );
         return $this->context->smarty->fetch('module:conektapaymentsprestashop/views/templates/front/payment_form.tpl');
     }
 
-    public function processPayment($type, $token, $msi) {
-        $key      = Configuration::get('CONEKTA_MODE') ? Configuration::get('CONEKTA_PRIVATE_KEY_LIVE') : Configuration::get('CONEKTA_PRIVATE_KEY_TEST');
+    /**
+     * Payment process and validates if the payment was made correctly
+     *
+     * @param $conektaOrderId The id of the order to pay
+     *
+     * @return string link redirect
+     */
+    public function processPayment($conektaOrderId)
+    {
+        $key = Configuration::get('CONEKTA_MODE') ? Configuration::get('CONEKTA_PRIVATE_KEY_LIVE') : Configuration::get('CONEKTA_PRIVATE_KEY_TEST');
         $iso_code = $this->context->language->iso_code;
 
         \Conekta\Conekta::setApiKey($key);
@@ -901,109 +1561,15 @@ public function processPayment($type, $token, $msi) {
         \Conekta\Conekta::setApiVersion("2.0.0");
         \Conekta\Conekta::setPluginVersion($this->version);
         \Conekta\Conekta::setLocale($iso_code);
-
-        $cart             = $this->context->cart;
-        $customer         = new Customer((int) $cart->id_customer);
-        $address_delivery = new Address((int) $cart->id_address_delivery);
-        $state            = State::getNameById($address_delivery->id_state);
-        $country          = Country::getIsoById($address_delivery->id_country);
-        $carrier          = new Carrier((int) $cart->id_carrier);
-        $shp_price        = $cart->getTotalShippingCost();
-        $shp_carrier      = "other";
-        $shp_service      = "other";
-        $discounts        = $cart->getCartRules();
-        $items            = $cart->getProducts();
-
-        if (isset($carrier)) {
-            if ($carrier->name != null) {
-                $shp_carrier = $carrier->name;
-                $shp_service = implode(",", $carrier->delay);
-            } else {
-                $shp_carrier = "Producto digital";
-                $shp_service = "Digital";
-            }
-        }
-        $order_details                     = array();
-        $order_details['currency']         = $this->context->currency->iso_code;
-        $order_details['line_items']       = Config::getLineItems($items);
-        $order_details['tax_lines']        = Config::getTaxLines($items);
-        $order_details['discount_lines']   = Config::getDiscountLines($discounts);
-        $order_details['customer_info']    = Config::getCustomerInfo($customer, $address_delivery);
-        $order_details['shipping_lines']   = Config::getShippingLines($shp_service, $shp_carrier, $shp_price);
-        $order_details['shipping_contact'] = Config::getShippingContact($customer, $address_delivery, $state, $country);
-        $order_details['metadata']         = array( "reference_id" => (int) $this->context->cart->id, );
-        $amount = 0;
-
-        foreach ($order_details['line_items'] as $item) {
-            $amount = $amount + ($item['quantity'] * $item['unit_price']);
-        }
-        if (isset($order_details['tax_lines'])) {
-            foreach ($order_details['tax_lines'] as $tax) {
-                $amount = $amount + $tax['amount'];
-            }
-        }
-        if (isset($order_details['shipping_lines'])) {
-            foreach ($order_details['shipping_lines'] as $shipping) {
-                $amount = $amount + $shipping['amount'];
-            }
-        }
-        if (isset($order_details['discount_lines'])) {
-            foreach ($order_details['discount_lines'] as $discount) {
-                $amount = $amount - $discount['amount'];
-            }
-        }
+        $cart = $this->context->cart;
         try {
-            $order = \Conekta\Order::create($order_details);
-            if ($type == "cash") {
-                $charge_params = array(
-                    'payment_method' => array(
-                        'type' => 'oxxo_cash',   
-                        'expires_at' => time() + Configuration::get('EXPIRATION_DATE_LIMIT') * (Configuration::get('EXPIRATION_DATE_TYPE') == 0 ? 86400 : 3600),
-                    ),
-                    'amount' => $amount
-                );
-                $charge_response            = $order->createCharge($charge_params);
-                $barcode_url                = $charge_response->payment_method->reference;
-                $reference                  = $charge_response->payment_method->reference;
-                $order_status               = (int) Configuration::get('waiting_cash_payment');
-                $message                    = $this->l('Conekta Transaction Details:') . "\n\n" . $this->l('Reference:') . ' ' . $reference . "\n" . $this->l('Barcode:') . ' ' . $barcode_url . "\n" . $this->l('Amount:') . ' ' . ($charge_response->amount * 0.01) . "\n" . $this->l('Processed on:') . ' ' . strftime('%Y-%m-%d %H:%M:%S', $charge_response->created_at) . "\n" . $this->l('Currency:') . ' ' . Tools::strtoupper($charge_response->currency) . "\n" . $this->l('Mode:') . ' ' . ($charge_response->livemode == 'true' ? $this->l('Live') : $this->l('Test')) . "\n";
-                $checkout                   = Module::getInstanceByName('conektapaymentsprestashop');
-                $checkout->extra_mail_vars  = array( '{barcode}' => (string) $reference );
-            } elseif ($type == "spei") {
-                $charge_params = array(
-                    'payment_method' => array(
-                        'type' => 'spei'
-                    ),
-                    'amount' => $amount
-                );
-                $charge_response = $order->createCharge($charge_params);
-                $reference       = $charge_response->payment_method->clabe;
-                $order_status    = (int)Configuration::get('waiting_spei_payment');
-                $message         = $this->l('Conekta Transaction Details:') . "\n\n" . $this->l('Reference:') . ' ' . $reference . "\n" . $this->l('Amount:') . ' ' . ($charge_response->amount * 0.01) . "\n" . $this->l('Processed on:') . ' ' . strftime('%Y-%m-%d %H:%M:%S', $charge_response->created_at) . "\n" . $this->l('Currency:') . ' ' . Tools::strtoupper($charge_response->currency) . "\n" . $this->l('Mode:') . ' ' . ($charge_response->livemode == 'true' ? $this->l('Live') : $this->l('Test')) . "\n";
-                $checkout        = Module::getInstanceByName('conektapaymentsprestashop');
-                $checkout->extra_mail_vars = array( '{receiving_account_number}' => (string) $reference );
-
-            } else {
-                $charge_params = array(
-                    'payment_method' => array(
-                        'type' => 'card',
-                        'token_id' => $token
-                    ),
-                    'amount' => $amount
-                );
-                $monthly_installments = (int) $msi;
-
-                if ($monthly_installments > 1) {
-                    $charge_params['payment_method'] = array_merge($charge_params['payment_method'], array(
-                        'monthly_installments' => $monthly_installments
-                    ));
-                }
-                $charge_response = $order->createCharge($charge_params);
-                $order_status    = (int)Configuration::get('PS_OS_PAYMENT');
-                $message         = $this->l('Conekta Transaction Details:') . "\n\n" . $this->l('Amount:') . ' ' . ($charge_response->amount * 0.01) . "\n" . $this->l('Status:') . ' ' . ($charge_response->status == 'paid' ? $this->l('Paid') : $this->l('Unpaid')) . "\n" . $this->l('Processed on:') . ' ' . strftime('%Y-%m-%d %H:%M:%S', $charge_response->created_at) . "\n" . $this->l('Currency:') . ' ' . Tools::strtoupper($charge_response->currency) . "\n" . $this->l('Mode:') . ' ' . ($charge_response->livemode == 'true' ? $this->l('Live') : $this->l('Test')) . "\n";
-            }
-	        $this->validateOrder((int) $this->context->cart->id, (int) $order_status, $order->amount / 100, $this->displayName, $message, array(), null, false, $this->context->customer->secure_key);
-
+            $order = \Conekta\Order::find($conektaOrderId);
+            $charge_response = $order->charges[0];
+            $order_status = (int) Configuration::get('PS_OS_PAYMENT');
+            
+            $message = $this->l('Conekta Transaction Details:') . "\n\n" . $this->l('Amount:') . ' ' . ($charge_response->amount * 0.01) . "\n" . $this->l('Status:') . ' ' . ($charge_response->status == 'paid' ? $this->l('Paid') : $this->l('Unpaid')) . "\n" . $this->l('Processed on:') . ' ' . strftime('%Y-%m-%d %H:%M:%S', $charge_response->created_at) . "\n" . $this->l('Currency:') . ' ' . Tools::strtoupper($charge_response->currency) . "\n" . $this->l('Mode:') . ' ' . ($charge_response->livemode == 'true' ? $this->l('Live') : $this->l('Test')) . "\n";
+            $this->validateOrder((int) $this->context->cart->id, (int) $order_status, $order->amount / 100, $this->displayName, $message, array(), null, false, $this->context->customer->secure_key);
+            
             if (version_compare(_PS_VERSION_, '1.5', '>=')) {
                 $new_order = new Order((int) $this->currentOrder);
                 if (Validate::isLoadedObject($new_order)) {
@@ -1014,15 +1580,21 @@ public function processPayment($type, $token, $msi) {
                     }
                 }
             }
-            if (isset($charge_response->id) && $type == "cash") {
-               Database::insertOxxoPayment($order, $charge_response, $reference, $this->currentOrder, $this->context->cart->id);
-            } elseif (isset($charge_response->id) && $type == "spei") {
+
+            if (isset($charge_response->id) && $charge_response->payment_method->type == "cash") {
+                Database::insertOxxoPayment($order, $charge_response, $reference, $this->currentOrder, $this->context->cart->id);
+            } elseif (isset($charge_response->id) && $charge_response->payment_method->type == "spei") {
                 Database::insertSpeiPayment($order, $charge_response, $reference, $this->currentOrder, $this->context->cart->id);
             } elseif (isset($charge_response->id)) {
                 Database::insertCardPayment($order, $charge_response, $this->currentOrder, $this->context->cart->id);
             }
+            Database::updateConektaOrder($this->context->customer->id, $this->context->cart->id, $this->conekta_mode, $order->id, $order->charges[0]->status);
+
             $redirect = $this->context->link->getPageLink(
-                'order-confirmation', true, null, array(
+                'order-confirmation',
+                true,
+                null,
+                array(
                     'id_order' => (int) $this->currentOrder,
                     'id_cart' => (int) $this->context->cart->id,
                     'key' => $this->context->customer->secure_key,
@@ -1036,14 +1608,25 @@ public function processPayment($type, $token, $msi) {
             if (class_exists('Logger')) {
                 Logger::addLog($this->l('Payment transaction failed') . ' ' . $log_message, 2, null, 'Cart', (int) $this->context->cart->id, true);
             }
+
             $message = $e->getMessage() . ' ';
+
             $controller = Configuration::get('PS_ORDER_PROCESS_TYPE') ? 'order-opc.php' : 'order.php';
             $location   = $this->context->link->getPageLink($controller, true) . (strpos($controller, '?') !== false ? '&' : '?') . 'step=3&conekta_error=1&message=' . $message . '#conekta_error';
 
             Tools::redirectLink($location);
         }
     }
-    public function fetchTemplate($name) {
+
+    /**
+     * Fetch template with the name
+     *
+     * @param $name Name of template
+     *
+     * @return string link template
+     */
+    public function fetchTemplate($name)
+    {
         $views = 'views/templates/';
         if (@filemtime(dirname(__FILE__) . '/' . $name)) {
             return $this->display(__FILE__, $name);
@@ -1054,9 +1637,19 @@ public function fetchTemplate($name) {
         } elseif (@filemtime(dirname(__FILE__) . '/' . $views . 'admin/' . $name)) {
             return $this->display(__FILE__, $views . 'admin/' . $name);
         }
+
         return $this->display(__FILE__, $name);
     }
-    public function getTransactionStatus($order_id) {
+
+    /**
+     * Returns a template with the order status
+     *
+     * @param $order_id The id of order
+     *
+     * @return string HTML
+     */
+    public function getTransactionStatus($order_id)
+    {
         if (Database::getOrderConekta($order_id) == $this->name) {
             $conekta_tran_details = Database::getConektaTransaction($order_id);
 
@@ -1091,6 +1684,7 @@ public function getTransactionStatus($order_id) {
                     )
                 );
             }
+
             return $this->fetchTemplate("admin-order.tpl");
         }
     }
diff --git a/config.xml b/config.xml
new file mode 100644
index 000000000..848b70d31
--- /dev/null
+++ b/config.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+    <name>conektapaymentsprestashop</name>
+    <displayName><![CDATA[Conekta Prestashop]]></displayName>
+    <version><![CDATA[1.1.0]]></version>
+    <description><![CDATA[Accept payments by Credit and Debit Card with Conekta (Visa, Mastercard, Amex)]]></description>
+    <author><![CDATA[Conekta]]></author>
+    <tab><![CDATA[payments_gateways]]></tab>
+    <is_configurable>1</is_configurable>
+    <need_instance>1</need_instance>
+	<limited_countries></limited_countries>
+</module>
\ No newline at end of file
diff --git a/controllers/front/index.php b/controllers/front/index.php
old mode 100755
new mode 100644
diff --git a/controllers/front/validation.php b/controllers/front/validation.php
old mode 100755
new mode 100644
index 1e8601446..d56e708ee
--- a/controllers/front/validation.php
+++ b/controllers/front/validation.php
@@ -1,21 +1,43 @@
 <?php
 /**
-* 2007-2019 PrestaShop
-*
-* NOTICE OF LICENSE
-* Title   : Conekta Card Payment Gateway for Prestashop
-* Author  : Conekta.io
-* URL     : https://www.conekta.io/es/docs/plugins/prestashop.
-*
-* @author Conekta <support@conekta.io>
-* @copyright 2012-2019 Conekta
-* @license http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*
-*/
+ * 2007-2019 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ * Title   : Conekta Card Payment Gateway for Prestashop
+ * Author  : Conekta.io
+ * URL     : https://www.conekta.io/es/docs/plugins/prestashop.
+ * PHP Version 7.0.0
+ *
+ * Validation File Doc Comment
+ *
+ * @category  Validation
+ * @package   Validation
+ * @author    Conekta <support@conekta.io>
+ * @copyright 2012-2019 Conekta
+ * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @version   GIT: @1.1.0@
+ * @link      https://conekta.com/
+ */
 
-class ConektaPaymentsPrestashopValidationModuleFrontController extends ModuleFrontController {
+/**
+ * ConektaPaymentsPrestashopValidationModuleFrontController Class Doc Comment
+ *
+ * @category Class
+ * @package  ConektaPaymentsPrestashopValidationModuleFrontController
+ * @author   Conekta <support@conekta.io>
+ * @license  http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @link     https://conekta.com/
+ */
 
-    public function postProcess() {
+class ConektaPaymentsPrestashopValidationModuleFrontController extends ModuleFrontController
+{
+    /**
+     * Returns the module that the payment of the order was made.
+     *
+     * @return void
+     */
+    public function postProcess()
+    {
         $cart = $this->context->cart;
         $authorized = false;
         $customer = new Customer($cart->id_customer);
@@ -35,11 +57,9 @@ public function postProcess() {
                 Tools::redirect('index.php?controller=order&step=1');
             }
             
-            $type = pSQL(Tools::getValue('type'));
-            $msi = pSQL(Tools::getValue('monthly_installments'));
-            $conektaToken = pSQL(Tools::getValue('conektaToken'));
+            $conektaOrderId = pSQL(Tools::getValue('conektaOrdenID'));
             
-            $conekta->processPayment($type, $conektaToken, $msi);
+            $conekta->processPayment($conektaOrderId);
             
             $this->setTemplate('module:conektapaymentsprestashop/views/templates/front/payment_return.tpl');
         }
diff --git a/controllers/index.php b/controllers/index.php
old mode 100755
new mode 100644
diff --git a/index.php b/index.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/.gitignore b/lib/conekta-php/.gitignore
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/CHANGELOG.md b/lib/conekta-php/CHANGELOG.md
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/LICENSE b/lib/conekta-php/LICENSE
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/README.md b/lib/conekta-php/README.md
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/composer.json b/lib/conekta-php/composer.json
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/index.php b/lib/conekta-php/index.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta.php b/lib/conekta-php/lib/Conekta.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Address.php b/lib/conekta-php/lib/Conekta/Address.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Card.php b/lib/conekta-php/lib/Conekta/Card.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Charge.php b/lib/conekta-php/lib/Conekta/Charge.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Conekta.php b/lib/conekta-php/lib/Conekta/Conekta.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/ConektaList.php b/lib/conekta-php/lib/Conekta/ConektaList.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/ConektaObject.php b/lib/conekta-php/lib/Conekta/ConektaObject.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/ConektaResource.php b/lib/conekta-php/lib/Conekta/ConektaResource.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Customer.php b/lib/conekta-php/lib/Conekta/Customer.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/DiscountLine.php b/lib/conekta-php/lib/Conekta/DiscountLine.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Event.php b/lib/conekta-php/lib/Conekta/Event.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Exceptions/ApiError.php b/lib/conekta-php/lib/Conekta/Exceptions/ApiError.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Exceptions/AuthenticationError.php b/lib/conekta-php/lib/Conekta/Exceptions/AuthenticationError.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Exceptions/Handler.php b/lib/conekta-php/lib/Conekta/Exceptions/Handler.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Exceptions/MalformedRequestError.php b/lib/conekta-php/lib/Conekta/Exceptions/MalformedRequestError.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Exceptions/NoConnectionError.php b/lib/conekta-php/lib/Conekta/Exceptions/NoConnectionError.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Exceptions/ParameterValidationError.php b/lib/conekta-php/lib/Conekta/Exceptions/ParameterValidationError.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Exceptions/ProcessingError.php b/lib/conekta-php/lib/Conekta/Exceptions/ProcessingError.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Exceptions/ResourceNotFoundError.php b/lib/conekta-php/lib/Conekta/Exceptions/ResourceNotFoundError.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Exceptions/index.php b/lib/conekta-php/lib/Conekta/Exceptions/index.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Lang.php b/lib/conekta-php/lib/Conekta/Lang.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/LineItem.php b/lib/conekta-php/lib/Conekta/LineItem.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Log.php b/lib/conekta-php/lib/Conekta/Log.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Method.php b/lib/conekta-php/lib/Conekta/Method.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Order.php b/lib/conekta-php/lib/Conekta/Order.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Payee.php b/lib/conekta-php/lib/Conekta/Payee.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/PaymentMethod.php b/lib/conekta-php/lib/Conekta/PaymentMethod.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/PaymentSource.php b/lib/conekta-php/lib/Conekta/PaymentSource.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Payout.php b/lib/conekta-php/lib/Conekta/Payout.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/PayoutMethod.php b/lib/conekta-php/lib/Conekta/PayoutMethod.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Plan.php b/lib/conekta-php/lib/Conekta/Plan.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Requestor.php b/lib/conekta-php/lib/Conekta/Requestor.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/ShippingContact.php b/lib/conekta-php/lib/Conekta/ShippingContact.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/ShippingLine.php b/lib/conekta-php/lib/Conekta/ShippingLine.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Subscription.php b/lib/conekta-php/lib/Conekta/Subscription.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/TaxLine.php b/lib/conekta-php/lib/Conekta/TaxLine.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Token.php b/lib/conekta-php/lib/Conekta/Token.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Util.php b/lib/conekta-php/lib/Conekta/Util.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/Webhook.php b/lib/conekta-php/lib/Conekta/Webhook.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/WebhookLog.php b/lib/conekta-php/lib/Conekta/WebhookLog.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/Conekta/index.php b/lib/conekta-php/lib/Conekta/index.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/index.php b/lib/conekta-php/lib/index.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/locales/index.php b/lib/conekta-php/lib/locales/index.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/locales/messages/en.php b/lib/conekta-php/lib/locales/messages/en.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/locales/messages/es.php b/lib/conekta-php/lib/locales/messages/es.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/locales/messages/index.php b/lib/conekta-php/lib/locales/messages/index.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/ssl_data/ca_bundle.crt b/lib/conekta-php/lib/ssl_data/ca_bundle.crt
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/lib/ssl_data/index.php b/lib/conekta-php/lib/ssl_data/index.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/phpunit.xml b/lib/conekta-php/phpunit.xml
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/readme_cover.png b/lib/conekta-php/readme_cover.png
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/BaseTest.php b/lib/conekta-php/test/BaseTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-1.0/ChargeTest.php b/lib/conekta-php/test/Conekta-1.0/ChargeTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-1.0/ConektaTest.php b/lib/conekta-php/test/Conekta-1.0/ConektaTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-1.0/CustomerTest.php b/lib/conekta-php/test/Conekta-1.0/CustomerTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-1.0/ErrorTest.php b/lib/conekta-php/test/Conekta-1.0/ErrorTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-1.0/EventTest.php b/lib/conekta-php/test/Conekta-1.0/EventTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-1.0/LangTest.php b/lib/conekta-php/test/Conekta-1.0/LangTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-1.0/LogTest.php b/lib/conekta-php/test/Conekta-1.0/LogTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-1.0/PayoutTest.php b/lib/conekta-php/test/Conekta-1.0/PayoutTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-1.0/PlanTest.php b/lib/conekta-php/test/Conekta-1.0/PlanTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-1.0/WebhookTest.php b/lib/conekta-php/test/Conekta-1.0/WebhookTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-1.0/index.php b/lib/conekta-php/test/Conekta-1.0/index.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/ChargeTest.php b/lib/conekta-php/test/Conekta-2.0/ChargeTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/ConektaListTest.php b/lib/conekta-php/test/Conekta-2.0/ConektaListTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/ConektaTest.php b/lib/conekta-php/test/Conekta-2.0/ConektaTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/CustomerTest.php b/lib/conekta-php/test/Conekta-2.0/CustomerTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/DiscountLineTest.php b/lib/conekta-php/test/Conekta-2.0/DiscountLineTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/ErrorHandlerTest.php b/lib/conekta-php/test/Conekta-2.0/ErrorHandlerTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/LangTest.php b/lib/conekta-php/test/Conekta-2.0/LangTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/LineItemTest.php b/lib/conekta-php/test/Conekta-2.0/LineItemTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/OrderTest.php b/lib/conekta-php/test/Conekta-2.0/OrderTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/ShippingContactTest.php b/lib/conekta-php/test/Conekta-2.0/ShippingContactTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/ShippingLineTest.php b/lib/conekta-php/test/Conekta-2.0/ShippingLineTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/SourceTest.php b/lib/conekta-php/test/Conekta-2.0/SourceTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/SubscriptionTest.php b/lib/conekta-php/test/Conekta-2.0/SubscriptionTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/TaxLineTest.php b/lib/conekta-php/test/Conekta-2.0/TaxLineTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/WebhookTest.php b/lib/conekta-php/test/Conekta-2.0/WebhookTest.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/Conekta-2.0/index.php b/lib/conekta-php/test/Conekta-2.0/index.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/bootstrap.php b/lib/conekta-php/test/bootstrap.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/index.php b/lib/conekta-php/test/index.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/support/fixtures/index.php b/lib/conekta-php/test/support/fixtures/index.php
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/support/fixtures/orders.json b/lib/conekta-php/test/support/fixtures/orders.json
old mode 100755
new mode 100644
diff --git a/lib/conekta-php/test/support/index.php b/lib/conekta-php/test/support/index.php
old mode 100755
new mode 100644
diff --git a/lib/index.php b/lib/index.php
old mode 100755
new mode 100644
diff --git a/logo.png b/logo.png
old mode 100755
new mode 100644
diff --git a/mails/en/conektaefectivo.html b/mails/en/conektaefectivo.html
old mode 100755
new mode 100644
diff --git a/mails/en/conektaefectivo.txt b/mails/en/conektaefectivo.txt
old mode 100755
new mode 100644
diff --git a/mails/en/conektaspei.html b/mails/en/conektaspei.html
old mode 100755
new mode 100644
diff --git a/mails/en/conektaspei.txt b/mails/en/conektaspei.txt
old mode 100755
new mode 100644
diff --git a/mails/en/index.php b/mails/en/index.php
old mode 100755
new mode 100644
diff --git a/mails/es/conektaefectivo.html b/mails/es/conektaefectivo.html
old mode 100755
new mode 100644
diff --git a/mails/es/conektaefectivo.txt b/mails/es/conektaefectivo.txt
old mode 100755
new mode 100644
diff --git a/mails/es/conektaspei.html b/mails/es/conektaspei.html
old mode 100755
new mode 100644
diff --git a/mails/es/conektaspei.txt b/mails/es/conektaspei.txt
old mode 100755
new mode 100644
diff --git a/mails/es/index.php b/mails/es/index.php
old mode 100755
new mode 100644
diff --git a/mails/index.php b/mails/index.php
old mode 100755
new mode 100644
diff --git a/mails/mx/conektaefectivo.html b/mails/mx/conektaefectivo.html
old mode 100755
new mode 100644
diff --git a/mails/mx/conektaefectivo.txt b/mails/mx/conektaefectivo.txt
old mode 100755
new mode 100644
diff --git a/mails/mx/conektaspei.html b/mails/mx/conektaspei.html
old mode 100755
new mode 100644
diff --git a/mails/mx/conektaspei.txt b/mails/mx/conektaspei.txt
old mode 100755
new mode 100644
diff --git a/mails/mx/index.php b/mails/mx/index.php
old mode 100755
new mode 100644
diff --git a/model/Config.php b/model/Config.php
old mode 100755
new mode 100644
index 3aa36c617..dc6aa4343
--- a/model/Config.php
+++ b/model/Config.php
@@ -126,7 +126,7 @@ public static function getCustomerInfo($customer = '', $address_delivery = '')
     {
         $customer_info = array(
             "name"     => $customer->firstname . " " . $customer->lastname,
-            "phone"    => $address_delivery->phone,
+            // "phone"    => $address_delivery->phone,
             "email"    => $customer->email,
             "metadata" => array("soft_validations" => true)
             );
diff --git a/model/Database.php b/model/Database.php
old mode 100755
new mode 100644
index c6d74aaec..a0c5a4ac4
--- a/model/Database.php
+++ b/model/Database.php
@@ -1,23 +1,43 @@
 <?php
 /**
-* 2007-2017 PrestaShop
-*
-* NOTICE OF LICENSE
-* Title   : Conekta Card Payment Gateway for Prestashop
-* Author  : Conekta.io
-* URL     : https://www.conekta.io/es/docs/plugins/prestashop.
-*
-*  @author Conekta <support@conekta.io>
-*  @copyright 2012-2017 Conekta
-*  @license http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  @version v1.0.0
-*/
+ * 2007-2019 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ * Title   : Conekta Card Payment Gateway for Prestashop
+ * Author  : Conekta.io
+ * URL     : https://www.conekta.io/es/docs/plugins/prestashop.
+ * PHP Version 7.0.0
+ *
+ * Database File Doc Comment
+ *
+ * @category  Database
+ * @package   Database
+ * @author    Conekta <support@conekta.io>
+ * @copyright 2012-2019 Conekta
+ * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @version   GIT: @1.1.0@
+ * @link      https://conekta.com/
+ */
 
 /**
-* Class Database
-*/
+ * Database Class Doc Comment
+ *
+ * @category Class
+ * @package  Database
+ * @author   Conekta <support@conekta.io>
+ * @license  http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @link     https://conekta.com/
+ */
+
 class Database
 {
+    /**
+     * Returns the module that the payment of the order was made.
+     *
+     * @param $order_id Order id
+     *
+     * @return array|string
+     */
     public static function getOrderConekta($order_id)
     {
         return Db::getInstance()->getValue(
@@ -26,6 +46,13 @@ public static function getOrderConekta($order_id)
         );
     }
 
+    /**
+     * Returns information of the order paid.
+     *
+     * @param $order_id The order id
+     *
+     * @return array
+     */
     public static function getConektaTransaction($order_id)
     {
         return Db::getInstance()->getRow(
@@ -35,71 +62,173 @@ public static function getConektaTransaction($order_id)
         );
     }
 
+    /**
+     * Insert payment with oxxo
+     *
+     * @param Order  $order           Object order
+     * @param array  $charge_response Charges made on the order
+     * @param string $reference       Payment reference code
+     * @param int    $currentOrder    Order ID
+     * @param int    $cartId          Cart ID
+     *
+     * @return boolean
+     */
     public static function insertOxxoPayment($order, $charge_response, $reference, $currentOrder, $cartId)
     {
-        return Db::getInstance()->Execute('INSERT INTO ' . _DB_PREFIX_ . 'conekta_transaction (
-        type, id_cart, id_order, id_conekta_order, id_transaction, amount,
-        status, currency, mode, date_add, reference, barcode, captured)
-        VALUES (\'payment\', ' . pSQL((int) $cartId) . ', ' . pSQL((int) $currentOrder) . ', \''
-        . pSQL($order->id) . '\', \'' . pSQL($charge_response->id) . '\',\''
-        . (float) ($order->amount * 0.01) . '\', \''
-        . ($charge_response->status == 'paid' ? 'paid' : 'unpaid') . '\', \''
-        . pSQL($charge_response->currency) . '\', \''
-        . ($charge_response->livemode == 'true' ? 'live' : 'test') . '\', NOW(),\''
-        . pSQL($reference) . '\',\'' . pSQL($reference) . '\',\''
-        . ($charge_response->livemode == 'true' ? '1' : '0') . '\' )');
+        return Db::getInstance()->Execute(
+            'INSERT INTO ' . _DB_PREFIX_ . 'conekta_transaction (
+            type, id_cart, id_order, id_conekta_order, id_transaction, amount,
+            status, currency, mode, date_add, reference, barcode, captured)
+            VALUES (\'payment\', ' . pSQL((int) $cartId) . ', ' . pSQL((int) $currentOrder) . ', \''
+            . pSQL($order->id) . '\', \'' . pSQL($charge_response->id) . '\',\''
+            . (float) ($order->amount * 0.01) . '\', \''
+            . ($charge_response->status == 'paid' ? 'paid' : 'unpaid') . '\', \''
+            . pSQL($charge_response->currency) . '\', \''
+            . ($charge_response->livemode == 'true' ? 'live' : 'test') . '\', NOW(),\''
+            . pSQL($reference) . '\',\'' . pSQL($reference) . '\',\''
+            . ($charge_response->livemode == 'true' ? '1' : '0') . '\' )'
+        );
     }
 
+    /**
+     * Create table ps_conekta_transaction
+     *
+     * @return boolean
+     */
     public static function installDb()
     {
-        return (Db::getInstance()->Execute('CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'conekta_transaction` (
-            `id_conekta_transaction` int(11) NOT NULL AUTO_INCREMENT,
-            `type` enum(\'payment\',\'refund\') NOT NULL,
-            `id_cart` int(10) unsigned NOT NULL,
-            `id_order` int(10) unsigned NOT NULL,
-            `id_conekta_order` varchar(32) NOT NULL,
-            `id_transaction` varchar(32) NOT NULL,
-            `amount` decimal(10,2) NOT NULL,
-            `status` enum(\'paid\',\'unpaid\') NOT NULL,
-            `currency` varchar(3) NOT NULL,
-            `mode` enum(\'live\',\'test\') NOT NULL,
-            `date_add` datetime NOT NULL,
-            `reference` varchar(30) NOT NULL,
-            `barcode` varchar(230) NOT NULL,
-            `captured` tinyint(1) NOT NULL DEFAULT \'1\',
-            PRIMARY KEY (`id_conekta_transaction`),
-            KEY `idx_transaction` (`type`,`id_order`,`status`))
-            ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8 AUTO_INCREMENT=1'));
+        return (
+            Db::getInstance()->execute(
+                'CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'conekta_transaction` (
+                `id_conekta_transaction` int(11) NOT NULL AUTO_INCREMENT,
+                `type` enum(\'payment\',\'refund\') NOT NULL,
+                `id_cart` int(10) unsigned NOT NULL,
+                `id_order` int(10) unsigned NOT NULL,
+                `id_conekta_order` varchar(32) NOT NULL,
+                `id_transaction` varchar(32) NOT NULL,
+                `amount` decimal(10,2) NOT NULL,
+                `status` enum(\'paid\',\'unpaid\') NOT NULL,
+                `currency` varchar(3) NOT NULL,
+                `mode` enum(\'live\',\'test\') NOT NULL,
+                `date_add` datetime NOT NULL,
+                `reference` varchar(30) NOT NULL,
+                `barcode` varchar(230) NOT NULL,
+                `captured` tinyint(1) NOT NULL DEFAULT \'1\',
+                PRIMARY KEY (`id_conekta_transaction`),
+                KEY `idx_transaction` (`type`,`id_order`,`status`))
+                ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8 AUTO_INCREMENT=1'
+            )
+        );
+    }
+
+    /**
+     * Create table ps_conekta_metadata
+     *
+     * @return boolean
+     */
+    public static function createTableMetaData()
+    {
+        $table = _DB_PREFIX_."conekta_metadata";
+        $sql = "CREATE TABLE IF NOT EXISTS $table (
+            id_conekta_metadata int(11) NOT NULL AUTO_INCREMENT,
+            id_user int(11) unsigned NOT NULL,
+            `mode` enum(\"live\",\"test\") NOT NULL,
+            meta_option varchar(32) NOT NULL,
+            meta_value varchar(128) NOT NULL,
+            PRIMARY KEY (id_conekta_metadata),
+            KEY id_user (id_user),
+            KEY id_conekta_metadata (id_conekta_metadata)
+            )
+            ENGINE=". _MYSQL_ENGINE_ . "DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
+
+        return (Db::getInstance()->execute($sql));
     }
 
+    /**
+     * Create table ps_conekta_order_checkout
+     *
+     * @return boolean
+     */
+    public static function createTableConektaOrder()
+    {
+        $table = _DB_PREFIX_."conekta_order_checkout";
+        $sql = "CREATE TABLE IF NOT EXISTS $table (
+            id int(11) NOT NULL AUTO_INCREMENT,
+            id_user int(11) unsigned NOT NULL,
+            id_cart int(11) unsigned NOT NULL,
+            `mode` enum(\"live\",\"test\") NOT NULL,
+            id_conekta_order varchar(32) NOT NULL,
+            `status` enum(\"paid\",\"unpaid\") NOT NULL,
+            PRIMARY KEY (id),
+            KEY id_user (id_user),
+            KEY id_cart (id_cart),
+            KEY id (id),
+            KEY id_conekta_order (id_conekta_order)
+            )
+            ENGINE=". _MYSQL_ENGINE_ . "DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
 
+        return (Db::getInstance()->execute($sql));
+    }
+
+    /**
+     * Insert payment with spei
+     *
+     * @param Order  $order           Object order
+     * @param array  $charge_response Charges made on the order
+     * @param string $reference       Payment reference code
+     * @param int    $currentOrder    Order ID
+     * @param int    $cartId          Cart ID
+     *
+     * @return boolean
+     */
     public static function insertSpeiPayment($order, $charge_response, $reference, $currentOrder, $cartId)
     {
-        return Db::getInstance()->Execute('INSERT INTO ' . _DB_PREFIX_ . 'conekta_transaction(
-        type, id_cart, id_order, id_conekta_order, id_transaction, amount,
-        status, currency, mode, date_add, reference, captured)
-        VALUES (\'payment\', ' . (int) $cartId . ', ' . (int) $currentOrder . ', \''
-        . pSQL($order->id) . '\', \'' . pSQL($charge_response->id) . '\', \''
-        . (float)($charge_response->amount * 0.01) . '\', \''
-        . ($charge_response->status == 'paid' ? 'paid' : 'unpaid') . '\', \''
-        . pSQL($charge_response->currency) . '\', \''
-        . ($charge_response->livemode == 'true' ? 'live' : 'test') . '\', NOW(),\''
-        . pSQL($reference) . '\', \'' . ($charge_response->livemode == 'true' ? '1' : '0') . '\' )');
+        return Db::getInstance()->Execute(
+            'INSERT INTO ' . _DB_PREFIX_ . 'conekta_transaction(
+            type, id_cart, id_order, id_conekta_order, id_transaction, amount,
+            status, currency, mode, date_add, reference, captured)
+            VALUES (\'payment\', ' . (int) $cartId . ', ' . (int) $currentOrder . ', \''
+            . pSQL($order->id) . '\', \'' . pSQL($charge_response->id) . '\', \''
+            . (float)($charge_response->amount * 0.01) . '\', \''
+            . ($charge_response->status == 'paid' ? 'paid' : 'unpaid') . '\', \''
+            . pSQL($charge_response->currency) . '\', \''
+            . ($charge_response->livemode == 'true' ? 'live' : 'test') . '\', NOW(),\''
+            . pSQL($reference) . '\', \'' . ($charge_response->livemode == 'true' ? '1' : '0') . '\' )'
+        );
     }
 
+    /**
+     * Insert payment with card
+     *
+     * @param Order $order           Object order
+     * @param array $charge_response Charges made on the order
+     * @param int   $currentOrder    Order ID
+     * @param int   $cartId          Cart ID
+     *
+     * @return boolean
+     */
     public static function insertCardPayment($order, $charge_response, $currentOrder, $cartId)
     {
-        return Db::getInstance()->Execute('INSERT INTO ' . _DB_PREFIX_ . 'conekta_transaction (
-        type, id_cart, id_order, id_conekta_order, id_transaction,
-        amount, status, currency, mode, date_add, captured)
-        VALUES (\'payment\', ' . (int) $cartId . ', ' . (int) $currentOrder . ', \''
-        . pSQL($order->id) . '\', \'' . pSQL($charge_response->id) . '\',\''
-        . (float)($charge_response->amount * 0.01) . '\', \''
-        . ($charge_response->status == 'paid' ? 'paid' : 'unpaid') . '\', \''
-        . pSQL($charge_response->currency) . '\', \''
-        . ($charge_response->livemode == 'true' ? 'live' : 'test') . '\', NOW(), \'1\')');
+        return Db::getInstance()->Execute(
+            'INSERT INTO ' . _DB_PREFIX_ . 'conekta_transaction (
+            type, id_cart, id_order, id_conekta_order, id_transaction,
+            amount, status, currency, mode, date_add, captured)
+            VALUES (\'payment\', ' . (int) $cartId . ', ' . (int) $currentOrder . ', \''
+            . pSQL($order->id) . '\', \'' . pSQL($charge_response->id) . '\',\''
+            . (float)($charge_response->amount * 0.01) . '\', \''
+            . ($charge_response->status == 'paid' ? 'paid' : 'unpaid') . '\', \''
+            . pSQL($charge_response->currency) . '\', \''
+            . ($charge_response->livemode == 'true' ? 'live' : 'test') . '\', NOW(), \'1\')'
+        );
     }
 
+    /**
+     * Returns the order information
+     *
+     * @param int $id_order Order ID
+     *
+     * @return array
+     */
     public static function getOrderById($id_order)
     {
         return Db::getInstance()->getRow(
@@ -107,4 +236,87 @@ public static function getOrderById($id_order)
             .'WHERE id_order = ' . pSQL((int) $id_order) . ';'
         );
     }
+
+    /**
+     * Returns the order information
+     *
+     * @param int    $user_id      Order ID
+     * @param string $mode         Mode (Production or Test)
+     * @param string $meta_options Metadata option to be searched
+     *
+     * @return array|string
+     */
+    public static function getConektaMetadata($user_id, $mode, $meta_options)
+    {
+        $table = _DB_PREFIX_."conekta_metadata";
+
+        $sql = "SELECT meta_value FROM  $table WHERE id_user = '{$user_id}' AND meta_option = '{$meta_options}' AND `mode` = '{$mode}'";
+
+        return  Db::getInstance()->getRow($sql);
+    }
+
+    /**
+     * Save or update value.
+     *
+     * @param int    $user_id      User ID
+     * @param string $mode         Mode (Production or Test)
+     * @param string $meta_options Metadata option to save
+     * @param string $meta_value   Value to be saved
+     *
+     * @return boolean
+     */
+    public static function updateConektaMetadata($user_id, $mode, $meta_options, $meta_value)
+    {
+        $table = _DB_PREFIX_."conekta_metadata";
+
+        if (empty(Database::getConektaMetadata($user_id, $mode, $meta_options))) {
+            $sql = "INSERT INTO $table(id_user, mode, meta_option, meta_value) VALUES ('{$user_id}','{$mode}','{$meta_options}','{$meta_value}')";
+        } else {
+            $sql ="UPDATE $table SET id_user = '{$user_id}', meta_option = '{$meta_options}', meta_value = '{$meta_value}' WHERE id_user = '{$user_id}' AND meta_option = '{$meta_options}' AND `mode` = '{$mode}'";
+        }
+
+        return Db::getInstance()->Execute($sql);
+    }
+
+    /**
+     * Returns the id of the order created by conekta
+     *
+     * @param int    $user_id User ID
+     * @param string $mode    Mode (Production or Test)
+     * @param int    $cart_id Cart ID
+     *
+     * @return array|string
+     */
+    public static function getConektaOrder($user_id, $mode, $cart_id)
+    {
+        $table = _DB_PREFIX_."conekta_order_checkout";
+
+        $sql = "SELECT id_conekta_order, `status` FROM  $table WHERE id_user = '{$user_id}' AND `mode` = '{$mode}'  AND `status` = 'unpaid' AND id_cart ='{$cart_id}'";
+        
+        return  Db::getInstance()->getRow($sql);
+    }
+
+    /**
+     * Add or update placed orders
+     *
+     * @param int    $user_id          User ID
+     * @param int    $cart_id          Cart ID
+     * @param string $mode             Mode (Production or Test)
+     * @param string $id_conekta_order Order ID generate for Conekta
+     * @param string $status           Order status
+     *
+     * @return boolean
+     */
+    public static function updateConektaOrder($user_id, $cart_id, $mode, $id_conekta_order, $status)
+    {
+        $table = _DB_PREFIX_."conekta_order_checkout";
+        
+        if (empty(Database::getConektaOrder($user_id, $mode, $cart_id))) {
+            $sql = "INSERT INTO $table(id_user,	id_cart, mode, id_conekta_order, `status`) VALUES ('{$user_id}','{$cart_id}','{$mode}','{$id_conekta_order}', '{$status}')";
+        } else {
+            $sql = "UPDATE $table SET `status` = '{$status}' WHERE id_user = '{$user_id}' AND id_cart = '{$cart_id}' AND id_conekta_order = '{$id_conekta_order}' AND `mode` = '{$mode}'";
+        }
+
+        return Db::getInstance()->Execute($sql);
+    }
 }
diff --git a/model/index.php b/model/index.php
old mode 100755
new mode 100644
diff --git a/notification.php b/notification.php
old mode 100755
new mode 100644
index 1c89229c2..b60dcb448
--- a/notification.php
+++ b/notification.php
@@ -1,73 +1,115 @@
 <?php
 /**
+ * 2007-2019 PrestaShop
+ *
+ * NOTICE OF LICENSE
  * Title   : Conekta Card Payment Gateway for Prestashop
  * Author  : Conekta.io
  * Url     : https://www.conekta.io/es/docs/plugins/prestashop.
+ * PHP Version 7.0.0
+ *
+ * Notification File Doc Comment
  *
- *  @author Conekta <support@conekta.io>
- *  @copyright  2012-2016 Conekta
- *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- *  @version  v2.0.0
+ * @category  Notification
+ * @package   Notification
+ * @author    Conekta <support@conekta.io>
+ * @copyright 2012-2019 Conekta
+ * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @version   GIT: @1.1.0@
+ * @link      https://conekta.com/
  */
 
-include(__DIR__ . '/../../config/config.inc.php');
-include(__DIR__ . '/../../init.php');
+require_once __DIR__ . '/../../config/config.inc.php';
+require_once __DIR__ . '/../../init.php';
 
 if (!defined('_PS_VERSION_')) {
     exit;
 }
 
-// To configure, add webhook in account storename.com/modules/conektaefectivo/notification.php
+define("ORDER_CANCELED", 6);
+define("ORDER_REFUNDED", 7);
 
+/*
+    To configure, add webhook in account
+    storename.com/modules/conektaefectivo/notification.php
+*/
 $body = Tools::file_get_contents('php://input');
 authenticateEvent($body, filter_input(INPUT_SERVER, 'HTTP_DIGEST'));
 $event_json = Tools::jsonDecode($body);
 
-if ($event_json->type == 'order.paid' && isset($event_json->data)) {
 
+if ($event_json->type == 'order.paid' && isset($event_json->data)) {
     $conekta_order = $event_json->data->object;
     
-    $reference_id           = (integer) $conekta_order->metadata->reference_id;
-    $id_order               = Order::getOrderByCartId($reference_id);
-    $order                  = new Order($id_order);
-    $order_fields           = $order->getFields();
-    $currency_payment       = Currency::getPaymentCurrencies(Module::getModuleIdByName('conektapaymentsprestashop'), $order_fields['id_shop']);
-    $total_order_amount     = $order->getOrdersTotalPaid();
+    $reference_id = (integer) $conekta_order->metadata->reference_id;
+    $id_order = Order::getOrderByCartId($reference_id);
+    $order = new Order($id_order);
+    $order_fields = $order->getFields();
+    $currency_payment = Currency::getPaymentCurrencies(
+        Module::getModuleIdByName('conektapaymentsprestashop'),
+        $order_fields['id_shop']
+    );
+    $total_order_amount = $order->getOrdersTotalPaid();
     $str_total_order_amount = (string) $total_order_amount * 100;
     
     if ($currency_payment[0]['iso_code'] === $conekta_order->currency) {
         if ($str_total_order_amount == $conekta_order->amount) {
             $orderHistory           = new OrderHistory();
             $orderHistory->id_order = (int) $order->id;
-            $orderHistory->changeIdOrderState((int) Configuration::get('PS_OS_PAYMENT'), (int) $order->id);
+            $orderHistory->changeIdOrderState(
+                (int) Configuration::get('PS_OS_PAYMENT'),
+                (int) $order->id
+            );
             $orderHistory->addWithEmail();
-            Db::getInstance()->Execute('UPDATE ' . _DB_PREFIX_ . 'conekta_transaction SET status = "paid" WHERE id_order = ' . pSQL($id_order));
+            Db::getInstance()->Execute(
+                'UPDATE ' . _DB_PREFIX_
+                .'conekta_transaction SET status = "paid" WHERE id_order = '
+                . pSQL($id_order)
+            );
         }
     }
-}elseif($event_json->type == 'order.expired' && isset($event_json->data)) {
-  $conekta_order = $event_json->data->object;
+} elseif ($event_json->type == 'order.expired' && isset($event_json->data)) {
+    $conekta_order = $event_json->data->object;
       
-  $reference_id           = (integer) $conekta_order->metadata->reference_id;
-  $id_order               = Order::getOrderByCartId($reference_id);
-  Db::getInstance()->Execute('UPDATE ' . _DB_PREFIX_ . 'orders SET current_state = 6 WHERE id_order = ' . pSQL($id_order));
-
-}elseif($event_json->type == 'order.canceled' && isset($event_json->data)) {
-  $conekta_order = $event_json->data->object;
+    $reference_id           = (integer) $conekta_order->metadata->reference_id;
+    $id_order               = Order::getOrderByCartId($reference_id);
+    Db::getInstance()->Execute(
+        'UPDATE ' . _DB_PREFIX_
+        . 'orders SET current_state = '. ORDER_CANCELED .' WHERE id_order = '
+        . pSQL($id_order)
+    );
+} elseif ($event_json->type == 'order.canceled' && isset($event_json->data)) {
+    $conekta_order = $event_json->data->object;
       
-  $reference_id           = (integer) $conekta_order->metadata->reference_id;
-  $id_order               = Order::getOrderByCartId($reference_id);
-  Db::getInstance()->Execute('UPDATE ' . _DB_PREFIX_ . 'orders SET current_state = 6 WHERE id_order = ' . pSQL($id_order));
-  
-}elseif($event_json->type == 'order.refunded' && isset($event_json->data)) {
-  $conekta_order = $event_json->data->object;
+    $reference_id           = (integer) $conekta_order->metadata->reference_id;
+    $id_order               = Order::getOrderByCartId($reference_id);
+    Db::getInstance()->Execute(
+        'UPDATE ' . _DB_PREFIX_
+        . 'orders SET current_state = '. ORDER_CANCELED .' WHERE id_order = '
+        . pSQL($id_order)
+    );
+} elseif ($event_json->type == 'order.refunded' && isset($event_json->data)) {
+    $conekta_order = $event_json->data->object;
       
-  $reference_id           = (integer) $conekta_order->metadata->reference_id;
-  $id_order               = Order::getOrderByCartId($reference_id);
-  Db::getInstance()->Execute('UPDATE ' . _DB_PREFIX_ . 'orders SET current_state = 7 WHERE id_order = ' . pSQL($id_order));
-
+    $reference_id           = (integer) $conekta_order->metadata->reference_id;
+    $id_order               = Order::getOrderByCartId($reference_id);
+    Db::getInstance()->Execute(
+        'UPDATE ' . _DB_PREFIX_
+        . 'orders SET current_state = '. ORDER_REFUNDED .' WHERE id_order = '
+        . pSQL($id_order)
+    );
 }
 
-function authenticateEvent($body, $digest) {
+/**
+ * Aunthenticate events
+ *
+ * @param $body   inputs
+ * @param $digest methods a web server can use to negotiate credentials
+ *
+ * @return void
+ */
+function authenticateEvent($body, $digest)
+{
     if (Configuration::get('CONEKTA_MODE')) {
         $private_key_string = Configuration::get('CONEKTA_SIGNATURE_KEY_LIVE');
     } else {
@@ -78,7 +120,11 @@ function authenticateEvent($body, $digest) {
             $private_key       = openssl_pkey_get_private($private_key_string);
             $encrypted_message = urldecode($digest);
             $sha256_message    = "";
-            openssl_private_decrypt($encrypted_message, $sha256_message, $private_key);
+            openssl_private_decrypt(
+                $encrypted_message,
+                $sha256_message,
+                $private_key
+            );
             if (hash("sha256", $body) != $sha256_message) {
                 authenticateLogger("unauthenticated event");
             }
@@ -88,8 +134,15 @@ function authenticateEvent($body, $digest) {
     }
 }
 
-
-function authenticateLogger($log_message) {
+/**
+ * Aunthenticate logger
+ *
+ * @param $log_message message log
+ *
+ * @return void
+ */
+function authenticateLogger($log_message)
+{
     if (version_compare(_PS_VERSION_, '1.4.0.3', '>') && class_exists('Logger')) {
         Logger::addLog($log_message, 1, null, 'notification', '');
     }
diff --git a/views/css/conekta-prestashop-admin.css b/views/css/conekta-prestashop-admin.css
old mode 100755
new mode 100644
diff --git a/views/css/conekta-prestashop.css b/views/css/conekta-prestashop.css
old mode 100755
new mode 100644
index 9a6248b5c..6a72d0fe3
--- a/views/css/conekta-prestashop.css
+++ b/views/css/conekta-prestashop.css
@@ -175,3 +175,67 @@ p.conekta-payment-module.payment_module.spei-option a.conekta_title {
 p.conekta-payment-module.payment_module.banorte-option a.conekta_title {
   background: url(../img/banorte.png) 20px 30px no-repeat #fbfbfb;
 }
+p.conekta-payment-module.payment_module.banorte-option a.conekta_title{
+background: url(../img/banorte.png) 20px 30px no-repeat #fbfbfb;
+}
+div.conekta-payment-module.payment_module.active a, p.conekta-payment-module.payment_module.active a:after {
+content:"\f078";
+padding-right: 20px;
+}
+
+.conekta_delete_card {
+    float:right;
+    cursor:pointer;
+}
+.info_card {
+    border-bottom: 0.15rem dotted #dedfdf;
+    padding:1rem;
+}
+.customer-payment-sources {
+	border-top: 0.2rem solid #dedfdf;
+    border-bottom: 0.2rem solid #dedfdf;
+
+    margin: 2rem 0;
+}
+#new_payment_card {
+    background-color:transparent;
+    color:#cd2653;
+    font-size: 1rem;
+    width:100%; 
+    cursor:pointer;
+    text-decoration:none;
+}
+@media (max-width:615px){
+    #new_payment_card {
+        font-size: 1.3rem;
+    }
+}
+#new_payment_card:hover {
+	text-decoration:underline;
+	color:#cd2653;
+}
+.content_new_card{
+	text-align: center;
+	margin-bottom: 1rem;
+}
+.card_details {
+	display: flex;
+	margin-top: 0.8rem;
+}
+#ckpg_checkout_delete_loader-gif{
+    float:right;
+    display: none;
+}
+.radio_payment_source{
+	float:left;
+	margin-right: 0.4rem;
+}
+.source_card {
+    box-shadow: 1px 1px 15px 0px grey;
+    height: 70px;
+    margin-bottom: 10px;
+    padding: 0.5rem;
+    border-radius: 7px 7px 7px 7px;
+    position: relative;
+    opacity: 1
+}
diff --git a/views/css/index.php b/views/css/index.php
old mode 100755
new mode 100644
diff --git a/views/img/ajax-loader.gif b/views/img/ajax-loader.gif
old mode 100755
new mode 100644
diff --git a/views/img/banorte.png b/views/img/banorte.png
old mode 100755
new mode 100644
diff --git a/views/img/card.png b/views/img/card.png
old mode 100755
new mode 100644
diff --git a/views/img/cards.png b/views/img/cards.png
old mode 100755
new mode 100644
diff --git a/views/img/cards2.png b/views/img/cards2.png
old mode 100755
new mode 100644
diff --git a/views/img/checkmark-blue.png b/views/img/checkmark-blue.png
old mode 100755
new mode 100644
diff --git a/views/img/index.php b/views/img/index.php
old mode 100755
new mode 100644
diff --git a/views/img/oxxo.png b/views/img/oxxo.png
old mode 100755
new mode 100644
diff --git a/views/img/secure-icon.png b/views/img/secure-icon.png
old mode 100755
new mode 100644
diff --git a/views/img/spei.png b/views/img/spei.png
old mode 100755
new mode 100644
diff --git a/views/index.php b/views/index.php
old mode 100755
new mode 100644
diff --git a/views/js/functions.js b/views/js/functions.js
old mode 100755
new mode 100644
index 0c1b892d6..6aa4ce53c
--- a/views/js/functions.js
+++ b/views/js/functions.js
@@ -12,4 +12,5 @@ $(document).ready(function() {
         $("#EXPIRATION_DATE_LIMIT").prop( "disabled", !this.checked );  
         $("#EXPIRATION_DATE_LIMIT").prop( "required", this.checked );      
     });
+
 }); 
\ No newline at end of file
diff --git a/views/js/index.php b/views/js/index.php
old mode 100755
new mode 100644
diff --git a/views/js/tokenize.js b/views/js/tokenize.js
old mode 100755
new mode 100644
index 8ab04fe54..a0e08bd99
--- a/views/js/tokenize.js
+++ b/views/js/tokenize.js
@@ -25,88 +25,52 @@
 */
 
 var conektaSuccessResponseHandler = function(response) {
-	var $form = $("#conekta-payment-form");
-	$form.append($("<input type='hidden' name='conektaToken' id='conektaToken' />").val(response.id));
-	$form.get(0).submit();
+	console.log(response);
+	var $form = $('#conekta-payment-form');
+	$form.append($('<input type="hidden" name="conektaToken" id="conektaToken" />').val(response.id));
 };
-
+ 
 var conektaErrorResponseHandler = function(token) {
-	if ($(".conekta-payment-errors").length) {
-		$(".conekta-payment-errors").fadeIn(1000);
+	if ($('.conekta-payment-errors').length) {
+		$('.conekta-payment-errors').fadeIn(1000);
 	} else {
-		$("#conekta-payment-form").prepend("<div class='conekta-payment-errors'>" + token +"</div>");
-		$(".conekta-payment-errors").fadeIn(1000);
+		$('#conekta-payment-form').prepend('<div class="conekta-payment-errors">' + token +'</div>');
+		$('.conekta-payment-errors').fadeIn(1000);
 	}
 };
 
-function callBack(token) {
-	if(!token.id) {
-		conektaErrorResponseHandler(token);
-	} else {
-		conektaSuccessResponseHandler(token);
-	}
-}
 
-function conektaSetup() {
-	if (!$("#conekta-payment-form").length){
-		return false;
-	}
-	
-	var cardComponent = {
-		idElement: "conekta-card-number",
-		style: {
-			"width": "210px",
-			"padding": "5px 10px",
-			"font-size": "15px",
-			"border": "1px solid rgb(204, 204, 204)"
+$(document).ready (function($) {
+	window.ConektaCheckoutComponents.Integration ({
+		targetIFrame: "#conektaIframeContainer", 
+		checkoutRequestId: conekta_checkout_id,
+		publicKey: conekta_public_key,
+		options: {
+			theme: 'default',
+			styles: {
+				fontSize: 'baseline',
+				inputType: 'rounded',
+				buttonType: 'sharp'
+			}
 		},
-		placeholder: " "
-	};
-	var cvcComponent = {
-		idElement: "conekta-card-cvc",
-		style: {
-			"padding": "5px 10px",
-			"font-size": "15px",
-			"border": "1px solid rgb(204, 204, 204)"
+		onCreateTokenSucceeded: function (token) {
+			console.log("Token creado ");
+			document.getElementById('conektaIframeContainer').remove();
+			conektaSuccessResponseHandler(token);
 		},
-		placeholder: " "
-	};
-
-	renderComponents(conekta_public_key, cardComponent, cvcComponent);
-	
-	//since we are using smarty html_select_date custom function
-	$("#conekta-card-expiry-month").removeAttr("name");
-	$("#conekta-card-expiry-year").removeAttr("name");	
-
-	$("#conekta-payment-form").submit(function(event) {
-		var $form = $("#conekta-payment-form");
-		if( $form.find("[name=conektaToken]").length) {
-			return true;
-		} else {
-			var month = $("#conekta-card-expiry-month").val();
-			var year = $("#conekta-card-expiry-year").val();
-			var owner = $(".conekta-card-name").val();
-			createToken("conekta-card-number", callBack, {
-				name: owner,
-				expMonth: month,
-				expYear: year
-				});
-			return false;
+		onCreateTokenError: function (error) {
+			console.log(error);
+			conektaErrorResponseHandler(error);
+		},
+		onFinalizePayment: function(event) {
+			var $form = $('#conekta-payment-form');
+			$form.append($('<input type="hidden" name="conektaOrdenID" id="conektaOrdenID" />').val(conekta_order_id));
+			$form.get(0).submit();
+			console.log("Pago exitoso.")
+		},
+		onErrorPayment: function(event) {
+			console.log(event)
+			alert("Pago declinado.")
 		}
-	});
-}
-
-if ( $.mobile ) {
-	//jq mobile loaded
-	$(document).on("pageinit", function() {
-		conektaSetup();
-	});
-	$(document).ready(function() {
-		conektaSetup();
-	});
-} else {
-	// not jqm
-	$(document).ready(function() {
-		conektaSetup();
-	});
-}
+	})
+});
diff --git a/views/templates/front/index.php b/views/templates/front/index.php
old mode 100755
new mode 100644
diff --git a/views/templates/front/payment_form.tpl b/views/templates/front/payment_form.tpl
old mode 100755
new mode 100644
index 15a4b0755..7f345191a
--- a/views/templates/front/payment_form.tpl
+++ b/views/templates/front/payment_form.tpl
@@ -24,49 +24,23 @@
  * International Registered Trademark & Property of PrestaShop SA
  *}
 
+{if isset($message)}
+  <div class="conekta-payment-errors" style="display:block;">{$message|escape:'htmlall':'UTF-8'}</div>
+{/if}
 {if isset($smarty.get.message)}
-<div class="conekta-payment-errors" style="display:block;">{$smarty.get.message|escape:'htmlall':'UTF-8'}</div>
+  <div class="conekta-payment-errors" style="display:block;">{$smarty.get.message|escape:'htmlall':'UTF-8'}</div>
 {/if}
 
 <form action="{$action|escape:'htmlall':'UTF-8'}" id="conekta-payment-form">
-{if isset($smarty.get.conekta_error)}<div class="conekta-payment-errors">{l s='There was a problem processing your credit card, please double check your data and try again.' mod='conektapaymentsprestashop'}</div>{/if}
-  <p>
-    <label>{l s='Nombre del Tarjetahabiente' mod='conektapaymentsprestashop'}</label>
-    <input type="text" autocomplete="off" class="conekta-card-name" data-conekta="card[name]">
-  </p>
-
-  <div>
-    <label>{l s='Número de Tarjeta' mod='conektapaymentsprestashop'}</label>
-    <div id="conekta-card-number" class="conekta-card-number" style="height: 50px;"></div>
-  </div>
-
-  <div>
-    <label>{l s='CVC' mod='conektapaymentsprestashop'}</label>
-    <div id="conekta-card-cvc" class="conekta-card-cvc" style="height: 50px;"></div>
-  </div>
 
-  <p>
-    <label>{l s='Expiration (MM/AAAA)' mod='conektapaymentsprestashop'}</label>
-    <select class="conekta-card-expiry-month" id="conekta-card-expiry-month" data-conekta="card[exp_month]" data-encrypted-name="month">
-      {foreach from=$months item=month}
-        <option value="{$month|escape:'htmlall':'UTF-8'}">{$month|escape:'htmlall':'UTF-8'}</option>
-      {/foreach}
-    </select>
-    <span> / </span>
-    <select class="conekta-card-expiry-year" id="conekta-card-expiry-year" data-conekta="card[exp_year]" data-encrypted-name="year">
-      {foreach from=$years item=year}
-        <option value="{$year|escape:'htmlall':'UTF-8'}">{$year|escape:'htmlall':'UTF-8'}</option>
-      {/foreach}
-    </select>
-  </p>
-  {if $msi == 1}
-    <p>
-    <label>{l s='Monthly Installments' mod='conektapaymentsprestashop'}</label>
-    <select class="conekta-card-msi" id="conekta-card-msi" name="monthly_installments">
-        {foreach from=$msi_jumps item=msi}
-          <option value="{$msi|escape:'htmlall':'UTF-8'}">{$msi|escape:'htmlall':'UTF-8'}</option>
-        {/foreach}
-      </select>
-    </p>
+  {if isset($smarty.get.conekta_error)}
+    <div class="conekta-payment-errors">
+      {l s='There was a problem processing your credit card, please double check your data and try again.' mod='conektapaymentsprestashop'}
+    </div>
   {/if}
+  {if !isset($message)}
+      <div id="conektaIframeContainer" style="height:800px; width: 600px;"></div>
+      <button style="display:none" id="conekta-payment-resume" type="submit" class="btn btn-primary">resumen</button>
+  {/if}
+
 </form>
diff --git a/views/templates/front/payment_return.tpl b/views/templates/front/payment_return.tpl
old mode 100755
new mode 100644
diff --git a/views/templates/hook/admin-order.tpl b/views/templates/hook/admin-order.tpl
old mode 100755
new mode 100644
diff --git a/views/templates/hook/checkout-confirmation-all.tpl b/views/templates/hook/checkout-confirmation-all.tpl
old mode 100755
new mode 100644
diff --git a/views/templates/hook/error.tpl b/views/templates/hook/error.tpl
old mode 100755
new mode 100644
diff --git a/views/templates/hook/hook-header.tpl b/views/templates/hook/hook-header.tpl
old mode 100755
new mode 100644
index 1f73c8e8d..533fb77e5
--- a/views/templates/hook/hook-header.tpl
+++ b/views/templates/hook/hook-header.tpl
@@ -25,8 +25,13 @@
  *}
 <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
 <script type="text/javascript" src="https://cdn.conekta.io/js/latest/conekta.min.js"></script>
-<script type="text/javascript" src="https://cdn.conekta.io/iframe/latest/conekta-iframe.js"></script>
+<script type="text/javascript" src="https://cdn.conekta.io/iframe/latest/conekta-iframe.js"></script> 
+<script type="text/javascript" src="https://pay.conekta.com/v1.0/js/conekta-checkout.min.js"></script> 
 <script type="text/javascript" src="{$path|escape:'htmlall':'UTF-8'}views/js/tokenize.js"></script>
+
+
 <script type="text/javascript">
 	var conekta_public_key = "{$api_key|escape:'htmlall':'UTF-8'}";
-</script>
\ No newline at end of file
+	var conekta_checkout_id = "{$checkoutRequestId|escape:'htmlall':'UTF-8'}";
+	var conekta_order_id = "{$orderID|escape:'htmlall':'UTF-8'}";
+</script> 
diff --git a/views/templates/hook/index.php b/views/templates/hook/index.php
old mode 100755
new mode 100644
diff --git a/views/templates/hook/infos.tpl b/views/templates/hook/infos.tpl
old mode 100755
new mode 100644
diff --git a/views/templates/index.php b/views/templates/index.php
old mode 100755
new mode 100644