Completed
Push — master ( 7f1e15...6e170c )
by Raúl
14s queued 12s
created
test/configure/ConfigurePPPTest.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,6 @@
 block discarded – undo
10 10
  * @package Test\Configure
11 11
  *
12 12
  * @group oscommerce-configure-ppp
13
-
14 13
  */
15 14
 class ConfigurePPPTest extends AbstractConfigure
16 15
 {
Please login to merge, or discard this patch.
test/Buy/AbstractBuy.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
         sleep(3);
121 121
         $productLinkElement->click();
122 122
         $this->assertSame(
123
-            self::PRODUCT_NAME . ', ' . self::TITLE,
123
+            self::PRODUCT_NAME.', '.self::TITLE,
124 124
             $this->webDriver->getTitle()
125 125
         );
126 126
     }
@@ -232,9 +232,9 @@  discard block
 block discarded – undo
232 232
         $paymentFormElement = WebDriverBy::className('FieldsPreview-desc');
233 233
         $condition = WebDriverExpectedCondition::visibilityOfElementLocated($paymentFormElement);
234 234
         $this->webDriver->wait()->until($condition);
235
-        $this->assertTrue((bool) $condition);
235
+        $this->assertTrue((bool)$condition);
236 236
         $this->assertSame(
237
-            $this->configuration['firstname'] . ' ' . $this->configuration['lastname'],
237
+            $this->configuration['firstname'].' '.$this->configuration['lastname'],
238 238
             $this->findByClass('FieldsPreview-desc')->getText()
239 239
         );
240 240
     }
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
      */
295 295
     protected function checkPagantisOrderId()
296 296
     {
297
-        $orderId=0;
297
+        $orderId = 0;
298 298
         $notifyUrl = self::OSCURL.self::NOTIFICATION_FOLDER.'?order='.$orderId;
299 299
         $this->assertNotEmpty($notifyUrl, $notifyUrl);
300 300
         $response = Request::post($notifyUrl)->expects('json')->send();
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
         $this->assertEquals(
305 305
             $response->body->merchant_order_id,
306 306
             $orderId,
307
-            $response->body->merchant_order_id.'!='. $orderId
307
+            $response->body->merchant_order_id.'!='.$orderId
308 308
         );
309 309
         $this->assertContains(
310 310
             NoIdentificationException::ERROR_MESSAGE,
Please login to merge, or discard this patch.
catalog/includes/modules/header_tags/ht_pagantis.php 1 patch
Spacing   +102 added lines, -102 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
         ) {
36 36
             $this->enabled = ((MODULE_HEADER_TAGS_PAGANTIS_STATUS == 'True') &&
37 37
                 (MODULE_PAYMENT_PAGANTIS_STATUS == 'True') &&
38
-                (MODULE_PAYMENT_PAGANTIS_SIMULATOR == 'True')) ;
38
+                (MODULE_PAYMENT_PAGANTIS_SIMULATOR == 'True'));
39 39
         }
40 40
 
41 41
         $this->extraConfig = $this->getExtraConfig();
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
      */
72 72
     private function getConfig($config = '')
73 73
     {
74
-        $query       = "select * from ".TABLE_CONFIGURATION . " where configuration_key ='" . $config . "'";
74
+        $query       = "select * from ".TABLE_CONFIGURATION." where configuration_key ='".$config."'";
75 75
         $result      = tep_db_query($query);
76 76
         $resultArray = tep_db_fetch_array($result);
77 77
         return $resultArray['configuration_value'];
@@ -88,29 +88,29 @@  discard block
 block discarded – undo
88 88
         $checkoutPage = strpos($_SERVER[REQUEST_URI], "checkout_payment.php") > 0;
89 89
 
90 90
         //Show promoted html
91
-        if ($this->isPromoted($productId) && $checkoutPage!='1') {
91
+        if ($this->isPromoted($productId) && $checkoutPage != '1') {
92 92
             echo "<div id='promotedText' style='display:none'><br/>".$this->extraConfig['PAGANTIS_PROMOTED_PRODUCT_CODE']."</div>";
93
-            echo '<script>'. PHP_EOL;
94
-            echo '        function loadPromoted()'. PHP_EOL;
95
-            echo '        {'. PHP_EOL;
96
-            echo 'var positionSelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR']. '\';'. PHP_EOL;
97
-            echo 'if (positionSelector === \'default\') {'. PHP_EOL;
98
-            echo 'positionSelector = \'.buttonSet\''. PHP_EOL;
99
-            echo '}'. PHP_EOL;
93
+            echo '<script>'.PHP_EOL;
94
+            echo '        function loadPromoted()'.PHP_EOL;
95
+            echo '        {'.PHP_EOL;
96
+            echo 'var positionSelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR'].'\';'.PHP_EOL;
97
+            echo 'if (positionSelector === \'default\') {'.PHP_EOL;
98
+            echo 'positionSelector = \'.buttonSet\''.PHP_EOL;
99
+            echo '}'.PHP_EOL;
100 100
             echo 'var docFather = document.querySelector(positionSelector);'.PHP_EOL;
101
-            echo 'if (typeof docFather != \'undefined\') {'. PHP_EOL;
101
+            echo 'if (typeof docFather != \'undefined\') {'.PHP_EOL;
102 102
             echo 'var promotedNode = document.getElementById("promotedText");'.PHP_EOL;
103 103
             echo 'docFather.appendChild(promotedNode);'.PHP_EOL;
104
-            echo 'promotedNode.style.display=""' . PHP_EOL;
105
-            echo '               clearInterval(window.OSPromotedId);'. PHP_EOL;
106
-            echo '               return true;'. PHP_EOL;
107
-            echo '       }'. PHP_EOL;
108
-            echo '               return false;'. PHP_EOL;
109
-            echo '       }'. PHP_EOL;
110
-            echo '       window.OSPromotedId = setInterval(function () {'. PHP_EOL;
111
-            echo '          loadPromoted();'. PHP_EOL;
112
-            echo '       }, 2000);'. PHP_EOL;
113
-            echo '</script>'. PHP_EOL;
104
+            echo 'promotedNode.style.display=""'.PHP_EOL;
105
+            echo '               clearInterval(window.OSPromotedId);'.PHP_EOL;
106
+            echo '               return true;'.PHP_EOL;
107
+            echo '       }'.PHP_EOL;
108
+            echo '               return false;'.PHP_EOL;
109
+            echo '       }'.PHP_EOL;
110
+            echo '       window.OSPromotedId = setInterval(function () {'.PHP_EOL;
111
+            echo '          loadPromoted();'.PHP_EOL;
112
+            echo '       }, 2000);'.PHP_EOL;
113
+            echo '</script>'.PHP_EOL;
114 114
         }
115 115
 
116 116
         if (isset($productId) || $checkoutPage) {
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
                 $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_TYPE'] = 'pmtSDK.simulator.types.SIMPLE';
121 121
                 $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_SKIN'] = 'pmtSDK.simulator.skins.BLUE';
122 122
                 $simulatorCode = 'pmtSDK';
123
-            } else {
123
+            }else {
124 124
                 return true;
125 125
             }
126 126
 
@@ -131,102 +131,102 @@  discard block
 block discarded – undo
131 131
                 $productId = array_shift($productId);
132 132
                 $promotedProduct = $this->isPromoted($productId);
133 133
                 if ($promotedProduct) {
134
-                    $promotedAmount+=number_format(($item['price'] * $item['qty']), 2);
134
+                    $promotedAmount += number_format(($item['price'] * $item['qty']), 2);
135 135
                 }
136 136
             }
137 137
 
138
-            echo "<script src='".$this->sdkFile."'></script>". PHP_EOL;
139
-            echo '<script>'. PHP_EOL;
140
-            echo '        function loadSimulator()'. PHP_EOL;
141
-            echo '        {'. PHP_EOL;
142
-            echo '           if (typeof '.$simulatorCode.' != \'undefined\') {'. PHP_EOL;
143
-            echo '               var positionSelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR']. '\';'. PHP_EOL;
144
-            echo '               var priceSelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR']. '\';'. PHP_EOL;
145
-            echo '               var checkoutPriceSelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR']. '\';'. PHP_EOL;
146
-            echo '               var quantitySelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_QUANTITY_SELECTOR']. '\';'. PHP_EOL;
147
-            echo '               var checkoutPage =     \'' . $checkoutPage.'\';'. PHP_EOL;
148
-            echo '               var promotedAmount =     \'' . $promotedAmount.'\';'. PHP_EOL;
149
-            echo '               var langCode =     \'' . $this->langCode.'\';'. PHP_EOL;
150
-
151
-            echo '               if (positionSelector === \'default\') {'. PHP_EOL;
152
-            echo '                   positionSelector = \'.buttonSet\''. PHP_EOL;
153
-            echo '               }'. PHP_EOL;
154
-
155
-            echo '               if (priceSelector === \'default\') {'. PHP_EOL;
156
-            echo '                   priceSelector = \'#bodyContent>form>div>h1\''. PHP_EOL;
157
-            echo '               }'. PHP_EOL;
158
-
159
-            echo '               if (checkoutPriceSelector == \'default\' && checkoutPage == \'1\')  {'. PHP_EOL;
160
-            echo '                   priceSelector = \'#columnRight > .infoBoxContainer > .infoBoxContents > tbody > tr:last-child > td\';'. PHP_EOL;
161
-            echo '               }'. PHP_EOL;
162
-            echo '               '.$simulatorCode.'.product_simulator = {};'. PHP_EOL;
163
-            echo '               '.$simulatorCode.'.product_simulator.id = \'product-simulator\';'. PHP_EOL;
164
-            echo '               '.$simulatorCode.'.product_simulator.publicKey = \'' . $this->pk . '\';'. PHP_EOL;
165
-            echo '               '.$simulatorCode.'.product_simulator.selector = positionSelector;'. PHP_EOL;
166
-            echo '               '.$simulatorCode.'.product_simulator.numInstalments = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_START_INSTALLMENTS'] . '\';'. PHP_EOL;
167
-            echo '               '.$simulatorCode.'.product_simulator.type = ' . $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_TYPE'] . ';'. PHP_EOL;
168
-            echo '               '.$simulatorCode.'.product_simulator.skin = ' . $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_SKIN'] . ';'. PHP_EOL;
169
-            echo '               '.$simulatorCode.'.product_simulator.position = ' . $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_CSS_POSITION'] . ';'. PHP_EOL;
138
+            echo "<script src='".$this->sdkFile."'></script>".PHP_EOL;
139
+            echo '<script>'.PHP_EOL;
140
+            echo '        function loadSimulator()'.PHP_EOL;
141
+            echo '        {'.PHP_EOL;
142
+            echo '           if (typeof '.$simulatorCode.' != \'undefined\') {'.PHP_EOL;
143
+            echo '               var positionSelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR'].'\';'.PHP_EOL;
144
+            echo '               var priceSelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR'].'\';'.PHP_EOL;
145
+            echo '               var checkoutPriceSelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR'].'\';'.PHP_EOL;
146
+            echo '               var quantitySelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_QUANTITY_SELECTOR'].'\';'.PHP_EOL;
147
+            echo '               var checkoutPage =     \''.$checkoutPage.'\';'.PHP_EOL;
148
+            echo '               var promotedAmount =     \''.$promotedAmount.'\';'.PHP_EOL;
149
+            echo '               var langCode =     \''.$this->langCode.'\';'.PHP_EOL;
150
+
151
+            echo '               if (positionSelector === \'default\') {'.PHP_EOL;
152
+            echo '                   positionSelector = \'.buttonSet\''.PHP_EOL;
153
+            echo '               }'.PHP_EOL;
154
+
155
+            echo '               if (priceSelector === \'default\') {'.PHP_EOL;
156
+            echo '                   priceSelector = \'#bodyContent>form>div>h1\''.PHP_EOL;
157
+            echo '               }'.PHP_EOL;
158
+
159
+            echo '               if (checkoutPriceSelector == \'default\' && checkoutPage == \'1\')  {'.PHP_EOL;
160
+            echo '                   priceSelector = \'#columnRight > .infoBoxContainer > .infoBoxContents > tbody > tr:last-child > td\';'.PHP_EOL;
161
+            echo '               }'.PHP_EOL;
162
+            echo '               '.$simulatorCode.'.product_simulator = {};'.PHP_EOL;
163
+            echo '               '.$simulatorCode.'.product_simulator.id = \'product-simulator\';'.PHP_EOL;
164
+            echo '               '.$simulatorCode.'.product_simulator.publicKey = \''.$this->pk.'\';'.PHP_EOL;
165
+            echo '               '.$simulatorCode.'.product_simulator.selector = positionSelector;'.PHP_EOL;
166
+            echo '               '.$simulatorCode.'.product_simulator.numInstalments = \''.$this->extraConfig['PAGANTIS_SIMULATOR_START_INSTALLMENTS'].'\';'.PHP_EOL;
167
+            echo '               '.$simulatorCode.'.product_simulator.type = '.$this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_TYPE'].';'.PHP_EOL;
168
+            echo '               '.$simulatorCode.'.product_simulator.skin = '.$this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_SKIN'].';'.PHP_EOL;
169
+            echo '               '.$simulatorCode.'.product_simulator.position = '.$this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_CSS_POSITION'].';'.PHP_EOL;
170 170
 
171 171
             //Amount in product page
172
-            echo '               var promotedProduct = \'' . $this->isPromoted($productId) .'\';'. PHP_EOL;
172
+            echo '               var promotedProduct = \''.$this->isPromoted($productId).'\';'.PHP_EOL;
173 173
             echo '               if(checkoutPage != \'1\' ) {';
174
-            echo '               '.$simulatorCode.'.product_simulator.itemAmountSelector = priceSelector;'. PHP_EOL;
175
-            echo '                   if(promotedProduct == \'1\') { ' . PHP_EOL;
176
-            echo '                    '.$simulatorCode.'.product_simulator.itemPromotedAmountSelector = priceSelector;'. PHP_EOL;
177
-            echo '                   }' . PHP_EOL;
174
+            echo '               '.$simulatorCode.'.product_simulator.itemAmountSelector = priceSelector;'.PHP_EOL;
175
+            echo '                   if(promotedProduct == \'1\') { '.PHP_EOL;
176
+            echo '                    '.$simulatorCode.'.product_simulator.itemPromotedAmountSelector = priceSelector;'.PHP_EOL;
177
+            echo '                   }'.PHP_EOL;
178 178
             echo '               }';
179 179
 
180 180
             //Amount in checkout page
181
-            echo '               if(checkoutPage == \'1\' ) { ' . PHP_EOL;
182
-            echo '               '.$simulatorCode.'.product_simulator.totalAmountSelector = priceSelector;'. PHP_EOL;
183
-            echo '                  if(promotedAmount != \'0\' && checkoutPage == \'1\' ) { ' . PHP_EOL;
184
-            echo '                  '   .$simulatorCode.'.product_simulator.totalPromotedAmount = promotedAmount;'. PHP_EOL;
185
-            echo '                  }' . PHP_EOL;
186
-            echo '               }' . PHP_EOL;
187
-            echo '               '.$simulatorCode.'.simulator.init('.$simulatorCode.'.product_simulator);'. PHP_EOL;
188
-            echo '               clearInterval(window.OSSimulatorId);'. PHP_EOL;
189
-            echo '               return true;'. PHP_EOL;
190
-            echo '           }'. PHP_EOL;
191
-            echo '           return false;'. PHP_EOL;
192
-            echo '       }'. PHP_EOL;
181
+            echo '               if(checkoutPage == \'1\' ) { '.PHP_EOL;
182
+            echo '               '.$simulatorCode.'.product_simulator.totalAmountSelector = priceSelector;'.PHP_EOL;
183
+            echo '                  if(promotedAmount != \'0\' && checkoutPage == \'1\' ) { '.PHP_EOL;
184
+            echo '                  '.$simulatorCode.'.product_simulator.totalPromotedAmount = promotedAmount;'.PHP_EOL;
185
+            echo '                  }'.PHP_EOL;
186
+            echo '               }'.PHP_EOL;
187
+            echo '               '.$simulatorCode.'.simulator.init('.$simulatorCode.'.product_simulator);'.PHP_EOL;
188
+            echo '               clearInterval(window.OSSimulatorId);'.PHP_EOL;
189
+            echo '               return true;'.PHP_EOL;
190
+            echo '           }'.PHP_EOL;
191
+            echo '           return false;'.PHP_EOL;
192
+            echo '       }'.PHP_EOL;
193 193
 
194 194
             //Invoke to main method
195
-            echo '       window.OSSimulatorId = setInterval(function () {'. PHP_EOL;
196
-            echo '          loadSimulator();'. PHP_EOL;
197
-            echo '       }, 2000);'. PHP_EOL;
198
-            echo '</script>'. PHP_EOL;
195
+            echo '       window.OSSimulatorId = setInterval(function () {'.PHP_EOL;
196
+            echo '          loadSimulator();'.PHP_EOL;
197
+            echo '       }, 2000);'.PHP_EOL;
198
+            echo '</script>'.PHP_EOL;
199 199
 
200 200
             //Checkout simulator
201 201
             if ($checkoutPage) {
202
-                echo '<script>' . PHP_EOL;
203
-
204
-                echo 'function checkSelected(value)'. PHP_EOL;
205
-                echo '{ '. PHP_EOL;
206
-                echo 'var simulator = document.getElementsByClassName("buttonSet");'  . PHP_EOL;
207
-                echo ' if(simulator == "undefined") { return false;  } '. PHP_EOL;
208
-                echo 'var pagantisCheckbox = document.querySelector("input[value=\'pagantis\']"); ' . PHP_EOL;
209
-                echo 'var grandparentNode = pagantisCheckbox.parentNode.parentNode;' . PHP_EOL;
210
-                echo 'if(grandparentNode == value) { var status="" } ' . PHP_EOL;
211
-                echo 'else { var status="none";} '. PHP_EOL;
212
-                echo 'simulator[0].style.display=status; ' . PHP_EOL;
213
-                echo '}'. PHP_EOL;
214
-
215
-                echo 'function showSimulator()'. PHP_EOL;
216
-                echo '{'. PHP_EOL;
217
-                echo 'var elements = document.querySelectorAll("tr[class^=\'moduleRow\']");' . PHP_EOL;
218
-                echo 'if(elements == null) { return false };' . PHP_EOL;
202
+                echo '<script>'.PHP_EOL;
203
+
204
+                echo 'function checkSelected(value)'.PHP_EOL;
205
+                echo '{ '.PHP_EOL;
206
+                echo 'var simulator = document.getElementsByClassName("buttonSet");'.PHP_EOL;
207
+                echo ' if(simulator == "undefined") { return false;  } '.PHP_EOL;
208
+                echo 'var pagantisCheckbox = document.querySelector("input[value=\'pagantis\']"); '.PHP_EOL;
209
+                echo 'var grandparentNode = pagantisCheckbox.parentNode.parentNode;'.PHP_EOL;
210
+                echo 'if(grandparentNode == value) { var status="" } '.PHP_EOL;
211
+                echo 'else { var status="none";} '.PHP_EOL;
212
+                echo 'simulator[0].style.display=status; '.PHP_EOL;
213
+                echo '}'.PHP_EOL;
214
+
215
+                echo 'function showSimulator()'.PHP_EOL;
216
+                echo '{'.PHP_EOL;
217
+                echo 'var elements = document.querySelectorAll("tr[class^=\'moduleRow\']");'.PHP_EOL;
218
+                echo 'if(elements == null) { return false };'.PHP_EOL;
219 219
                 echo 'for(var i = 0, max = elements.length; i < max; i++) { elements[i].onclick = function() {
220 220
                         checkSelected(this);
221 221
                     } }' . PHP_EOL;
222 222
                 echo 'clearInterval(window.OSdisplayId);';
223
-                echo 'return true;'. PHP_EOL;
224
-                echo '};'. PHP_EOL;
223
+                echo 'return true;'.PHP_EOL;
224
+                echo '};'.PHP_EOL;
225 225
 
226
-                echo '       window.OSdisplayId = setInterval(function () {'. PHP_EOL;
227
-                echo '          showSimulator();'. PHP_EOL;
228
-                echo '       }, 2000);'. PHP_EOL;
229
-                echo '</script>'. PHP_EOL;
226
+                echo '       window.OSdisplayId = setInterval(function () {'.PHP_EOL;
227
+                echo '          showSimulator();'.PHP_EOL;
228
+                echo '       }, 2000);'.PHP_EOL;
229
+                echo '</script>'.PHP_EOL;
230 230
             }
231 231
         }
232 232
     }
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
      * install
250 250
      */
251 251
     function install() {
252
-        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())");
252
+        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())");
253 253
 
254 254
     }
255 255
 
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
      * remove
258 258
      */
259 259
     function remove() {
260
-        tep_db_query("delete from " . TABLE_CONFIGURATION . " where configuration_key in ('" . implode("', '", $this->keys()) . "')");
260
+        tep_db_query("delete from ".TABLE_CONFIGURATION." where configuration_key in ('".implode("', '", $this->keys())."')");
261 261
     }
262 262
 
263 263
     /**
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 
281 281
         if ($this->extraConfig['PAGANTIS_PROMOTION'] == '') {
282 282
             $promotedProducts = array();
283
-        } else {
283
+        }else {
284 284
             $promotedProducts = array_values((array)unserialize($this->extraConfig['PAGANTIS_PROMOTION']));
285 285
         }
286 286
 
Please login to merge, or discard this patch.
catalog/admin/allowedCountries.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,9 +5,9 @@  discard block
 block discarded – undo
5 5
 define('TABLE_LAUGUAGES', 'languages');
6 6
 
7 7
 //Check if module is installed
8
-$result = tep_db_query("select * from " . TABLE_CONFIGURATION . " where configuration_key='MODULE_PAYMENT_PAGANTIS_STATUS'");
8
+$result = tep_db_query("select * from ".TABLE_CONFIGURATION." where configuration_key='MODULE_PAYMENT_PAGANTIS_STATUS'");
9 9
 $resultSelect = tep_db_fetch_array($result);
10
-if (tep_db_num_rows($result) == 0 || $resultSelect['configuration_value'] !=='True') {
10
+if (tep_db_num_rows($result) == 0 || $resultSelect['configuration_value'] !== 'True') {
11 11
     tep_redirect('/admin/index.php');
12 12
 }
13 13
 
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
     $resultSelect = tep_db_fetch_array($result);
29 29
     if ($resultSelect['value'] == '') {
30 30
         $allowedCountries = array();
31
-    } else {
31
+    }else {
32 32
         $allowedCountries = array_values((array)unserialize($resultSelect['value']));
33 33
     }
34 34
 }
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
                                     </tr>
84 84
     <?php foreach ($availableLanguages as $countryId => $country) {
85 85
         $checked = (in_array($country['code'], $allowedCountries)) ? 'checked' : '';
86
-        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>";
86
+        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>";
87 87
     }
88 88
                                     ?>
89 89
                                     <tr>
Please login to merge, or discard this patch.
catalog/ext/modules/payment/pagantis/notifyController.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -83,22 +83,22 @@  discard block
 block discarded – undo
83 83
             $jsonResponse->setException($exception);
84 84
             $this->insertLog($exception);
85 85
 
86
-            if ($this->extraConfig['PAGANTIS_URL_KO'] =! '') {
86
+            if ($this->extraConfig['PAGANTIS_URL_KO'] = !'') {
87 87
                 $koUrl = $this->extraConfig['PAGANTIS_URL_KO'];
88
-            } else {
88
+            }else {
89 89
                 $koUrl = trim(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL', false));
90 90
             }
91 91
 
92 92
             if ($this->origin == 'notify') {
93 93
                 $jsonResponse->printResponse();
94
-            } else {
94
+            }else {
95 95
                 if ($exception->getMessage() == AlreadyProcessedException::ERROR_MESSAGE) {
96
-                    if ($this->extraConfig['PAGANTIS_URL_OK']!='') {
96
+                    if ($this->extraConfig['PAGANTIS_URL_OK'] != '') {
97 97
                         $confirmationUrl = $this->extraConfig['PAGANTIS_URL_OK'];
98
-                        $confirmationUrl.="?order_id=$this->merchantOrderId";
99
-                    } else {
98
+                        $confirmationUrl .= "?order_id=$this->merchantOrderId";
99
+                    }else {
100 100
                         $confirmationUrl = trim(tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, '', 'SSL', false));
101
-                        $confirmationUrl.="?order_id=$this->merchantOrderId";
101
+                        $confirmationUrl .= "?order_id=$this->merchantOrderId";
102 102
                     }
103 103
 
104 104
                     header("Location: $confirmationUrl");
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 
134 134
         if ($this->origin == 'notify') {
135 135
             $jsonResponse->printResponse();
136
-        } else {
136
+        }else {
137 137
             return $jsonResponse;
138 138
         }
139 139
     }
@@ -210,12 +210,12 @@  discard block
 block discarded – undo
210 210
         try {
211 211
             $this->checkPagantisStatus(array('AUTHORIZED'));
212 212
         } catch (\Exception $e) {
213
-            if ($this->findOscommerceOrderId()!='') {
213
+            if ($this->findOscommerceOrderId() != '') {
214 214
                 throw new AlreadyProcessedException();
215
-            } else {
215
+            }else {
216 216
                 if ($this->pagantisOrder instanceof \Pagantis\OrdersApiClient\Model\Order) {
217 217
                     $status = $this->pagantisOrder->getStatus();
218
-                } else {
218
+                }else {
219 219
                     $status = '-';
220 220
                 }
221 221
                 throw new WrongStatusException($status);
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
     {
231 231
         global $order;
232 232
 
233
-        if ($order->info['order_status']!=='1') {
233
+        if ($order->info['order_status'] !== '1') {
234 234
             throw new AlreadyProcessedException();
235 235
         }
236 236
     }
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
             $this->pagantisOrder = $this->orderClient->getOrder($this->pagantisOrderId);
262 262
             if ($this->pagantisOrder->getStatus() !== Order::STATUS_CONFIRMED) {
263 263
                 throw new UnknownException($e->getMessage());
264
-            } else {
264
+            }else {
265 265
                 $logMessage = 'Concurrency issue: Order_id '.$this->pagantisOrderId.' was confirmed by other process';
266 266
                 $this->insertLog(null, $logMessage);
267 267
             }
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
             if ($orderId == null) {
316 316
                 $query = "delete from ".TABLE_PAGANTIS_CONCURRENCY." where  timestamp<".(time() - 5);
317 317
                 tep_db_query($query);
318
-            } elseif ($orderId!='') {
318
+            } elseif ($orderId != '') {
319 319
                 $query = "delete from ".TABLE_PAGANTIS_CONCURRENCY." where id='$orderId'";
320 320
                 tep_db_query($query);
321 321
             }
@@ -367,12 +367,12 @@  discard block
 block discarded – undo
367 367
             if (!$payed) {
368 368
                 if ($this->pagantisOrder instanceof \Pagantis\OrdersApiClient\Model\Order) {
369 369
                     $status = $this->pagantisOrder->getStatus();
370
-                } else {
370
+                }else {
371 371
                     $status = '-';
372 372
                 }
373 373
                 throw new WrongStatusException($status);
374 374
             }
375
-        } else {
375
+        }else {
376 376
             throw new OrderNotFoundException();
377 377
         }
378 378
     }
@@ -418,12 +418,12 @@  discard block
 block discarded – undo
418 418
         $metadataInfo = '';
419 419
         foreach ($metadataOrder as $metadataKey => $metadataValue) {
420 420
             if ($metadataKey == 'promotedProduct') {
421
-                $metadataInfo.= "/Producto promocionado = $metadataValue";
421
+                $metadataInfo .= "/Producto promocionado = $metadataValue";
422 422
             }
423 423
         }
424 424
 
425 425
         $comment = "Pagantis id=$this->pagantisOrderId/Via=".ucfirst($this->origin)."/".$metadataInfo;
426
-        $query = "insert into ".TABLE_ORDERS_STATUS_HISTORY ."(comments, orders_id, orders_status_id, customer_notified,
426
+        $query = "insert into ".TABLE_ORDERS_STATUS_HISTORY."(comments, orders_id, orders_status_id, customer_notified,
427 427
         date_added) values ('$comment', ".$insert_id.", '2', -1, now() )";
428 428
         tep_db_query($query);
429 429
 
@@ -453,10 +453,10 @@  discard block
 block discarded – undo
453 453
      */
454 454
     private function insertLog($exception = null, $message = null)
455 455
     {
456
-        $logEntry= new LogEntry();
456
+        $logEntry = new LogEntry();
457 457
         if ($exception instanceof \Exception) {
458 458
             $logEntryJson = $logEntry->error($exception)->toJson();
459
-        } else {
459
+        }else {
460 460
             $logEntryJson = $logEntry->info($message)->toJson();
461 461
         }
462 462
             $query = "insert into ".TABLE_PAGANTIS_LOG."(log) values ('$logEntryJson')";
Please login to merge, or discard this patch.
test/basic/BasicTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
         $this->webDriver->get(self::OSCURL);
31 31
         $condition = WebDriverExpectedCondition::titleContains(self::TITLE);
32 32
         $this->webDriver->wait()->until($condition);
33
-        $this->assertTrue((bool) $condition);
33
+        $this->assertTrue((bool)$condition);
34 34
         $this->quit();
35 35
     }
36 36
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
         $this->webDriver->get(self::OSCURL_BACKOFFICE);
43 43
         $condition = WebDriverExpectedCondition::titleContains(self::ADMIN_TITLE);
44 44
         $this->webDriver->wait()->until($condition);
45
-        $this->assertTrue((bool) $condition);
45
+        $this->assertTrue((bool)$condition);
46 46
         $this->quit();
47 47
     }
48 48
 }
49 49
\ No newline at end of file
Please login to merge, or discard this patch.