@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | exit; |
12 | 12 | } |
13 | 13 | |
14 | -define('_PS_PAGANTIS_DIR', _PS_MODULE_DIR_. '/pagantis'); |
|
14 | +define('_PS_PAGANTIS_DIR', _PS_MODULE_DIR_.'/pagantis'); |
|
15 | 15 | |
16 | 16 | require _PS_PAGANTIS_DIR.'/vendor/autoload.php'; |
17 | 17 | |
@@ -189,18 +189,18 @@ discard block |
||
189 | 189 | public function checkHooks() |
190 | 190 | { |
191 | 191 | try { |
192 | - $sql_content = 'select * from ' . _DB_PREFIX_. 'hook_module where |
|
193 | - id_module = \'' . Module::getModuleIdByName($this->name) . '\' and |
|
194 | - id_shop = \'' . Shop::getContextShopID() . '\' and |
|
195 | - id_hook = \'' . Hook::getIdByName('header') . '\''; |
|
192 | + $sql_content = 'select * from '._DB_PREFIX_.'hook_module where |
|
193 | + id_module = \'' . Module::getModuleIdByName($this->name).'\' and |
|
194 | + id_shop = \'' . Shop::getContextShopID().'\' and |
|
195 | + id_hook = \'' . Hook::getIdByName('header').'\''; |
|
196 | 196 | $hook_exists = Db::getInstance()->ExecuteS($sql_content); |
197 | 197 | if (empty($hook_exists)) { |
198 | - $sql_insert = 'insert into ' . _DB_PREFIX_. 'hook_module |
|
198 | + $sql_insert = 'insert into '._DB_PREFIX_.'hook_module |
|
199 | 199 | (id_module, id_shop, id_hook, position) |
200 | 200 | values |
201 | - (\''. Module::getModuleIdByName($this->name) . '\', |
|
202 | - \''. Shop::getContextShopID() . '\', |
|
203 | - \''. Hook::getIdByName('header') . '\', |
|
201 | + (\''. Module::getModuleIdByName($this->name).'\', |
|
202 | + \''. Shop::getContextShopID().'\', |
|
203 | + \''. Hook::getIdByName('header').'\', |
|
204 | 204 | 150)'; |
205 | 205 | Db::getInstance()->execute($sql_insert); |
206 | 206 | } |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | */ |
215 | 215 | public function checkEnvVariables() |
216 | 216 | { |
217 | - $sql_content = 'select * from ' . _DB_PREFIX_. 'pagantis_config'; |
|
217 | + $sql_content = 'select * from '._DB_PREFIX_.'pagantis_config'; |
|
218 | 218 | $dbConfigs = Db::getInstance()->executeS($sql_content); |
219 | 219 | |
220 | 220 | // 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($url); |
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 | /** |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | $paymentOption |
369 | 369 | ->setCallToActionText($pagantisTitle) |
370 | 370 | ->setAction($link->getModuleLink('pagantis', 'payment')) |
371 | - ->setLogo($this->getPathUri(). 'views/img/' . $logo) |
|
371 | + ->setLogo($this->getPathUri().'views/img/'.$logo) |
|
372 | 372 | ->setModuleName(__CLASS__) |
373 | 373 | ; |
374 | 374 | |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | 'input' => array( |
396 | 396 | array( |
397 | 397 | 'name' => 'pagantis_is_enabled', |
398 | - 'type' => (version_compare(_PS_VERSION_, '1.6')<0) ?'radio' :'switch', |
|
398 | + 'type' => (version_compare(_PS_VERSION_, '1.6') < 0) ? 'radio' : 'switch', |
|
399 | 399 | 'label' => $this->l('Module is enabled'), |
400 | 400 | 'prefix' => '<i class="icon icon-key"></i>', |
401 | 401 | 'class' => 't', |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | ), |
436 | 436 | array( |
437 | 437 | 'name' => 'pagantis_simulator_is_enabled', |
438 | - 'type' => (version_compare(_PS_VERSION_, '1.6')<0) ?'radio' :'switch', |
|
438 | + 'type' => (version_compare(_PS_VERSION_, '1.6') < 0) ? 'radio' : 'switch', |
|
439 | 439 | 'label' => $this->l('Simulator is enabled'), |
440 | 440 | 'prefix' => '<i class="icon icon-key"></i>', |
441 | 441 | 'class' => 't', |
@@ -551,9 +551,9 @@ discard block |
||
551 | 551 | $message = $this->displayError($error); |
552 | 552 | } |
553 | 553 | |
554 | - $logo = $this->getPathUri(). 'views/img/logo_pagantis.png'; |
|
554 | + $logo = $this->getPathUri().'views/img/logo_pagantis.png'; |
|
555 | 555 | if ($this->language == 'ES' || $this->language == null) { |
556 | - $logo = $this->getPathUri(). 'views/img/logo_pagamastarde.png'; |
|
556 | + $logo = $this->getPathUri().'views/img/logo_pagamastarde.png'; |
|
557 | 557 | } |
558 | 558 | $tpl = $this->local_path.'views/templates/admin/config-info.tpl'; |
559 | 559 | $this->context->smarty->assign(array( |
@@ -600,8 +600,7 @@ discard block |
||
600 | 600 | 'amount' => $orderTotal, |
601 | 601 | 'locale' => $this->language, |
602 | 602 | 'logo' => ($this->language == 'ES' || $this->language == null) ? |
603 | - 'pagamastarde.png' : |
|
604 | - 'pagantis.png', |
|
603 | + 'pagamastarde.png' : 'pagantis.png', |
|
605 | 604 | 'pagantisPublicKey' => $pagantisPublicKey, |
606 | 605 | 'pagantisCSSSelector' => $pagantisSimulatorCSSSelector, |
607 | 606 | 'pagantisPriceSelector' => $pagantisSimulatorPriceSelector, |
@@ -754,17 +753,17 @@ discard block |
||
754 | 753 | */ |
755 | 754 | public function checkLogoExists() |
756 | 755 | { |
757 | - $logoPmt = _PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments/pagamastarde.png'; |
|
758 | - $logoPg = _PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments/pagantis.png'; |
|
759 | - if (!file_exists($logoPmt) && is_dir(_PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments')) { |
|
756 | + $logoPmt = _PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments/pagamastarde.png'; |
|
757 | + $logoPg = _PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments/pagantis.png'; |
|
758 | + if (!file_exists($logoPmt) && is_dir(_PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments')) { |
|
760 | 759 | copy( |
761 | - _PS_PAGANTIS_DIR . '/views/img/logo_pagamastarde.png', |
|
760 | + _PS_PAGANTIS_DIR.'/views/img/logo_pagamastarde.png', |
|
762 | 761 | $logoPmt |
763 | 762 | ); |
764 | 763 | } |
765 | - if (!file_exists($logoPg) && is_dir(_PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments')) { |
|
764 | + if (!file_exists($logoPg) && is_dir(_PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments')) { |
|
766 | 765 | copy( |
767 | - _PS_PAGANTIS_DIR . '/views/img/logo_pagantis.png', |
|
766 | + _PS_PAGANTIS_DIR.'/views/img/logo_pagantis.png', |
|
768 | 767 | $logoPg |
769 | 768 | ); |
770 | 769 | } |
@@ -776,7 +775,7 @@ discard block |
||
776 | 775 | return ''; |
777 | 776 | } |
778 | 777 | |
779 | - $sql = 'SELECT value FROM '._DB_PREFIX_.'pagantis_config where config = \'' . pSQL($config) . '\' limit 1'; |
|
778 | + $sql = 'SELECT value FROM '._DB_PREFIX_.'pagantis_config where config = \''.pSQL($config).'\' limit 1'; |
|
780 | 779 | if ($results = Db::getInstance()->ExecuteS($sql)) { |
781 | 780 | if (is_array($results) && count($results) === 1 && isset($results[0]['value'])) { |
782 | 781 | return $results[0]['value']; |
@@ -25,9 +25,9 @@ discard block |
||
25 | 25 | { |
26 | 26 | if (_PS_VERSION_ < 1.6) { |
27 | 27 | Logger::addLog( |
28 | - 'Pagantis Exception For user ' . |
|
29 | - $customer->email . |
|
30 | - ' : ' . |
|
28 | + 'Pagantis 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 | - 'Pagantis Exception For user ' . |
|
41 | - $customer->email . |
|
42 | - ' : ' . |
|
40 | + 'Pagantis Exception For user '. |
|
41 | + $customer->email. |
|
42 | + ' : '. |
|
43 | 43 | $exception->getMessage(), |
44 | 44 | 3, |
45 | 45 | $exception->getCode(), |
@@ -103,24 +103,24 @@ discard block |
||
103 | 103 | ); |
104 | 104 | |
105 | 105 | try { |
106 | - $userAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); |
|
106 | + $userAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); |
|
107 | 107 | $userAddress |
108 | 108 | ->setZipCode($shippingAddress->postcode) |
109 | - ->setFullName($shippingAddress->firstname . ' ' . $shippingAddress->lastname) |
|
109 | + ->setFullName($shippingAddress->firstname.' '.$shippingAddress->lastname) |
|
110 | 110 | ->setCountryCode('ES') |
111 | 111 | ->setCity($shippingAddress->city) |
112 | - ->setAddress($shippingAddress->address1 . ' ' . $shippingAddress->address2) |
|
112 | + ->setAddress($shippingAddress->address1.' '.$shippingAddress->address2) |
|
113 | 113 | ->setTaxId($this->getTaxId($customer, $shippingAddress, $billingAddress)) |
114 | 114 | ->setNationalId($this->getNationalId($customer, $shippingAddress, $billingAddress)) |
115 | 115 | ; |
116 | 116 | |
117 | - $orderShippingAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); |
|
117 | + $orderShippingAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); |
|
118 | 118 | $orderShippingAddress |
119 | 119 | ->setZipCode($shippingAddress->postcode) |
120 | - ->setFullName($shippingAddress->firstname . ' ' . $shippingAddress->lastname) |
|
120 | + ->setFullName($shippingAddress->firstname.' '.$shippingAddress->lastname) |
|
121 | 121 | ->setCountryCode('ES') |
122 | 122 | ->setCity($shippingAddress->city) |
123 | - ->setAddress($shippingAddress->address1 . ' ' . $shippingAddress->address2) |
|
123 | + ->setAddress($shippingAddress->address1.' '.$shippingAddress->address2) |
|
124 | 124 | ->setTaxId($this->getTaxId($customer, $shippingAddress, $billingAddress)) |
125 | 125 | ->setNationalId($this->getNationalId($customer, $shippingAddress, $billingAddress)) |
126 | 126 | ->setFixPhone($shippingAddress->phone) |
@@ -130,10 +130,10 @@ discard block |
||
130 | 130 | $orderBillingAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); |
131 | 131 | $orderBillingAddress |
132 | 132 | ->setZipCode($billingAddress->postcode) |
133 | - ->setFullName($billingAddress->firstname . ' ' . $billingAddress->lastname) |
|
133 | + ->setFullName($billingAddress->firstname.' '.$billingAddress->lastname) |
|
134 | 134 | ->setCountryCode('ES') |
135 | 135 | ->setCity($billingAddress->city) |
136 | - ->setAddress($billingAddress->address1 . ' ' . $billingAddress->address2) |
|
136 | + ->setAddress($billingAddress->address1.' '.$billingAddress->address2) |
|
137 | 137 | ->setTaxId($this->getTaxId($customer, $billingAddress, $shippingAddress)) |
138 | 138 | ->setNationalId($this->getNationalId($customer, $billingAddress, $shippingAddress)) |
139 | 139 | ->setFixPhone($billingAddress->phone) |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | ->setNationalId($this->getNationalId($customer, $shippingAddress, $billingAddress)) |
154 | 154 | ; |
155 | 155 | |
156 | - if ($customer->birthday!='0000-00-00') { |
|
156 | + if ($customer->birthday != '0000-00-00') { |
|
157 | 157 | $orderUser->setDateOfBirth($customer->birthday); |
158 | 158 | } |
159 | 159 | |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | Tools::redirect($cancelUrl); |
232 | 232 | } |
233 | 233 | |
234 | - $url =''; |
|
234 | + $url = ''; |
|
235 | 235 | try { |
236 | 236 | $orderClient = new \Pagantis\OrdersApiClient\Client( |
237 | 237 | $pagantisPublicKey, |
@@ -242,12 +242,12 @@ discard block |
||
242 | 242 | if ($order instanceof \Pagantis\OrdersApiClient\Model\Order) { |
243 | 243 | $url = $order->getActionUrls()->getForm(); |
244 | 244 | $orderId = $order->getId(); |
245 | - $sql = "INSERT INTO `" . _DB_PREFIX_ . "pagantis_order` (`id`, `order_id`) |
|
245 | + $sql = "INSERT INTO `"._DB_PREFIX_."pagantis_order` (`id`, `order_id`) |
|
246 | 246 | VALUES ('$cart->id','$orderId') |
247 | 247 | ON DUPLICATE KEY UPDATE `order_id` = '$orderId'"; |
248 | 248 | $result = Db::getInstance()->execute($sql); |
249 | 249 | if (!$result) { |
250 | - throw new UnknownException('Unable to save pagantis-order-id in database: '. $sql); |
|
250 | + throw new UnknownException('Unable to save pagantis-order-id in database: '.$sql); |
|
251 | 251 | } |
252 | 252 | } else { |
253 | 253 | throw new OrderNotFoundException(); |