pagantis / oscommerce

test/basic/BasicTest.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         $this->webDriver->get(self::OSCURL);
         $condition = WebDriverExpectedCondition::titleContains(self::TITLE);
         $this->webDriver->wait()->until($condition);
-        $this->assertTrue((bool) $condition);
+        $this->assertTrue((bool)$condition);
         $this->quit();
     }
 
@@ -42,7 +42,7 @@ 
         $this->webDriver->get(self::OSCURL.self::BACKOFFICE_FOLDER);
         $condition = WebDriverExpectedCondition::titleContains(self::ADMIN_TITLE);
         $this->webDriver->wait()->until($condition);
-        $this->assertTrue((bool) $condition);
+        $this->assertTrue((bool)$condition);
         $this->quit();
     }
 }
\ No newline at end of file

test/PagantisOscommerceTest.php

Spacing +10 added lines, -10 removed lines

@@ -73,16 +73,16 @@ 
         $faker = Factory::create();
         $this->configuration['dni'] = $this->getDNI();
         $this->configuration['birthdate'] =
-            $faker->numberBetween(1, 28) . '/' .
-            $faker->numberBetween(1, 12). '/1975'
+            $faker->numberBetween(1, 28).'/'.
+            $faker->numberBetween(1, 12).'/1975'
         ;
         $this->configuration['firstname'] = $faker->firstName;
-        $this->configuration['lastname'] = $faker->lastName . ' ' . $faker->lastName;
+        $this->configuration['lastname'] = $faker->lastName.' '.$faker->lastName;
         $this->configuration['company'] = $faker->company;
         $this->configuration['zip'] = '28'.$faker->randomNumber(3, true);
         $this->configuration['street'] = $faker->streetAddress;
-        $this->configuration['phone'] = '6' . $faker->randomNumber(8);
-        $this->configuration['email'] = date('ymd') . '@pagamastarde.com';
+        $this->configuration['phone'] = '6'.$faker->randomNumber(8);
+        $this->configuration['email'] = date('ymd').'@pagamastarde.com';
         parent::__construct($name, $data, $dataName);
     }
     /**
@@ -90,12 +90,12 @@ 
      */
     protected function getDNI()
     {
-        $dni = '0000' . rand(pow(10, 4-1), pow(10, 4)-1);
-        $value = (int) ($dni / 23);
+        $dni = '0000'.rand(pow(10, 4 - 1), pow(10, 4) - 1);
+        $value = (int)($dni / 23);
         $value *= 23;
-        $value= $dni - $value;
-        $letter= "TRWAGMYFPDXBNJZSQVHLCKEO";
-        $dniLetter= substr($letter, $value, 1);
+        $value = $dni - $value;
+        $letter = "TRWAGMYFPDXBNJZSQVHLCKEO";
+        $dniLetter = substr($letter, $value, 1);
         return $dni.$dniLetter;
     }
 

config/configure_admin.php

Spacing +14 added lines, -14 removed lines

@@ -17,21 +17,21 @@
 define('DIR_WS_HTTPS_CATALOG', '/');
 define('DIR_FS_CATALOG', '/var/www/html/');
 define('DIR_WS_IMAGES', 'images/');
-define('DIR_WS_ICONS', DIR_WS_IMAGES . 'icons/');
-define('DIR_WS_CATALOG_IMAGES', DIR_WS_CATALOG . 'images/');
+define('DIR_WS_ICONS', DIR_WS_IMAGES.'icons/');
+define('DIR_WS_CATALOG_IMAGES', DIR_WS_CATALOG.'images/');
 define('DIR_WS_INCLUDES', 'includes/');
