pagantis / oscommerce

catalog/admin/promotion.php

Spacing +4 added lines, -4 removed lines

@@ -3,12 +3,12 @@ 
 require('includes/application_top.php');
 
 define('TABLE_PAGANTIS_CONFIG', 'pagantis_config');
-define('TABLE_PRODUCTS_DESCRIPTIONS','products_description');
+define('TABLE_PRODUCTS_DESCRIPTIONS', 'products_description');
 
 //Check if module is installed
-$result = tep_db_query("select * from " . TABLE_CONFIGURATION . " where configuration_key='MODULE_PAYMENT_PAGANTIS_STATUS'");
+$result = tep_db_query("select * from ".TABLE_CONFIGURATION." where configuration_key='MODULE_PAYMENT_PAGANTIS_STATUS'");
 $resultSelect = tep_db_fetch_array($result);
-if (tep_db_num_rows($result) == 0 || $resultSelect['configuration_value'] !=='True') {
+if (tep_db_num_rows($result) == 0 || $resultSelect['configuration_value'] !== 'True') {
     tep_redirect('/admin/index.php');
 }
 
@@ -31,7 +31,7 @@ 
     $resultSelect = tep_db_fetch_array($result);
     if ($resultSelect['value'] == '') {
         $promotedProducts = array();
-    } else {
+    }else {
         $promotedProducts = array_values((array)unserialize($resultSelect['value']));
     }
 }

test/Buy/BuyPromotedProductTest.php

Spacing +2 added lines, -2 removed lines

@@ -139,7 +139,7 @@ 
      */
     protected function checkPagantisOrderId()
     {
-        $orderId=0;
+        $orderId = 0;
         $notifyUrl = self::OSCURL.self::NOTIFICATION_FOLDER.'?order='.$orderId;
         $this->assertNotEmpty($notifyUrl, $notifyUrl);
         $response = Request::post($notifyUrl)->expects('json')->send();
@@ -149,7 +149,7 @@ 
         $this->assertEquals(
             $response->body->merchant_order_id,
             $orderId,
-            $response->body->merchant_order_id.'!='. $orderId
+            $response->body->merchant_order_id.'!='.$orderId
         );
         $this->assertContains(
             NoIdentificationException::ERROR_MESSAGE,

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

Spacing +18 added lines, -18 removed lines

@@ -83,22 +83,22 @@ 
             $jsonResponse->setException($exception);
             $this->insertLog($exception);
 
-            if ($this->extraConfig['PAGANTIS_URL_KO'] =! '') {
+            if ($this->extraConfig['PAGANTIS_URL_KO'] = !'') {
                 $koUrl = $this->extraConfig['PAGANTIS_URL_KO'];
-            } else {
+            }else {
                 $koUrl = trim(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL', false));
             }
 
             if ($this->origin == 'notify') {
                 $jsonResponse->printResponse();
-            } else {
+            }else {
                 if ($exception->getMessage() == AlreadyProcessedException::ERROR_MESSAGE) {
-                    if ($this->extraConfig['PAGANTIS_URL_OK']!='') {
+                    if ($this->extraConfig['PAGANTIS_URL_OK'] != '') {
                         $confirmationUrl = $this->extraConfig['PAGANTIS_URL_OK'];
-                        $confirmationUrl.="?order_id=$this->merchantOrderId";
-                    } else {
+                        $confirmationUrl .= "?order_id=$this->merchantOrderId";
+                    }else {
                         $confirmationUrl = trim(tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, '', 'SSL', false));
-                        $confirmationUrl.="?order_id=$this->merchantOrderId";
+                        $confirmationUrl .= "?order_id=$this->merchantOrderId";
                     }
 
                     header("Location: $confirmationUrl");
@@ -133,7 +133,7 @@ 
 
         if ($this->origin == 'notify') {
             $jsonResponse->printResponse();
-        } else {
+        }else {
             return $jsonResponse;
         }
     }
@@ -206,12 +206,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);
@@ -226,7 +226,7 @@ 
     {
         global $order;
 
-        if ($order->info['order_status']!=='1') {
+        if ($order->info['order_status'] !== '1') {
             throw new AlreadyProcessedException();
         }
     }
@@ -303,7 +303,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);
             }
@@ -355,12 +355,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();
         }
     }
@@ -397,12 +397,12 @@ 
         $metadataInfo = '';
         foreach ($metadataOrder as $metadataKey => $metadataValue) {
             if ($metadataKey == 'promotedProduct') {
-                $metadataInfo.= "/Producto promocionado = $metadataValue";
+                $metadataInfo .= "/Producto promocionado = $metadataValue";
             }
         }
 
         $comment = "Pagantis id=$this->pagantisOrderId/Via=".ucfirst($this->origin)."/".$metadataInfo;
-        $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);
 
@@ -427,7 +427,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')";

test/configure/ConfigureTest.php

Indentation -1 removed lines

@@ -10,7 +10,6 @@
  * @package Test\Configure
  *
  * @group oscommerce-configure
