@@ -44,7 +44,7 @@ |
||
44 | 44 | |
45 | 45 | header('HTTP/1.1 200 Ok', true, 200); |
46 | 46 | header('Content-Type: application/json', true); |
47 | - header('Content-Length: ' . Tools::strlen($result)); |
|
47 | + header('Content-Length: '.Tools::strlen($result)); |
|
48 | 48 | |
49 | 49 | echo $result; |
50 | 50 | exit(); |
@@ -72,8 +72,8 @@ |
||
72 | 72 | $paylaterPublicKey = Configuration::get('pmt_public_key'); |
73 | 73 | $paylaterPrivateKey = Configuration::get('pmt_private_key'); |
74 | 74 | $okUrl = _PS_BASE_URL_.__PS_BASE_URI__ |
75 | - .'index.php?canonical=true&fc=module&module=paylater&controller=notify&' |
|
76 | - .http_build_query($query) |
|
75 | + .'index.php?canonical=true&fc=module&module=paylater&controller=notify&' |
|
76 | + .http_build_query($query) |
|
77 | 77 | ; |
78 | 78 | |
79 | 79 | $shippingAddress = new Address($cart->id_address_delivery); |
@@ -25,9 +25,9 @@ discard block |
||
25 | 25 | { |
26 | 26 | if (_PS_VERSION_ < 1.6) { |
27 | 27 | Logger::addLog( |
28 | - 'PagaMasTarde Exception For user ' . |
|
29 | - $customer->email . |
|
30 | - ' : ' . |
|
28 | + 'PagaMasTarde Exception For user '. |
|
29 | + $customer->email. |
|
30 | + ' : '. |
|
31 | 31 | $exception->getMessage(), |
32 | 32 | 3, |
33 | 33 | $exception->getCode(), |
@@ -37,9 +37,9 @@ discard block |
||
37 | 37 | ); |
38 | 38 | } else { |
39 | 39 | PrestaShopLogger::addLog( |
40 | - 'PagaMasTarde Exception For user ' . |
|
41 | - $customer->email . |
|
42 | - ' : ' . |
|
40 | + 'PagaMasTarde Exception For user '. |
|
41 | + $customer->email. |
|
42 | + ' : '. |
|
43 | 43 | $exception->getMessage(), |
44 | 44 | 3, |
45 | 45 | $exception->getCode(), |
@@ -98,22 +98,22 @@ discard block |
||
98 | 98 | ); |
99 | 99 | |
100 | 100 | try { |
101 | - $userAddress = new \PagaMasTarde\OrdersApiClient\Model\Order\User\Address(); |
|
101 | + $userAddress = new \PagaMasTarde\OrdersApiClient\Model\Order\User\Address(); |
|
102 | 102 | $userAddress |
103 | 103 | ->setZipCode($shippingAddress->postcode) |
104 | - ->setFullName($shippingAddress->firstname . ' ' . $shippingAddress->lastname) |
|
104 | + ->setFullName($shippingAddress->firstname.' '.$shippingAddress->lastname) |
|
105 | 105 | ->setCountryCode('ES') |
106 | 106 | ->setCity($shippingAddress->city) |
107 | - ->setAddress($shippingAddress->address1 . ' ' . $shippingAddress->address2) |
|
107 | + ->setAddress($shippingAddress->address1.' '.$shippingAddress->address2) |
|
108 | 108 | ; |
109 | 109 | |
110 | - $orderShippingAddress = new \PagaMasTarde\OrdersApiClient\Model\Order\User\Address(); |
|
110 | + $orderShippingAddress = new \PagaMasTarde\OrdersApiClient\Model\Order\User\Address(); |
|
111 | 111 | $orderShippingAddress |
112 | 112 | ->setZipCode($shippingAddress->postcode) |
113 | - ->setFullName($shippingAddress->firstname . ' ' . $shippingAddress->lastname) |
|
113 | + ->setFullName($shippingAddress->firstname.' '.$shippingAddress->lastname) |
|
114 | 114 | ->setCountryCode('ES') |
115 | 115 | ->setCity($shippingAddress->city) |
116 | - ->setAddress($shippingAddress->address1 . ' ' . $shippingAddress->address2) |
|
116 | + ->setAddress($shippingAddress->address1.' '.$shippingAddress->address2) |
|
117 | 117 | ->setDni($shippingAddress->dni) |
118 | 118 | ->setFixPhone($shippingAddress->phone) |
119 | 119 | ->setMobilePhone($shippingAddress->phone_mobile) |
@@ -122,10 +122,10 @@ discard block |
||
122 | 122 | $orderBillingAddress = new \PagaMasTarde\OrdersApiClient\Model\Order\User\Address(); |
123 | 123 | $orderBillingAddress |
124 | 124 | ->setZipCode($billingAddress->postcode) |
125 | - ->setFullName($billingAddress->firstname . ' ' . $billingAddress->lastname) |
|
125 | + ->setFullName($billingAddress->firstname.' '.$billingAddress->lastname) |
|
126 | 126 | ->setCountryCode('ES') |
127 | 127 | ->setCity($billingAddress->city) |
128 | - ->setAddress($billingAddress->address1 . ' ' . $billingAddress->address2) |
|
128 | + ->setAddress($billingAddress->address1.' '.$billingAddress->address2) |
|
129 | 129 | ->setDni($billingAddress->dni) |
130 | 130 | ->setFixPhone($billingAddress->phone) |
131 | 131 | ->setMobilePhone($billingAddress->phone_mobile) |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | ->setDni($shippingAddress->dni) |
144 | 144 | ; |
145 | 145 | |
146 | - if ($customer->birthday!='0000-00-00') { |
|
146 | + if ($customer->birthday != '0000-00-00') { |
|
147 | 147 | $orderUser->setDateOfBirth($customer->birthday); |
148 | 148 | } |
149 | 149 | |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | Tools::redirect($cancelUrl); |
220 | 220 | } |
221 | 221 | |
222 | - $url =''; |
|
222 | + $url = ''; |
|
223 | 223 | try { |
224 | 224 | $orderClient = new \PagaMasTarde\OrdersApiClient\Client( |
225 | 225 | $paylaterPublicKey, |
@@ -229,12 +229,12 @@ discard block |
||
229 | 229 | if ($order instanceof \PagaMasTarde\OrdersApiClient\Model\Order) { |
230 | 230 | $url = $order->getActionUrls()->getForm(); |
231 | 231 | $orderId = $order->getId(); |
232 | - $sql = "INSERT INTO `" . _DB_PREFIX_ . "pmt_order` (`id`, `order_id`) |
|
232 | + $sql = "INSERT INTO `"._DB_PREFIX_."pmt_order` (`id`, `order_id`) |
|
233 | 233 | VALUES ('$cart->id','$orderId') |
234 | 234 | ON DUPLICATE KEY UPDATE `order_id` = '$orderId'"; |
235 | 235 | $result = Db::getInstance()->execute($sql); |
236 | 236 | if (!$result) { |
237 | - throw new UnknownException('Unable to save pmt-order-id in database: '. $sql); |
|
237 | + throw new UnknownException('Unable to save pmt-order-id in database: '.$sql); |
|
238 | 238 | } |
239 | 239 | } else { |
240 | 240 | throw new OrderNotFoundException(); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | |
67 | 67 | header('HTTP/1.1 200 Ok', true, 200); |
68 | 68 | header('Content-Type: application/json', true); |
69 | - header('Content-Length: ' . Tools::strlen($result)); |
|
69 | + header('Content-Length: '.Tools::strlen($result)); |
|
70 | 70 | |
71 | 71 | echo $result; |
72 | 72 | exit(); |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | |
91 | 91 | header('HTTP/1.1 403 Forbidden', true, 403); |
92 | 92 | header('Content-Type: application/json', true); |
93 | - header('Content-Length: ' . Tools::strlen($result)); |
|
93 | + header('Content-Length: '.Tools::strlen($result)); |
|
94 | 94 | |
95 | 95 | echo $result; |
96 | 96 | exit(); |
@@ -18,12 +18,12 @@ discard block |
||
18 | 18 | public function initContent() |
19 | 19 | { |
20 | 20 | $this->authorize(); |
21 | - $method = Tools::strtolower($_SERVER['REQUEST_METHOD']) . "Method"; |
|
21 | + $method = Tools::strtolower($_SERVER['REQUEST_METHOD'])."Method"; |
|
22 | 22 | if (method_exists($this, $method)) { |
23 | 23 | header('HTTP/1.1 200 Ok', true, 200); |
24 | 24 | header('Content-Type: application/json', true); |
25 | 25 | $result = json_encode($this->{$method}()); |
26 | - header('Content-Length: ' . Tools::strlen($result)); |
|
26 | + header('Content-Length: '.Tools::strlen($result)); |
|
27 | 27 | echo $result; |
28 | 28 | exit(); |
29 | 29 | } |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | */ |
40 | 40 | public function getExtraConfigs() |
41 | 41 | { |
42 | - $sql_content = 'select * from ' . _DB_PREFIX_. 'pmt_config'; |
|
42 | + $sql_content = 'select * from '._DB_PREFIX_.'pmt_config'; |
|
43 | 43 | $dbConfigs = Db::getInstance()->executeS($sql_content); |
44 | 44 | |
45 | 45 | // Convert a multimple dimension array for SQL insert statements into a simple key/value |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | Db::getInstance()->update( |
70 | 70 | 'pmt_config', |
71 | 71 | array('value' => pSQL($value)), |
72 | - 'config = \''. pSQL($config) .'\'' |
|
72 | + 'config = \''.pSQL($config).'\'' |
|
73 | 73 | ); |
74 | 74 | } else { |
75 | 75 | $errors[$config] = $value; |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | */ |
94 | 94 | public function getMethod() |
95 | 95 | { |
96 | - $sql_content = 'select * from ' . _DB_PREFIX_. 'pmt_config'; |
|
96 | + $sql_content = 'select * from '._DB_PREFIX_.'pmt_config'; |
|
97 | 97 | $dbConfigs = Db::getInstance()->executeS($sql_content); |
98 | 98 | |
99 | 99 | $simpleDbConfigs = array(); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | { |
35 | 35 | $parsedUrl = parse_url($url); |
36 | 36 | $separator = ($parsedUrl['query'] == null) ? '?' : '&'; |
37 | - $redirectUrl = $url. $separator . http_build_query($parameters); |
|
37 | + $redirectUrl = $url.$separator.http_build_query($parameters); |
|
38 | 38 | Tools::redirect($redirectUrl); |
39 | 39 | } |
40 | 40 | |
@@ -76,8 +76,8 @@ discard block |
||
76 | 76 | $response = $exception->getMessage(); |
77 | 77 | } else { |
78 | 78 | $response = 'Unable to serialize log.'. |
79 | - 'data: '. json_encode($data). |
|
80 | - 'exception: '. json_encode($exception); |
|
79 | + 'data: '.json_encode($data). |
|
80 | + 'exception: '.json_encode($exception); |
|
81 | 81 | } |
82 | 82 | } |
83 | 83 |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | exit; |
12 | 12 | } |
13 | 13 | |
14 | -define('_PS_PAYLATER_DIR', _PS_MODULE_DIR_. '/paylater'); |
|
14 | +define('_PS_PAYLATER_DIR', _PS_MODULE_DIR_.'/paylater'); |
|
15 | 15 | |
16 | 16 | require _PS_PAYLATER_DIR.'/vendor/autoload.php'; |
17 | 17 | |
@@ -194,18 +194,18 @@ discard block |
||
194 | 194 | public function checkHooks() |
195 | 195 | { |
196 | 196 | try { |
197 | - $sql_content = 'select * from ' . _DB_PREFIX_. 'hook_module where |
|
198 | - id_module = \'' . Module::getModuleIdByName($this->name) . '\' and |
|
199 | - id_shop = \'' . Shop::getContextShopID() . '\' and |
|
200 | - id_hook = \'' . Hook::getIdByName('header') . '\''; |
|
197 | + $sql_content = 'select * from '._DB_PREFIX_.'hook_module where |
|
198 | + id_module = \'' . Module::getModuleIdByName($this->name).'\' and |
|
199 | + id_shop = \'' . Shop::getContextShopID().'\' and |
|
200 | + id_hook = \'' . Hook::getIdByName('header').'\''; |
|
201 | 201 | $hook_exists = Db::getInstance()->ExecuteS($sql_content); |
202 | 202 | if (empty($hook_exists)) { |
203 | - $sql_insert = 'insert into ' . _DB_PREFIX_. 'hook_module |
|
203 | + $sql_insert = 'insert into '._DB_PREFIX_.'hook_module |
|
204 | 204 | (id_module, id_shop, id_hook, position) |
205 | 205 | values |
206 | - (\''. Module::getModuleIdByName($this->name) . '\', |
|
207 | - \''. Shop::getContextShopID() . '\', |
|
208 | - \''. Hook::getIdByName('header') . '\', |
|
206 | + (\''. Module::getModuleIdByName($this->name).'\', |
|
207 | + \''. Shop::getContextShopID().'\', |
|
208 | + \''. Hook::getIdByName('header').'\', |
|
209 | 209 | 150)'; |
210 | 210 | Db::getInstance()->execute($sql_insert); |
211 | 211 | } |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | */ |
220 | 220 | public function checkEnvVariables() |
221 | 221 | { |
222 | - $sql_content = 'select * from ' . _DB_PREFIX_. 'pmt_config'; |
|
222 | + $sql_content = 'select * from '._DB_PREFIX_.'pmt_config'; |
|
223 | 223 | $dbConfigs = Db::getInstance()->executeS($sql_content); |
224 | 224 | |
225 | 225 | // Convert a multimple dimension array for SQL insert statements into a simple key/value |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | } else { |
318 | 318 | $this->context->controller->addJS('https://cdn.pagamastarde.com/js/pmt-v2/sdk.js'); |
319 | 319 | } |
320 | - $this->context->controller->addJS($this->getPathUri(). 'views/js/simulator.js'); |
|
320 | + $this->context->controller->addJS($this->getPathUri().'views/js/simulator.js'); |
|
321 | 321 | } |
322 | 322 | |
323 | 323 | /** |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | $paymentOption |
367 | 367 | ->setCallToActionText($pmtTitle) |
368 | 368 | ->setAction($link->getModuleLink('paylater', 'payment')) |
369 | - ->setLogo($this->getPathUri(). 'logo.gif') |
|
369 | + ->setLogo($this->getPathUri().'logo.gif') |
|
370 | 370 | ->setModuleName(__CLASS__) |
371 | 371 | ; |
372 | 372 | |
@@ -396,7 +396,7 @@ discard block |
||
396 | 396 | 'input' => array( |
397 | 397 | array( |
398 | 398 | 'name' => 'pmt_is_enabled', |
399 | - 'type' => (version_compare(_PS_VERSION_, '1.6')<0) ?'radio' :'switch', |
|
399 | + 'type' => (version_compare(_PS_VERSION_, '1.6') < 0) ? 'radio' : 'switch', |
|
400 | 400 | 'label' => $this->l('Module is enabled'), |
401 | 401 | 'prefix' => '<i class="icon icon-key"></i>', |
402 | 402 | 'class' => 't', |
@@ -436,7 +436,7 @@ discard block |
||
436 | 436 | ), |
437 | 437 | array( |
438 | 438 | 'name' => 'pmt_simulator_is_enabled', |
439 | - 'type' => (version_compare(_PS_VERSION_, '1.6')<0) ?'radio' :'switch', |
|
439 | + 'type' => (version_compare(_PS_VERSION_, '1.6') < 0) ? 'radio' : 'switch', |
|
440 | 440 | 'label' => $this->l('Simulator is enabled'), |
441 | 441 | 'prefix' => '<i class="icon icon-key"></i>', |
442 | 442 | 'class' => 't', |
@@ -552,7 +552,7 @@ discard block |
||
552 | 552 | $message = $this->displayError($error); |
553 | 553 | } |
554 | 554 | |
555 | - $logo = $this->getPathUri(). 'views/img/logo_pagamastarde.png'; |
|
555 | + $logo = $this->getPathUri().'views/img/logo_pagamastarde.png'; |
|
556 | 556 | $tpl = $this->local_path.'views/templates/admin/config-info.tpl'; |
557 | 557 | $this->context->smarty->assign(array( |
558 | 558 | 'logo' => $logo, |
@@ -746,10 +746,10 @@ discard block |
||
746 | 746 | */ |
747 | 747 | public function checkLogoExists() |
748 | 748 | { |
749 | - $logo = _PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments/'. Tools::strtolower(__CLASS__). '.png'; |
|
750 | - if (!file_exists($logo) && is_dir(_PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments')) { |
|
749 | + $logo = _PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments/'.Tools::strtolower(__CLASS__).'.png'; |
|
750 | + if (!file_exists($logo) && is_dir(_PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments')) { |
|
751 | 751 | copy( |
752 | - _PS_PAYLATER_DIR . '/views/img/logo-64x64.png', |
|
752 | + _PS_PAYLATER_DIR.'/views/img/logo-64x64.png', |
|
753 | 753 | $logo |
754 | 754 | ); |
755 | 755 | } |
@@ -761,7 +761,7 @@ discard block |
||
761 | 761 | return ''; |
762 | 762 | } |
763 | 763 | |
764 | - $sql = 'SELECT value FROM '._DB_PREFIX_.'pmt_config where config = \'' . pSQL($config) . '\' limit 1'; |
|
764 | + $sql = 'SELECT value FROM '._DB_PREFIX_.'pmt_config where config = \''.pSQL($config).'\' limit 1'; |
|
765 | 765 | if ($results = Db::getInstance()->ExecuteS($sql)) { |
766 | 766 | if (is_array($results) && count($results) === 1 && isset($results[0]['value'])) { |
767 | 767 | return $results[0]['value']; |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | private function getPmtOrderId() |
197 | 197 | { |
198 | 198 | try { |
199 | - $this->pmtOrderId= Db::getInstance()->getValue( |
|
199 | + $this->pmtOrderId = Db::getInstance()->getValue( |
|
200 | 200 | 'select order_id from '._DB_PREFIX_.'pmt_order where id = '.$this->merchantOrderId |
201 | 201 | ); |
202 | 202 | |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | Configuration::get('PS_OS_PAYMENT'), |
279 | 279 | $this->merchantOrder->getOrderTotal(true), |
280 | 280 | $this->module->displayName, |
281 | - 'pmtOrderId: ' . $this->pmtOrder->getId(), |
|
281 | + 'pmtOrderId: '.$this->pmtOrder->getId(), |
|
282 | 282 | array('transaction_id' => $this->pmtOrderId), |
283 | 283 | null, |
284 | 284 | false, |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | protected function unblockConcurrency() |
338 | 338 | { |
339 | 339 | try { |
340 | - Db::getInstance()->delete('pmt_cart_process', 'timestamp < ' . (time() - 6)); |
|
340 | + Db::getInstance()->delete('pmt_cart_process', 'timestamp < '.(time() - 6)); |
|
341 | 341 | } catch (\Exception $exception) { |
342 | 342 | throw new ConcurrencyException(); |
343 | 343 | } |
@@ -355,15 +355,15 @@ discard block |
||
355 | 355 | { |
356 | 356 | if ($this->merchantOrder && $this->processError === true) { |
357 | 357 | sleep(5); |
358 | - $id = (!is_null($this->pmtOrder))?$this->pmtOrder->getId():null; |
|
359 | - $status = (!is_null($this->pmtOrder))?$this->pmtOrder->getStatus():null; |
|
358 | + $id = (!is_null($this->pmtOrder)) ? $this->pmtOrder->getId() : null; |
|
359 | + $status = (!is_null($this->pmtOrder)) ? $this->pmtOrder->getStatus() : null; |
|
360 | 360 | $this->module->validateOrder( |
361 | 361 | $this->merchantOrderId, |
362 | 362 | Configuration::get('PS_OS_ERROR'), |
363 | 363 | $this->merchantOrder->getOrderTotal(true), |
364 | 364 | $this->module->displayName, |
365 | - ' pmtOrderId: ' . $id . |
|
366 | - ' pmtStatusId:' . $status, |
|
365 | + ' pmtOrderId: '.$id. |
|
366 | + ' pmtStatusId:'.$status, |
|
367 | 367 | null, |
368 | 368 | null, |
369 | 369 | false, |
@@ -399,9 +399,9 @@ discard block |
||
399 | 399 | 'id_cart' => $this->merchantOrderId, |
400 | 400 | 'key' => $this->config['secureKey'], |
401 | 401 | 'id_module' => $this->module->id, |
402 | - 'id_order' => ($this->pmtOrder)?$this->pmtOrder->getId(): null, |
|
402 | + 'id_order' => ($this->pmtOrder) ? $this->pmtOrder->getId() : null, |
|
403 | 403 | ); |
404 | - $url = ($error)? $this->config['urlKO'] : $this->config['urlOK']; |
|
404 | + $url = ($error) ? $this->config['urlKO'] : $this->config['urlOK']; |
|
405 | 405 | return $this->redirect($url, $parameters); |
406 | 406 | } |
407 | 407 | } |