@@ -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(); |
@@ -34,7 +34,7 @@ |
||
| 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 | |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | private function getPmtOrderId() |
| 192 | 192 | { |
| 193 | 193 | try { |
| 194 | - $this->pmtOrderId= Db::getInstance()->getValue( |
|
| 194 | + $this->pmtOrderId = Db::getInstance()->getValue( |
|
| 195 | 195 | 'select order_id from '._DB_PREFIX_.'pmt_order where id = '.$this->merchantOrderId |
| 196 | 196 | ); |
| 197 | 197 | |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | public function validateAmount() |
| 254 | 254 | { |
| 255 | 255 | $totalAmount = $this->pmtOrder->getShoppingCart()->getTotalAmount(); |
| 256 | - $merchantAmount = (int)((string) (100 * $this->merchantOrder->getOrderTotal(true))); |
|
| 256 | + $merchantAmount = (int) ((string) (100 * $this->merchantOrder->getOrderTotal(true))); |
|
| 257 | 257 | if ($totalAmount != $merchantAmount) { |
| 258 | 258 | throw new AmountMismatchException($totalAmount, $merchantAmount); |
| 259 | 259 | } |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | Configuration::get('PS_OS_PAYMENT'), |
| 273 | 273 | $this->merchantOrder->getOrderTotal(true), |
| 274 | 274 | $this->module->displayName, |
| 275 | - 'pmtOrderId: ' . $this->pmtOrder->getId(), |
|
| 275 | + 'pmtOrderId: '.$this->pmtOrder->getId(), |
|
| 276 | 276 | array('transaction_id' => $this->pmtOrderId), |
| 277 | 277 | null, |
| 278 | 278 | false, |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | protected function unblockConcurrency() |
| 332 | 332 | { |
| 333 | 333 | try { |
| 334 | - Db::getInstance()->delete('pmt_cart_process', 'timestamp < ' . (time() - 6)); |
|
| 334 | + Db::getInstance()->delete('pmt_cart_process', 'timestamp < '.(time() - 6)); |
|
| 335 | 335 | } catch (\Exception $exception) { |
| 336 | 336 | throw new ConcurrencyException(); |
| 337 | 337 | } |
@@ -348,13 +348,13 @@ discard block |
||
| 348 | 348 | public function cancelProcess($response = null) |
| 349 | 349 | { |
| 350 | 350 | if ($this->merchantOrder) { |
| 351 | - $id = (!is_null($this->pmtOrder))?$this->pmtOrder->getId():null; |
|
| 351 | + $id = (!is_null($this->pmtOrder)) ? $this->pmtOrder->getId() : null; |
|
| 352 | 352 | $this->module->validateOrder( |
| 353 | 353 | $this->merchantOrderId, |
| 354 | 354 | Configuration::get('PS_OS_ERROR'), |
| 355 | 355 | $this->merchantOrder->getOrderTotal(true), |
| 356 | 356 | $this->module->displayName, |
| 357 | - 'pmtOrderId: ' . $id, |
|
| 357 | + 'pmtOrderId: '.$id, |
|
| 358 | 358 | null, |
| 359 | 359 | null, |
| 360 | 360 | false, |
@@ -390,9 +390,9 @@ discard block |
||
| 390 | 390 | 'id_cart' => $this->merchantOrderId, |
| 391 | 391 | 'key' => $this->config['secureKey'], |
| 392 | 392 | 'id_module' => $this->module->id, |
| 393 | - 'id_order' => ($this->pmtOrder)?$this->pmtOrder->getId(): null, |
|
| 393 | + 'id_order' => ($this->pmtOrder) ? $this->pmtOrder->getId() : null, |
|
| 394 | 394 | ); |
| 395 | - $url = ($error)? $this->config['urlKO'] : $this->config['urlOK']; |
|
| 395 | + $url = ($error) ? $this->config['urlKO'] : $this->config['urlOK']; |
|
| 396 | 396 | return $this->redirect($url, $parameters); |
| 397 | 397 | } |
| 398 | 398 | } |
@@ -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 | } |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | Db::getInstance()->update( |
| 52 | 52 | 'pmt_config', |
| 53 | 53 | array('value' => pSQL($value)), |
| 54 | - 'config = \''. pSQL($config) .'\'' |
|
| 54 | + 'config = \''.pSQL($config).'\'' |
|
| 55 | 55 | ); |
| 56 | 56 | } else { |
| 57 | 57 | $errors[$config] = $value; |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | public function getMethod() |
| 77 | 77 | { |
| 78 | - $sql_content = 'select * from ' . _DB_PREFIX_. 'pmt_config'; |
|
| 78 | + $sql_content = 'select * from '._DB_PREFIX_.'pmt_config'; |
|
| 79 | 79 | $dbConfigs = Db::getInstance()->executeS($sql_content); |
| 80 | 80 | |
| 81 | 81 | $simpleDbConfigs = array(); |
@@ -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 | } |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | |
| 217 | 217 | public function loadEnvVariables() |
| 218 | 218 | { |
| 219 | - $sql_content = 'select * from ' . _DB_PREFIX_. 'pmt_config'; |
|
| 219 | + $sql_content = 'select * from '._DB_PREFIX_.'pmt_config'; |
|
| 220 | 220 | $dbConfigs = Db::getInstance()->executeS($sql_content); |
| 221 | 221 | |
| 222 | 222 | // Convert a multimple dimension array for SQL insert statements into a simple key/value |
@@ -237,10 +237,10 @@ discard block |
||
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | foreach (array_merge($this->defaultConfigs, $simpleDbConfigs) as $key => $value) { |
| 240 | - putenv($key . '=' . $value); |
|
| 240 | + putenv($key.'='.$value); |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | - putenv("PMT_DEFAULT_CONFIGS" . '=' . json_encode($this->defaultConfigs)); |
|
| 243 | + putenv("PMT_DEFAULT_CONFIGS".'='.json_encode($this->defaultConfigs)); |
|
| 244 | 244 | } |
| 245 | 245 | |
| 246 | 246 | /** |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | } else { |
| 321 | 321 | $this->context->controller->addJS('https://cdn.pagamastarde.com/js/pmt-v2/sdk.js'); |
| 322 | 322 | } |
| 323 | - $this->context->controller->addJS($this->getPathUri(). 'views/js/simulator.js'); |
|
| 323 | + $this->context->controller->addJS($this->getPathUri().'views/js/simulator.js'); |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | /** |
@@ -369,7 +369,7 @@ discard block |
||
| 369 | 369 | $paymentOption |
| 370 | 370 | ->setCallToActionText($pmtTitle) |
| 371 | 371 | ->setAction($link->getModuleLink('paylater', 'payment')) |
| 372 | - ->setLogo($this->getPathUri(). 'logo.gif') |
|
| 372 | + ->setLogo($this->getPathUri().'logo.gif') |
|
| 373 | 373 | ->setModuleName(__CLASS__) |
| 374 | 374 | ; |
| 375 | 375 | |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | 'input' => array( |
| 400 | 400 | array( |
| 401 | 401 | 'name' => 'pmt_is_enabled', |
| 402 | - 'type' => (version_compare(_PS_VERSION_, '1.6')<0) ?'radio' :'switch', |
|
| 402 | + 'type' => (version_compare(_PS_VERSION_, '1.6') < 0) ? 'radio' : 'switch', |
|
| 403 | 403 | 'label' => $this->l('Module is enabled'), |
| 404 | 404 | 'prefix' => '<i class="icon icon-key"></i>', |
| 405 | 405 | 'class' => 't', |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | ), |
| 440 | 440 | array( |
| 441 | 441 | 'name' => 'pmt_simulator_is_enabled', |
| 442 | - 'type' => (version_compare(_PS_VERSION_, '1.6')<0) ?'radio' :'switch', |
|
| 442 | + 'type' => (version_compare(_PS_VERSION_, '1.6') < 0) ? 'radio' : 'switch', |
|
| 443 | 443 | 'label' => $this->l('Simulator is enabled'), |
| 444 | 444 | 'prefix' => '<i class="icon icon-key"></i>', |
| 445 | 445 | 'class' => 't', |
@@ -555,7 +555,7 @@ discard block |
||
| 555 | 555 | $message = $this->displayError($error); |
| 556 | 556 | } |
| 557 | 557 | |
| 558 | - $logo = $this->getPathUri(). 'views/img/logo_pagamastarde.png'; |
|
| 558 | + $logo = $this->getPathUri().'views/img/logo_pagamastarde.png'; |
|
| 559 | 559 | $tpl = $this->local_path.'views/templates/admin/config-info.tpl'; |
| 560 | 560 | $this->context->smarty->assign(array( |
| 561 | 561 | 'logo' => $logo, |
@@ -640,7 +640,7 @@ discard block |
||
| 640 | 640 | /** @var ProductCore $product */ |
| 641 | 641 | $product = new Product(Tools::getValue('id_product')); |
| 642 | 642 | $amount = $product->getPublicPrice(); |
| 643 | - $pmtPublicKey = Configuration::get('pmt_public_key'); |
|
| 643 | + $pmtPublicKey = Configuration::get('pmt_public_key'); |
|
| 644 | 644 | $pmtSimulatorIsEnabled = Configuration::get('pmt_simulator_is_enabled'); |
| 645 | 645 | $pmtIsEnabled = Configuration::get('pmt_is_enabled'); |
| 646 | 646 | $pmtSimulatorType = getenv('PMT_SIMULATOR_DISPLAY_TYPE'); |
@@ -749,10 +749,10 @@ discard block |
||
| 749 | 749 | */ |
| 750 | 750 | public function checkLogoExists() |
| 751 | 751 | { |
| 752 | - $logo = _PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments/'. Tools::strtolower(__CLASS__). '.png'; |
|
| 753 | - if (!file_exists($logo) && is_dir(_PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments')) { |
|
| 752 | + $logo = _PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments/'.Tools::strtolower(__CLASS__).'.png'; |
|
| 753 | + if (!file_exists($logo) && is_dir(_PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments')) { |
|
| 754 | 754 | copy( |
| 755 | - _PS_PAYLATER_DIR . '/views/img/logo-64x64.png', |
|
| 755 | + _PS_PAYLATER_DIR.'/views/img/logo-64x64.png', |
|
| 756 | 756 | $logo |
| 757 | 757 | ); |
| 758 | 758 | } |