@@ -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 | |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | Configuration::updateValue('pagantis_public_key', ''); |
| 134 | 134 | Configuration::updateValue('pagantis_private_key', ''); |
| 135 | 135 | |
| 136 | - $return = (parent::install() |
|
| 136 | + $return = (parent::install() |
|
| 137 | 137 | && $this->registerHook('displayShoppingCart') |
| 138 | 138 | && $this->registerHook('paymentOptions') |
| 139 | 139 | && $this->registerHook('displayRightColumn') |
@@ -215,18 +215,18 @@ discard block |
||
| 215 | 215 | public function checkHooks() |
| 216 | 216 | { |
| 217 | 217 | try { |
| 218 | - $sql_content = 'select * from ' . _DB_PREFIX_. 'hook_module where |
|
| 219 | - id_module = \'' . Module::getModuleIdByName($this->name) . '\' and |
|
| 220 | - id_shop = \'' . Shop::getContextShopID() . '\' and |
|
| 221 | - id_hook = \'' . Hook::getIdByName('header') . '\''; |
|
| 218 | + $sql_content = 'select * from '._DB_PREFIX_.'hook_module where |
|
| 219 | + id_module = \'' . Module::getModuleIdByName($this->name).'\' and |
|
| 220 | + id_shop = \'' . Shop::getContextShopID().'\' and |
|
| 221 | + id_hook = \'' . Hook::getIdByName('header').'\''; |
|
| 222 | 222 | $hook_exists = Db::getInstance()->ExecuteS($sql_content); |
| 223 | 223 | if (empty($hook_exists)) { |
| 224 | - $sql_insert = 'insert into ' . _DB_PREFIX_. 'hook_module |
|
| 224 | + $sql_insert = 'insert into '._DB_PREFIX_.'hook_module |
|
| 225 | 225 | (id_module, id_shop, id_hook, position) |
| 226 | 226 | values |
| 227 | - (\''. Module::getModuleIdByName($this->name) . '\', |
|
| 228 | - \''. Shop::getContextShopID() . '\', |
|
| 229 | - \''. Hook::getIdByName('header') . '\', |
|
| 227 | + (\''. Module::getModuleIdByName($this->name).'\', |
|
| 228 | + \''. Shop::getContextShopID().'\', |
|
| 229 | + \''. Hook::getIdByName('header').'\', |
|
| 230 | 230 | 150)'; |
| 231 | 231 | Db::getInstance()->execute($sql_insert); |
| 232 | 232 | } |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | */ |
| 241 | 241 | public function checkEnvVariables() |
| 242 | 242 | { |
| 243 | - $sql_content = 'select * from ' . _DB_PREFIX_. 'pagantis_config'; |
|
| 243 | + $sql_content = 'select * from '._DB_PREFIX_.'pagantis_config'; |
|
| 244 | 244 | $dbConfigs = Db::getInstance()->executeS($sql_content); |
| 245 | 245 | |
| 246 | 246 | // Convert a multimple dimension array for SQL insert statements into a simple key/value |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | } else { |
| 359 | 359 | $this->context->controller->addJS($url); |
| 360 | 360 | } |
| 361 | - $this->context->controller->addJS($this->getPathUri(). 'views/js/simulator.js'); |
|
| 361 | + $this->context->controller->addJS($this->getPathUri().'views/js/simulator.js'); |
|
| 362 | 362 | } |
| 363 | 363 | |
| 364 | 364 | /** |
@@ -456,7 +456,7 @@ discard block |
||
| 456 | 456 | 'input' => array( |
| 457 | 457 | array( |
| 458 | 458 | 'name' => 'pagantis_is_enabled', |
| 459 | - 'type' => (version_compare(_PS_VERSION_, '1.6')<0) ?'radio' :'switch', |
|
| 459 | + 'type' => (version_compare(_PS_VERSION_, '1.6') < 0) ? 'radio' : 'switch', |
|
| 460 | 460 | 'label' => $this->l('Module is enabled'), |
| 461 | 461 | 'prefix' => '<i class="icon icon-key"></i>', |
| 462 | 462 | 'class' => 't', |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | ), |
| 497 | 497 | array( |
| 498 | 498 | 'name' => 'pagantis_simulator_is_enabled', |
| 499 | - 'type' => (version_compare(_PS_VERSION_, '1.6')<0) ?'radio' :'switch', |
|
| 499 | + 'type' => (version_compare(_PS_VERSION_, '1.6') < 0) ? 'radio' : 'switch', |
|
| 500 | 500 | 'label' => $this->l('Simulator is enabled'), |
| 501 | 501 | 'prefix' => '<i class="icon icon-key"></i>', |
| 502 | 502 | 'class' => 't', |
@@ -849,16 +849,16 @@ discard block |
||
| 849 | 849 | if (!in_array(PROMOTIONS_CATEGORY_NAME, $categories)) { |
| 850 | 850 | /** @var CategoryCore $category */ |
| 851 | 851 | $category = new Category(); |
| 852 | - $categoryArray = array((int)Configuration::get('PS_LANG_DEFAULT')=> PROMOTIONS_CATEGORY ); |
|
| 852 | + $categoryArray = array((int) Configuration::get('PS_LANG_DEFAULT')=> PROMOTIONS_CATEGORY); |
|
| 853 | 853 | $category->is_root_category = false; |
| 854 | 854 | $category->link_rewrite = $categoryArray; |
| 855 | 855 | $category->meta_description = $categoryArray; |
| 856 | 856 | $category->meta_keywords = $categoryArray; |
| 857 | 857 | $category->meta_title = $categoryArray; |
| 858 | - $category->name = array((int)Configuration::get('PS_LANG_DEFAULT')=> PROMOTIONS_CATEGORY_NAME); |
|
| 858 | + $category->name = array((int) Configuration::get('PS_LANG_DEFAULT')=> PROMOTIONS_CATEGORY_NAME); |
|
| 859 | 859 | $category->id_parent = Configuration::get('PS_HOME_CATEGORY'); |
| 860 | - $category->active=0; |
|
| 861 | - $description = 'Pagantis: Products with this category have free financing assumed by the merchant. ' . |
|
| 860 | + $category->active = 0; |
|
| 861 | + $description = 'Pagantis: Products with this category have free financing assumed by the merchant. '. |
|
| 862 | 862 | 'Use it to promote your products or brands.'; |
| 863 | 863 | $category->description = $this->l($description); |
| 864 | 864 | $category->save(); |
@@ -872,7 +872,7 @@ discard block |
||
| 872 | 872 | return ''; |
| 873 | 873 | } |
| 874 | 874 | |
| 875 | - $sql = 'SELECT value FROM '._DB_PREFIX_.'pagantis_config where config = \'' . pSQL($config) . '\' limit 1'; |
|
| 875 | + $sql = 'SELECT value FROM '._DB_PREFIX_.'pagantis_config where config = \''.pSQL($config).'\' limit 1'; |
|
| 876 | 876 | if ($results = Db::getInstance()->ExecuteS($sql)) { |
| 877 | 877 | if (is_array($results) && count($results) === 1 && isset($results[0]['value'])) { |
| 878 | 878 | return $results[0]['value']; |
@@ -892,7 +892,7 @@ discard block |
||
| 892 | 892 | if (count($langArray) != 2 && isset($lang['locale'])) { |
| 893 | 893 | $langArray = explode("-", $lang['locale']); |
| 894 | 894 | } |
| 895 | - $this->language = Tools::strtoupper($langArray[count($langArray)-1]); |
|
| 895 | + $this->language = Tools::strtoupper($langArray[count($langArray) - 1]); |
|
| 896 | 896 | // Prevent null language detection |
| 897 | 897 | if (in_array(Tools::strtolower($this->language), $this->allowedCountries)) { |
| 898 | 898 | return; |
@@ -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(), |
@@ -102,24 +102,24 @@ discard block |
||
| 102 | 102 | ); |
| 103 | 103 | |
| 104 | 104 | try { |
| 105 | - $userAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); |
|
| 105 | + $userAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); |
|
| 106 | 106 | $userAddress |
| 107 | 107 | ->setZipCode($shippingAddress->postcode) |
| 108 | - ->setFullName($shippingAddress->firstname . ' ' . $shippingAddress->lastname) |
|
| 108 | + ->setFullName($shippingAddress->firstname.' '.$shippingAddress->lastname) |
|
| 109 | 109 | ->setCountryCode($this->language) |
| 110 | 110 | ->setCity($shippingAddress->city) |
| 111 | - ->setAddress($shippingAddress->address1 . ' ' . $shippingAddress->address2) |
|
| 111 | + ->setAddress($shippingAddress->address1.' '.$shippingAddress->address2) |
|
| 112 | 112 | ->setTaxId($this->getTaxId($customer, $shippingAddress, $billingAddress)) |
| 113 | 113 | ->setNationalId($this->getNationalId($customer, $shippingAddress, $billingAddress)) |
| 114 | 114 | ; |
| 115 | 115 | |
| 116 | - $orderShippingAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); |
|
| 116 | + $orderShippingAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); |
|
| 117 | 117 | $orderShippingAddress |
| 118 | 118 | ->setZipCode($shippingAddress->postcode) |
| 119 | - ->setFullName($shippingAddress->firstname . ' ' . $shippingAddress->lastname) |
|
| 119 | + ->setFullName($shippingAddress->firstname.' '.$shippingAddress->lastname) |
|
| 120 | 120 | ->setCountryCode($this->language) |
| 121 | 121 | ->setCity($shippingAddress->city) |
| 122 | - ->setAddress($shippingAddress->address1 . ' ' . $shippingAddress->address2) |
|
| 122 | + ->setAddress($shippingAddress->address1.' '.$shippingAddress->address2) |
|
| 123 | 123 | ->setTaxId($this->getTaxId($customer, $shippingAddress, $billingAddress)) |
| 124 | 124 | ->setNationalId($this->getNationalId($customer, $shippingAddress, $billingAddress)) |
| 125 | 125 | ->setFixPhone($shippingAddress->phone) |
@@ -129,10 +129,10 @@ discard block |
||
| 129 | 129 | $orderBillingAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address(); |
| 130 | 130 | $orderBillingAddress |
| 131 | 131 | ->setZipCode($billingAddress->postcode) |
| 132 | - ->setFullName($billingAddress->firstname . ' ' . $billingAddress->lastname) |
|
| 132 | + ->setFullName($billingAddress->firstname.' '.$billingAddress->lastname) |
|
| 133 | 133 | ->setCountryCode($this->language) |
| 134 | 134 | ->setCity($billingAddress->city) |
| 135 | - ->setAddress($billingAddress->address1 . ' ' . $billingAddress->address2) |
|
| 135 | + ->setAddress($billingAddress->address1.' '.$billingAddress->address2) |
|
| 136 | 136 | ->setTaxId($this->getTaxId($customer, $billingAddress, $shippingAddress)) |
| 137 | 137 | ->setNationalId($this->getNationalId($customer, $billingAddress, $shippingAddress)) |
| 138 | 138 | ->setFixPhone($billingAddress->phone) |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | ->setNationalId($this->getNationalId($customer, $shippingAddress, $billingAddress)) |
| 153 | 153 | ; |
| 154 | 154 | |
| 155 | - if ($customer->birthday!='0000-00-00') { |
|
| 155 | + if ($customer->birthday != '0000-00-00') { |
|
| 156 | 156 | $orderUser->setDateOfBirth($customer->birthday); |
| 157 | 157 | } |
| 158 | 158 | |
@@ -186,13 +186,13 @@ discard block |
||
| 186 | 186 | ->setQuantity($item['quantity']) |
| 187 | 187 | ->setDescription($item['name']); |
| 188 | 188 | if ($promotedProduct) { |
| 189 | - $promotedAmount+=$product->getAmount(); |
|
| 189 | + $promotedAmount += $product->getAmount(); |
|
| 190 | 190 | $productId = $item['id_product']; |
| 191 | 191 | $finalPrice = Product::getPriceStatic($productId); |
| 192 | - $promotedMessage = 'Promoted Item: ' . $product->getDescription() . |
|
| 193 | - ' Price: ' . $finalPrice . |
|
| 194 | - ' Qty: ' . $product->getQuantity() . |
|
| 195 | - ' Item ID: ' . $item['id_product']; |
|
| 192 | + $promotedMessage = 'Promoted Item: '.$product->getDescription(). |
|
| 193 | + ' Price: '.$finalPrice. |
|
| 194 | + ' Qty: '.$product->getQuantity(). |
|
| 195 | + ' Item ID: '.$item['id_product']; |
|
| 196 | 196 | $metadataOrder->addMetadata('promotedProduct', $promotedMessage); |
| 197 | 197 | } |
| 198 | 198 | $details->addProduct($product); |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | Tools::redirect($cancelUrl); |
| 243 | 243 | } |
| 244 | 244 | |
| 245 | - $url =''; |
|
| 245 | + $url = ''; |
|
| 246 | 246 | try { |
| 247 | 247 | $orderClient = new \Pagantis\OrdersApiClient\Client( |
| 248 | 248 | $pagantisPublicKey, |
@@ -253,12 +253,12 @@ discard block |
||
| 253 | 253 | if ($order instanceof \Pagantis\OrdersApiClient\Model\Order) { |
| 254 | 254 | $url = $order->getActionUrls()->getForm(); |
| 255 | 255 | $orderId = $order->getId(); |
| 256 | - $sql = "INSERT INTO `" . _DB_PREFIX_ . "pagantis_order` (`id`, `order_id`) |
|
| 256 | + $sql = "INSERT INTO `"._DB_PREFIX_."pagantis_order` (`id`, `order_id`) |
|
| 257 | 257 | VALUES ('$cart->id','$orderId') |
| 258 | 258 | ON DUPLICATE KEY UPDATE `order_id` = '$orderId'"; |
| 259 | 259 | $result = Db::getInstance()->execute($sql); |
| 260 | 260 | if (!$result) { |
| 261 | - throw new UnknownException('Unable to save pagantis-order-id in database: '. $sql); |
|
| 261 | + throw new UnknownException('Unable to save pagantis-order-id in database: '.$sql); |
|
| 262 | 262 | } |
| 263 | 263 | } else { |
| 264 | 264 | throw new OrderNotFoundException(); |