@@ -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.self::BACKOFFICE_FOLDER); |
| 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 |
@@ -17,21 +17,21 @@ |
||
| 17 | 17 | define('DIR_WS_HTTPS_CATALOG', '/'); |
| 18 | 18 | define('DIR_FS_CATALOG', '/var/www/html/'); |
| 19 | 19 | define('DIR_WS_IMAGES', 'images/'); |
| 20 | -define('DIR_WS_ICONS', DIR_WS_IMAGES . 'icons/'); |
|
| 21 | -define('DIR_WS_CATALOG_IMAGES', DIR_WS_CATALOG . 'images/'); |
|
| 20 | +define('DIR_WS_ICONS', DIR_WS_IMAGES.'icons/'); |
|
| 21 | +define('DIR_WS_CATALOG_IMAGES', DIR_WS_CATALOG.'images/'); |
|
| 22 | 22 | define('DIR_WS_INCLUDES', 'includes/'); |
| 23 | -define('DIR_WS_BOXES', DIR_WS_INCLUDES . 'boxes/'); |
|
| 24 | -define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES . 'functions/'); |
|
| 25 | -define('DIR_WS_CLASSES', DIR_WS_INCLUDES . 'classes/'); |
|
| 26 | -define('DIR_WS_MODULES', DIR_WS_INCLUDES . 'modules/'); |
|
| 27 | -define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES . 'languages/'); |
|
| 28 | -define('DIR_WS_CATALOG_LANGUAGES', DIR_WS_CATALOG . 'includes/languages/'); |
|
| 29 | -define('DIR_FS_CATALOG_LANGUAGES', DIR_FS_CATALOG . 'includes/languages/'); |
|
| 30 | -define('DIR_FS_CATALOG_IMAGES', DIR_FS_CATALOG . 'images/'); |
|
| 31 | -define('DIR_FS_CATALOG_MODULES', DIR_FS_CATALOG . 'includes/modules/'); |
|
| 32 | -define('DIR_FS_BACKUP', DIR_FS_ADMIN . 'backups/'); |
|
| 33 | -define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG . 'download/'); |
|
| 34 | -define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG . 'pub/'); |
|
| 23 | +define('DIR_WS_BOXES', DIR_WS_INCLUDES.'boxes/'); |
|
| 24 | +define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES.'functions/'); |
|
| 25 | +define('DIR_WS_CLASSES', DIR_WS_INCLUDES.'classes/'); |
|
| 26 | +define('DIR_WS_MODULES', DIR_WS_INCLUDES.'modules/'); |
|
| 27 | +define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES.'languages/'); |
|
| 28 | +define('DIR_WS_CATALOG_LANGUAGES', DIR_WS_CATALOG.'includes/languages/'); |
|
| 29 | +define('DIR_FS_CATALOG_LANGUAGES', DIR_FS_CATALOG.'includes/languages/'); |
|
| 30 | +define('DIR_FS_CATALOG_IMAGES', DIR_FS_CATALOG.'images/'); |
|
| 31 | +define('DIR_FS_CATALOG_MODULES', DIR_FS_CATALOG.'includes/modules/'); |
|
| 32 | +define('DIR_FS_BACKUP', DIR_FS_ADMIN.'backups/'); |
|
| 33 | +define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG.'download/'); |
|
| 34 | +define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG.'pub/'); |
|
| 35 | 35 | |
| 36 | 36 | define('DB_SERVER', getenv('OSCOMMERCE_DB_HOST')); |
| 37 | 37 | define('DB_SERVER_USERNAME', getenv('OSCOMMERCE_DB_USER')); |
@@ -9,17 +9,17 @@ |
||
| 9 | 9 | define('DIR_WS_HTTP_CATALOG', '/'); |
| 10 | 10 | define('DIR_WS_HTTPS_CATALOG', '/'); |
| 11 | 11 | define('DIR_WS_IMAGES', 'images/'); |
| 12 | -define('DIR_WS_ICONS', DIR_WS_IMAGES . 'icons/'); |
|
| 12 | +define('DIR_WS_ICONS', DIR_WS_IMAGES.'icons/'); |
|
| 13 | 13 | define('DIR_WS_INCLUDES', 'includes/'); |
| 14 | -define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES . 'functions/'); |
|
| 15 | -define('DIR_WS_CLASSES', DIR_WS_INCLUDES . 'classes/'); |
|
| 16 | -define('DIR_WS_MODULES', DIR_WS_INCLUDES . 'modules/'); |
|
| 17 | -define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES . 'languages/'); |
|
| 14 | +define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES.'functions/'); |
|
| 15 | +define('DIR_WS_CLASSES', DIR_WS_INCLUDES.'classes/'); |
|
| 16 | +define('DIR_WS_MODULES', DIR_WS_INCLUDES.'modules/'); |
|
| 17 | +define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES.'languages/'); |
|
| 18 | 18 | |
| 19 | 19 | define('DIR_WS_DOWNLOAD_PUBLIC', 'pub/'); |
| 20 | 20 | define('DIR_FS_CATALOG', '/var/www/html'); |
| 21 | -define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG . 'download/'); |
|
| 22 | -define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG . 'pub/'); |
|
| 21 | +define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG.'download/'); |
|
| 22 | +define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG.'pub/'); |
|
| 23 | 23 | |
| 24 | 24 | define('DB_SERVER', getenv('OSCOMMERCE_DB_HOST')); |
| 25 | 25 | define('DB_SERVER_USERNAME', getenv('OSCOMMERCE_DB_USER')); |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | $destUrl = $_POST['formUrl']; |
| 5 | 5 | } elseif ($_POST['cancelUrl']) { |
| 6 | 6 | $destUrl = $_POST['cancelUrl']; |
| 7 | -} else { |
|
| 7 | +}else { |
|
| 8 | 8 | $destUrl = $_SERVER['HTTP_REFERER']; |
| 9 | 9 | } |
| 10 | 10 | |
@@ -41,22 +41,22 @@ |
||
| 41 | 41 | } elseif ($_SERVER['REQUEST_METHOD'] == 'POST') { |
| 42 | 42 | if (count($_POST)) { |
| 43 | 43 | foreach ($_POST as $config => $value) { |
| 44 | - if (isset($defaultConfigs[$config]) && $response['status']==null) { |
|
| 44 | + if (isset($defaultConfigs[$config]) && $response['status'] == null) { |
|
| 45 | 45 | $updateQuery = "update ".TABLE_PAGANTIS_CONFIG." set value='$value' where config='$config'"; |
| 46 | 46 | $resultsSelect = tep_db_query($updateQuery); |
| 47 | - } else { |
|
| 47 | + }else { |
|
| 48 | 48 | $response['status'] = 400; |
| 49 | 49 | $response['result'] = 'Bad request'; |
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | - } else { |
|
| 52 | + }else { |
|
| 53 | 53 | $response['status'] = 422; |
| 54 | 54 | $response['result'] = 'Empty data'; |
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | $formattedResult = array(); |
| 59 | -if ($response['status']==null) { |
|
| 59 | +if ($response['status'] == null) { |
|
| 60 | 60 | $query = "select * from ".TABLE_PAGANTIS_CONFIG; |
| 61 | 61 | $resultsSelect = tep_db_query($query); |
| 62 | 62 | while ($orderRow = tep_db_fetch_array($resultsSelect)) { |
@@ -11,8 +11,8 @@ discard block |
||
| 11 | 11 | $orderRow = tep_db_fetch_array($resultsSelect); |
| 12 | 12 | $privateKey = $orderRow['configuration_value']; |
| 13 | 13 | |
| 14 | -if ($secretKey!='' && $privateKey!='') { |
|
| 15 | - $query ="select log, createdAt from ".TABLE_PAGANTIS_LOG; |
|
| 14 | +if ($secretKey != '' && $privateKey != '') { |
|
| 15 | + $query = "select log, createdAt from ".TABLE_PAGANTIS_LOG; |
|
| 16 | 16 | |
| 17 | 17 | $where = array(); |
| 18 | 18 | if (isset($_GET['from'])) { |
@@ -24,16 +24,16 @@ discard block |
||
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | |
| 27 | - if (count($where)>0) { |
|
| 28 | - $query.=" where "; |
|
| 27 | + if (count($where) > 0) { |
|
| 28 | + $query .= " where "; |
|
| 29 | 29 | foreach ((array)$where as $clause) { |
| 30 | - $query.=" $clause AND"; |
|
| 30 | + $query .= " $clause AND"; |
|
| 31 | 31 | } |
| 32 | 32 | $query = substr($query, 0, -3); |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | $limit = ($_GET['limit']) ? $_GET['limit'] : 50; |
| 36 | - $query.=" order by createdAt desc limit $limit"; |
|
| 36 | + $query .= " order by createdAt desc limit $limit"; |
|
| 37 | 37 | |
| 38 | 38 | $response = array(); |
| 39 | 39 | $resultsSelect = tep_db_query($query); |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | $response[$i]['log'] = $orderRow['log']; |
| 45 | 45 | $i++; |
| 46 | 46 | } |
| 47 | - } else { |
|
| 47 | + }else { |
|
| 48 | 48 | $response['result'] = 'Error'; |
| 49 | 49 | } |
| 50 | 50 | |
@@ -16,8 +16,8 @@ |
||
| 16 | 16 | tep_session_register($var); |
| 17 | 17 | } |
| 18 | 18 | $destUrl = tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL', true, false); |
| 19 | - $destUrl.="?order_id=$_GET[order_id]&from=notify"; |
|
| 20 | -} else { |
|
| 19 | + $destUrl .= "?order_id=$_GET[order_id]&from=notify"; |
|
| 20 | +}else { |
|
| 21 | 21 | $destUrl = tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL', true, false); |
| 22 | 22 | } |
| 23 | 23 | |
@@ -64,12 +64,12 @@ discard block |
||
| 64 | 64 | $faker = Factory::create(); |
| 65 | 65 | $this->configuration['dni'] = $this->getDNI(); |
| 66 | 66 | $this->configuration['firstname'] = $faker->firstName; |
| 67 | - $this->configuration['lastname'] = $faker->lastName . ' ' . $faker->lastName; |
|
| 67 | + $this->configuration['lastname'] = $faker->lastName.' '.$faker->lastName; |
|
| 68 | 68 | $this->configuration['company'] = $faker->company; |
| 69 | 69 | $this->configuration['zip'] = '28'.$faker->randomNumber(3, true); |
| 70 | 70 | $this->configuration['address'] = $faker->streetAddress; |
| 71 | - $this->configuration['phone'] = '6' . $faker->randomNumber(8); |
|
| 72 | - $this->configuration['email'] = date('ymd') . '@pagantis.com'; |
|
| 71 | + $this->configuration['phone'] = '6'.$faker->randomNumber(8); |
|
| 72 | + $this->configuration['email'] = date('ymd').'@pagantis.com'; |
|
| 73 | 73 | parent::__construct($name, $data, $dataName); |
| 74 | 74 | } |
| 75 | 75 | /** |
@@ -77,12 +77,12 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | protected function getDNI() |
| 79 | 79 | { |
| 80 | - $dni = '0000' . rand(pow(10, 4-1), pow(10, 4)-1); |
|
| 81 | - $value = (int) ($dni / 23); |
|
| 80 | + $dni = '0000'.rand(pow(10, 4 - 1), pow(10, 4) - 1); |
|
| 81 | + $value = (int)($dni / 23); |
|
| 82 | 82 | $value *= 23; |
| 83 | - $value= $dni - $value; |
|
| 84 | - $letter= "TRWAGMYFPDXBNJZSQVHLCKEO"; |
|
| 85 | - $dniLetter= substr($letter, $value, 1); |
|
| 83 | + $value = $dni - $value; |
|
| 84 | + $letter = "TRWAGMYFPDXBNJZSQVHLCKEO"; |
|
| 85 | + $dniLetter = substr($letter, $value, 1); |
|
| 86 | 86 | return $dni.$dniLetter; |
| 87 | 87 | } |
| 88 | 88 | |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | */ |
| 140 | 140 | protected function checkPagantisOrderId() |
| 141 | 141 | { |
| 142 | - $orderId=0; |
|
| 142 | + $orderId = 0; |
|
| 143 | 143 | $notifyUrl = self::OSCURL.self::NOTIFICATION_FOLDER.'?order='.$orderId; |
| 144 | 144 | $this->assertNotEmpty($notifyUrl, $notifyUrl); |
| 145 | 145 | $response = Request::post($notifyUrl)->expects('json')->send(); |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | $this->assertEquals( |
| 150 | 150 | $response->body->merchant_order_id, |
| 151 | 151 | $orderId, |
| 152 | - $response->body->merchant_order_id.'!='. $orderId |
|
| 152 | + $response->body->merchant_order_id.'!='.$orderId |
|
| 153 | 153 | ); |
| 154 | 154 | $this->assertContains( |
| 155 | 155 | NoIdentificationException::ERROR_MESSAGE, |