fix plugin and add message for error 401

controllers/front/chargeajax.php

@@ -1,13 +1,17 @@
 <?php
 
-class CulqiChargeAjaxModuleFrontController extends ModuleFrontController {
-  public function initContent() {
+class CulqiChargeAjaxModuleFrontController extends ModuleFrontController
+{
+
+  public function initContent()
+  {
     parent::initContent();
     $this->ajax = true;
   }
 
-  public function displayAjax(){
-    $result = $this->module->charge($_POST["token_id"], $_POST["installments"]);
+  public function displayAjax()
+  {
+    $result = $this->module->charge(Tools::getValue("token_id"), Tools::getValue("installments")); //$_POST["token_id"], $_POST["installments"]
     die(Tools::jsonEncode($result));
   }
 

controllers/front/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

controllers/front/payment.php

@@ -1,6 +1,7 @@
 <?php
 
-class CulqiPaymentModuleFrontController extends ModuleFrontController {
+class CulqiPaymentModuleFrontController extends ModuleFrontController
+{
 
     public $ssl = true;
     public $display_column_left = false;
@@ -9,21 +10,23 @@ class CulqiPaymentModuleFrontController extends ModuleFrontController {
     /**
      * @see FrontController::initContent()
      */
-    public function initContent() {
+    public function initContent()
+    {
 
         parent::initContent();
 
         // se agrega js y css necesarios
-        $this->context->controller->addCSS(__PS_BASE_URI__.'modules/'.$this->module->name.'/assets/css/culqi.css');
-        $this->context->controller->addCSS(__PS_BASE_URI__.'modules/'.$this->module->name.'/assets/css/waitMe.min.css');
+        $this->context->controller->addCSS(__PS_BASE_URI__.'modules/'.$this->module->name.'/views/css/culqi.css');
+        $this->context->controller->addCSS(__PS_BASE_URI__.'modules/'.$this->module->name.'/views/css/waitMe.min.css');
         $this->context->controller->addJS('https://checkout.culqi.com/plugins/v2/');
         $this->context->controller->addJS('https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js');
-        $this->context->controller->addJS(__PS_BASE_URI__.'modules/'.$this->module->name.'/assets/js/waitMe.min.js');
+        $this->context->controller->addJS(__PS_BASE_URI__.'modules/'.$this->module->name.'/views/js/waitMe.min.js');
 
         $cart = $this->context->cart;
 
-        if (!$this->module->checkCurrency($cart)) {
-          Tools::redirect('index.php?controller=order');
+        if (!$this->module->checkCurrency($cart))
+        {
+            Tools::redirect('index.php?controller=order');
         }
 
         $this->context->smarty->assign(array(

controllers/front/validation.php

@@ -3,18 +3,16 @@
 class CulqiValidationModuleFrontController extends ModuleFrontController
 {
 
-    public function initContent() {
+    public function initContent()
+    {
         parent::initContent();
         $this->ajax = true;
     }
 
-    public function displayAjax() {
-        $smarty = $this->context->smarty;
-
+    public function displayAjax()
+    {
         $respuesta = $this->module->postPayment(Tools::getValue('respuesta'));
-        $array = json_decode(json_encode($respuesta), true);
-
-        die(Tools::jsonEncode($array));
+        die(Tools::jsonEncode($respuesta));
     }
 
-}
+}

controllers/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

culqi.php

@@ -14,7 +14,8 @@
 include_once dirname(__FILE__).'/libraries/culqi-php/lib/culqi.php';
 
 
-class Culqi extends PaymentModule {
+class Culqi extends PaymentModule
+{
 
     private $_postErrors = array();
 
@@ -24,20 +25,20 @@ class Culqi extends PaymentModule {
 
     public function __construct()
     {
-        $this->name = self::MODULE_NAME;
+        $this->name = 'culqi';
         $this->tab = 'payments_gateways';
         $this->version = '2.0.0';
         $this->controllers = array('chargeajax' ,'payment', 'validation', 'postpayment');
-        $this->author = self::MODULE_AUTHOR;
+        $this->author = 'Team Culqi (Brayan Cruces, Willy Aguirre)';
         $this->need_instance = 0;
         $this->ps_versions_compliancy = array('min' => '1.5', 'max' => _PS_VERSION_);
         $this->bootstrap = true;
 
         parent::__construct();
 
-        $this->displayName = self::MODULE_NAME_DISP;
+        $this->displayName = 'Culqi';
         $this->description = $this->l('Acepta tarjetas de crédito y débito en tu tienda online.');
-        $this->confirmUninstall = $this->l('¿Estás seguro que quieres desintalar el módulo de ' . self::MODULE_NAME_DISP . '?');
+        $this->confirmUninstall = $this->l('¿Estás seguro que quieres desintalar el módulo de Culqi?');
 
     }
 
@@ -54,49 +55,50 @@ public function install()
         );
     }
 
-    private function getAddress($address) {
+    private function getAddress($address)
+    {
         if(empty($address->address1)) {
             return $address->address2;
         } else {
             return $address->address1;
         }
     }
 
-    private function getPhone($address) {
-        if(empty($address->phone_mobile)) {
+    private function getPhone($address)
+    {
+        if(empty($address->phone_mobile))
+        {
             return $address->phone;
         } else {
             return $address->phone_mobile;
         }
     }
 
-    private function getCustomerId() {
-        if ($this->context->customer->isLogged()) {
+    private function getCustomerId()
+    {
+        if ($this->context->customer->isLogged())
+        {
             return (int) $this->context->customer->id;
         } else {
             return 0;
         }
     }
 
-    public function postPayment($respuestaCliente) {
-        CulqiPago::$codigoComercio = Configuration::get('CULQI_CODIGO_COMERCIO');
-        CulqiPago::$llaveSecreta = Configuration::get('CULQI_LLAVE_COMERCIO');
-        return json_decode(CulqiPago::decifrar($respuestaCliente));
-    }
-
-    public function errorPayment($mensaje) {
+    public function errorPayment($mensaje)
+    {
         $smarty = $this->context->smarty;
         $smarty->assign('culqi_error_pago', $mensaje);
     }
 
     /* Se crea un Cargo con la nueva api v2 de Culqi PHP */
-    public function charge($token_id, $installments){
+    public function charge($token_id, $installments)
+    {
       try {
 
         $cart = $this->context->cart;
 
-        $userAddress = new Address(intval($cart->id_address_invoice));
-        $userCountry = new Country(intval($userAddress->id_country));
+        $userAddress = new Address((int)$cart->id_address_invoice);
+        $userCountry = new Country((int)$userAddress->id_country);
 
         $culqi = new Culqi\Culqi(array('api_key' => Configuration::get('CULQI_LLAVE_COMERCIO')));
 
@@ -128,10 +130,12 @@ public function charge($token_id, $installments){
 
     public function hookPayment($params)
     {
-        if (!$this->active) {
+        if (!$this->active)
+        {
           return;
         }
-        if (!$this->checkCurrency($params['cart'])) {
+        if (!$this->checkCurrency($params['cart']))
+        {
           return;
         }
         $this->smarty->assign(array(
@@ -143,7 +147,8 @@ public function hookPayment($params)
 
     public function hookPaymentReturn($params)
     {
-        if (!$this->active) {
+        if (!$this->active)
+        {
           return;
         }
         $this->smarty->assign(
@@ -159,9 +164,12 @@ public function checkCurrency($cart)
         $currency_order = new Currency((int)($cart->id_currency));
         $currencies_module = $this->getCurrency((int)$cart->id_currency);
 
-        if (is_array($currencies_module)) {
-          foreach ($currencies_module as $currency_module) {
-            if ($currency_order->id == $currency_module['id_currency']) {
+        if (is_array($currencies_module))
+        {
+          foreach ($currencies_module as $currency_module)
+          {
+            if ($currency_order->id == $currency_module['id_currency'])
+            {
               return true;
             }
           }
@@ -170,7 +178,8 @@ public function checkCurrency($cart)
         return false;
     }
 
-    public function uninstallStates() {
+    public function uninstallStates()
+    {
         if (Db::getInstance()->Execute("DELETE FROM " . _DB_PREFIX_ . "order_state WHERE id_order_state = ( SELECT value
                 FROM " . _DB_PREFIX_ . "configuration WHERE name =  'CULQI_STATE_OK' )") &&
             Db::getInstance()->Execute("DELETE FROM " . _DB_PREFIX_ . "order_state_lang WHERE id_order_state = ( SELECT value
@@ -199,11 +208,13 @@ private function _postValidation()
     {
         if (Tools::isSubmit('btnSubmit'))
         {
-            if (!Tools::getValue('CULQI_LLAVE_COMERCIO')) {
+            if (!Tools::getValue('CULQI_LLAVE_COMERCIO'))
+            {
               $this->_postErrors[] = $this->l('El campo llave de comercio es requerido.');
             }
 
-            if (!Tools::getValue('CULQI_CODIGO_COMERCIO')) {
+            if (!Tools::getValue('CULQI_CODIGO_COMERCIO'))
+            {
               $this->_postErrors[] = $this->l('El campo código de comercio es requerido.');
             }
         }
@@ -221,7 +232,8 @@ public function getContent()
         if (Tools::isSubmit('btnSubmit'))
         {
             $this->_postValidation();
-            if (!count($this->_postErrors)) {
+            if (!count($this->_postErrors))
+            {
               $this->_postProcess();
             } else {
               foreach ($this->_postErrors as $err) {
@@ -236,7 +248,8 @@ public function getContent()
         return $this->_html;
     }
 
-    private function createStates() {
+    private function createStates()
+    {
         if (!Configuration::get('CULQI_STATE_OK'))
         {
             $order_state = new OrderState();
@@ -262,7 +275,7 @@ private function createStates() {
             $order_state->name = array();
             foreach (Language::getLanguages() as $language) {
               $order_state->name[$language['id_lang']] = 'Incorrecto';
-            }                
+            }
             $order_state->send_email = false;
             $order_state->color = '#FF2843';
             $order_state->module_name = 'culqi';
@@ -347,7 +360,7 @@ private function _postProcess()
     }
 
     public function removeComma($amount) {
-        return str_replace(".","",str_replace( ',', '', number_format($amount,2,'.',',')));
+        return str_replace(".","",str_replace(',', '', number_format($amount,2,'.',',')));
     }
 
   }

index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/Requests/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/Requests/library/Requests/Auth/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/Requests/library/Requests/Cookie/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/Requests/library/Requests/Exception/HTTP/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/Requests/library/Requests/Exception/Transport/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/Requests/library/Requests/Exception/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/Requests/library/Requests/Proxy/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/Requests/library/Requests/Response/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/Requests/library/Requests/Transport/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/Requests/library/Requests/Utility/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/Requests/library/Requests/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/Requests/library/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/culqi-php/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/culqi-php/lib/Culqi/Error/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/culqi-php/lib/Culqi/Lang/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/culqi-php/lib/Culqi/Lang/messages/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/culqi-php/lib/Culqi/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/culqi-php/lib/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

libraries/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

views/css/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

views/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

views/js/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden

views/templates/front/index.php

@@ -0,0 +1 @@
+<?php // Silence is golden