-define('DIR_WS_BOXES', DIR_WS_INCLUDES . 'boxes/');
-define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES . 'functions/');
-define('DIR_WS_CLASSES', DIR_WS_INCLUDES . 'classes/');
-define('DIR_WS_MODULES', DIR_WS_INCLUDES . 'modules/');
-define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES . 'languages/');
-define('DIR_WS_CATALOG_LANGUAGES', DIR_WS_CATALOG . 'includes/languages/');
-define('DIR_FS_CATALOG_LANGUAGES', DIR_FS_CATALOG . 'includes/languages/');
-define('DIR_FS_CATALOG_IMAGES', DIR_FS_CATALOG . 'images/');
-define('DIR_FS_CATALOG_MODULES', DIR_FS_CATALOG . 'includes/modules/');
-define('DIR_FS_BACKUP', DIR_FS_ADMIN . 'backups/');
-define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG . 'download/');
-define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG . 'pub/');
+define('DIR_WS_BOXES', DIR_WS_INCLUDES.'boxes/');
+define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES.'functions/');
+define('DIR_WS_CLASSES', DIR_WS_INCLUDES.'classes/');
+define('DIR_WS_MODULES', DIR_WS_INCLUDES.'modules/');
+define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES.'languages/');
+define('DIR_WS_CATALOG_LANGUAGES', DIR_WS_CATALOG.'includes/languages/');
+define('DIR_FS_CATALOG_LANGUAGES', DIR_FS_CATALOG.'includes/languages/');
+define('DIR_FS_CATALOG_IMAGES', DIR_FS_CATALOG.'images/');
+define('DIR_FS_CATALOG_MODULES', DIR_FS_CATALOG.'includes/modules/');
+define('DIR_FS_BACKUP', DIR_FS_ADMIN.'backups/');
+define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG.'download/');
+define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG.'pub/');
 
 define('DB_SERVER', getenv('OSCOMMERCE_DB_HOST'));
 define('DB_SERVER_USERNAME', getenv('OSCOMMERCE_DB_USER'));

config/configure.php

Spacing +7 added lines, -7 removed lines

@@ -9,17 +9,17 @@
 define('DIR_WS_HTTP_CATALOG', '/');
 define('DIR_WS_HTTPS_CATALOG', '/');
 define('DIR_WS_IMAGES', 'images/');
-define('DIR_WS_ICONS', DIR_WS_IMAGES . 'icons/');
+define('DIR_WS_ICONS', DIR_WS_IMAGES.'icons/');
 define('DIR_WS_INCLUDES', 'includes/');
-define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES . 'functions/');
-define('DIR_WS_CLASSES', DIR_WS_INCLUDES . 'classes/');
-define('DIR_WS_MODULES', DIR_WS_INCLUDES . 'modules/');
-define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES . 'languages/');
+define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES.'functions/');
+define('DIR_WS_CLASSES', DIR_WS_INCLUDES.'classes/');
+define('DIR_WS_MODULES', DIR_WS_INCLUDES.'modules/');
+define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES.'languages/');
 
 define('DIR_WS_DOWNLOAD_PUBLIC', 'pub/');
 define('DIR_FS_CATALOG', '/var/www/html');
-define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG . 'download/');
-define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG . 'pub/');
+define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG.'download/');
+define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG.'pub/');
 
 define('DB_SERVER', getenv('OSCOMMERCE_DB_HOST'));
 define('DB_SERVER_USERNAME', getenv('OSCOMMERCE_DB_USER'));

catalog/ext/modules/payment/pagantis/bypass.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
     $destUrl = $_POST['formUrl'];
 } elseif ($_POST['cancelUrl']) {
     $destUrl = $_POST['cancelUrl'];
-} else {
+}else {
     $destUrl = $_SERVER['HTTP_REFERER'];
 }
 

catalog/includes/languages/english/modules/payment/pagantis.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
   global $customer_id, $order;
 
-  define('MODULE_PAYMENT_PAGANTIS_TEXT_CATALOG_TITLE', 'Instant financing');  // Payment option title as displayed to the customer
+  define('MODULE_PAYMENT_PAGANTIS_TEXT_CATALOG_TITLE', 'Instant financing'); // Payment option title as displayed to the customer
 
   define('MODULE_PAYMENT_PAGANTIS_TEXT_ADMIN_TITLE', 'Pagantis');
 

catalog/includes/languages/espanol/modules/payment/pagantis.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
   global $customer_id, $order;
 
-  define('MODULE_PAYMENT_PAGANTIS_TEXT_CATALOG_TITLE', 'Financiación instantanea');  // Payment option title as displayed to the customer
+  define('MODULE_PAYMENT_PAGANTIS_TEXT_CATALOG_TITLE', 'Financiación instantanea'); // Payment option title as displayed to the customer
 
   define('MODULE_PAYMENT_PAGANTIS_TEXT_ADMIN_TITLE', 'Pagantis');
 

catalog/includes/modules/payment/pagantis.php

Spacing +24 added lines, -24 removed lines

@@ -59,7 +59,7 @@ 
 
         if (strpos($_SERVER[REQUEST_URI], "checkout_payment.php") <= 0) {
             $this->title = MODULE_PAYMENT_PAGANTIS_TEXT_ADMIN_TITLE; // Payment module title in Admin
-        } else {
+        }else {
             $this->title = MODULE_PAYMENT_PAGANTIS_TEXT_CATALOG_TITLE; // Payment module title in Catalog
         }
 
@@ -77,7 +77,7 @@ 
             )
         );
 
-        $this->form_action_url = $this->base_url . '/ext/modules/payment/pagantis/bypass.php';
+        $this->form_action_url = $this->base_url.'/ext/modules/payment/pagantis/bypass.php';
     }
 
     /***************
@@ -287,16 +287,16 @@ 
             if ($pagantisOrder instanceof \Pagantis\OrdersApiClient\Model\Order) {
                 $url = $pagantisOrder->getActionUrls()->getForm();
                 $this->insertRow($this->order_id, $pagantisOrder->getId(), serialize($global_vars));
-            } else {
+            }else {
                 throw new OrderNotFoundException();
             }
 
             if ($url == "") {
                 throw new UnknownException(_("No ha sido posible obtener una respuesta de Pagantis"));
-            } else { //if ($this->extraConfig['PAGANTIS_FORM_DISPLAY_TYPE'] == '0') {
+            }else { //if ($this->extraConfig['PAGANTIS_FORM_DISPLAY_TYPE'] == '0') {
                 $output = "\n";
-                $output.= tep_draw_hidden_field("formUrl", $url) . "\n";
-                $output.= tep_draw_hidden_field("cancelUrl", $cancelUrl) . "\n";
+                $output .= tep_draw_hidden_field("formUrl", $url)."\n";
+                $output .= tep_draw_hidden_field("cancelUrl", $cancelUrl)."\n";
                 return $output;
             } /*else {
                 $template_fields = array(
@@ -317,7 +317,7 @@ 
     public function before_process()
     {
         include_once('./ext/modules/payment/pagantis/notifyController.php');
-        $this->pgNotify = new notifyController();var_dump($_GET['from']);var_dump($_POST);die;
+        $this->pgNotify = new notifyController(); var_dump($_GET['from']); var_dump($_POST); die;
         $this->pgNotify->setOscommerceOrderId($_GET['order_id']);
         $this->pgNotify->setOrigin(isset($_GET['from']) ? ($_GET['from']) : 'order');
         $this->pgNotify->setOrderStatus($this->extraConfig['PAGANTIS_ORDER_STATUS']);
@@ -342,7 +342,7 @@ 
     public function check()
     {
         if (!isset($this->_check)) {
-            $check_query = tep_db_query("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key = 'MODULE_PAYMENT_PAGANTIS_STATUS'");
+            $check_query = tep_db_query("select configuration_value from ".TABLE_CONFIGURATION." where configuration_key = 'MODULE_PAYMENT_PAGANTIS_STATUS'");
             $this->_check = tep_db_num_rows($check_query);
         }
         $this->installPagantisTables();
@@ -360,9 +360,9 @@ 
             tep_redirect(tep_href_link(FILENAME_MODULES, 'set=payment&module=pagantis', 'NONSSL'));
             return 'failed';
         }
-        tep_db_query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values ('Enable Pagantis module', 'MODULE_PAYMENT_PAGANTIS_STATUS', 'True', '', '6', '0', 'tep_cfg_select_option(array(\'True\', \'False\'), ', now())");
-        tep_db_query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Public Key', 'MODULE_PAYMENT_PAGANTIS_PK', '', 'MANDATORY. You can get in your pagantis profile', '6', '0', now())");
-        tep_db_query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Secret Key', 'MODULE_PAYMENT_PAGANTIS_SK', '', 'MANDATORY. You can get in your pagantis profile', '6', '0', now())");
+        tep_db_query("insert into ".TABLE_CONFIGURATION." (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values ('Enable Pagantis module', 'MODULE_PAYMENT_PAGANTIS_STATUS', 'True', '', '6', '0', 'tep_cfg_select_option(array(\'True\', \'False\'), ', now())");
+        tep_db_query("insert into ".TABLE_CONFIGURATION." (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Public Key', 'MODULE_PAYMENT_PAGANTIS_PK', '', 'MANDATORY. You can get in your pagantis profile', '6', '0', now())");
+        tep_db_query("insert into ".TABLE_CONFIGURATION." (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Secret Key', 'MODULE_PAYMENT_PAGANTIS_SK', '', 'MANDATORY. You can get in your pagantis profile', '6', '0', now())");
 
         //tep_db_query("insert into " . TABLE_ORDERS_STATUS . " (orders_status_id, language_id, orders_status_name, public_flag, downloads_flag) values (6, 1, 'Pagantis [Transactions]', 0, 0)");
         $this->installPagantisTables();
@@ -373,25 +373,25 @@ 
      */
     private function installPagantisTables()
     {
-        $sql = "CREATE TABLE IF NOT EXISTS " . TABLE_PAGANTIS_LOG . " ( 
+        $sql = "CREATE TABLE IF NOT EXISTS ".TABLE_PAGANTIS_LOG." ( 
                           id int NOT NULL AUTO_INCREMENT, 
                           log text NOT NULL, 
                           createdAt timestamp DEFAULT CURRENT_TIMESTAMP, 
                           UNIQUE KEY id (id))";
         tep_db_query($sql);
 
