pagantis / oscommerce

test/Buy/AbstractBuy.php

Spacing +5 added lines, -5 removed lines

@@ -120,7 +120,7 @@ 
         sleep(3);
         $productLinkElement->click();
         $this->assertSame(
-            self::PRODUCT_NAME . ', ' . self::TITLE,
+            self::PRODUCT_NAME.', '.self::TITLE,
             $this->webDriver->getTitle()
         );
     }
@@ -232,9 +232,9 @@ 
         $paymentFormElement = WebDriverBy::className('FieldsPreview-desc');
         $condition = WebDriverExpectedCondition::visibilityOfElementLocated($paymentFormElement);
         $this->webDriver->wait()->until($condition);
-        $this->assertTrue((bool) $condition);
+        $this->assertTrue((bool)$condition);
         $this->assertSame(
-            $this->configuration['firstname'] . ' ' . $this->configuration['lastname'],
+            $this->configuration['firstname'].' '.$this->configuration['lastname'],
             $this->findByClass('FieldsPreview-desc')->getText()
         );
     }
@@ -294,7 +294,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();
@@ -304,7 +304,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/includes/modules/header_tags/ht_pagantis.php

Spacing +102 added lines, -102 removed lines

@@ -35,7 +35,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();
@@ -71,7 +71,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'];
@@ -88,29 +88,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) {
@@ -120,7 +120,7 @@ 
                 $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_TYPE'] = 'pmtSDK.simulator.types.SIMPLE';
                 $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_SKIN'] = 'pmtSDK.simulator.skins.BLUE';
                 $simulatorCode = 'pmtSDK';
-            } else {
+            }else {
                 return true;
             }
 
@@ -131,102 +131,102 @@ 
                 $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 '               var langCode =     \'' . $this->langCode.'\';'. 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 '               var langCode =     \''.$this->langCode.'\';'.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 '               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;
 
             //Invoke to main method
-            echo '       window.OSSimulatorId = setInterval(function () {'. PHP_EOL;
-            echo '          loadSimulator();'. PHP_EOL;
-            echo '       }, 2000);'. PHP_EOL;
-            echo '</script>'. 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 '</script>'. PHP_EOL;
+                echo '       window.OSdisplayId = setInterval(function () {'.PHP_EOL;
+                echo '          showSimulator();'.PHP_EOL;
+                echo '       }, 2000);'.PHP_EOL;
+                echo '</script>'.PHP_EOL;
             }
         }
     }
@@ -249,7 +249,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())");
 
     }
 
