Preautorizaciones + Cancelaciones + minor bugfixes

controllers/front/validation.php

@@ -50,7 +50,11 @@ public function postProcess()
             }
         }
         if (!$authorized) {
-            print_r($this->getTranslator()->trans('This payment method is not available.', array(), 'Modules.ConektaPaymentsPrestashop.Shop'));
+            print_r($this->getTranslator()->trans(
+                'This payment method is not available.',
+                array(),
+                'Modules.ConektaPaymentsPrestashop.Shop'
+            ));
         } else {
             if (!Validate::isLoadedObject($customer)) {
                 Tools::redirect('index.php?controller=order&step=1');

model/Config.php

@@ -122,11 +122,11 @@ public static function getShippingContact($customer = '', $address_delivery = ''
         return $shipping_contact;
     }
 
-    public static function getCustomerInfo($customer = '')
+    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)
             );

model/Database.php

@@ -42,7 +42,7 @@ public static function getOrderConekta($order_id)
     {
         return Db::getInstance()->getValue(
             'SELECT module FROM ' . _DB_PREFIX_ . 'orders '
-            .'WHERE id_order = ' . pSQL((int) $order_id)
+            . 'WHERE id_order = ' . pSQL((int) $order_id)
         );
     }
 
@@ -57,8 +57,8 @@ public static function getConektaTransaction($order_id)
     {
         return Db::getInstance()->getRow(
             'SELECT * FROM ' . _DB_PREFIX_ . 'conekta_transaction '
-            .'WHERE id_order = ' . pSQL((int) $order_id) .
-            ' AND type = \'payment\''
+            . 'WHERE id_order = ' . pSQL((int) $order_id)
+            . ' AND type = \'payment\''
         );
     }
 
@@ -76,10 +76,10 @@ public static function getConektaTransaction($order_id)
     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) . ', \''
+            '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') . '\', \''
@@ -158,7 +158,11 @@ public static function createTableConektaOrder()
             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,
+            `status` enum(\"paid\",\"pre_authorized\",\"unpaid\",\"pending_payment\",\"expired\",\"voided\","
+            . "\"fraudulent\",\"preauthorized\",\"canceled\",\"pending_confirmation\",\"charged_back\","
+            . "\"partially_refunded\",\"refunded\",\"reversed\",\"approved\",\"declined\",\"in_review\","
+            . "\"insufficient_funds\",\"card_declined\",\"stolen_card\",\"suspected_fraud\","
+            . "\"unprocessable_card_type\") NOT NULL,
             PRIMARY KEY (id),
             KEY id_user (id_user),
             KEY id_cart (id_cart),
@@ -184,10 +188,10 @@ public static function createTableConektaOrder()
     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 . ', \''
+            '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') . '\', \''
@@ -210,10 +214,10 @@ public static function insertSpeiPayment($order, $charge_response, $reference, $
     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 . ', \''
+            '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') . '\', \''
@@ -233,7 +237,7 @@ public static function getOrderById($id_order)
     {
         return Db::getInstance()->getRow(
             'SELECT * FROM ' . _DB_PREFIX_ . 'conekta_transaction '
-            .'WHERE id_order = ' . pSQL((int) $id_order) . ';'
+            . 'WHERE id_order = ' . pSQL((int) $id_order) . ';'
         );
     }
 
@@ -250,7 +254,9 @@ 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}'";
+        $sql = "SELECT meta_value FROM  $table WHERE id_user = '{$user_id}' "
+        . "AND meta_option = '{$meta_options}' "
+        . "AND `mode` = '{$mode}'";
 
         return  Db::getInstance()->getRow($sql);
     }
@@ -270,11 +276,13 @@ public static function updateConektaMetadata($user_id, $mode, $meta_options, $me
         $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}')";
+            $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}'";
+            $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);
     }
 
@@ -291,8 +299,9 @@ 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}'";
-
+        $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);
     }
 
@@ -310,13 +319,28 @@ public static function getConektaOrder($user_id, $mode, $cart_id)
     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}')";
+            $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}'";
+            $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);
     }
+
+    /**
+     * Returns the id of the order related to the reference_id
+     *
+     * @param string $reference_id Alphabetical reference code assigned to the order.
+     *
+     * @return array|string
+     */
+    public static function getOrderByReferenceId($reference_id)
+    {
+        $table = _DB_PREFIX_."orders";
+        $sql = "SELECT id_order FROM $table WHERE reference = '{$reference_id}'";
+        return Db::getInstance()->getRow($sql);
+    }
 }

notification.php

@@ -21,6 +21,7 @@
 
 require_once dirname(__FILE__) . '/../../config/config.inc.php';
 require_once dirname(__FILE__) . '/../../init.php';
+require_once dirname(__FILE__) . '/model/Database.php';
 
 if (!defined('_PS_VERSION_')) {
     exit;
@@ -41,8 +42,9 @@
 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);
+    $reference_id = (string) $conekta_order->metadata->reference_id;
+    $result = Database::getOrderByReferenceId($reference_id);
+    $id_order = $result['id_order'];
     $order = new Order($id_order);
     $order_fields = $order->getFields();
     $currency_payment = Currency::getPaymentCurrencies(
@@ -51,7 +53,7 @@
     );
     $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();
@@ -71,28 +73,29 @@
 } 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);
+    $reference_id           = (string) $conekta_order->metadata->reference_id;
+    $result                 = Database::getOrderByReferenceId($reference_id);
+    $id_order               = $result['id_order'];
     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);
+    $reference_id           = (string) $conekta_order->metadata->reference_id;
+    $result                 = Database::getOrderByReferenceId($reference_id);
+    $id_order               = $result['id_order'];
     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);
+    $reference_id           = (string) $conekta_order->metadata->reference_id;
+    $result                 = Database::getOrderByReferenceId($reference_id);
+    $id_order               = $result['id_order'];
     Db::getInstance()->Execute(
         'UPDATE ' . _DB_PREFIX_
         . 'orders SET current_state = '. ORDER_REFUNDED .' WHERE id_order = '

views/templates/hook/admin-order.tpl

@@ -46,7 +46,7 @@
 					<br>
 					<strong>{l s='Processed on:' mod='conektapaymentsprestashop'}</strong> {$processed_on|escape:'htmlall':'UTF-8'}
 					<br>
-					<strong>{l s='Mode:' mod='conektapaymentsprestashop'}</strong> <span style="font-weight: bold; color: {$color_mode|escape:'htmlall':'UTF-8'}};">{$txt_mode|unescape:"htmlall"}</span>
+					<strong>{l s='Mode:' mod='conektapaymentsprestashop'}</strong> <span style="font-weight: bold; color: {$color_mode|escape:'htmlall':'UTF-8'}};">{$txt_mode|escape:'htmlall':'UTF-8'}</span>
 				</p>
 			{else}
 				<span style="color: #CC0000;"><strong>{l s='Warning:' mod='conektapaymentsprestashop'}</strong></span> {l s='The customer paid using Conekta and an error occured (check details at the bottom of this page)' mod='conektapaymentsprestashop'}