Fixes from latest report

README.md

@@ -17,7 +17,7 @@ Current version features:
 Installation
 -----------
 
-  Clone the module using git clone --recursive [email protected]:conekta/conektapaymentsprestashop.git
+  Clone the module using <pre>git clone --recursive [email protected]:conekta/conekta_prestashop.git ./conektapaymentsprestashop</pre>
 
 There is no custom installation for this plugin, just the default:
 

conektapaymentsprestashop.php

@@ -10,20 +10,20 @@
  *
  * ConektaPaymentsPrestashop File Doc Comment
  *
- * @category  ConektaPaymentsPrestashop
- * @package   ConektaPaymentsPrestashop
  * @author    Conekta <[email protected]>
  * @copyright 2012-2019 Conekta
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @category  ConektaPaymentsPrestashop
+ * @package   ConektaPaymentsPrestashop
  * @version   GIT: @1.1.0@
  * @link      https://conekta.com/
  */
 
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
 
-require_once __DIR__ . '/model/Config.php';
-require_once __DIR__ . '/model/Database.php';
-require_once __DIR__ . '/lib/conekta-php/lib/Conekta.php';
+require_once dirname(__FILE__) . '/model/Config.php';
+require_once dirname(__FILE__) . '/model/Database.php';
+require_once dirname(__FILE__) . '/lib/conekta-php/lib/Conekta.php';
 
 if (!defined('_PS_VERSION_')) {
     exit;
@@ -94,11 +94,11 @@ public function __construct()
         );
         $order_elements = array_keys(get_class_vars('Cart'));
         foreach ($order_elements as $element) {
-            $settings[] = 'ORDER_'.strtoupper($element);
+            $settings[] = 'ORDER_'.Tools::strtoupper($element);
         }
         $product_elements = self::CART_PRODUCT_ATTR;
         foreach ($product_elements as $element) {
-            $settings[] = 'PRODUCT_'.strtoupper($element);
+            $settings[] = 'PRODUCT_'.Tools::strtoupper($element);
         }
 
         $config = Configuration::getMultiple($settings);
@@ -478,6 +478,7 @@ public function hookHeader()
         \Conekta\Conekta::setApiKey($key);
         \Conekta\Conekta::setPlugin("Prestashop1.7");
         \Conekta\Conekta::setApiVersion("2.0.0");
+        \Conekta\Conekta::setLocale($iso_code);
 
         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;
@@ -513,7 +514,7 @@ public function hookHeader()
             array_push($payment_options, 'card');
         }
 
-        $msi = false;
+        // $msi = false;
         $force_3ds = false;
         $on_demand_enabled = false;
         $address_delivery = new Address((int) $cart->id_address_delivery);
@@ -537,7 +538,7 @@ public function hookHeader()
         }
 
         $shippingContact = Config::getShippingContact($customer, $address_delivery, $state, $country);
-        $customerInfo = Config::getCustomerInfo($customer, $address_delivery);
+        $customerInfo = Config::getCustomerInfo($customer);
 
         $result = Database::getConektaMetadata($customer->id, $this->conekta_mode, "conekta_customer_id");
 
@@ -591,7 +592,7 @@ public function hookHeader()
 
             $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)) {
+                if (!empty(Configuration::get('ORDER_'.Tools::strtoupper($element))) && property_exists($this->context->cart, $element)) {
                     $order_details['metadata'][$element] = $this->context->cart->$element;
                 }
             }
@@ -601,13 +602,13 @@ public function hookHeader()
                 $index ='product-'.$item['id_product'];
                 $order_details['metadata'][$index] = '';
                 foreach ($product_elements as $element) {
-                    if (!empty(Configuration::get('PRODUCT_'.strtoupper($element)))
+                    if (!empty(Configuration::get('PRODUCT_'.Tools::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);
+                $order_details['metadata'][$index] = Tools::substr($order_details['metadata'][$index], 0, -2);
             }
 
             $amount = 0;
@@ -715,18 +716,18 @@ 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);
+                $key_concat = (string)($key).'-'.(string)($data_key);
                 if (empty($data_object[$data_key])) {
-                    $string .= strval($key_concat) . ': NULL | ';
+                    $string .= (string)($key_concat) . ': NULL | ';
                 } else {
                     $string .= $this->buildRecursiveMetadata($data_object[$data_key], $key_concat);
                 }
             }
         } else {
             if (empty($data_object)) {
-                $string .= strval($key) . ': NULL | ';
+                $string .= (string)($key) . ': NULL | ';
             } else {
-                $string .= strval($key) . ': ' . strval($data_object) . ' | ';
+                $string .= (string)($key) . ': ' . (string)($data_object) . ' | ';
             }
         }
         return $string;