@@ -257,7 +257,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())."')");
     }
 
     /**
@@ -280,7 +280,7 @@ 
 
         if ($this->extraConfig['PAGANTIS_PROMOTION'] == '') {
             $promotedProducts = array();
-        } else {
+        }else {
             $promotedProducts = array_values((array)unserialize($this->extraConfig['PAGANTIS_PROMOTION']));
         }
 

catalog/admin/allowedCountries.php

Spacing +4 added lines, -4 removed lines

@@ -5,9 +5,9 @@ 
 define('TABLE_LAUGUAGES', 'languages');
 
 //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');
 }
 
@@ -28,7 +28,7 @@ 
     $resultSelect = tep_db_fetch_array($result);
     if ($resultSelect['value'] == '') {
         $allowedCountries = array();
-    } else {
+    }else {
         $allowedCountries = array_values((array)unserialize($resultSelect['value']));
     }
 }
@@ -83,7 +83,7 @@ 
                                     </tr>
     <?php foreach ($availableLanguages as $countryId => $country) {
         $checked = (in_array($country['code'], $allowedCountries)) ? 'checked' : '';
-        echo "<tr class='dataTableRow'><td class='dataTableContent'>". $country['name']."</td><td class='dataTableContent' align='center'><input name='checkboxCountries[".$country['code']."]' type='checkbox' $checked </td></tr>";
+        echo "<tr class='dataTableRow'><td class='dataTableContent'>".$country['name']."</td><td class='dataTableContent' align='center'><input name='checkboxCountries[".$country['code']."]' type='checkbox' $checked </td></tr>";
     }
                                     ?>
                                     <tr>

catalog/includes/modules/payment/pagantis.php

Spacing +54 added lines, -54 removed lines

@@ -75,8 +75,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 = MODULE_PAYMENT_PAGANTIS_TEXT_CHECKOUT .'<br/><br/><div class="buttonSet" style="display:none"></div><br/>'; // Payment module title in Catalog
+        }else {
+            $this->title = MODULE_PAYMENT_PAGANTIS_TEXT_CHECKOUT.'<br/><br/><div class="buttonSet" style="display:none"></div><br/>'; // Payment module title in Catalog
         }
 
         if (defined('MODULE_PAYMENT_PAGANTIS_LANG_CODE')) {
@@ -92,12 +92,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_ERROR_MESSAGE')) {
             $this->errorMessage = strtoupper(MODULE_PAYMENT_PAGANTIS_ERROR_MESSAGE);
@@ -211,12 +211,12 @@ 
             $national_id = $this->getNationalId();
             $tax_id = $this->getTaxId();
 
-            $fullName = $order->billing['firstname'] . ' ' . $order->billing['lastname'];
+            $fullName = $order->billing['firstname'].' '.$order->billing['lastname'];
             if ($fullName == ' ') {
-                $fullName = $order->customer['firstname'] . ' ' . $order->customer['lastname'];
+                $fullName = $order->customer['firstname'].' '.$order->customer['lastname'];
             }
             if ($fullName == ' ') {
-                $fullName = $order->delivery['firstname'] . ' ' . $order->delivery['lastname'];
+                $fullName = $order->delivery['firstname'].' '.$order->delivery['lastname'];
             }
             $userAddress = new Address();
             $userAddress
@@ -286,7 +286,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);
                 }
@@ -306,9 +306,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;
             }
 
@@ -346,25 +346,25 @@ 
             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
         } catch (\Exception $exception) {
             $this->insertLog($exception);
             $output = "\n";
-            $output .= tep_draw_hidden_field("cancelUrl", $cancelUrl) . "\n";
-            $output .= tep_draw_hidden_field("errorMessage", $exception->getMessage()) . "\n";
-            $output .= tep_draw_hidden_field("errorCode", $exception->getCode()) . "\n";
+            $output .= tep_draw_hidden_field("cancelUrl", $cancelUrl)."\n";
+            $output .= tep_draw_hidden_field("errorMessage", $exception->getMessage())."\n";
+            $output .= tep_draw_hidden_field("errorCode", $exception->getCode())."\n";
             $output .= "<p>".$this->errorMessage.", <a href='$cancelUrl' style='text-decoration:underline'><b>";
             $output .= $this->errorLinkMessage." </b></a></p>";
 
@@ -428,7 +428,7 @@ 
             return 'failed';
         }
 
-        tep_db_query("insert into " . TABLE_CONFIGURATION . "
+        tep_db_query("insert into ".TABLE_CONFIGURATION."
         (
             configuration_title,
             configuration_key,
@@ -451,7 +451,7 @@ 
             ',
             now()
         )");
-        tep_db_query("insert into " . TABLE_CONFIGURATION . "
+        tep_db_query("insert into ".TABLE_CONFIGURATION."
         (
             configuration_title,
             configuration_key,
@@ -471,7 +471,7 @@ 
             '0',
             now()
         )");
-        tep_db_query("insert into " . TABLE_CONFIGURATION . "
+        tep_db_query("insert into ".TABLE_CONFIGURATION."
         (
             configuration_title,
             configuration_key,
@@ -491,7 +491,7 @@ 
             '0',
             now()
         )");
-        tep_db_query("insert into " . TABLE_CONFIGURATION . "
+        tep_db_query("insert into ".TABLE_CONFIGURATION."
         (
             configuration_title,
             configuration_key,
@@ -523,14 +523,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, 
@@ -538,10 +538,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
@@ -555,7 +555,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,
@@ -564,7 +564,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))";
@@ -576,29 +576,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();
@@ -653,13 +653,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'";
         }
@@ -697,7 +697,7 @@ 
 
         if ($this->extraConfig['PAGANTIS_PROMOTION'] == '') {
             $promotedProducts = array();
-        } else {
+        }else {
             $promotedProducts = array_values((array)unserialize($this->extraConfig['PAGANTIS_PROMOTION']));
         }
 
@@ -710,17 +710,17 @@ 
     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') {
             $pagantisPromotionUrl = $this->base_url.'/admin/promotion.php';
             $linkDescription = "Si deseas ofrecer financiación sin intereses para alguno de tus productos ";
-            $descriptionCode.= "<img src='images/icon_info.gif' border='0'/> $linkDescription<a href='$pagantisPromotionUrl' style='text-decoration: underline; font-weight: bold;'>haz click aquí</a>";
+            $descriptionCode .= "<img src='images/icon_info.gif' border='0'/> $linkDescription<a href='$pagantisPromotionUrl' style='text-decoration: underline; font-weight: bold;'>haz click aquí</a>";
 
             $pagantisAllowedCountriesUrl = $this->base_url.'/admin/allowedCountries.php';
             $linkDescription = "Para gestionar paises en los que operar con Pagantis ";
-            $descriptionCode.= "<br/><br/><img src='images/icon_info.gif' border='0'/> $linkDescription<a href='$pagantisAllowedCountriesUrl' style='text-decoration: underline; font-weight: bold;'>haz click aquí</a>";
+            $descriptionCode .= "<br/><br/><img src='images/icon_info.gif' border='0'/> $linkDescription<a href='$pagantisAllowedCountriesUrl' style='text-decoration: underline; font-weight: bold;'>haz click aquí</a>";
         }
 
         return $descriptionCode;
@@ -731,18 +731,18 @@ 
      */
     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())");
     }
 
     /**
@@ -750,18 +750,18 @@ 
      */
     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);
     }
 