-
  */
 class ConfigureTest extends AbstractConfigure
 {

test/configure/ConfigurePPPTest.php

Indentation -1 removed lines

@@ -10,7 +10,6 @@
  * @package Test\Configure
  *
  * @group oscommerce-configure-ppp
-
  */
 class ConfigurePPPTest extends AbstractConfigure
 {

test/configure/AbstractConfigure.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      */
     public function loginToBackOffice()
     {
-        $this->webDriver->get(self::OSCURL . self::BACKOFFICE_FOLDER);
+        $this->webDriver->get(self::OSCURL.self::BACKOFFICE_FOLDER);
         sleep(2);
 
         $usernameElementSearch = WebDriverBy::name('username');

catalog/includes/modules/header_tags/ht_pagantis.php

Spacing +99 added lines, -99 removed lines

@@ -34,7 +34,7 @@ 
         ) {
             $this->enabled = ((MODULE_HEADER_TAGS_PAGANTIS_STATUS == 'True') &&
                 (MODULE_PAYMENT_PAGANTIS_STATUS == 'True') &&
-                (MODULE_PAYMENT_PAGANTIS_SIMULATOR == 'True')) ;
+                (MODULE_PAYMENT_PAGANTIS_SIMULATOR == 'True'));
         }
 
         $this->extraConfig = $this->getExtraConfig();
@@ -66,7 +66,7 @@ 
      */
     private function getConfig($config = '')
     {
-        $query       = "select * from ".TABLE_CONFIGURATION . " where configuration_key ='" . $config . "'";
+        $query       = "select * from ".TABLE_CONFIGURATION." where configuration_key ='".$config."'";
         $result      = tep_db_query($query);
         $resultArray = tep_db_fetch_array($result);
         return $resultArray['configuration_value'];
@@ -83,29 +83,29 @@ 
         $checkoutPage = strpos($_SERVER[REQUEST_URI], "checkout_payment.php") > 0;
 
         //Show promoted html
-        if ($this->isPromoted($productId) && $checkoutPage!='1') {
+        if ($this->isPromoted($productId) && $checkoutPage != '1') {
             echo "<div id='promotedText' style='display:none'><br/>".$this->extraConfig['PAGANTIS_PROMOTED_PRODUCT_CODE']."</div>";
-            echo '<script>'. PHP_EOL;
-            echo '        function loadPromoted()'. PHP_EOL;
-            echo '        {'. PHP_EOL;
-            echo 'var positionSelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR']. '\';'. PHP_EOL;
-            echo 'if (positionSelector === \'default\') {'. PHP_EOL;
-            echo 'positionSelector = \'.buttonSet\''. PHP_EOL;
-            echo '}'. PHP_EOL;
+            echo '<script>'.PHP_EOL;
+            echo '        function loadPromoted()'.PHP_EOL;
+            echo '        {'.PHP_EOL;
+            echo 'var positionSelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR'].'\';'.PHP_EOL;
+            echo 'if (positionSelector === \'default\') {'.PHP_EOL;
+            echo 'positionSelector = \'.buttonSet\''.PHP_EOL;
+            echo '}'.PHP_EOL;
             echo 'var docFather = document.querySelector(positionSelector);'.PHP_EOL;
-            echo 'if (typeof docFather != \'undefined\') {'. PHP_EOL;
+            echo 'if (typeof docFather != \'undefined\') {'.PHP_EOL;
             echo 'var promotedNode = document.getElementById("promotedText");'.PHP_EOL;
             echo 'docFather.appendChild(promotedNode);'.PHP_EOL;
-            echo 'promotedNode.style.display=""' . PHP_EOL;
-            echo '               clearInterval(window.OSPromotedId);'. PHP_EOL;
-            echo '               return true;'. PHP_EOL;
-            echo '       }'. PHP_EOL;
-            echo '               return false;'. PHP_EOL;
-            echo '       }'. PHP_EOL;
-            echo '       window.OSPromotedId = setInterval(function () {'. PHP_EOL;
-            echo '          loadPromoted();'. PHP_EOL;
-            echo '       }, 2000);'. PHP_EOL;
-            echo '</script>'. PHP_EOL;
+            echo 'promotedNode.style.display=""'.PHP_EOL;
+            echo '               clearInterval(window.OSPromotedId);'.PHP_EOL;
+            echo '               return true;'.PHP_EOL;
+            echo '       }'.PHP_EOL;
+            echo '               return false;'.PHP_EOL;
+            echo '       }'.PHP_EOL;
+            echo '       window.OSPromotedId = setInterval(function () {'.PHP_EOL;
+            echo '          loadPromoted();'.PHP_EOL;
+            echo '       }, 2000);'.PHP_EOL;
+            echo '</script>'.PHP_EOL;
         }
 
         if (isset($productId) || $checkoutPage) {
@@ -124,101 +124,101 @@ 
                 $productId = array_shift($productId);
                 $promotedProduct = $this->isPromoted($productId);
                 if ($promotedProduct) {
-                    $promotedAmount+=number_format(($item['price'] * $item['qty']), 2);
+                    $promotedAmount += number_format(($item['price'] * $item['qty']), 2);
                 }
             }
 
-            echo "<script src='".$this->sdkFile."'></script>". PHP_EOL;
-            echo '<script>'. PHP_EOL;
-            echo '        function loadSimulator()'. PHP_EOL;
-            echo '        {'. PHP_EOL;
-            echo '           if (typeof '.$simulatorCode.' != \'undefined\') {'. PHP_EOL;
-            echo '               var positionSelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR']. '\';'. PHP_EOL;
-            echo '               var priceSelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR']. '\';'. PHP_EOL;
-            echo '               var checkoutPriceSelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR']. '\';'. PHP_EOL;
-            echo '               var quantitySelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_QUANTITY_SELECTOR']. '\';'. PHP_EOL;
-            echo '               var checkoutPage =     \'' . $checkoutPage.'\';'. PHP_EOL;
-            echo '               var promotedAmount =     \'' . $promotedAmount.'\';'. PHP_EOL;
-
-            echo '               if (positionSelector === \'default\') {'. PHP_EOL;
-            echo '                   positionSelector = \'.buttonSet\''. PHP_EOL;
-            echo '               }'. PHP_EOL;
-
-            echo '               if (priceSelector === \'default\') {'. PHP_EOL;
-            echo '                   priceSelector = \'#bodyContent>form>div>h1\''. PHP_EOL;
-            echo '               }'. PHP_EOL;
-
-            echo '               if (checkoutPriceSelector == \'default\' && checkoutPage == \'1\')  {'. PHP_EOL;
-            echo '                   priceSelector = \'#columnRight > .infoBoxContainer > .infoBoxContents > tbody > tr:last-child > td\';'. PHP_EOL;
-            echo '               }'. PHP_EOL;
-            echo '               '.$simulatorCode.'.product_simulator = {};'. PHP_EOL;
-            echo '               '.$simulatorCode.'.product_simulator.id = \'product-simulator\';'. PHP_EOL;
-            echo '               '.$simulatorCode.'.product_simulator.publicKey = \'' . $this->pk . '\';'. PHP_EOL;
-            echo '               '.$simulatorCode.'.product_simulator.selector = positionSelector;'. PHP_EOL;
-            echo '               '.$simulatorCode.'.product_simulator.numInstalments = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_START_INSTALLMENTS'] . '\';'. PHP_EOL;
-            echo '               '.$simulatorCode.'.product_simulator.type = ' . $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_TYPE'] . ';'. PHP_EOL;
-            echo '               '.$simulatorCode.'.product_simulator.skin = ' . $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_SKIN'] . ';'. PHP_EOL;
-            echo '               '.$simulatorCode.'.product_simulator.position = ' . $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_CSS_POSITION'] . ';'. PHP_EOL;
+            echo "<script src='".$this->sdkFile."'></script>".PHP_EOL;
+            echo '<script>'.PHP_EOL;
+            echo '        function loadSimulator()'.PHP_EOL;
+            echo '        {'.PHP_EOL;
+            echo '           if (typeof '.$simulatorCode.' != \'undefined\') {'.PHP_EOL;
+            echo '               var positionSelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR'].'\';'.PHP_EOL;
+            echo '               var priceSelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR'].'\';'.PHP_EOL;
+            echo '               var checkoutPriceSelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR'].'\';'.PHP_EOL;
+            echo '               var quantitySelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_QUANTITY_SELECTOR'].'\';'.PHP_EOL;
+            echo '               var checkoutPage =     \''.$checkoutPage.'\';'.PHP_EOL;
+            echo '               var promotedAmount =     \''.$promotedAmount.'\';'.PHP_EOL;
+
+            echo '               if (positionSelector === \'default\') {'.PHP_EOL;
+            echo '                   positionSelector = \'.buttonSet\''.PHP_EOL;
+            echo '               }'.PHP_EOL;
+
+            echo '               if (priceSelector === \'default\') {'.PHP_EOL;
+            echo '                   priceSelector = \'#bodyContent>form>div>h1\''.PHP_EOL;
+            echo '               }'.PHP_EOL;
+
+            echo '               if (checkoutPriceSelector == \'default\' && checkoutPage == \'1\')  {'.PHP_EOL;
+            echo '                   priceSelector = \'#columnRight > .infoBoxContainer > .infoBoxContents > tbody > tr:last-child > td\';'.PHP_EOL;
+            echo '               }'.PHP_EOL;
+            echo '               '.$simulatorCode.'.product_simulator = {};'.PHP_EOL;
+            echo '               '.$simulatorCode.'.product_simulator.id = \'product-simulator\';'.PHP_EOL;
+            echo '               '.$simulatorCode.'.product_simulator.publicKey = \''.$this->pk.'\';'.PHP_EOL;
+            echo '               '.$simulatorCode.'.product_simulator.selector = positionSelector;'.PHP_EOL;
+            echo '               '.$simulatorCode.'.product_simulator.numInstalments = \''.$this->extraConfig['PAGANTIS_SIMULATOR_START_INSTALLMENTS'].'\';'.PHP_EOL;
+            echo '               '.$simulatorCode.'.product_simulator.type = '.$this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_TYPE'].';'.PHP_EOL;
+            echo '               '.$simulatorCode.'.product_simulator.skin = '.$this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_SKIN'].';'.PHP_EOL;
+            echo '               '.$simulatorCode.'.product_simulator.position = '.$this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_CSS_POSITION'].';'.PHP_EOL;
 
             //Amount in product page
