| @@ -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(); | 
| @@ -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 @@ 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 | |
| @@ -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 | } | 
| @@ -38,7 +38,7 @@ discard block | ||
| 38 | 38 | */ | 
| 39 | 39 | public function getExtraConfigs() | 
| 40 | 40 |      { | 
| 41 | - $sql_content = 'select * from ' . _DB_PREFIX_. 'pagantis_config'; | |
| 41 | + $sql_content = 'select * from '._DB_PREFIX_.'pagantis_config'; | |
| 42 | 42 | $dbConfigs = Db::getInstance()->executeS($sql_content); | 
| 43 | 43 | |
| 44 | 44 | $simpleDbConfigs = array(); | 
| @@ -67,7 +67,7 @@ discard block | ||
| 67 | 67 | Db::getInstance()->update( | 
| 68 | 68 | 'pagantis_config', | 
| 69 | 69 |                          array('value' => pSQL($value)), | 
| 70 | - 'config = \''. pSQL($config) .'\'' | |
| 70 | + 'config = \''.pSQL($config).'\'' | |
| 71 | 71 | ); | 
| 72 | 72 |                  } else { | 
| 73 | 73 | $errors[$config] = $value; | 
| @@ -91,7 +91,7 @@ discard block | ||
| 91 | 91 | */ | 
| 92 | 92 | public function getMethod() | 
| 93 | 93 |      { | 
| 94 | - $sql_content = 'select * from ' . _DB_PREFIX_. 'pagantis_config'; | |
| 94 | + $sql_content = 'select * from '._DB_PREFIX_.'pagantis_config'; | |
| 95 | 95 | $dbConfigs = Db::getInstance()->executeS($sql_content); | 
| 96 | 96 | |
| 97 | 97 | $simpleDbConfigs = array(); | 
| @@ -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 |  define('PROMOTIONS_CATEGORY', 'pagantis-promotion-product'); | 
| 16 | 16 |  define('PROMOTIONS_CATEGORY_NAME', 'Pagantis Promoted Product'); | 
| 17 | 17 | |
| @@ -120,7 +120,7 @@ discard block | ||
| 120 | 120 |          Configuration::updateValue('pagantis_public_key', ''); | 
| 121 | 121 |          Configuration::updateValue('pagantis_private_key', ''); | 
| 122 | 122 | |
| 123 | - $return = (parent::install() | |
| 123 | + $return = (parent::install() | |
| 124 | 124 |              && $this->registerHook('displayShoppingCart') | 
| 125 | 125 |              && $this->registerHook('paymentOptions') | 
| 126 | 126 |              && $this->registerHook('displayRightColumn') | 
| @@ -202,18 +202,18 @@ discard block | ||
| 202 | 202 | public function checkHooks() | 
| 203 | 203 |      { | 
| 204 | 204 |          try { | 
| 205 | - $sql_content = 'select * from ' . _DB_PREFIX_. 'hook_module where | |
| 206 | - id_module = \'' . Module::getModuleIdByName($this->name) . '\' and | |
| 207 | - id_shop = \'' . Shop::getContextShopID() . '\' and | |
| 208 | -            id_hook = \'' . Hook::getIdByName('header') . '\''; | |
| 205 | + $sql_content = 'select * from '._DB_PREFIX_.'hook_module where | |
| 206 | + id_module = \'' . Module::getModuleIdByName($this->name).'\' and | |
| 207 | + id_shop = \'' . Shop::getContextShopID().'\' and | |
| 208 | +            id_hook = \'' . Hook::getIdByName('header').'\''; | |
| 209 | 209 | $hook_exists = Db::getInstance()->ExecuteS($sql_content); | 
| 210 | 210 |              if (empty($hook_exists)) { | 
| 211 | - $sql_insert = 'insert into ' . _DB_PREFIX_. 'hook_module | |
| 211 | + $sql_insert = 'insert into '._DB_PREFIX_.'hook_module | |
| 212 | 212 | (id_module, id_shop, id_hook, position) | 
| 213 | 213 | values | 
| 214 | - (\''. Module::getModuleIdByName($this->name) . '\', | |
| 215 | - \''. Shop::getContextShopID() . '\', | |
| 216 | -            \''. Hook::getIdByName('header') . '\', | |
| 214 | + (\''. Module::getModuleIdByName($this->name).'\', | |
| 215 | + \''. Shop::getContextShopID().'\', | |
| 216 | +            \''. Hook::getIdByName('header').'\', | |
| 217 | 217 | 150)'; | 
| 218 | 218 | Db::getInstance()->execute($sql_insert); | 
| 219 | 219 | } | 
| @@ -227,7 +227,7 @@ discard block | ||
| 227 | 227 | */ | 
| 228 | 228 | public function checkEnvVariables() | 
| 229 | 229 |      { | 
| 230 | - $sql_content = 'select * from ' . _DB_PREFIX_. 'pagantis_config'; | |
| 230 | + $sql_content = 'select * from '._DB_PREFIX_.'pagantis_config'; | |
| 231 | 231 | $dbConfigs = Db::getInstance()->executeS($sql_content); | 
| 232 | 232 | |
| 233 | 233 | // Convert a multimple dimension array for SQL insert statements into a simple key/value | 
| @@ -330,7 +330,7 @@ discard block | ||
| 330 | 330 |          } else { | 
| 331 | 331 | $this->context->controller->addJS($url); | 
| 332 | 332 | } | 
| 333 | - $this->context->controller->addJS($this->getPathUri(). 'views/js/simulator.js'); | |
| 333 | + $this->context->controller->addJS($this->getPathUri().'views/js/simulator.js'); | |
| 334 | 334 | } | 
| 335 | 335 | |
| 336 | 336 | /** | 
| @@ -394,7 +394,7 @@ discard block | ||
| 394 | 394 | $paymentOption | 
| 395 | 395 | ->setCallToActionText($pagantisTitle) | 
| 396 | 396 |              ->setAction($link->getModuleLink('pagantis', 'payment')) | 
| 397 | - ->setLogo($this->getPathUri(). 'views/img/' . $logo) | |
| 397 | + ->setLogo($this->getPathUri().'views/img/'.$logo) | |
| 398 | 398 | ->setModuleName(__CLASS__) | 
| 399 | 399 | ; | 
| 400 | 400 | |
| @@ -421,7 +421,7 @@ discard block | ||
| 421 | 421 | 'input' => array( | 
| 422 | 422 | array( | 
| 423 | 423 | 'name' => 'pagantis_is_enabled', | 
| 424 | - 'type' => (version_compare(_PS_VERSION_, '1.6')<0) ?'radio' :'switch', | |
| 424 | + 'type' => (version_compare(_PS_VERSION_, '1.6') < 0) ? 'radio' : 'switch', | |
| 425 | 425 |                          'label' => $this->l('Module is enabled'), | 
| 426 | 426 | 'prefix' => '<i class="icon icon-key"></i>', | 
| 427 | 427 | 'class' => 't', | 
| @@ -461,7 +461,7 @@ discard block | ||
| 461 | 461 | ), | 
| 462 | 462 | array( | 
| 463 | 463 | 'name' => 'pagantis_simulator_is_enabled', | 
| 464 | - 'type' => (version_compare(_PS_VERSION_, '1.6')<0) ?'radio' :'switch', | |
| 464 | + 'type' => (version_compare(_PS_VERSION_, '1.6') < 0) ? 'radio' : 'switch', | |
| 465 | 465 |                          'label' => $this->l('Simulator is enabled'), | 
| 466 | 466 | 'prefix' => '<i class="icon icon-key"></i>', | 
| 467 | 467 | 'class' => 't', | 
| @@ -577,9 +577,9 @@ discard block | ||
| 577 | 577 | $message = $this->displayError($error); | 
| 578 | 578 | } | 
| 579 | 579 | |
| 580 | - $logo = $this->getPathUri(). 'views/img/logo_pagantis.png'; | |
| 580 | + $logo = $this->getPathUri().'views/img/logo_pagantis.png'; | |
| 581 | 581 |          if ($this->language == 'ES' || $this->language == null) { | 
| 582 | - $logo = $this->getPathUri(). 'views/img/logo_pagamastarde.png'; | |
| 582 | + $logo = $this->getPathUri().'views/img/logo_pagamastarde.png'; | |
| 583 | 583 | } | 
| 584 | 584 | $tpl = $this->local_path.'views/templates/admin/config-info.tpl'; | 
| 585 | 585 | $this->context->smarty->assign(array( | 
| @@ -803,17 +803,17 @@ discard block | ||
| 803 | 803 | */ | 
| 804 | 804 | public function checkLogoExists() | 
| 805 | 805 |      { | 
| 806 | - $logoPmt = _PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments/pagamastarde.png'; | |
| 807 | - $logoPg = _PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments/pagantis.png'; | |
| 808 | -        if (!file_exists($logoPmt) && is_dir(_PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments')) { | |
| 806 | + $logoPmt = _PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments/pagamastarde.png'; | |
| 807 | + $logoPg = _PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments/pagantis.png'; | |
| 808 | +        if (!file_exists($logoPmt) && is_dir(_PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments')) { | |
| 809 | 809 | copy( | 
| 810 | - _PS_PAGANTIS_DIR . '/views/img/logo_pagamastarde.png', | |
| 810 | + _PS_PAGANTIS_DIR.'/views/img/logo_pagamastarde.png', | |
| 811 | 811 | $logoPmt | 
| 812 | 812 | ); | 
| 813 | 813 | } | 
| 814 | -        if (!file_exists($logoPg) && is_dir(_PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments')) { | |
| 814 | +        if (!file_exists($logoPg) && is_dir(_PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments')) { | |
| 815 | 815 | copy( | 
| 816 | - _PS_PAGANTIS_DIR . '/views/img/logo_pagantis.png', | |
| 816 | + _PS_PAGANTIS_DIR.'/views/img/logo_pagantis.png', | |
| 817 | 817 | $logoPg | 
| 818 | 818 | ); | 
| 819 | 819 | } | 
| @@ -828,16 +828,16 @@ discard block | ||
| 828 | 828 |          if (!in_array(PROMOTIONS_CATEGORY_NAME, $categories)) { | 
| 829 | 829 | /** @var CategoryCore $category */ | 
| 830 | 830 | $category = new Category(); | 
| 831 | -            $categoryArray = array((int)Configuration::get('PS_LANG_DEFAULT')=> PROMOTIONS_CATEGORY ); | |
| 831 | +            $categoryArray = array((int) Configuration::get('PS_LANG_DEFAULT')=> PROMOTIONS_CATEGORY); | |
| 832 | 832 | $category->is_root_category = false; | 
| 833 | 833 | $category->link_rewrite = $categoryArray; | 
| 834 | 834 | $category->meta_description = $categoryArray; | 
| 835 | 835 | $category->meta_keywords = $categoryArray; | 
| 836 | 836 | $category->meta_title = $categoryArray; | 
| 837 | -            $category->name = array((int)Configuration::get('PS_LANG_DEFAULT')=> PROMOTIONS_CATEGORY_NAME); | |
| 837 | +            $category->name = array((int) Configuration::get('PS_LANG_DEFAULT')=> PROMOTIONS_CATEGORY_NAME); | |
| 838 | 838 |              $category->id_parent = Configuration::get('PS_HOME_CATEGORY'); | 
| 839 | - $category->active=0; | |
| 840 | - $description = 'Pagantis: Products with this category have free financing assumed by the merchant. ' . | |
| 839 | + $category->active = 0; | |
| 840 | + $description = 'Pagantis: Products with this category have free financing assumed by the merchant. '. | |
| 841 | 841 | 'Use it to promote your products or brands.'; | 
| 842 | 842 | $category->description = $this->l($description); | 
| 843 | 843 | $category->save(); | 
| @@ -851,7 +851,7 @@ discard block | ||
| 851 | 851 | return ''; | 
| 852 | 852 | } | 
| 853 | 853 | |
| 854 | - $sql = 'SELECT value FROM '._DB_PREFIX_.'pagantis_config where config = \'' . pSQL($config) . '\' limit 1'; | |
| 854 | + $sql = 'SELECT value FROM '._DB_PREFIX_.'pagantis_config where config = \''.pSQL($config).'\' limit 1'; | |
| 855 | 855 |          if ($results = Db::getInstance()->ExecuteS($sql)) { | 
| 856 | 856 |              if (is_array($results) && count($results) === 1 && isset($results[0]['value'])) { | 
| 857 | 857 | return $results[0]['value']; | 
| @@ -871,7 +871,7 @@ discard block | ||
| 871 | 871 |          if (count($langArray) != 2 && isset($lang['locale'])) { | 
| 872 | 872 |              $langArray = explode("-", $lang['locale']); | 
| 873 | 873 | } | 
| 874 | - $this->language = Tools::strtoupper($langArray[count($langArray)-1]); | |
| 874 | + $this->language = Tools::strtoupper($langArray[count($langArray) - 1]); | |
| 875 | 875 | // Prevent null language detection | 
| 876 | 876 | $this->language = ($this->language) ? $this->language : 'ES'; | 
| 877 | 877 | } | 
| @@ -88,8 +88,8 @@ discard block | ||
| 88 | 88 |          $pagantisPublicKey = Configuration::get('pagantis_public_key'); | 
| 89 | 89 |          $pagantisPrivateKey = Configuration::get('pagantis_private_key'); | 
| 90 | 90 | $okUrl = _PS_BASE_URL_SSL_.__PS_BASE_URI__ | 
| 91 | - .'index.php?canonical=true&fc=module&module=pagantis&controller=notify&' | |
| 92 | - .http_build_query($query) | |
| 91 | + .'index.php?canonical=true&fc=module&module=pagantis&controller=notify&' | |
| 92 | + .http_build_query($query) | |
| 93 | 93 | ; | 
| 94 | 94 | |
| 95 | 95 | $shippingAddress = new Address($cart->id_address_delivery); | 
| @@ -192,9 +192,9 @@ discard block | ||
| 192 | 192 | $productId = $item['id_product']; | 
| 193 | 193 | $finalPrice = Product::getPriceStatic($productId); | 
| 194 | 194 | $promotedMessage = 'Promoted Item: ' . $product->getDescription() . | 
| 195 | - ' Price: ' . $finalPrice . | |
| 196 | - ' Qty: ' . $product->getQuantity() . | |
| 197 | - ' Item ID: ' . $item['id_product']; | |
| 195 | + ' Price: ' . $finalPrice . | |
| 196 | + ' Qty: ' . $product->getQuantity() . | |
| 197 | + ' Item ID: ' . $item['id_product']; | |
| 198 | 198 |                      $metadataOrder->addMetadata('promotedProduct', $promotedMessage); | 
| 199 | 199 | } | 
| 200 | 200 | $details->addProduct($product); | 
| @@ -28,9 +28,9 @@ discard block | ||
| 28 | 28 |      { | 
| 29 | 29 |          if (_PS_VERSION_ < 1.6) { | 
| 30 | 30 | Logger::addLog( | 
| 31 | - 'Pagantis Exception For user ' . | |
| 32 | - $customer->email . | |
| 33 | - ' : ' . | |
| 31 | + 'Pagantis Exception For user '. | |
| 32 | + $customer->email. | |
| 33 | + ' : '. | |
| 34 | 34 | $exception->getMessage(), | 
| 35 | 35 | 3, | 
| 36 | 36 | $exception->getCode(), | 
| @@ -40,9 +40,9 @@ discard block | ||
| 40 | 40 | ); | 
| 41 | 41 |          } else { | 
| 42 | 42 | PrestaShopLogger::addLog( | 
| 43 | - 'Pagantis Exception For user ' . | |
| 44 | - $customer->email . | |
| 45 | - ' : ' . | |
| 43 | + 'Pagantis Exception For user '. | |
| 44 | + $customer->email. | |
| 45 | + ' : '. | |
| 46 | 46 | $exception->getMessage(), | 
| 47 | 47 | 3, | 
| 48 | 48 | $exception->getCode(), | 
| @@ -104,24 +104,24 @@ discard block | ||
| 104 | 104 | ); | 
| 105 | 105 | |
| 106 | 106 |          try { | 
| 107 | - $userAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); | |
| 107 | + $userAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); | |
| 108 | 108 | $userAddress | 
| 109 | 109 | ->setZipCode($shippingAddress->postcode) | 
| 110 | - ->setFullName($shippingAddress->firstname . ' ' . $shippingAddress->lastname) | |
| 110 | + ->setFullName($shippingAddress->firstname.' '.$shippingAddress->lastname) | |
| 111 | 111 | ->setCountryCode($this->language) | 
| 112 | 112 | ->setCity($shippingAddress->city) | 
| 113 | - ->setAddress($shippingAddress->address1 . ' ' . $shippingAddress->address2) | |
| 113 | + ->setAddress($shippingAddress->address1.' '.$shippingAddress->address2) | |
| 114 | 114 | ->setTaxId($this->getTaxId($customer, $shippingAddress, $billingAddress)) | 
| 115 | 115 | ->setNationalId($this->getNationalId($customer, $shippingAddress, $billingAddress)) | 
| 116 | 116 | ; | 
| 117 | 117 | |
| 118 | - $orderShippingAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); | |
| 118 | + $orderShippingAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); | |
| 119 | 119 | $orderShippingAddress | 
| 120 | 120 | ->setZipCode($shippingAddress->postcode) | 
| 121 | - ->setFullName($shippingAddress->firstname . ' ' . $shippingAddress->lastname) | |
| 121 | + ->setFullName($shippingAddress->firstname.' '.$shippingAddress->lastname) | |
| 122 | 122 | ->setCountryCode($this->language) | 
| 123 | 123 | ->setCity($shippingAddress->city) | 
| 124 | - ->setAddress($shippingAddress->address1 . ' ' . $shippingAddress->address2) | |
| 124 | + ->setAddress($shippingAddress->address1.' '.$shippingAddress->address2) | |
| 125 | 125 | ->setTaxId($this->getTaxId($customer, $shippingAddress, $billingAddress)) | 
| 126 | 126 | ->setNationalId($this->getNationalId($customer, $shippingAddress, $billingAddress)) | 
| 127 | 127 | ->setFixPhone($shippingAddress->phone) | 
| @@ -131,10 +131,10 @@ discard block | ||
| 131 | 131 | $orderBillingAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); | 
| 132 | 132 | $orderBillingAddress | 
| 133 | 133 | ->setZipCode($billingAddress->postcode) | 
| 134 | - ->setFullName($billingAddress->firstname . ' ' . $billingAddress->lastname) | |
| 134 | + ->setFullName($billingAddress->firstname.' '.$billingAddress->lastname) | |
| 135 | 135 | ->setCountryCode($this->language) | 
| 136 | 136 | ->setCity($billingAddress->city) | 
| 137 | - ->setAddress($billingAddress->address1 . ' ' . $billingAddress->address2) | |
| 137 | + ->setAddress($billingAddress->address1.' '.$billingAddress->address2) | |
| 138 | 138 | ->setTaxId($this->getTaxId($customer, $billingAddress, $shippingAddress)) | 
| 139 | 139 | ->setNationalId($this->getNationalId($customer, $billingAddress, $shippingAddress)) | 
| 140 | 140 | ->setFixPhone($billingAddress->phone) | 
| @@ -154,7 +154,7 @@ discard block | ||
| 154 | 154 | ->setNationalId($this->getNationalId($customer, $shippingAddress, $billingAddress)) | 
| 155 | 155 | ; | 
| 156 | 156 | |
| 157 | -            if ($customer->birthday!='0000-00-00') { | |
| 157 | +            if ($customer->birthday != '0000-00-00') { | |
| 158 | 158 | $orderUser->setDateOfBirth($customer->birthday); | 
| 159 | 159 | } | 
| 160 | 160 | |
| @@ -188,13 +188,13 @@ discard block | ||
| 188 | 188 | ->setQuantity($item['quantity']) | 
| 189 | 189 | ->setDescription($item['name']); | 
| 190 | 190 |                  if ($promotedProduct) { | 
| 191 | - $promotedAmount+=$product->getAmount(); | |
| 191 | + $promotedAmount += $product->getAmount(); | |
| 192 | 192 | $productId = $item['id_product']; | 
| 193 | 193 | $finalPrice = Product::getPriceStatic($productId); | 
| 194 | - $promotedMessage = 'Promoted Item: ' . $product->getDescription() . | |
| 195 | - ' Price: ' . $finalPrice . | |
| 196 | - ' Qty: ' . $product->getQuantity() . | |
| 197 | - ' Item ID: ' . $item['id_product']; | |
| 194 | + $promotedMessage = 'Promoted Item: '.$product->getDescription(). | |
| 195 | + ' Price: '.$finalPrice. | |
| 196 | + ' Qty: '.$product->getQuantity(). | |
| 197 | + ' Item ID: '.$item['id_product']; | |
| 198 | 198 |                      $metadataOrder->addMetadata('promotedProduct', $promotedMessage); | 
| 199 | 199 | } | 
| 200 | 200 | $details->addProduct($product); | 
| @@ -244,7 +244,7 @@ discard block | ||
| 244 | 244 | Tools::redirect($cancelUrl); | 
| 245 | 245 | } | 
| 246 | 246 | |
| 247 | - $url =''; | |
| 247 | + $url = ''; | |
| 248 | 248 |          try { | 
| 249 | 249 | $orderClient = new \Pagantis\OrdersApiClient\Client( | 
| 250 | 250 | $pagantisPublicKey, | 
| @@ -255,12 +255,12 @@ discard block | ||
| 255 | 255 |              if ($order instanceof \Pagantis\OrdersApiClient\Model\Order) { | 
| 256 | 256 | $url = $order->getActionUrls()->getForm(); | 
| 257 | 257 | $orderId = $order->getId(); | 
| 258 | - $sql = "INSERT INTO `" . _DB_PREFIX_ . "pagantis_order` (`id`, `order_id`) | |
| 258 | + $sql = "INSERT INTO `"._DB_PREFIX_."pagantis_order` (`id`, `order_id`) | |
| 259 | 259 |                       VALUES ('$cart->id','$orderId')  | 
| 260 | 260 | ON DUPLICATE KEY UPDATE `order_id` = '$orderId'"; | 
| 261 | 261 | $result = Db::getInstance()->execute($sql); | 
| 262 | 262 |                  if (!$result) { | 
| 263 | -                    throw new UnknownException('Unable to save pagantis-order-id in database: '. $sql); | |
| 263 | +                    throw new UnknownException('Unable to save pagantis-order-id in database: '.$sql); | |
| 264 | 264 | } | 
| 265 | 265 |              } else { | 
| 266 | 266 | throw new OrderNotFoundException(); | 
| @@ -359,7 +359,7 @@ discard block | ||
| 359 | 359 |          if (count($langArray) != 2 && isset($lang['locale'])) { | 
| 360 | 360 |              $langArray = explode("-", $lang['locale']); | 
| 361 | 361 | } | 
| 362 | - $this->language = Tools::strtoupper($langArray[count($langArray)-1]); | |
| 362 | + $this->language = Tools::strtoupper($langArray[count($langArray) - 1]); | |
| 363 | 363 | // Prevent null language detection | 
| 364 | 364 | $this->language = ($this->language) ? $this->language : 'ES'; | 
| 365 | 365 | } | 
| @@ -210,7 +210,7 @@ discard block | ||
| 210 | 210 | private function getPagantisOrderId() | 
| 211 | 211 |      { | 
| 212 | 212 |          try { | 
| 213 | - $this->pagantisOrderId= Db::getInstance()->getValue( | |
| 213 | + $this->pagantisOrderId = Db::getInstance()->getValue( | |
| 214 | 214 | 'select order_id from '._DB_PREFIX_.'pagantis_order where id = '.$this->merchantOrderId | 
| 215 | 215 | ); | 
| 216 | 216 | |
| @@ -272,20 +272,20 @@ discard block | ||
| 272 | 272 |          $merchantAmount = explode('.', explode(',', $merchantAmount)[0])[0]; | 
| 273 | 273 |          if ($totalAmount != $merchantAmount) { | 
| 274 | 274 |              try { | 
| 275 | - $psTotalAmount = substr_replace($merchantAmount, '.', (Tools::strlen($merchantAmount) -2), 0); | |
| 275 | + $psTotalAmount = substr_replace($merchantAmount, '.', (Tools::strlen($merchantAmount) - 2), 0); | |
| 276 | 276 | |
| 277 | 277 | $pgTotalAmountInCents = (string) $this->pagantisOrder->getShoppingCart()->getTotalAmount(); | 
| 278 | 278 | $pgTotalAmount = substr_replace( | 
| 279 | 279 | $pgTotalAmountInCents, | 
| 280 | 280 | '.', | 
| 281 | - (Tools::strlen($pgTotalAmountInCents) -2), | |
| 281 | + (Tools::strlen($pgTotalAmountInCents) - 2), | |
| 282 | 282 | 0 | 
| 283 | 283 | ); | 
| 284 | 284 | |
| 285 | - $this->amountMismatchError = '. Amount mismatch in PrestaShop Order #'. $this->merchantOrderId . | |
| 286 | - ' compared with Pagantis Order: ' . $this->pagantisOrderId . | |
| 287 | - '. The order in PrestaShop has an amount of ' . $psTotalAmount . ' and in Pagantis ' . | |
| 288 | - $pgTotalAmount . ' PLEASE REVIEW THE ORDER'; | |
| 285 | + $this->amountMismatchError = '. Amount mismatch in PrestaShop Order #'.$this->merchantOrderId. | |
| 286 | + ' compared with Pagantis Order: '.$this->pagantisOrderId. | |
| 287 | + '. The order in PrestaShop has an amount of '.$psTotalAmount.' and in Pagantis '. | |
| 288 | + $pgTotalAmount.' PLEASE REVIEW THE ORDER'; | |
| 289 | 289 | $this->saveLog(array( | 
| 290 | 290 | 'message' => $this->amountMismatchError | 
| 291 | 291 | )); | 
| @@ -305,20 +305,20 @@ discard block | ||
| 305 | 305 |          try { | 
| 306 | 306 |              if ($this->merchantOrder->orderExists() !== false) { | 
| 307 | 307 |                  throw new WrongStatusException('PS->orderExists() cart_id = ' | 
| 308 | - . $this->merchantOrderId . ' pagantis_id = ' | |
| 309 | - . $this->pagantisOrderId . '): already_processed'); | |
| 308 | + . $this->merchantOrderId.' pagantis_id = ' | |
| 309 | + . $this->pagantisOrderId.'): already_processed'); | |
| 310 | 310 | } | 
| 311 | 311 | |
| 312 | 312 | // Double check | 
| 313 | - $tableName = _DB_PREFIX_ . 'pagantis_order'; | |
| 314 | -            $sql = ('select ps_order_id from `' . $tableName . '` where `id` = ' . $this->merchantOrderId | |
| 315 | - . ' and `order_id` = \'' . $this->pagantisOrderId . '\'' | |
| 313 | + $tableName = _DB_PREFIX_.'pagantis_order'; | |
| 314 | +            $sql = ('select ps_order_id from `'.$tableName.'` where `id` = '.$this->merchantOrderId | |
| 315 | + . ' and `order_id` = \''.$this->pagantisOrderId.'\'' | |
| 316 | 316 | . ' and `ps_order_id` is not null'); | 
| 317 | 317 | $results = Db::getInstance()->ExecuteS($sql); | 
| 318 | 318 |              if (is_array($results) && count($results) === 1) { | 
| 319 | -                throw new WrongStatusException('PS->record found in ' . $tableName | |
| 320 | - . ' (cart_id = ' . $this->merchantOrderId . ' pagantis_id = ' | |
| 321 | - . $this->pagantisOrderId . '): already_processed'); | |
| 319 | +                throw new WrongStatusException('PS->record found in '.$tableName | |
| 320 | + . ' (cart_id = '.$this->merchantOrderId.' pagantis_id = ' | |
| 321 | + . $this->pagantisOrderId.'): already_processed'); | |
| 322 | 322 | } | 
| 323 | 323 |          } catch (\Exception $exception) { | 
| 324 | 324 | throw new UnknownException($exception->getMessage()); | 
| @@ -347,9 +347,9 @@ discard block | ||
| 347 | 347 |                  Configuration::get('PS_OS_PAYMENT'), | 
| 348 | 348 | $this->merchantOrder->getOrderTotal(true), | 
| 349 | 349 | $this->module->displayName, | 
| 350 | - 'pagantisOrderId: ' . $this->pagantisOrder->getId() . ' ' . | |
| 351 | - 'pagantisOrderStatus: '. $this->pagantisOrder->getStatus() . | |
| 352 | - $this->amountMismatchError . | |
| 350 | + 'pagantisOrderId: '.$this->pagantisOrder->getId().' '. | |
| 351 | + 'pagantisOrderStatus: '.$this->pagantisOrder->getStatus(). | |
| 352 | + $this->amountMismatchError. | |
| 353 | 353 | $metadataInfo, | 
| 354 | 354 |                  array('transaction_id' => $this->pagantisOrderId), | 
| 355 | 355 | null, | 
| @@ -363,7 +363,7 @@ discard block | ||
| 363 | 363 | Db::getInstance()->update( | 
| 364 | 364 | 'pagantis_order', | 
| 365 | 365 |                  array('ps_order_id' => $this->module->currentOrder), | 
| 366 | - 'id = \''. $this->merchantOrderId . '\' and order_id = \'' . $this->pagantisOrderId . '\'' | |
| 366 | + 'id = \''.$this->merchantOrderId.'\' and order_id = \''.$this->pagantisOrderId.'\'' | |
| 367 | 367 | ); | 
| 368 | 368 |          } catch (\Exception $exception) { | 
| 369 | 369 | // Do nothing | 
| @@ -381,9 +381,9 @@ discard block | ||
| 381 | 381 | $this->orderClient->confirmOrder($this->pagantisOrderId); | 
| 382 | 382 |              try { | 
| 383 | 383 | $mode = ($_SERVER['REQUEST_METHOD'] == 'POST') ? 'NOTIFICATION' : 'REDIRECTION'; | 
| 384 | - $message = 'Order CONFIRMED. The order was confirmed by a ' . $mode . | |
| 385 | - '. Pagantis OrderId=' . $this->pagantisOrderId . | |
| 386 | - '. Prestashop OrderId=' . $this->module->currentOrder; | |
| 384 | + $message = 'Order CONFIRMED. The order was confirmed by a '.$mode. | |
| 385 | + '. Pagantis OrderId='.$this->pagantisOrderId. | |
| 386 | + '. Prestashop OrderId='.$this->module->currentOrder; | |
| 387 | 387 |                  $this->saveLog(array('message' => $message)); | 
| 388 | 388 |              } catch (\Exception $exception) { | 
| 389 | 389 | // Do nothing | 
| @@ -402,9 +402,9 @@ discard block | ||
| 402 | 402 |      { | 
| 403 | 403 | // Do nothing because the order is created only when the purchase was successfully | 
| 404 | 404 |          try { | 
| 405 | - $message = 'Roolback method: ' . | |
| 406 | - '. Pagantis OrderId=' . $this->pagantisOrderId . | |
| 407 | - '. Prestashop CartId=' . $this->merchantOrderId; | |
| 405 | + $message = 'Roolback method: '. | |
| 406 | + '. Pagantis OrderId='.$this->pagantisOrderId. | |
| 407 | + '. Prestashop CartId='.$this->merchantOrderId; | |
| 408 | 408 |              $this->saveLog(array('message' => $message)); | 
| 409 | 409 |          } catch (\Exception $exception) { | 
| 410 | 410 | // Do nothing | 
| @@ -435,10 +435,10 @@ discard block | ||
| 435 | 435 | ); | 
| 436 | 436 | $resultSeconds = Db::getInstance()->getValue($query); | 
| 437 | 437 | $restSeconds = isset($resultSeconds) ? ($resultSeconds) : 0; | 
| 438 | - $secondsToExpire = ($restSeconds>self::CONCURRENCY_TIMEOUT) ? self::CONCURRENCY_TIMEOUT : $restSeconds; | |
| 438 | + $secondsToExpire = ($restSeconds > self::CONCURRENCY_TIMEOUT) ? self::CONCURRENCY_TIMEOUT : $restSeconds; | |
| 439 | 439 | |
| 440 | 440 | $logMessage = sprintf( | 
| 441 | - "Redirect concurrency, User have to wait %s seconds, default seconds %s, bd time to expire %s seconds. CartId=" . $orderId, | |
| 441 | + "Redirect concurrency, User have to wait %s seconds, default seconds %s, bd time to expire %s seconds. CartId=".$orderId, | |
| 442 | 442 | $secondsToExpire, | 
| 443 | 443 | self::CONCURRENCY_TIMEOUT, | 
| 444 | 444 | $restSeconds | 
| @@ -447,7 +447,7 @@ discard block | ||
| 447 | 447 | $this->saveLog(array( | 
| 448 | 448 | 'message' => $logMessage | 
| 449 | 449 | )); | 
| 450 | - sleep($secondsToExpire+1); | |
| 450 | + sleep($secondsToExpire + 1); | |
| 451 | 451 | // After waiting...user continue the confirmation, hoping that previous call have finished. | 
| 452 | 452 | return true; | 
| 453 | 453 | } | 
| @@ -467,11 +467,11 @@ discard block | ||
| 467 | 467 |              if (is_null($orderId)) { | 
| 468 | 468 | Db::getInstance()->delete( | 
| 469 | 469 | 'pagantis_cart_process', | 
| 470 | - 'timestamp < ' . (time() - self::CONCURRENCY_TIMEOUT) | |
| 470 | + 'timestamp < '.(time() - self::CONCURRENCY_TIMEOUT) | |
| 471 | 471 | ); | 
| 472 | 472 | return; | 
| 473 | 473 | } | 
| 474 | -            Db::getInstance()->delete('pagantis_cart_process', 'id = \'' . $orderId . '\''); | |
| 474 | +            Db::getInstance()->delete('pagantis_cart_process', 'id = \''.$orderId.'\''); | |
| 475 | 475 |          } catch (\Exception $exception) { | 
| 476 | 476 | throw new ConcurrencyException(); | 
| 477 | 477 | } | 
| @@ -493,8 +493,8 @@ discard block | ||
| 493 | 493 | $data = array( | 
| 494 | 494 | 'merchantOrderId' => $this->merchantOrderId, | 
| 495 | 495 | 'pagantisOrderId' => $this->pagantisOrderId, | 
| 496 | - 'message' => ($exception)? $exception->getMessage() : 'Unable to get Exception message', | |
| 497 | - 'statusCode' => ($exception)? $exception->getCode() : 'Unable to get Exception statusCode', | |
| 496 | + 'message' => ($exception) ? $exception->getMessage() : 'Unable to get Exception message', | |
| 497 | + 'statusCode' => ($exception) ? $exception->getCode() : 'Unable to get Exception statusCode', | |
| 498 | 498 | 'method' => $method, | 
| 499 | 499 | 'file' => __FILE__, | 
| 500 | 500 | 'line' => $line, | 
| @@ -518,9 +518,9 @@ discard block | ||
| 518 | 518 | 'id_cart' => $this->merchantOrderId, | 
| 519 | 519 | 'key' => $this->config['secureKey'], | 
| 520 | 520 | 'id_module' => $this->module->id, | 
| 521 | - 'id_order' => ($this->pagantisOrder)?$this->pagantisOrder->getId(): null, | |
| 521 | + 'id_order' => ($this->pagantisOrder) ? $this->pagantisOrder->getId() : null, | |
| 522 | 522 | ); | 
| 523 | - $url = ($error)? $this->config['urlKO'] : $this->config['urlOK']; | |
| 523 | + $url = ($error) ? $this->config['urlKO'] : $this->config['urlOK']; | |
| 524 | 524 | return $this->redirect($url, $parameters); | 
| 525 | 525 | } | 
| 526 | 526 | } | 
| 527 | 527 | \ No newline at end of file |