@@ -771,7 +771,7 @@ 
     private function insertLog($exception)
     {
         if ($exception instanceof \Exception) {
-            $logEntry= new LogEntry();
+            $logEntry = new LogEntry();
             $logEntryJson = $logEntry->error($exception)->toJson();
             $logEntryJson = addslashes($logEntryJson);
 
@@ -790,7 +790,7 @@ 
             return $order->customer['national_id'];
         } elseif (isset($order->billing['piva'])) {
             return $order->billing['piva'];
-        } else {
+        }else {
             return null;
         }
     }
@@ -805,7 +805,7 @@ 
             return $order->customer['tax_id'];
         } elseif (isset($order->billing['cf'])) {
             return $order->billing['cf'];
-        } else {
+        }else {
             return null;
         }
     }

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

Spacing +20 added lines, -20 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;
         }
     }
@@ -210,12 +210,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);
@@ -230,7 +230,7 @@ 
     {
         global $order;
 
-        if ($order->info['order_status']!=='1') {
+        if ($order->info['order_status'] !== '1') {
             throw new AlreadyProcessedException();
         }
     }
@@ -261,7 +261,7 @@ 
             $this->pagantisOrder = $this->orderClient->getOrder($this->pagantisOrderId);
             if ($this->pagantisOrder->getStatus() !== Order::STATUS_CONFIRMED) {
                 throw new UnknownException($e->getMessage());
-            } else {
+            }else {
                 $logMessage = 'Concurrency issue: Order_id '.$this->pagantisOrderId.' was confirmed by other process';
                 $this->insertLog(null, $logMessage);
             }
@@ -315,7 +315,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);
             }
@@ -367,12 +367,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();
         }
     }
@@ -418,12 +418,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,
+        $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);
 
@@ -453,10 +453,10 @@ 
      */
     private function insertLog($exception = null, $message = null)
     {
-        $logEntry= new LogEntry();
+        $logEntry = new LogEntry();
         if ($exception instanceof \Exception) {
             $logEntryJson = $logEntry->error($exception)->toJson();
-        } else {
+        }else {
             $logEntryJson = $logEntry->info($message)->toJson();
         }
             $query = "insert into ".TABLE_PAGANTIS_LOG."(log) values ('$logEntryJson')";