-            echo '               var promotedProduct = \'' . $this->isPromoted($productId) .'\';'. PHP_EOL;
+            echo '               var promotedProduct = \''.$this->isPromoted($productId).'\';'.PHP_EOL;
             echo '               if(checkoutPage != \'1\' ) {';
-            echo '               '.$simulatorCode.'.product_simulator.itemAmountSelector = priceSelector;'. PHP_EOL;
-            echo '                   if(promotedProduct == \'1\') { ' . PHP_EOL;
-            echo '                    '.$simulatorCode.'.product_simulator.itemPromotedAmountSelector = priceSelector;'. PHP_EOL;
-            echo '                   }' . PHP_EOL;
+            echo '               '.$simulatorCode.'.product_simulator.itemAmountSelector = priceSelector;'.PHP_EOL;
+            echo '                   if(promotedProduct == \'1\') { '.PHP_EOL;
+            echo '                    '.$simulatorCode.'.product_simulator.itemPromotedAmountSelector = priceSelector;'.PHP_EOL;
+            echo '                   }'.PHP_EOL;
             echo '               }';
 
             //Amount in checkout page
-            echo '               if(checkoutPage == \'1\' ) { ' . PHP_EOL;
-            echo '               '.$simulatorCode.'.product_simulator.totalAmountSelector = priceSelector;'. PHP_EOL;
-            echo '                  if(promotedAmount != \'0\' && checkoutPage == \'1\' ) { ' . PHP_EOL;
-            echo '                  '   .$simulatorCode.'.product_simulator.totalPromotedAmount = promotedAmount;'. PHP_EOL;
-            echo '                  }' . PHP_EOL;
-            echo '               }' . PHP_EOL;
-            echo '               '.$simulatorCode.'.simulator.init('.$simulatorCode.'.product_simulator);'. PHP_EOL;
-            echo '               clearInterval(window.OSSimulatorId);'. PHP_EOL;
-            echo '               return true;'. PHP_EOL;
-            echo '           }'. PHP_EOL;
-            echo '           return false;'. PHP_EOL;
-            echo '       }'. PHP_EOL;
-            echo '       window.OSSimulatorId = setInterval(function () {'. PHP_EOL;
-            echo '          loadSimulator();'. PHP_EOL;
-            echo '       }, 2000);'. PHP_EOL;
-            echo '</script>'. PHP_EOL;
+            echo '               if(checkoutPage == \'1\' ) { '.PHP_EOL;
+            echo '               '.$simulatorCode.'.product_simulator.totalAmountSelector = priceSelector;'.PHP_EOL;
+            echo '                  if(promotedAmount != \'0\' && checkoutPage == \'1\' ) { '.PHP_EOL;
+            echo '                  '.$simulatorCode.'.product_simulator.totalPromotedAmount = promotedAmount;'.PHP_EOL;
+            echo '                  }'.PHP_EOL;
+            echo '               }'.PHP_EOL;
+            echo '               '.$simulatorCode.'.simulator.init('.$simulatorCode.'.product_simulator);'.PHP_EOL;
+            echo '               clearInterval(window.OSSimulatorId);'.PHP_EOL;
+            echo '               return true;'.PHP_EOL;
+            echo '           }'.PHP_EOL;
+            echo '           return false;'.PHP_EOL;
+            echo '       }'.PHP_EOL;
+            echo '       window.OSSimulatorId = setInterval(function () {'.PHP_EOL;
+            echo '          loadSimulator();'.PHP_EOL;
+            echo '       }, 2000);'.PHP_EOL;
+            echo '</script>'.PHP_EOL;
 
             //Checkout simulator
             if ($checkoutPage) {
-                echo '<script>' . PHP_EOL;
-                echo 'function checkSelected(value)'. PHP_EOL;
-                echo '{ '. PHP_EOL;
-                echo 'var simulator = document.getElementsByClassName("buttonSet");'  . PHP_EOL;
-                echo ' if(simulator == "undefined") { return false;  } '. PHP_EOL;
-                echo 'var pagantisCheckbox = document.querySelector("input[value=\'pagantis\']"); ' . PHP_EOL;
-                echo 'var grandparentNode = pagantisCheckbox.parentNode.parentNode;' . PHP_EOL;
-                echo 'if(grandparentNode == value) { var status="" } ' . PHP_EOL;
-                echo 'else { var status="none";} '. PHP_EOL;
-                echo 'simulator[0].style.display=status; ' . PHP_EOL;
-                echo '}'. PHP_EOL;
-
-                echo 'function showSimulator()'. PHP_EOL;
-                echo '{'. PHP_EOL;
-                echo 'var elements = document.querySelectorAll("tr[class^=\'moduleRow\']");' . PHP_EOL;
-                echo 'if(elements == null) { return false };' . PHP_EOL;
+                echo '<script>'.PHP_EOL;
+                echo 'function checkSelected(value)'.PHP_EOL;
+                echo '{ '.PHP_EOL;
+                echo 'var simulator = document.getElementsByClassName("buttonSet");'.PHP_EOL;
+                echo ' if(simulator == "undefined") { return false;  } '.PHP_EOL;
+                echo 'var pagantisCheckbox = document.querySelector("input[value=\'pagantis\']"); '.PHP_EOL;
+                echo 'var grandparentNode = pagantisCheckbox.parentNode.parentNode;'.PHP_EOL;
+                echo 'if(grandparentNode == value) { var status="" } '.PHP_EOL;
+                echo 'else { var status="none";} '.PHP_EOL;
+                echo 'simulator[0].style.display=status; '.PHP_EOL;
+                echo '}'.PHP_EOL;
+
+                echo 'function showSimulator()'.PHP_EOL;
+                echo '{'.PHP_EOL;
+                echo 'var elements = document.querySelectorAll("tr[class^=\'moduleRow\']");'.PHP_EOL;
+                echo 'if(elements == null) { return false };'.PHP_EOL;
 
                 echo 'for(var i = 0, max = elements.length; i < max; i++) { elements[i].onclick = function() {
                         checkSelected(this);
                     } }' . PHP_EOL;
                 echo 'clearInterval(window.OSdisplayId);';