@@ -860,15 +861,15 @@ private function postValidation()
             $i = 0;
             $attributes_count = 0;
             while ($i < count($order_elements) && $attributes_count <= METADATA_LIMIT) {
-                if (!empty(Tools::getValue('ORDER_'.strtoupper($order_elements[$i])))) {
+                if (!empty(Tools::getValue('ORDER_'.Tools::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])))) {
+                if (!empty(Tools::getValue('PRODUCT_'.Tools::strtoupper($product_elements[$i])))) {
                     $attributes_count++;
                 }
                 $i++;
@@ -923,11 +924,11 @@ private function postProcess()
 
             $order_elements = array_keys(get_class_vars('Cart'));
             foreach ($order_elements as $element) {
-                Configuration::updateValue('ORDER_'.strtoupper($element), Tools::getValue('ORDER_'.strtoupper($element)));
+                Configuration::updateValue('ORDER_'.Tools::strtoupper($element), Tools::getValue('ORDER_'.Tools::strtoupper($element)));
             }
             $product_elements = self::CART_PRODUCT_ATTR;
             foreach ($product_elements as $element) {
-                Configuration::updateValue('PRODUCT_'.strtoupper($element), Tools::getValue('PRODUCT_'.strtoupper($element)));
+                Configuration::updateValue('PRODUCT_'.Tools::strtoupper($element), Tools::getValue('PRODUCT_'.Tools::strtoupper($element)));
             }
         }
 
@@ -972,11 +973,11 @@ public function getConfigFieldsValues()
         );
         $order_elements = array_keys(get_class_vars('Cart'));
         foreach ($order_elements as $element) {
-            $ret['ORDER_'.strtoupper($element)] = Configuration::get('ORDER_'.strtoupper($element));
+            $ret['ORDER_'.Tools::strtoupper($element)] = Configuration::get('ORDER_'.Tools::strtoupper($element));
         }
         $product_elements = self::CART_PRODUCT_ATTR;
         foreach ($product_elements as $element) {
-            $ret['PRODUCT_'.strtoupper($element)] = Configuration::get('PRODUCT_'.strtoupper($element));
+            $ret['PRODUCT_'.Tools::strtoupper($element)] = Configuration::get('PRODUCT_'.Tools::strtoupper($element));
         }
 
         return $ret;
