pagantis / oscommerce

catalog/includes/modules/payment/pagantis.php

Spacing +23 added lines, -23 removed lines

@@ -58,7 +58,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
         }
 
@@ -76,7 +76,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';
     }
 
     /***************
@@ -286,16 +286,16 @@ 
             if ($pagantisOrder instanceof \Pagantis\OrdersApiClient\Model\Order) {
                 $url = $pagantisOrder->getActionUrls()->getForm();
                 $this->insertRow($this->os_order_reference, $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;
             } //TODO IFRAME
         } catch (\Exception $exception) {
@@ -334,7 +334,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();
@@ -352,9 +352,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())");
 
         $this->installPagantisTables();
     }
@@ -364,25 +364,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,
@@ -391,7 +391,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 varchar(50) NOT NULL,
                             `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
                             UNIQUE KEY id(id))";
@@ -405,22 +405,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'";
@@ -473,13 +473,13 @@ 
      */
     private function insertRow($orderId, $pagantisOrderId, $globalVars)
     {
-        $query = "select * from ". TABLE_PAGANTIS_ORDERS ." where os_order_reference='$orderId'";
+        $query = "select * from ".TABLE_PAGANTIS_ORDERS." where os_order_reference='$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 ('$orderId', '$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 ('$orderId', '$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/notifyController.php

Spacing +11 added lines, -11 removed lines

@@ -75,7 +75,7 @@ 
 
             if ($this->origin == 'notify') {
                 $jsonResponse->printResponse();
-            } else {
+            }else {
                 if ($exception->getMessage() == AlreadyProcessedException::ERROR_MESSAGE) {
                     return;
                 }
@@ -108,7 +108,7 @@ 
 
         if ($this->origin == 'notify') {
             $jsonResponse->printResponse();
-        } else {
+        }else {
             return $jsonResponse;
         }
     }
@@ -180,12 +180,12 @@ 
         try {
             $this->checkPagantisStatus(array('AUTHORIZED'));
         } catch (\Exception $e) {
-            if ($this->findOscommerceOrderId()!='') {
+            if ($this->findOscommerceOrderId() != '') {
                 throw new AlreadyProcessedException();
-            } else {
+            }else {
                 if ($this->pagantisOrder instanceof \Pagantis\OrdersApiClient\Model\Order) {
                     $status = $this->pagantisOrder->getStatus();
-                } else {
+                }else {
                     $status = '-';
                 }
                 throw new WrongStatusException($status);
@@ -200,7 +200,7 @@ 
     {
         global $order;
 
-        if ($order->info['order_status']!=='1') {
+        if ($order->info['order_status'] !== '1') {
             throw new AlreadyProcessedException();
         }
     }
@@ -277,7 +277,7 @@ 
             if ($orderId == null) {
                 $query = "delete from ".TABLE_PAGANTIS_CONCURRENCY." where  timestamp<".(time() - 5);
                 tep_db_query($query);
-            } elseif ($orderId!='') {
+            } elseif ($orderId != '') {
                 $query = "delete from ".TABLE_PAGANTIS_CONCURRENCY." where id='$orderId'";
                 tep_db_query($query);
             }
@@ -329,12 +329,12 @@ 
             if (!$payed) {
                 if ($this->pagantisOrder instanceof \Pagantis\OrdersApiClient\Model\Order) {
                     $status = $this->pagantisOrder->getStatus();
-                } else {
+                }else {
                     $status = '-';
                 }
                 throw new WrongStatusException($status);
             }
-        } else {
+        }else {
             throw new OrderNotFoundException();
         }
     }
@@ -367,7 +367,7 @@ 
         tep_db_query($query);
 
         $comment = "Pagantis id=$this->pagantisOrderId/Via=".ucfirst($this->origin);
-        $query = "insert into ".TABLE_ORDERS_STATUS_HISTORY ."(comments, orders_id, orders_status_id, customer_notified, date_added) values
+        $query = "insert into ".TABLE_ORDERS_STATUS_HISTORY."(comments, orders_id, orders_status_id, customer_notified, date_added) values
             ('$comment', ".$insert_id.", '2', -1, now() )";
         tep_db_query($query);
 
@@ -392,7 +392,7 @@ 
     private function insertLog($exception)
     {
         if ($exception instanceof \Exception) {
-            $logEntry= new LogEntry();
+            $logEntry = new LogEntry();
             $logEntryJson = $logEntry->error($exception)->toJson();
 
             $query = "insert into ".TABLE_PAGANTIS_LOG."(log) values ('$logEntryJson')";