pagantis / oscommerce

test/Buy/CancelBuyRegisteredTest.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
         $checkoutStepShippingMethodSearch = WebDriverBy::id('checkout-shipping-method-load');
         $condition = WebDriverExpectedCondition::visibilityOfElementLocated($checkoutStepShippingMethodSearch);
         $this->webDriver->wait()->until($condition);
-        $this->assertTrue((bool) $condition);
+        $this->assertTrue((bool)$condition);
     }
 
     /**
@@ -54,7 +54,7 @@ 
         $billingAddressSelector = WebDriverBy::id('billing-address-select');
         $condition = WebDriverExpectedCondition::visibilityOfElementLocated($billingAddressSelector);
         $this->webDriver->wait()->until($condition);
-        $this->assertTrue((bool) $condition);
+        $this->assertTrue((bool)$condition);
     }
 
     /**

test/PagantisOscommerceTest.php

Spacing +8 added lines, -8 removed lines

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

test/Buy/BuyRegisteredTest.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,

test/Buy/AbstractBuy.php

Spacing +3 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
         sleep(3);
         $productLinkElement->click();
         $this->assertSame(
-            self::PRODUCT_NAME . ', ' . self::TITLE,
+            self::PRODUCT_NAME.', '.self::TITLE,
             $this->webDriver->getTitle()
         );
     }
@@ -181,9 +181,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()
         );
     }

catalog/includes/modules/header_tags/ht_pagantis.php

Spacing +11 added lines, -11 removed lines

@@ -27,7 +27,7 @@ 
         $this->title = MODULE_HEADER_TAGS_PAGANTIS_TITLE;
         $this->description = MODULE_HEADER_TAGS_PAGANTIS_DESCRIPTION;
 
-        if ( defined('MODULE_HEADER_TAGS_PAGANTIS_STATUS') ) {
+        if (defined('MODULE_HEADER_TAGS_PAGANTIS_STATUS')) {
             $this->sort_order = MODULE_HEADER_TAGS_PAGANTIS_SORT_ORDER;
             $this->enabled = (MODULE_HEADER_TAGS_PAGANTIS_STATUS == 'True');
         }
@@ -63,9 +63,9 @@ 
         echo '           if (typeof pgSDK != \'undefined\') {';
         echo '               var price = null;';
         echo '               var quantity = null;';
-        echo '               var positionSelector = ' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR'];
-        echo '               var priceSelector = ' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR'];
-        echo '               var quantitySelector = ' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_QUANTITY_SELECTOR'];
+        echo '               var positionSelector = '.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR'];
+        echo '               var priceSelector = '.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR'];
+        echo '               var quantitySelector = '.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_QUANTITY_SELECTOR'];
 
         echo '               if (positionSelector === \'default\') {';
         echo '                   positionSelector = \'.pagantisSimulator\'';
@@ -86,10 +86,10 @@ 
         echo '               pgSDK.product_simulator.id = \'product-simulator\';';
         echo '               pgSDK.product_simulator.publicKey = MODULE_PAYMENT_PAGANTIS_PK;';
         echo '               pgSDK.product_simulator.selector = positionSelector;';
-        echo '               pgSDK.product_simulator.numInstalments = ' . $this->extraConfig['PAGANTIS_SIMULATOR_START_INSTALLMENTS'] . ';';
-        echo '               pgSDK.product_simulator.type = ' . $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_TYPE'] . ';';
-        echo '               pgSDK.product_simulator.skin = ' . $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_SKIN'] . ';';
-        echo '               pgSDK.product_simulator.position = ' . $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_CSS_POSITION'] . ';';
+        echo '               pgSDK.product_simulator.numInstalments = '.$this->extraConfig['PAGANTIS_SIMULATOR_START_INSTALLMENTS'].';';
+        echo '               pgSDK.product_simulator.type = '.$this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_TYPE'].';';
+        echo '               pgSDK.product_simulator.skin = '.$this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_SKIN'].';';
+        echo '               pgSDK.product_simulator.position = '.$this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_CSS_POSITION'].';';
 
         echo '               if (priceSelector !== \'default\') {';
         echo '                   pgSDK.product_simulator.itemAmountSelector = priceSelector;';
@@ -128,12 +128,12 @@ 
     }
 
     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', 'Do you want to allow product titles to be added to the page title?', '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, date_added) values ('Sort Order', 'MODULE_HEADER_TAGS_PAGANTIS_SORT_ORDER', '0', 'Sort order of display. Lowest is displayed first.', '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_HEADER_TAGS_PAGANTIS_STATUS', 'True', 'Do you want to allow product titles to be added to the page title?', '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, date_added) values ('Sort Order', 'MODULE_HEADER_TAGS_PAGANTIS_SORT_ORDER', '0', 'Sort order of display. Lowest is displayed first.', '6', '0', now())");
     }
 
     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())."')");
     }
 
     function keys() {

catalog/includes/modules/payment/pagantis.php

Spacing +25 added lines, -25 removed lines

@@ -59,7 +59,7 @@ 
 
         if (strpos($_SERVER[REQUEST_URI], "checkout_payment.php") <= 0) {
             $this->title = MODULE_PAYMENT_PAGANTIS_TEXT_ADMIN_TITLE; // Payment module title in Admin
-        } else {
+        }else {
             $this->title = MODULE_PAYMENT_PAGANTIS_TEXT_CATALOG_TITLE; // Payment module title in Catalog
         }
 
@@ -77,7 +77,7 @@ 
             )
         );
 
-        $this->form_action_url = $this->base_url . '/ext/modules/payment/pagantis/bypass.php';
+        $this->form_action_url = $this->base_url.'/ext/modules/payment/pagantis/bypass.php';
     }
 
     /***************
@@ -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
@@ -335,7 +335,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();
@@ -353,9 +353,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();
     }
@@ -365,14 +365,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, 
@@ -380,15 +380,15 @@ 
         tep_db_query($sql);
 
         // check if table has records
-        $check_query = tep_db_query("select value from " . TABLE_PAGANTIS_CONFIG);
-        if(tep_db_num_rows($check_query) === 0) {
+        $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 . " (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,
@@ -397,7 +397,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))";
@@ -411,22 +411,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'";
@@ -479,13 +479,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);
     }