-        $sql = "CREATE TABLE IF NOT EXISTS " . TABLE_PAGANTIS_CONFIG . " (
+        $sql = "CREATE TABLE IF NOT EXISTS ".TABLE_PAGANTIS_CONFIG." (
                             id int NOT NULL AUTO_INCREMENT, 
                             config varchar(60) NOT NULL, 
                             value varchar(200) NOT NULL, 
                             UNIQUE KEY id(id))";
         tep_db_query($sql);
         foreach ((array)$this->defaultConfigs as $configKey => $configValue) {
-            $query = "INSERT INTO " . TABLE_PAGANTIS_CONFIG . " (config, value) values ('$configKey', '$configValue')";
+            $query = "INSERT INTO ".TABLE_PAGANTIS_CONFIG." (config, value) values ('$configKey', '$configValue')";
             tep_db_query($query);
         }
 
-        $sql = "CREATE TABLE IF NOT EXISTS " . TABLE_PAGANTIS_ORDERS . " (
+        $sql = "CREATE TABLE IF NOT EXISTS ".TABLE_PAGANTIS_ORDERS." (
                             id int NOT NULL AUTO_INCREMENT, 
                             os_order_id varchar(50), 
                             os_order_reference varchar(50) NOT NULL,
@@ -400,7 +400,7 @@ 
                             UNIQUE KEY id(id))";
         tep_db_query($sql);
 