-                echo 'return true;'. PHP_EOL;
-                echo '};'. PHP_EOL;
+                echo 'return true;'.PHP_EOL;
+                echo '};'.PHP_EOL;
 
-                echo '       window.OSdisplayId = setInterval(function () {'. PHP_EOL;
-                echo '          showSimulator();'. PHP_EOL;
-                echo '       }, 2000);'. PHP_EOL;
+                echo '       window.OSdisplayId = setInterval(function () {'.PHP_EOL;
+                echo '          showSimulator();'.PHP_EOL;
+                echo '       }, 2000);'.PHP_EOL;
 
 
-                echo '</script>'. PHP_EOL;
+                echo '</script>'.PHP_EOL;
             }
         }
     }
@@ -241,7 +241,7 @@ 
      * install
      */
     function install() {
-        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_HEADER_TAGS_PAGANTIS_STATUS', 'True', '', '6', '1', '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, set_function, date_added) values ('Enable Pagantis Module', 'MODULE_HEADER_TAGS_PAGANTIS_STATUS', 'True', '', '6', '1', 'tep_cfg_select_option(array(\'True\', \'False\'), ', now())");
 
     }
 
@@ -249,7 +249,7 @@ 
      * remove
      */
     function remove() {
-        tep_db_query("delete from " . TABLE_CONFIGURATION . " where configuration_key in ('" . implode("', '", $this->keys()) . "')");
+        tep_db_query("delete from ".TABLE_CONFIGURATION." where configuration_key in ('".implode("', '", $this->keys())."')");
     }
 
     /**
@@ -275,7 +275,7 @@ 
 
         if ($this->extraConfig['PAGANTIS_PROMOTION'] == '') {
             $promotedProducts = array();
-        } else {
+        }else {
             $promotedProducts = array_values((array)unserialize($this->extraConfig['PAGANTIS_PROMOTION']));
         }
 

catalog/includes/modules/payment/pagantis.php

Spacing +48 added lines, -48 removed lines

@@ -67,8 +67,8 @@ 
 
         if (strpos($_SERVER[REQUEST_URI], "checkout_payment.php") <= 0) {
             $this->title = MODULE_PAYMENT_PAGANTIS_TEXT_ADMIN_TITLE; // Payment module title in Admin
-        } else {
-            $this->title = $this->extraConfig['PAGANTIS_TITLE'] .'<br/><br/><div class="buttonSet" style="display:none"></div><br/>'; // Payment module title in Catalog
+        }else {
+            $this->title = $this->extraConfig['PAGANTIS_TITLE'].'<br/><br/><div class="buttonSet" style="display:none"></div><br/>'; // Payment module title in Catalog
         }
 
         $this->enabled = ((MODULE_PAYMENT_PAGANTIS_STATUS == 'True') ? true : false);
@@ -78,12 +78,12 @@ 
                 "%s://%s%s%s",
                 isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' ? 'https' : 'http',
                 $_SERVER['SERVER_NAME'],
-                isset($_SERVER['SERVER_PORT']) ? ":" . $_SERVER['SERVER_PORT'] : '',
+                isset($_SERVER['SERVER_PORT']) ? ":".$_SERVER['SERVER_PORT'] : '',
                 $_SERVER['REQUEST_URI']
             )
         );
 
-        $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';
 
         if (defined('MODULE_PAYMENT_PAGANTIS_LANG_CODE')) {
             $this->langCode = MODULE_PAYMENT_PAGANTIS_LANG_CODE;
@@ -186,14 +186,14 @@ 
                 throw new UnknownException("Order not found");
             }
 
-            $id_hash = time() . serialize($order->products) . '' . serialize($order->customer) . '' . serialize($order->delivery);
+            $id_hash = time().serialize($order->products).''.serialize($order->customer).''.serialize($order->delivery);
             $this->os_order_reference = md5($id_hash);
             $_SESSION['order_id'] = $this->os_order_reference;
 
             $userAddress = new Address();
             $userAddress
                 ->setZipCode($order->billing['postcode'])
-                ->setFullName($order->billing['firstname'] . ' ' . $order->billing['lastname'])
+                ->setFullName($order->billing['firstname'].' '.$order->billing['lastname'])
                 ->setCountryCode('ES')
                 ->setCity($order->billing['city'])
                 ->setAddress($order->billing['street_address'])
@@ -205,7 +205,7 @@ 
             $orderShippingAddress = new Address();
             $orderShippingAddress
                 ->setZipCode($order->delivery['postcode'])
-                ->setFullName($order->billing['firstname'] . ' ' . $order->billing['lastname'])
+                ->setFullName($order->billing['firstname'].' '.$order->billing['lastname'])
                 ->setCountryCode('ES')
                 ->setCity($order->delivery['city'])
                 ->setAddress($order->delivery['street_address'])
@@ -215,7 +215,7 @@ 
             $orderUser = new \Pagantis\OrdersApiClient\Model\Order\User();
             $orderUser
                 ->setAddress($userAddress)
-                ->setFullName($order->billing['firstname'] . ' ' . $order->billing['lastname'])
+                ->setFullName($order->billing['firstname'].' '.$order->billing['lastname'])
                 ->setBillingAddress($orderBillingAddress)
                 ->setEmail($order->customer['email_address'])
                 ->setFixPhone($order->customer['telephone'])
@@ -254,7 +254,7 @@ 
                     ->setQuantity(intval($item['qty']))
                     ->setDescription($item['name']);
                 if ($promotedProduct) {
-                    $promotedAmount+=$product->getAmount();
+                    $promotedAmount += $product->getAmount();
                     $promotedMessage = $product->getDescription()."-Price:".$item['final_price']."-Qty:".$product->getQuantity();
                     $metadataOrder->addMetadata('promotedProduct', $promotedMessage);
                 }
@@ -274,9 +274,9 @@ 
             );
 
             $cancelUrl = trim(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL', false));
-            if ($this->extraConfig['PAGANTIS_URL_KO']!='') {
+            if ($this->extraConfig['PAGANTIS_URL_KO'] != '') {
                 $koUrl = $this->extraConfig['PAGANTIS_URL_KO'];
-            } else {
+            }else {
                 $koUrl = $cancelUrl;
             }
 
@@ -312,16 +312,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 {
+            }else {
                 $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
@@ -387,7 +387,7 @@ 
             return 'failed';
         }
 
-        tep_db_query("insert into " . TABLE_CONFIGURATION . "
+        tep_db_query("insert into ".TABLE_CONFIGURATION."
         (
             configuration_title,
             configuration_key,
@@ -410,7 +410,7 @@ 
             ',
             now()
         )");
-        tep_db_query("insert into " . TABLE_CONFIGURATION . "
+        tep_db_query("insert into ".TABLE_CONFIGURATION."
         (
             configuration_title,
             configuration_key,
@@ -430,7 +430,7 @@ 
             '0',
             now()
         )");
-        tep_db_query("insert into " . TABLE_CONFIGURATION . "
+        tep_db_query("insert into ".TABLE_CONFIGURATION."
         (
             configuration_title,
             configuration_key,
@@ -450,7 +450,7 @@ 
             '0',
             now()
         )");
-        tep_db_query("insert into " . TABLE_CONFIGURATION . "
+        tep_db_query("insert into ".TABLE_CONFIGURATION."
         (
             configuration_title,
             configuration_key,
@@ -482,14 +482,14 @@ 
      */
     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, 