@@ -997,7 +998,7 @@ public function buildAdminContent()
         $order_meta =  array();
         foreach ($order_elements as $val) {
             $order_meta[] = array(
-                "id" => strtoupper($val),
+                "id" => Tools::strtoupper($val),
                 "name" => $val,
                 "val" => $val
             );
@@ -1007,7 +1008,7 @@ public function buildAdminContent()
         $product_meta =  array();
         foreach ($product_elements as $val) {
             $product_meta[] = array(
-                "id" => strtoupper($val),
+                "id" => Tools::strtoupper($val),
                 "name" => $val,
                 "val" => $val
             );
@@ -1561,7 +1562,7 @@ public function processPayment($conektaOrderId)
         \Conekta\Conekta::setApiVersion("2.0.0");
         \Conekta\Conekta::setPluginVersion($this->version);
         \Conekta\Conekta::setLocale($iso_code);
-        $cart = $this->context->cart;
+        // $cart = $this->context->cart;
         try {
             $order = \Conekta\Order::find($conektaOrderId);
             $charge_response = $order->charges[0];
@@ -1581,6 +1582,7 @@ public function processPayment($conektaOrderId)
                 }
             }
 
+            $reference = $charge_response->payment_method->reference;
             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") {

controllers/front/validation.php

@@ -10,21 +10,21 @@
  *
  * Validation File Doc Comment
  *
- * @category  Validation
- * @package   Validation
  * @author    Conekta <[email protected]>
  * @copyright 2012-2019 Conekta
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @category  Validation
+ * @package   Validation
  * @version   GIT: @1.1.0@
  * @link      https://conekta.com/
  */
 
 /**
  * ConektaPaymentsPrestashopValidationModuleFrontController Class Doc Comment
  *
+ * @author   Conekta <[email protected]>
  * @category Class
  * @package  ConektaPaymentsPrestashopValidationModuleFrontController
- * @author   Conekta <[email protected]>
  * @license  http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  * @link     https://conekta.com/
  */
@@ -50,9 +50,8 @@ 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

@@ -79,7 +79,7 @@ public static function getDiscountLines($discounts)
                     array(
                         array(
                             'code' => (string) $discount['name'],
-                            'amount' => str_replace(',','',number_format(($discount['value_real'] * 100))),
+                            'amount' => str_replace(',', '', number_format(($discount['value_real'] * 100))),
                             'type'=>'coupon'
                         )
                     )
@@ -91,7 +91,7 @@ public static function getDiscountLines($discounts)
 
     public static function getShippingLines($shipping_service, $shipping_carrier = '', $shipping_price = '')
     {
-        $shipping_price = str_replace(',','',number_format(($shipping_price * 100)));
+        $shipping_price = str_replace(',', '', number_format(($shipping_price * 100)));
         $shipping_lines = array(
             array(
                 "amount"          => $shipping_price,
@@ -122,7 +122,7 @@ public static function getShippingContact($customer = '', $address_delivery = ''
         return $shipping_contact;
     }
 
-    public static function getCustomerInfo($customer = '', $address_delivery = '')
+    public static function getCustomerInfo($customer = '')
     {
         $customer_info = array(
             "name"     => $customer->firstname . " " . $customer->lastname,

model/Database.php

@@ -10,21 +10,21 @@
  *
  * Database File Doc Comment
  *
- * @category  Database
- * @package   Database
  * @author    Conekta <[email protected]>
  * @copyright 2012-2019 Conekta
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @category  Database
+ * @package   Database
  * @version   GIT: @1.1.0@
  * @link      https://conekta.com/
  */
 
 /**
  * Database Class Doc Comment
  *
+ * @author   Conekta <[email protected]>
  * @category Class
  * @package  Database
- * @author   Conekta <[email protected]>
  * @license  http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  * @link     https://conekta.com/
  */

notification.php

@@ -10,17 +10,17 @@
  *
  * Notification File Doc Comment
  *
- * @category  Notification
- * @package   Notification
  * @author    Conekta <[email protected]>
  * @copyright 2012-2019 Conekta
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @category  Notification
+ * @package   Notification
  * @version   GIT: @1.1.0@
  * @link      https://conekta.com/
  */
 
-require_once __DIR__ . '/../../config/config.inc.php';
-require_once __DIR__ . '/../../init.php';
+require_once dirname(__FILE__) . '/../../config/config.inc.php';
+require_once dirname(__FILE__) . '/../../init.php';
 
 if (!defined('_PS_VERSION_')) {
     exit;

views/js/functions.js

@@ -1,3 +1,28 @@
+/**
+* 2007-2021 Conekta
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to [email protected] so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author Conekta <[email protected]>
+*  @copyright  2012-2021 Conekta
+*  @version  v2.0.0
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
 
 $(document).ready(function() {
     //initial state

views/js/tokenize.js

@@ -1,5 +1,5 @@
 /**
-* 2007-2016 Conekta
+* 2012-2021 Conekta
 *
 * NOTICE OF LICENSE
 *
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author Conekta <[email protected]>
-*  @copyright  2012-2016 Conekta
+*  @copyright  2012-2021 Conekta
 *  @version  v2.0.0
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA

views/templates/front/payment_form.tpl

@@ -1,5 +1,5 @@
 {*
- * 2007-2019 PrestaShop and Contributors
+ * 2007-2021 PrestaShop and Contributors
  *
  * NOTICE OF LICENSE
  *
@@ -18,7 +18,7 @@
  * needs please refer to https://www.prestashop.com for more information.
  *
  * @author    Conekta <[email protected]>
- * @copyright 2007-2019 PrestaShop SA and Contributors
+ * @copyright 2007-2021 PrestaShop SA and Contributors
  * @version v1.0.0
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA

views/templates/front/payment_return.tpl

@@ -1,5 +1,5 @@
 {*
- * 2007-2019 PrestaShop and Contributors
+ * 2007-2021 PrestaShop and Contributors
  *
  * NOTICE OF LICENSE
  *
@@ -18,7 +18,7 @@
  * needs please refer to https://www.prestashop.com for more information.
  *
  * @author    Conekta <[email protected]>
- * @copyright 2007-2019 PrestaShop SA and Contributors
+ * @copyright 2007-2021 PrestaShop SA and Contributors
  * @version v1.0.0
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA