@@ -10,7 +10,6 @@ |
||
| 10 | 10 | * @package Test\Configure |
| 11 | 11 | * |
| 12 | 12 | * @group oscommerce-configure-ppp |
| 13 | - |
|
| 14 | 13 | */ |
| 15 | 14 | class ConfigurePPPTest extends AbstractConfigure |
| 16 | 15 | { |
@@ -120,7 +120,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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, |
@@ -5,9 +5,9 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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> |
@@ -30,7 +30,7 @@ discard block |
||
| 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 |
||
| 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 |
@@ -86,22 +86,22 @@ discard block |
||
| 86 | 86 | $jsonResponse->setException($exception); |
| 87 | 87 | $this->insertLog($exception); |
| 88 | 88 | |
| 89 | - if ($this->extraConfig['PAGANTIS_URL_KO'] =! '') { |
|
| 89 | + if ($this->extraConfig['PAGANTIS_URL_KO'] = !'') { |
|
| 90 | 90 | $koUrl = $this->extraConfig['PAGANTIS_URL_KO']; |
| 91 | - } else { |
|
| 91 | + }else { |
|
| 92 | 92 | $koUrl = trim(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL', false)); |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | if ($this->origin == 'notify') { |
| 96 | 96 | $jsonResponse->printResponse(); |
| 97 | - } else { |
|
| 97 | + }else { |
|
| 98 | 98 | if ($exception->getMessage() == AlreadyProcessedException::ERROR_MESSAGE) { |
| 99 | - if ($this->extraConfig['PAGANTIS_URL_OK']!='') { |
|
| 99 | + if ($this->extraConfig['PAGANTIS_URL_OK'] != '') { |
|
| 100 | 100 | $confirmationUrl = $this->extraConfig['PAGANTIS_URL_OK']; |
| 101 | - $confirmationUrl.="?order_id=$this->merchantOrderId"; |
|
| 102 | - } else { |
|
| 101 | + $confirmationUrl .= "?order_id=$this->merchantOrderId"; |
|
| 102 | + }else { |
|
| 103 | 103 | $confirmationUrl = trim(tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, '', 'SSL', false)); |
| 104 | - $confirmationUrl.="?order_id=$this->merchantOrderId"; |
|
| 104 | + $confirmationUrl .= "?order_id=$this->merchantOrderId"; |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | header("Location: $confirmationUrl"); |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | |
| 137 | 137 | if ($this->origin == 'notify') { |
| 138 | 138 | $jsonResponse->printResponse(); |
| 139 | - } else { |
|
| 139 | + }else { |
|
| 140 | 140 | return $jsonResponse; |
| 141 | 141 | } |
| 142 | 142 | } |
@@ -213,12 +213,12 @@ discard block |
||
| 213 | 213 | try { |
| 214 | 214 | $this->checkPagantisStatus(array('AUTHORIZED')); |
| 215 | 215 | } catch (\Exception $e) { |
| 216 | - if ($this->findOscommerceOrderId()!='') { |
|
| 216 | + if ($this->findOscommerceOrderId() != '') { |
|
| 217 | 217 | throw new AlreadyProcessedException(); |
| 218 | - } else { |
|
| 218 | + }else { |
|
| 219 | 219 | if ($this->pagantisOrder instanceof \Pagantis\OrdersApiClient\Model\Order) { |
| 220 | 220 | $status = $this->pagantisOrder->getStatus(); |
| 221 | - } else { |
|
| 221 | + }else { |
|
| 222 | 222 | $status = '-'; |
| 223 | 223 | } |
| 224 | 224 | throw new WrongStatusException($status); |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | { |
| 234 | 234 | global $order; |
| 235 | 235 | |
| 236 | - if ($order->info['order_status']!=='1') { |
|
| 236 | + if ($order->info['order_status'] !== '1') { |
|
| 237 | 237 | throw new AlreadyProcessedException(); |
| 238 | 238 | } |
| 239 | 239 | } |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | $this->pagantisOrder = $this->orderClient->getOrder($this->pagantisOrderId); |
| 265 | 265 | if ($this->pagantisOrder->getStatus() !== Order::STATUS_CONFIRMED) { |
| 266 | 266 | throw new UnknownException($e->getMessage()); |
| 267 | - } else { |
|
| 267 | + }else { |
|
| 268 | 268 | $logMessage = 'Concurrency issue: Order_id '.$this->pagantisOrderId.' was confirmed by other process'; |
| 269 | 269 | $this->insertLog(null, $logMessage); |
| 270 | 270 | } |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | self::CONCURRENCY_TIMEOUT |
| 323 | 323 | ); |
| 324 | 324 | tep_db_query($query); |
| 325 | - } elseif ($orderId!='') { |
|
| 325 | + } elseif ($orderId != '') { |
|
| 326 | 326 | $query = "delete from ".TABLE_PAGANTIS_CONCURRENCY." where id='$orderId'"; |
| 327 | 327 | tep_db_query($query); |
| 328 | 328 | } |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | if (isset($orderRow['timestamp'])) { |
| 344 | 344 | if ($this->origin == 'notify') { |
| 345 | 345 | throw new ConcurrencyException(); |
| 346 | - } else { |
|
| 346 | + }else { |
|
| 347 | 347 | $query = sprintf( |
| 348 | 348 | "SELECT TIMESTAMPDIFF(SECOND,NOW()-INTERVAL %s SECOND, timestamp) as rest FROM %s %s", |
| 349 | 349 | self::CONCURRENCY_TIMEOUT, |
@@ -353,7 +353,7 @@ discard block |
||
| 353 | 353 | $resultsSelect = tep_db_query($query); |
| 354 | 354 | $resultsArray = tep_db_fetch_array($resultsSelect); |
| 355 | 355 | $restSeconds = isset($resultsArray['rest']) ? ($resultsArray['rest']) : 0; |
| 356 | - $expirationSec = ($restSeconds>self::CONCURRENCY_TIMEOUT)? self::CONCURRENCY_TIMEOUT : $restSeconds; |
|
| 356 | + $expirationSec = ($restSeconds > self::CONCURRENCY_TIMEOUT) ? self::CONCURRENCY_TIMEOUT : $restSeconds; |
|
| 357 | 357 | if ($expirationSec > 0) { |
| 358 | 358 | sleep($expirationSec + 1); |
| 359 | 359 | } |
@@ -368,8 +368,8 @@ discard block |
||
| 368 | 368 | $os_order_id = tep_db_fetch_array($resultsSelect); |
| 369 | 369 | if (isset($os_order_id['os_order_id'])) { |
| 370 | 370 | $redirectUrl = trim(tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, '', 'SSL', false)); |
| 371 | - $redirectUrl.="?order_id=$this->oscommerceOrderId"; |
|
| 372 | - } else { |
|
| 371 | + $redirectUrl .= "?order_id=$this->oscommerceOrderId"; |
|
| 372 | + }else { |
|
| 373 | 373 | $redirectUrl = trim(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL', false)); |
| 374 | 374 | } |
| 375 | 375 | |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | header("Location: $redirectUrl"); |
| 386 | 386 | exit; |
| 387 | 387 | } |
| 388 | - } else { |
|
| 388 | + }else { |
|
| 389 | 389 | $query = "INSERT INTO ".TABLE_PAGANTIS_CONCURRENCY." (id) VALUES ('$this->oscommerceOrderId');"; |
| 390 | 390 | tep_db_query($query); |
| 391 | 391 | } |
@@ -415,12 +415,12 @@ discard block |
||
| 415 | 415 | if (!$payed) { |
| 416 | 416 | if ($this->pagantisOrder instanceof \Pagantis\OrdersApiClient\Model\Order) { |
| 417 | 417 | $status = $this->pagantisOrder->getStatus(); |
| 418 | - } else { |
|
| 418 | + }else { |
|
| 419 | 419 | $status = '-'; |
| 420 | 420 | } |
| 421 | 421 | throw new WrongStatusException($status); |
| 422 | 422 | } |
| 423 | - } else { |
|
| 423 | + }else { |
|
| 424 | 424 | throw new OrderNotFoundException(); |
| 425 | 425 | } |
| 426 | 426 | } |
@@ -466,12 +466,12 @@ discard block |
||
| 466 | 466 | $metadataInfo = ''; |
| 467 | 467 | foreach ($metadataOrder as $metadataKey => $metadataValue) { |
| 468 | 468 | if ($metadataKey == 'promotedProduct') { |
| 469 | - $metadataInfo.= "/Producto promocionado = $metadataValue"; |
|
| 469 | + $metadataInfo .= "/Producto promocionado = $metadataValue"; |
|
| 470 | 470 | } |
| 471 | 471 | } |
| 472 | 472 | |
| 473 | 473 | $comment = "Pagantis id=$this->pagantisOrderId/Via=".ucfirst($this->origin)."/".$metadataInfo; |
| 474 | - $query = "insert into ".TABLE_ORDERS_STATUS_HISTORY ."(comments, orders_id, orders_status_id, customer_notified, |
|
| 474 | + $query = "insert into ".TABLE_ORDERS_STATUS_HISTORY."(comments, orders_id, orders_status_id, customer_notified, |
|
| 475 | 475 | date_added) values ('$comment', ".$insert_id.", '2', -1, now() )"; |
| 476 | 476 | tep_db_query($query); |
| 477 | 477 | |
@@ -501,10 +501,10 @@ discard block |
||
| 501 | 501 | */ |
| 502 | 502 | private function insertLog($exception = null, $message = null) |
| 503 | 503 | { |
| 504 | - $logEntry= new LogEntry(); |
|
| 504 | + $logEntry = new LogEntry(); |
|
| 505 | 505 | if ($exception instanceof \Exception) { |
| 506 | 506 | $logEntryJson = $logEntry->error($exception)->toJson(); |
| 507 | - } else { |
|
| 507 | + }else { |
|
| 508 | 508 | $logEntryJson = $logEntry->info($message)->toJson(); |
| 509 | 509 | } |
| 510 | 510 | $query = "insert into ".TABLE_PAGANTIS_LOG."(log) values ('$logEntryJson')"; |
@@ -35,7 +35,7 @@ discard block |
||
| 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 |
||
| 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']; |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | */ |
| 83 | 83 | private function getProductPrice() |
| 84 | 84 | { |
| 85 | - $query = "select products_price from products where products_id ='" . urlencode($_GET['products_id']) . "'"; |
|
| 85 | + $query = "select products_price from products where products_id ='".urlencode($_GET['products_id'])."'"; |
|
| 86 | 86 | $result = tep_db_query($query); |
| 87 | 87 | $resultArray = tep_db_fetch_array($result); |
| 88 | 88 | return (int)$resultArray['products_price']; |
@@ -99,40 +99,40 @@ discard block |
||
| 99 | 99 | $productId = $GLOBALS["HTTP_GET_VARS"]["products_id"]; |
| 100 | 100 | $checkoutPage = strpos($_SERVER[REQUEST_URI], "checkout_payment.php") > 0; |
| 101 | 101 | |
| 102 | - if (isset($productId) && $checkoutPage!='1') { |
|
| 102 | + if (isset($productId) && $checkoutPage != '1') { |
|
| 103 | 103 | $productPrice = $this->getProductPrice(); |
| 104 | 104 | $pagantisDisplayMinAmount = $this->extraConfig['PAGANTIS_DISPLAY_MIN_AMOUNT']; |
| 105 | 105 | $pagantisDisplayMaxAmount = $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_MAX_AMOUNT']; |
| 106 | - if (($productPrice > (int)$pagantisDisplayMaxAmount && (int)$pagantisDisplayMaxAmount != '0') || |
|
| 106 | + if (($productPrice > (int)$pagantisDisplayMaxAmount && (int)$pagantisDisplayMaxAmount != '0') || |
|
| 107 | 107 | $productPrice < (int)$pagantisDisplayMinAmount) { |
| 108 | 108 | return false; |
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | 111 | //Show promoted html |
| 112 | - if ($this->isPromoted($productId) && $checkoutPage!='1') { |
|
| 112 | + if ($this->isPromoted($productId) && $checkoutPage != '1') { |
|
| 113 | 113 | echo "<style> #promotedText{margin-left: 10%;} .pmt-no-interest{color: #00c1d5 }</style>"; |
| 114 | 114 | echo "<div id='promotedText' style='display:none'><br/>".$this->extraConfig['PAGANTIS_PROMOTED_PRODUCT_CODE']."</div>"; |
| 115 | - echo '<script>'. PHP_EOL; |
|
| 116 | - echo ' function loadPromoted()'. PHP_EOL; |
|
| 117 | - echo ' {'. PHP_EOL; |
|
| 118 | - echo 'var positionSelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR']. '\';'. PHP_EOL; |
|
| 119 | - echo 'if (positionSelector === \'default\') {'. PHP_EOL; |
|
| 120 | - echo 'positionSelector = \'.buttonSet\''. PHP_EOL; |
|
| 121 | - echo '}'. PHP_EOL; |
|
| 115 | + echo '<script>'.PHP_EOL; |
|
| 116 | + echo ' function loadPromoted()'.PHP_EOL; |
|
| 117 | + echo ' {'.PHP_EOL; |
|
| 118 | + echo 'var positionSelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR'].'\';'.PHP_EOL; |
|
| 119 | + echo 'if (positionSelector === \'default\') {'.PHP_EOL; |
|
| 120 | + echo 'positionSelector = \'.buttonSet\''.PHP_EOL; |
|
| 121 | + echo '}'.PHP_EOL; |
|
| 122 | 122 | echo 'var docFather = document.querySelector(positionSelector);'.PHP_EOL; |
| 123 | - echo 'if (typeof docFather != \'undefined\') {'. PHP_EOL; |
|
| 123 | + echo 'if (typeof docFather != \'undefined\') {'.PHP_EOL; |
|
| 124 | 124 | echo 'var promotedNode = document.getElementById("promotedText");'.PHP_EOL; |
| 125 | 125 | echo 'docFather.appendChild(promotedNode);'.PHP_EOL; |
| 126 | - echo 'promotedNode.style.display=""' . PHP_EOL; |
|
| 127 | - echo ' clearInterval(window.OSPromotedId);'. PHP_EOL; |
|
| 128 | - echo ' return true;'. PHP_EOL; |
|
| 129 | - echo ' }'. PHP_EOL; |
|
| 130 | - echo ' return false;'. PHP_EOL; |
|
| 131 | - echo ' }'. PHP_EOL; |
|
| 132 | - echo ' window.OSPromotedId = setInterval(function () {'. PHP_EOL; |
|
| 133 | - echo ' loadPromoted();'. PHP_EOL; |
|
| 134 | - echo ' }, 2000);'. PHP_EOL; |
|
| 135 | - echo '</script>'. PHP_EOL; |
|
| 126 | + echo 'promotedNode.style.display=""'.PHP_EOL; |
|
| 127 | + echo ' clearInterval(window.OSPromotedId);'.PHP_EOL; |
|
| 128 | + echo ' return true;'.PHP_EOL; |
|
| 129 | + echo ' }'.PHP_EOL; |
|
| 130 | + echo ' return false;'.PHP_EOL; |
|
| 131 | + echo ' }'.PHP_EOL; |
|
| 132 | + echo ' window.OSPromotedId = setInterval(function () {'.PHP_EOL; |
|
| 133 | + echo ' loadPromoted();'.PHP_EOL; |
|
| 134 | + echo ' }, 2000);'.PHP_EOL; |
|
| 135 | + echo '</script>'.PHP_EOL; |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | if (isset($productId) || $checkoutPage) { |
@@ -145,111 +145,111 @@ discard block |
||
| 145 | 145 | $productId = array_shift($productId); |
| 146 | 146 | $promotedProduct = $this->isPromoted($productId); |
| 147 | 147 | if ($promotedProduct) { |
| 148 | - $promotedAmount+=number_format(($item['price'] * $item['qty']), 2); |
|
| 148 | + $promotedAmount += number_format(($item['price'] * $item['qty']), 2); |
|
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - echo "<script src='".$this->sdkFile."'></script>". PHP_EOL; |
|
| 153 | - echo '<style>#bodyContent>form>div>iframe {float: right; width: 280px !important; margin-right: -90px;} .contentContainer {clear: both;}</style>'. PHP_EOL; |
|
| 154 | - echo '<script>'. PHP_EOL; |
|
| 155 | - echo ' function loadSimulator()'. PHP_EOL; |
|
| 156 | - echo ' {'. PHP_EOL; |
|
| 157 | - echo ' if (typeof '.$simulatorCode.' != \'undefined\') {'. PHP_EOL; |
|
| 158 | - echo ' var sdk = '.$simulatorCode.';'. PHP_EOL; |
|
| 159 | - echo ' var positionSelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR']. '\';'. PHP_EOL; |
|
| 160 | - echo ' var priceSelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR']. '\';'. PHP_EOL; |
|
| 161 | - echo ' var checkoutPriceSelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR']. '\';'. PHP_EOL; |
|
| 162 | - echo ' var quantitySelector = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_CSS_QUANTITY_SELECTOR']. '\';'. PHP_EOL; |
|
| 163 | - echo ' var checkoutPage = \'' . $checkoutPage.'\';'. PHP_EOL; |
|
| 164 | - echo ' var promotedAmount = \'' . $promotedAmount.'\';'. PHP_EOL; |
|
| 165 | - echo ' var langCode = \'' . $this->langCode.'\';'. PHP_EOL; |
|
| 166 | - |
|
| 167 | - echo ' if (positionSelector === \'default\') {'. PHP_EOL; |
|
| 168 | - echo ' positionSelector = \'#bodyContent>form>div\''. PHP_EOL; |
|
| 169 | - echo ' }'. PHP_EOL; |
|
| 170 | - |
|
| 171 | - echo ' if (priceSelector === \'default\') {'. PHP_EOL; |
|
| 172 | - echo ' priceSelector = \'#bodyContent>form>div>h1:first-child\''. PHP_EOL; |
|
| 173 | - echo ' }'. PHP_EOL; |
|
| 174 | - |
|
| 175 | - echo ' if (checkoutPriceSelector == \'default\' && checkoutPage == \'1\') {'. PHP_EOL; |
|
| 176 | - echo ' priceSelector = \'#columnRight > .infoBoxContainer > .infoBoxContents > tbody > tr:last-child > td\';'. PHP_EOL; |
|
| 177 | - echo ' }'. PHP_EOL; |
|
| 178 | - |
|
| 179 | - echo ' product_simulator = {};'. PHP_EOL; |
|
| 180 | - echo ' product_simulator.locale = \'' . strtolower($this->langCode) . '\';'. PHP_EOL; |
|
| 181 | - echo ' product_simulator.country = \'' . strtolower($this->langCode) . '\';'. PHP_EOL; |
|
| 182 | - echo ' product_simulator.publicKey = \'' . $this->pk . '\';'. PHP_EOL; |
|
| 183 | - echo ' product_simulator.selector = positionSelector;'. PHP_EOL; |
|
| 184 | - echo ' product_simulator.numInstalments = \'' . $this->extraConfig['PAGANTIS_SIMULATOR_START_INSTALLMENTS'] . '\';'. PHP_EOL; |
|
| 185 | - echo ' product_simulator.type = ' . $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_TYPE'] . ';'. PHP_EOL; |
|
| 186 | - echo ' product_simulator.skin = ' . $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_SKIN'] . ';'. PHP_EOL; |
|
| 187 | - echo ' product_simulator.position = ' . $this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_CSS_POSITION'] . ';'. PHP_EOL; |
|
| 188 | - echo ' product_simulator.amountParserConfig = {};'. PHP_EOL; |
|
| 189 | - echo ' product_simulator.amountParserConfig.thousandSeparator = "' . $this->extraConfig['PAGANTIS_SIMULATOR_THOUSANDS_SEPARATOR'] . '";'. PHP_EOL; |
|
| 190 | - echo ' product_simulator.amountParserConfig.decimalSeparator = "' . $this->extraConfig['PAGANTIS_SIMULATOR_DECIMAL_SEPARATOR'] . '";'. PHP_EOL; |
|
| 152 | + echo "<script src='".$this->sdkFile."'></script>".PHP_EOL; |
|
| 153 | + echo '<style>#bodyContent>form>div>iframe {float: right; width: 280px !important; margin-right: -90px;} .contentContainer {clear: both;}</style>'.PHP_EOL; |
|
| 154 | + echo '<script>'.PHP_EOL; |
|
| 155 | + echo ' function loadSimulator()'.PHP_EOL; |
|
| 156 | + echo ' {'.PHP_EOL; |
|
| 157 | + echo ' if (typeof '.$simulatorCode.' != \'undefined\') {'.PHP_EOL; |
|
| 158 | + echo ' var sdk = '.$simulatorCode.';'.PHP_EOL; |
|
| 159 | + echo ' var positionSelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR'].'\';'.PHP_EOL; |
|
| 160 | + echo ' var priceSelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR'].'\';'.PHP_EOL; |
|
| 161 | + echo ' var checkoutPriceSelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR'].'\';'.PHP_EOL; |
|
| 162 | + echo ' var quantitySelector = \''.$this->extraConfig['PAGANTIS_SIMULATOR_CSS_QUANTITY_SELECTOR'].'\';'.PHP_EOL; |
|
| 163 | + echo ' var checkoutPage = \''.$checkoutPage.'\';'.PHP_EOL; |
|
| 164 | + echo ' var promotedAmount = \''.$promotedAmount.'\';'.PHP_EOL; |
|
| 165 | + echo ' var langCode = \''.$this->langCode.'\';'.PHP_EOL; |
|
| 166 | + |
|
| 167 | + echo ' if (positionSelector === \'default\') {'.PHP_EOL; |
|
| 168 | + echo ' positionSelector = \'#bodyContent>form>div\''.PHP_EOL; |
|
| 169 | + echo ' }'.PHP_EOL; |
|
| 170 | + |
|
| 171 | + echo ' if (priceSelector === \'default\') {'.PHP_EOL; |
|
| 172 | + echo ' priceSelector = \'#bodyContent>form>div>h1:first-child\''.PHP_EOL; |
|
| 173 | + echo ' }'.PHP_EOL; |
|
| 174 | + |
|
| 175 | + echo ' if (checkoutPriceSelector == \'default\' && checkoutPage == \'1\') {'.PHP_EOL; |
|
| 176 | + echo ' priceSelector = \'#columnRight > .infoBoxContainer > .infoBoxContents > tbody > tr:last-child > td\';'.PHP_EOL; |
|
| 177 | + echo ' }'.PHP_EOL; |
|
| 178 | + |
|
| 179 | + echo ' product_simulator = {};'.PHP_EOL; |
|
| 180 | + echo ' product_simulator.locale = \''.strtolower($this->langCode).'\';'.PHP_EOL; |
|
| 181 | + echo ' product_simulator.country = \''.strtolower($this->langCode).'\';'.PHP_EOL; |
|
| 182 | + echo ' product_simulator.publicKey = \''.$this->pk.'\';'.PHP_EOL; |
|
| 183 | + echo ' product_simulator.selector = positionSelector;'.PHP_EOL; |
|
| 184 | + echo ' product_simulator.numInstalments = \''.$this->extraConfig['PAGANTIS_SIMULATOR_START_INSTALLMENTS'].'\';'.PHP_EOL; |
|
| 185 | + echo ' product_simulator.type = '.$this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_TYPE'].';'.PHP_EOL; |
|
| 186 | + echo ' product_simulator.skin = '.$this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_SKIN'].';'.PHP_EOL; |
|
| 187 | + echo ' product_simulator.position = '.$this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_CSS_POSITION'].';'.PHP_EOL; |
|
| 188 | + echo ' product_simulator.amountParserConfig = {};'.PHP_EOL; |
|
| 189 | + echo ' product_simulator.amountParserConfig.thousandSeparator = "'.$this->extraConfig['PAGANTIS_SIMULATOR_THOUSANDS_SEPARATOR'].'";'.PHP_EOL; |
|
| 190 | + echo ' product_simulator.amountParserConfig.decimalSeparator = "'.$this->extraConfig['PAGANTIS_SIMULATOR_DECIMAL_SEPARATOR'].'";'.PHP_EOL; |
|
| 191 | 191 | |
| 192 | 192 | //Amount in product page |
| 193 | - echo ' var promotedProduct = \'' . $this->isPromoted($productId) .'\';'. PHP_EOL; |
|
| 194 | - echo ' if(checkoutPage != \'1\' ) {'. PHP_EOL; |
|
| 195 | - echo ' product_simulator.itemAmountSelector = priceSelector;'. PHP_EOL; |
|
| 196 | - echo ' if(promotedProduct == \'1\') { ' . PHP_EOL; |
|
| 197 | - echo ' product_simulator.itemPromotedAmountSelector = priceSelector;'. PHP_EOL; |
|
| 198 | - echo ' }' . PHP_EOL; |
|
| 193 | + echo ' var promotedProduct = \''.$this->isPromoted($productId).'\';'.PHP_EOL; |
|
| 194 | + echo ' if(checkoutPage != \'1\' ) {'.PHP_EOL; |
|
| 195 | + echo ' product_simulator.itemAmountSelector = priceSelector;'.PHP_EOL; |
|
| 196 | + echo ' if(promotedProduct == \'1\') { '.PHP_EOL; |
|
| 197 | + echo ' product_simulator.itemPromotedAmountSelector = priceSelector;'.PHP_EOL; |
|
| 198 | + echo ' }'.PHP_EOL; |
|
| 199 | 199 | echo ' }'; |
| 200 | 200 | |
| 201 | 201 | //Amount in checkout page |
| 202 | - echo ' if(checkoutPage == \'1\' ) { ' . PHP_EOL; |
|
| 203 | - echo ' product_simulator.totalAmountSelector = priceSelector;'. PHP_EOL; |
|
| 204 | - echo ' if(promotedAmount != \'0\' && checkoutPage == \'1\' ) { ' . PHP_EOL; |
|
| 205 | - echo ' product_simulator.totalPromotedAmount = promotedAmount;'. PHP_EOL; |
|
| 206 | - echo ' }' . PHP_EOL; |
|
| 207 | - echo ' product_simulator.selector = \'.buttonSet\';' . PHP_EOL; |
|
| 208 | - echo ' product_simulator.type = ' .$this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_TYPE_CHECKOUT'] . PHP_EOL; |
|
| 209 | - echo ' }' . PHP_EOL; |
|
| 210 | - echo ' sdk.simulator.init(product_simulator);'. PHP_EOL; |
|
| 211 | - echo ' clearInterval(window.OSSimulatorId);'. PHP_EOL; |
|
| 212 | - echo ' return true;'. PHP_EOL; |
|
| 213 | - echo ' }'. PHP_EOL; |
|
| 214 | - echo ' return false;'. PHP_EOL; |
|
| 215 | - echo ' }'. PHP_EOL; |
|
| 202 | + echo ' if(checkoutPage == \'1\' ) { '.PHP_EOL; |
|
| 203 | + echo ' product_simulator.totalAmountSelector = priceSelector;'.PHP_EOL; |
|
| 204 | + echo ' if(promotedAmount != \'0\' && checkoutPage == \'1\' ) { '.PHP_EOL; |
|
| 205 | + echo ' product_simulator.totalPromotedAmount = promotedAmount;'.PHP_EOL; |
|
| 206 | + echo ' }'.PHP_EOL; |
|
| 207 | + echo ' product_simulator.selector = \'.buttonSet\';'.PHP_EOL; |
|
| 208 | + echo ' product_simulator.type = '.$this->extraConfig['PAGANTIS_SIMULATOR_DISPLAY_TYPE_CHECKOUT'].PHP_EOL; |
|
| 209 | + echo ' }'.PHP_EOL; |
|
| 210 | + echo ' sdk.simulator.init(product_simulator);'.PHP_EOL; |
|
| 211 | + echo ' clearInterval(window.OSSimulatorId);'.PHP_EOL; |
|
| 212 | + echo ' return true;'.PHP_EOL; |
|
| 213 | + echo ' }'.PHP_EOL; |
|
| 214 | + echo ' return false;'.PHP_EOL; |
|
| 215 | + echo ' }'.PHP_EOL; |
|
| 216 | 216 | |
| 217 | 217 | //Invoke to main method |
| 218 | - echo ' window.OSSimulatorId = setInterval(function () {'. PHP_EOL; |
|
| 219 | - echo ' loadSimulator();'. PHP_EOL; |
|
| 220 | - echo ' }, 2500);'. PHP_EOL; |
|
| 221 | - echo '</script>'. PHP_EOL; |
|
| 218 | + echo ' window.OSSimulatorId = setInterval(function () {'.PHP_EOL; |
|
| 219 | + echo ' loadSimulator();'.PHP_EOL; |
|
| 220 | + echo ' }, 2500);'.PHP_EOL; |
|
| 221 | + echo '</script>'.PHP_EOL; |
|
| 222 | 222 | |
| 223 | 223 | //Checkout simulator |
| 224 | 224 | if ($checkoutPage) { |
| 225 | - echo '<script>' . PHP_EOL; |
|
| 226 | - |
|
| 227 | - echo 'function checkSelected(value)'. PHP_EOL; |
|
| 228 | - echo '{ '. PHP_EOL; |
|
| 229 | - echo 'var simulator = document.getElementsByClassName("buttonSet");' . PHP_EOL; |
|
| 230 | - echo ' if(simulator == "undefined") { return false; } '. PHP_EOL; |
|
| 231 | - echo 'var pagantisCheckbox = document.querySelector("input[value=\'pagantis\']"); ' . PHP_EOL; |
|
| 232 | - echo 'var grandparentNode = pagantisCheckbox.parentNode.parentNode;' . PHP_EOL; |
|
| 233 | - echo 'if(grandparentNode == value) { var status="" } ' . PHP_EOL; |
|
| 234 | - echo 'else { var status="none";} '. PHP_EOL; |
|
| 235 | - echo 'simulator[0].style.display=status; ' . PHP_EOL; |
|
| 236 | - echo '}'. PHP_EOL; |
|
| 237 | - |
|
| 238 | - echo 'function showSimulator()'. PHP_EOL; |
|
| 239 | - echo '{'. PHP_EOL; |
|
| 240 | - echo 'var elements = document.querySelectorAll("tr[class^=\'moduleRow\']");' . PHP_EOL; |
|
| 241 | - echo 'if(elements == null) { return false };' . PHP_EOL; |
|
| 225 | + echo '<script>'.PHP_EOL; |
|
| 226 | + |
|
| 227 | + echo 'function checkSelected(value)'.PHP_EOL; |
|
| 228 | + echo '{ '.PHP_EOL; |
|
| 229 | + echo 'var simulator = document.getElementsByClassName("buttonSet");'.PHP_EOL; |
|
| 230 | + echo ' if(simulator == "undefined") { return false; } '.PHP_EOL; |
|
| 231 | + echo 'var pagantisCheckbox = document.querySelector("input[value=\'pagantis\']"); '.PHP_EOL; |
|
| 232 | + echo 'var grandparentNode = pagantisCheckbox.parentNode.parentNode;'.PHP_EOL; |
|
| 233 | + echo 'if(grandparentNode == value) { var status="" } '.PHP_EOL; |
|
| 234 | + echo 'else { var status="none";} '.PHP_EOL; |
|
| 235 | + echo 'simulator[0].style.display=status; '.PHP_EOL; |
|
| 236 | + echo '}'.PHP_EOL; |
|
| 237 | + |
|
| 238 | + echo 'function showSimulator()'.PHP_EOL; |
|
| 239 | + echo '{'.PHP_EOL; |
|
| 240 | + echo 'var elements = document.querySelectorAll("tr[class^=\'moduleRow\']");'.PHP_EOL; |
|
| 241 | + echo 'if(elements == null) { return false };'.PHP_EOL; |
|
| 242 | 242 | echo 'for(var i = 0, max = elements.length; i < max; i++) { elements[i].onclick = function() { |
| 243 | 243 | checkSelected(this); |
| 244 | 244 | } }' . PHP_EOL; |
| 245 | 245 | echo 'clearInterval(window.OSdisplayId);'; |
| 246 | - echo 'return true;'. PHP_EOL; |
|
| 247 | - echo '};'. PHP_EOL; |
|
| 246 | + echo 'return true;'.PHP_EOL; |
|
| 247 | + echo '};'.PHP_EOL; |
|
| 248 | 248 | |
| 249 | - echo ' window.OSdisplayId = setInterval(function () {'. PHP_EOL; |
|
| 250 | - echo ' showSimulator();'. PHP_EOL; |
|
| 251 | - echo ' }, 2000);'. PHP_EOL; |
|
| 252 | - echo '</script>'. PHP_EOL; |
|
| 249 | + echo ' window.OSdisplayId = setInterval(function () {'.PHP_EOL; |
|
| 250 | + echo ' showSimulator();'.PHP_EOL; |
|
| 251 | + echo ' }, 2000);'.PHP_EOL; |
|
| 252 | + echo '</script>'.PHP_EOL; |
|
| 253 | 253 | } |
| 254 | 254 | } |
| 255 | 255 | $oscTemplate->addBlock(ob_get_clean(), $this->group); |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | * install |
| 274 | 274 | */ |
| 275 | 275 | function install() { |
| 276 | - 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())"); |
|
| 276 | + 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())"); |
|
| 277 | 277 | |
| 278 | 278 | } |
| 279 | 279 | |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | * remove |
| 282 | 282 | */ |
| 283 | 283 | function remove() { |
| 284 | - tep_db_query("delete from " . TABLE_CONFIGURATION . " where configuration_key in ('" . implode("', '", $this->keys()) . "')"); |
|
| 284 | + tep_db_query("delete from ".TABLE_CONFIGURATION." where configuration_key in ('".implode("', '", $this->keys())."')"); |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | /** |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | |
| 305 | 305 | if ($this->extraConfig['PAGANTIS_PROMOTION'] == '') { |
| 306 | 306 | $promotedProducts = array(); |
| 307 | - } else { |
|
| 307 | + }else { |
|
| 308 | 308 | $promotedProducts = array_values((array)unserialize($this->extraConfig['PAGANTIS_PROMOTION'])); |
| 309 | 309 | } |
| 310 | 310 | |