@@ -497,10 +497,10 @@ 
         tep_db_query($sql);
 
         // check if table has records
-        $check_query = tep_db_query("select value from " . TABLE_PAGANTIS_CONFIG);
+        $check_query = tep_db_query("select value from ".TABLE_PAGANTIS_CONFIG);
         if (tep_db_num_rows($check_query) === 0) {
             foreach ((array)$this->defaultConfigs as $configKey => $configValue) {
-                $query = "INSERT INTO " . TABLE_PAGANTIS_CONFIG . "
+                $query = "INSERT INTO ".TABLE_PAGANTIS_CONFIG."
                 (
                     config,
                     value
@@ -514,7 +514,7 @@ 
             }
         }
 
-        $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,
@@ -523,7 +523,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))";
@@ -535,29 +535,29 @@ 
      */
     public function remove()
     {
-        $checkTable = tep_db_query("SHOW TABLES LIKE '" . TABLE_PAGANTIS_LOG . "'");
+        $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 . "'");
+        $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 . "'");
+        $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 . "'");
+        $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);
         }
 
-        tep_db_query("DELETE FROM ". TABLE_CONFIGURATION ." where configuration_key in ('MODULE_PAYMENT_PAGANTIS_STATUS','MODULE_PAYMENT_PAGANTIS_PK','MODULE_PAYMENT_PAGANTIS_SK')");
+        tep_db_query("DELETE FROM ".TABLE_CONFIGURATION." where configuration_key in ('MODULE_PAYMENT_PAGANTIS_STATUS','MODULE_PAYMENT_PAGANTIS_PK','MODULE_PAYMENT_PAGANTIS_SK')");
 