-        $sql = "CREATE TABLE IF NOT EXISTS " . TABLE_PAGANTIS_CONCURRENCY . " (
+        $sql = "CREATE TABLE IF NOT EXISTS ".TABLE_PAGANTIS_CONCURRENCY." (
                             id int NOT NULL,
                             `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
                             UNIQUE KEY id(id))";
@@ -414,22 +414,22 @@ 
     {
         $checkTable = tep_db_query("SHOW TABLES LIKE '".TABLE_PAGANTIS_LOG."'");
         if (tep_db_num_rows($checkTable) > 0) {
-            tep_db_query("drop table " . TABLE_PAGANTIS_LOG);
+            tep_db_query("drop table ".TABLE_PAGANTIS_LOG);
         }
 
         $checkTable = tep_db_query("SHOW TABLES LIKE '".TABLE_PAGANTIS_CONFIG."'");
         if (tep_db_num_rows($checkTable) > 0) {
-            tep_db_query("drop table " . TABLE_PAGANTIS_CONFIG);
+            tep_db_query("drop table ".TABLE_PAGANTIS_CONFIG);
         }
 
         $checkTable = tep_db_query("SHOW TABLES LIKE '".TABLE_PAGANTIS_ORDERS."'");
         if (tep_db_num_rows($checkTable) > 0) {
-            tep_db_query("drop table " . TABLE_PAGANTIS_ORDERS);
+            tep_db_query("drop table ".TABLE_PAGANTIS_ORDERS);
         }
 
         $checkTable = tep_db_query("SHOW TABLES LIKE '".TABLE_PAGANTIS_CONCURRENCY."'");
         if (tep_db_num_rows($checkTable) > 0) {
-            tep_db_query("drop table " . TABLE_PAGANTIS_CONCURRENCY);
+            tep_db_query("drop table ".TABLE_PAGANTIS_CONCURRENCY);
         }
 
         $query = "delete from ".TABLE_ORDERS_STATUS." where orders_status_id='6'";
@@ -482,13 +482,13 @@ 
      */
     private function insertRow($orderId, $pagantisOrderId, $globalVars)
     {
-        $query = "select * from ". TABLE_PAGANTIS_ORDERS ." where os_order_id='$orderId'";
+        $query = "select * from ".TABLE_PAGANTIS_ORDERS." where os_order_id='$orderId'";
         $resultsSelect = tep_db_query($query);
         $countResults = tep_db_num_rows($resultsSelect);
         if ($countResults == 0) {
-            $query = "INSERT INTO ". TABLE_PAGANTIS_ORDERS ."(os_order_reference, PAGANTIS_order_id, globals) values ('$this->os_order_reference', '$pagantisOrderId','$globalVars')";
-        } else {
-            $query = "UPDATE " . TABLE_PAGANTIS_ORDERS . " set PAGANTIS_order_id='$pagantisOrderId' where os_order_reference='$orderId'";
+            $query = "INSERT INTO ".TABLE_PAGANTIS_ORDERS."(os_order_reference, PAGANTIS_order_id, globals) values ('$this->os_order_reference', '$pagantisOrderId','$globalVars')";
+        }else {
+            $query = "UPDATE ".TABLE_PAGANTIS_ORDERS." set PAGANTIS_order_id='$pagantisOrderId' where os_order_reference='$orderId'";
         }
         tep_db_query($query);
     }

catalog/ext/modules/payment/pagantis/configController.php

Spacing +4 added lines, -4 removed lines

@@ -41,22 +41,22 @@
 } elseif ($_SERVER['REQUEST_METHOD'] == 'POST') {
     if (count($_POST)) {
         foreach ($_POST as $config => $value) {
-            if (isset($defaultConfigs[$config]) && $response['status']==null) {
+            if (isset($defaultConfigs[$config]) && $response['status'] == null) {
                 $updateQuery = "update ".TABLE_PAGANTIS_CONFIG." set value='$value' where config='$config'";
                 $resultsSelect = tep_db_query($updateQuery);
-            } else {
+            }else {
                 $response['status'] = 400;
                 $response['result'] = 'Bad request';
             }
         }
-    } else {
+    }else {
         $response['status'] = 422;
         $response['result'] = 'Empty data';
     }
 }
 
 $formattedResult = array();
-if ($response['status']==null) {
+if ($response['status'] == null) {
     $query = "select * from ".TABLE_PAGANTIS_CONFIG;
     $resultsSelect = tep_db_query($query);
     while ($orderRow = tep_db_fetch_array($resultsSelect)) {