-        $query = "delete from " . TABLE_CONFIGURATION . " where configuration_key like '%_PAGANTIS_%'";
+        $query = "delete from ".TABLE_CONFIGURATION." where configuration_key like '%_PAGANTIS_%'";
         tep_db_query($query);
 
         $this->uninstallSimulator();
@@ -612,13 +612,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 . " 
+            $query = "INSERT INTO ".TABLE_PAGANTIS_ORDERS." 
                 (os_order_reference, pagantis_order_id, globals) values ('$orderId', '$pagantisOrderId','$globalVars')";
-        } else {
+        }else {
             $query = "UPDATE ".TABLE_PAGANTIS_ORDERS." set pagantis_order_id='$pagantisOrderId' 
                         where os_order_reference='$orderId'";
         }
@@ -659,7 +659,7 @@ 
 
         if ($this->extraConfig['PAGANTIS_PROMOTION'] == '') {
             $promotedProducts = array();
-        } else {
+        }else {
             $promotedProducts = array_values((array)unserialize($this->extraConfig['PAGANTIS_PROMOTION']));
         }
 
@@ -672,13 +672,13 @@ 
     private function getDescription()
     {
         $descriptionCode = "<img src=\"images/icon_info.gif\" border=\"0\" alt=\"Info\" title=\"Info\">&nbsp;<strong>Module version:</strong> $this->version<br/><br/>";
-        $descriptionCode.= "<img src=\"images/icon_info.gif\" border=\"0\">&nbsp;<a href='https://developer.pagantis.com/' target=\"_blank\" style=\"text-decoration: underline; font-weight: bold;\">View Online Documentation</a><br/><br/>";
-        $descriptionCode.= "<img src='images/icon_popup.gif'  border='0'>        <a href='http://pagantis.com' target='_blank' style='text-decoration: underline; font-weight: bold;'>Visit Pagantis Website</a><br/><br/><br/>";
+        $descriptionCode .= "<img src=\"images/icon_info.gif\" border=\"0\">&nbsp;<a href='https://developer.pagantis.com/' target=\"_blank\" style=\"text-decoration: underline; font-weight: bold;\">View Online Documentation</a><br/><br/>";
+        $descriptionCode .= "<img src='images/icon_popup.gif'  border='0'>        <a href='http://pagantis.com' target='_blank' style='text-decoration: underline; font-weight: bold;'>Visit Pagantis Website</a><br/><br/><br/>";
 
         if (MODULE_PAYMENT_PAGANTIS_STATUS == 'True' && $this->isPromoted(null)) {
             $pagantisPromotionUrl = $this->base_url.'/admin/promotion.php';
             $linkDescription = "Si desea gestionar los productos promocionados pulse aquí";
-            $descriptionCode.= "<a href='$pagantisPromotionUrl'>$linkDescription</a>";
+            $descriptionCode .= "<a href='$pagantisPromotionUrl'>$linkDescription</a>";
         }
 
         return $descriptionCode;
@@ -689,34 +689,34 @@ 
      */
     private function installSimulator()
     {
-        $checkSimulator = tep_db_query("select configuration_key, configuration_value from " .TABLE_CONFIGURATION ." 
+        $checkSimulator = tep_db_query("select configuration_key, configuration_value from ".TABLE_CONFIGURATION." 
                                     where configuration_key like 'MODULE_HEADER_TAGS_INSTALLED'
                                     and configuration_value like '%ht_pagantis.php%';");
         if (tep_db_num_rows($checkSimulator) > 0) {
             return true;
         }
 
-        $query = "UPDATE " . TABLE_CONFIGURATION . " set configuration_value = concat(configuration_value, ';ht_pagantis.php')
+        $query = "UPDATE ".TABLE_CONFIGURATION." set configuration_value = concat(configuration_value, ';ht_pagantis.php')
                         where configuration_key like 'MODULE_HEADER_TAGS_INSTALLED'";
         tep_db_query($query);
 
-        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_HEADER_TAGS_PAGANTIS_STATUS', 'True', '', '6', '1', '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, set_function, date_added) values ('Enable Pagantis Module', 'MODULE_HEADER_TAGS_PAGANTIS_STATUS', 'True', '', '6', '1', 'tep_cfg_select_option(array(\'True\', \'False\'), ', now())");
     }
 
     private function uninstallSimulator()
     {
-        $checkSimulator = tep_db_query("select configuration_key, configuration_value from " .TABLE_CONFIGURATION ." 
+        $checkSimulator = tep_db_query("select configuration_key, configuration_value from ".TABLE_CONFIGURATION." 
                                     where configuration_key like 'MODULE_HEADER_TAGS_INSTALLED'
                                     and configuration_value like '%ht_pagantis.php%';");
         if (tep_db_num_rows($checkSimulator) == 0) {
             return true;
         }
 
-        $query = "UPDATE " . TABLE_CONFIGURATION . " set configuration_value = REPLACE(configuration_value, ';ht_pagantis.php', '')
+        $query = "UPDATE ".TABLE_CONFIGURATION." set configuration_value = REPLACE(configuration_value, ';ht_pagantis.php', '')
                         where configuration_key like 'MODULE_HEADER_TAGS_INSTALLED'";
         tep_db_query($query);
 
-        $query = "delete from " . TABLE_CONFIGURATION . " where configuration_key = 'MODULE_HEADER_TAGS_PAGANTIS_STATUS'";
+        $query = "delete from ".TABLE_CONFIGURATION." where configuration_key = 'MODULE_HEADER_TAGS_PAGANTIS_STATUS'";
         tep_db_query($query);
     }
 }

Indentation +18 added lines, -18 removed lines

@@ -35,23 +35,23 @@ 
     public $langCode = null;
 
     public $defaultConfigs = array('PAGANTIS_TITLE'=>'Instant Financing',
-                                   'PAGANTIS_SIMULATOR_DISPLAY_TYPE'=>'pgSDK.simulator.types.SIMPLE',
-                                   'PAGANTIS_SIMULATOR_DISPLAY_SKIN'=>'pgSDK.simulator.skins.BLUE',
-                                   'PAGANTIS_SIMULATOR_DISPLAY_POSITION'=>'hookDisplayProductButtons',
-                                   'PAGANTIS_SIMULATOR_START_INSTALLMENTS'=>3,
-                                   'PAGANTIS_SIMULATOR_MAX_INSTALLMENTS'=>12,
-                                   'PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR'=>'default',
-                                   'PAGANTIS_SIMULATOR_DISPLAY_CSS_POSITION'=>'pgSDK.simulator.positions.INNER',
-                                   'PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR'=>'default',
-                                   'PAGANTIS_SIMULATOR_CSS_QUANTITY_SELECTOR'=>'default',
-                                   'PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR_CHECKOUT'=>'default',
-                                   'PAGANTIS_FORM_DISPLAY_TYPE'=>0,
-                                   'PAGANTIS_DISPLAY_MIN_AMOUNT'=>1,
-                                   'PAGANTIS_URL_OK'=>'',
-                                   'PAGANTIS_URL_KO'=>'',
-                                   'PAGANTIS_TITLE_EXTRA' => 'Paga hasta en 12 cómodas cuotas con Paga+Tarde. Solicitud totalmente online y sin papeleos,¡y la respuesta es inmediata!',
-                                   'PAGANTIS_PROMOTION' => '',
-                                   'PAGANTIS_PROMOTED_PRODUCT_CODE' => '<p>¡Financia este producto sin intereses! - 0% TAE</p>'
+                                    'PAGANTIS_SIMULATOR_DISPLAY_TYPE'=>'pgSDK.simulator.types.SIMPLE',
+                                    'PAGANTIS_SIMULATOR_DISPLAY_SKIN'=>'pgSDK.simulator.skins.BLUE',
+                                    'PAGANTIS_SIMULATOR_DISPLAY_POSITION'=>'hookDisplayProductButtons',
+                                    'PAGANTIS_SIMULATOR_START_INSTALLMENTS'=>3,
+                                    'PAGANTIS_SIMULATOR_MAX_INSTALLMENTS'=>12,
+                                    'PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR'=>'default',
+                                    'PAGANTIS_SIMULATOR_DISPLAY_CSS_POSITION'=>'pgSDK.simulator.positions.INNER',
+                                    'PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR'=>'default',
+                                    'PAGANTIS_SIMULATOR_CSS_QUANTITY_SELECTOR'=>'default',
+                                    'PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR_CHECKOUT'=>'default',
+                                    'PAGANTIS_FORM_DISPLAY_TYPE'=>0,
+                                    'PAGANTIS_DISPLAY_MIN_AMOUNT'=>1,
+                                    'PAGANTIS_URL_OK'=>'',
+                                    'PAGANTIS_URL_KO'=>'',
+                                    'PAGANTIS_TITLE_EXTRA' => 'Paga hasta en 12 cómodas cuotas con Paga+Tarde. Solicitud totalmente online y sin papeleos,¡y la respuesta es inmediata!',
+                                    'PAGANTIS_PROMOTION' => '',
+                                    'PAGANTIS_PROMOTED_PRODUCT_CODE' => '<p>¡Financia este producto sin intereses! - 0% TAE</p>'
     );
 
     /**
@@ -166,7 +166,7 @@ 
         try {
             include_once('./ext/modules/payment/pagantis/vendor/autoload.php');
             global $order, $customer_id, $sendto, $billto, $cart, $languages_id, $currency, $currencies, $shipping,
-                   $payment, $comments, $customer_default_address_id, $cartID;
+                    $payment, $comments, $customer_default_address_id, $cartID;
             $global_vars = array();
             $global_vars['customer_id'] = serialize($customer_id);
             $global_vars['sendTo'] = serialize($sendto);