pagantis / prestashop

controllers/front/AbstractController.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
     {
         $parsedUrl = parse_url($url);
         $separator = ($parsedUrl['query'] == null) ? '?' : '&';
-        $redirectUrl = $url. $separator . http_build_query($parameters);
+        $redirectUrl = $url.$separator.http_build_query($parameters);
         Tools::redirect($redirectUrl);
     }
 
@@ -76,8 +76,8 @@ 
                     $response = $exception->getMessage();
                 } else {
                     $response = 'Unable to serialize log.'.
-                        'data: '. json_encode($data).
-                        'exception: '. json_encode($exception);
+                        'data: '.json_encode($data).
+                        'exception: '.json_encode($exception);
                 }
             }
 

pagantis.php

Indentation +1 added lines, -1 removed lines

@@ -473,7 +473,7 @@
      * Get the form for editing the BackOffice options of the module
      *
      * @return array
-            */
+     */
     private function getConfigForm()
     {
         $products = explode(',', Pagantis::getExtraConfig('PRODUCTS', null));

Spacing +119 added lines, -119 removed lines

@@ -11,7 +11,7 @@ 
     exit;
 }
 
-define('_PS_PAGANTIS_DIR', _PS_MODULE_DIR_. '/pagantis');
+define('_PS_PAGANTIS_DIR', _PS_MODULE_DIR_.'/pagantis');
 define('PROMOTIONS_CATEGORY', 'pagantis-promotion-product');
 define('PROMOTIONS_CATEGORY_NAME', 'Pagantis Promoted Product');
 
@@ -162,14 +162,14 @@ 
         foreach ($products as $product) {
             $code = Tools::strtolower(Pagantis::getExtraConfig('CODE', $product));
             if ($code === 'p4x') {
-                Configuration::updateValue($code . '_simulator_is_enabled', 1);
+                Configuration::updateValue($code.'_simulator_is_enabled', 1);
             }
-            Configuration::updateValue($code . '_is_enabled', 0);
-            Configuration::updateValue($code . '_public_key', '');
-            Configuration::updateValue($code . '_private_key', '');
+            Configuration::updateValue($code.'_is_enabled', 0);
+            Configuration::updateValue($code.'_public_key', '');
+            Configuration::updateValue($code.'_private_key', '');
         }
 
-        $return =  (parent::install()
+        $return = (parent::install()
             && $this->registerHook('displayShoppingCart')
             && $this->registerHook('paymentOptions')
             && $this->registerHook('displayProductButtons')
@@ -215,34 +215,34 @@ 
     public function checkHooks()
     {
         try {
-            $sql_content = 'select * from ' . _DB_PREFIX_. 'hook_module where 
-            id_module = \'' . Module::getModuleIdByName($this->name) . '\' and 
-            id_shop = \'' . Shop::getContextShopID() . '\' and 
-            id_hook = \'' . Hook::getIdByName('header') . '\'';
+            $sql_content = 'select * from '._DB_PREFIX_.'hook_module where 
+            id_module = \'' . Module::getModuleIdByName($this->name).'\' and 
+            id_shop = \'' . Shop::getContextShopID().'\' and 
+            id_hook = \'' . Hook::getIdByName('header').'\'';
             $hook_exists = Db::getInstance()->ExecuteS($sql_content);
             if (empty($hook_exists)) {
-                $sql_insert = 'insert into ' . _DB_PREFIX_.  'hook_module 
+                $sql_insert = 'insert into '._DB_PREFIX_.'hook_module 
             (id_module, id_shop, id_hook, position)
             values
-            (\''. Module::getModuleIdByName($this->name) . '\',
-            \''. Shop::getContextShopID() . '\',
-            \''. Hook::getIdByName('header') . '\',
+            (\''. Module::getModuleIdByName($this->name).'\',
+            \''. Shop::getContextShopID().'\',
+            \''. Hook::getIdByName('header').'\',
             150)';
                 Db::getInstance()->execute($sql_insert);
             }
 
-            $sql_content = 'select * from ' . _DB_PREFIX_. 'hook_module where 
-            id_module = \'' . Module::getModuleIdByName($this->name) . '\' and 
-            id_shop = \'' . Shop::getContextShopID() . '\' and 
-            id_hook = \'' . Hook::getIdByName('displayProductPriceBlock') . '\'';
+            $sql_content = 'select * from '._DB_PREFIX_.'hook_module where 
+            id_module = \'' . Module::getModuleIdByName($this->name).'\' and 
+            id_shop = \'' . Shop::getContextShopID().'\' and 
+            id_hook = \'' . Hook::getIdByName('displayProductPriceBlock').'\'';
             $hook_exists = Db::getInstance()->ExecuteS($sql_content);
             if (empty($hook_exists)) {
-                $sql_insert = 'insert into ' . _DB_PREFIX_.  'hook_module 
+                $sql_insert = 'insert into '._DB_PREFIX_.'hook_module 
             (id_module, id_shop, id_hook, position)
             values
-            (\''. Module::getModuleIdByName($this->name) . '\',
-            \''. Shop::getContextShopID() . '\',
-            \''. Hook::getIdByName('displayProductPriceBlock') . '\',
+            (\''. Module::getModuleIdByName($this->name).'\',
+            \''. Shop::getContextShopID().'\',
+            \''. Hook::getIdByName('displayProductPriceBlock').'\',
             160)';
                 Db::getInstance()->execute($sql_insert);
             }
@@ -256,7 +256,7 @@ 
      */
     public function checkEnvVariables()
     {
-        $sql_content = 'select * from ' . _DB_PREFIX_. 'pagantis_config';
+        $sql_content = 'select * from '._DB_PREFIX_.'pagantis_config';
         $dbConfigs = Db::getInstance()->executeS($sql_content);
 
         // Convert a multimple dimension array for SQL insert statements into a simple key/value
@@ -285,10 +285,10 @@ 
     {
         try {
             $tableName = _DB_PREFIX_.'pagantis_order';
-            $sql = "show tables like '"   . $tableName . "'";
+            $sql = "show tables like '".$tableName."'";
             $data = Db::getInstance()->ExecuteS($sql);
             if (count($data) > 0) {
-                $sql = "desc "   . $tableName;
+                $sql = "desc ".$tableName;
                 $data = Db::getInstance()->ExecuteS($sql);
                 if (count($data) == 2) {
                     $sql = "ALTER TABLE $tableName ADD COLUMN ps_order_id VARCHAR(60) AFTER order_id";
@@ -296,10 +296,10 @@ 
                 }
             }
             $tableName = _DB_PREFIX_.'pagantis_config';
-            $sql = "show tables like '"   . $tableName . "'";
+            $sql = "show tables like '".$tableName."'";
             $data = Db::getInstance()->ExecuteS($sql);
             if (count($data) > 0) {
-                $sql = "desc "   . $tableName;
+                $sql = "desc ".$tableName;
                 $data = Db::getInstance()->ExecuteS($sql);
                 if (count($data) === 3 && $data[2]['Type'] !== 'varchar(5000)') {
                     $sql = "ALTER TABLE $tableName MODIFY `value` VARCHAR(5000)";
@@ -342,8 +342,8 @@ 
         $availableCurrencies       = array('EUR');
         $pagantisDisplayMinAmount  = $configs['DISPLAY_MIN_AMOUNT'];
         $pagantisDisplayMaxAmount  = $configs['DISPLAY_MAX_AMOUNT'];
-        $pagantisPublicKey         = Configuration::get(Tools::strtolower($configs['CODE']) . '_public_key');
-        $pagantisPrivateKey        = Configuration::get(Tools::strtolower($configs['CODE']) . '_private_key');
+        $pagantisPublicKey         = Configuration::get(Tools::strtolower($configs['CODE']).'_public_key');
+        $pagantisPrivateKey        = Configuration::get(Tools::strtolower($configs['CODE']).'_private_key');
         $this->allowedCountries    = unserialize(Pagantis::getExtraConfig('ALLOWED_COUNTRIES', null));
         $this->getUserLanguage();
         return (
@@ -422,42 +422,42 @@ 
             if ($this->isPaymentMethodAvailable($product)) {
                 $productConfigs = Pagantis::getExtraConfig($product, null);
                 $productConfigs = json_decode($productConfigs, true);
-                $publicKey = Configuration::get(Tools::strtolower($productConfigs['CODE']) . '_public_key');
-                $simulatorIsEnabled = Configuration::get(Tools::strtolower($productConfigs['CODE']) . '_simulator_is_enabled');
-                $isEnabled = Configuration::get(Tools::strtolower($productConfigs['CODE']) . '_is_enabled');
+                $publicKey = Configuration::get(Tools::strtolower($productConfigs['CODE']).'_public_key');
+                $simulatorIsEnabled = Configuration::get(Tools::strtolower($productConfigs['CODE']).'_simulator_is_enabled');
+                $isEnabled = Configuration::get(Tools::strtolower($productConfigs['CODE']).'_is_enabled');
 
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_TITLE'] = $this->l($productConfigs['TITLE']);
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_TITLE'] = $this->l($productConfigs['TITLE']);
                 unset($productConfigs['TITLE']);
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_AMOUNT'] = $orderTotal;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_PROMOTED_AMOUNT'] = $promotedAmount;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_LOCALE'] = $this->language;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_COUNTRY'] = $this->language;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_PUBLIC_KEY'] = $publicKey;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_SIMULATOR_IS_ENABLED'] = $simulatorIsEnabled;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_IS_ENABLED'] = $isEnabled;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_LOGO'] = 'https://cdn.digitalorigin.com/assets/master/logos/pg-favicon.png';
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_PAYMENT_URL'] = $link->getModuleLink('pagantis', 'payment') . '&product=' . $productConfigs['CODE'];
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_PS_VERSION'] = str_replace('.', '-', Tools::substr(_PS_VERSION_, 0, 3));
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_AMOUNT'] = $orderTotal;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_PROMOTED_AMOUNT'] = $promotedAmount;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_LOCALE'] = $this->language;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_COUNTRY'] = $this->language;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_PUBLIC_KEY'] = $publicKey;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_SIMULATOR_IS_ENABLED'] = $simulatorIsEnabled;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_IS_ENABLED'] = $isEnabled;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_LOGO'] = 'https://cdn.digitalorigin.com/assets/master/logos/pg-favicon.png';
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_PAYMENT_URL'] = $link->getModuleLink('pagantis', 'payment').'&product='.$productConfigs['CODE'];
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_PS_VERSION'] = str_replace('.', '-', Tools::substr(_PS_VERSION_, 0, 3));
 
                 foreach ($productConfigs as $productConfigKey => $productConfigValue) {
-                    $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . "_" . $productConfigKey] = $productConfigValue;
+                    $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE']))."_".$productConfigKey] = $productConfigValue;
                 }
                 $this->context->smarty->assign($templateConfigs);
 
                 $paymentOption = new PrestaShop\PrestaShop\Core\Payment\PaymentOption();
                 $uri = $link->getModuleLink('pagantis', 'payment');
                 if (strpos($uri, '?') !== false) {
-                    $uri .= '&product=' . $productConfigs['CODE'];
+                    $uri .= '&product='.$productConfigs['CODE'];
                 } else {
-                    $uri .= '?product=' . $productConfigs['CODE'];
+                    $uri .= '?product='.$productConfigs['CODE'];
                 }
                 $paymentOption
-                    ->setCallToActionText($templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_TITLE'])
+                    ->setCallToActionText($templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_TITLE'])
                     ->setAction($uri)
-                    ->setLogo($templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_LOGO'])
+                    ->setLogo($templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_LOGO'])
                     ->setModuleName(__CLASS__)
                     ->setAdditionalInformation(
-                        $this->fetch('module:pagantis/views/templates/hook/checkout-' . Tools::strtolower($productConfigs['CODE']) . '.tpl')
+                        $this->fetch('module:pagantis/views/templates/hook/checkout-'.Tools::strtolower($productConfigs['CODE']).'.tpl')
                     )
                 ;
                 $return[] = $paymentOption;
@@ -481,61 +481,61 @@ 
         foreach ($products as $product) {
             $code = Tools::strtolower(Pagantis::getExtraConfig('CODE', $product));
             $inputs[] = array(
-                'name' => $code .'_is_enabled',
-                'type' =>  (version_compare(_PS_VERSION_, '1.6')<0) ?'radio' :'switch',
-                'label' => $this->l('Module is enabled ' . $code),
+                'name' => $code.'_is_enabled',
+                'type' =>  (version_compare(_PS_VERSION_, '1.6') < 0) ? 'radio' : 'switch',
+                'label' => $this->l('Module is enabled '.$code),
                 'prefix' => '<i class="icon icon-key"></i>',
                 'class' => 't',
                 'required' => true,
                 'values'=> array(
                     array(
-                        'id' => $code .'_is_enabled_true',
+                        'id' => $code.'_is_enabled_true',
                         'value' => 1,
                         'label' => $this->l('Yes', get_class($this), null, false),
                     ),
                     array(
-                        'id' => $code . '_is_enabled_false',
+                        'id' => $code.'_is_enabled_false',
                         'value' => 0,
                         'label' => $this->l('No', get_class($this), null, false),
                     ),
                 )
             );
             $inputs[] = array(
-                'name' => $code . '_public_key',
+                'name' => $code.'_public_key',
                 'suffix' => $this->l('ex: pk_fd53cd467ba49022e4gf215e'),
                 'type' => 'text',
                 'size' => 60,
-                'label' => $this->l('Public Key ' . $code),
+                'label' => $this->l('Public Key '.$code),
                 'prefix' => '<i class="icon icon-key"></i>',
                 'col' => 6,
                 'required' => true,
             );
             $inputs[] = array(
-                'name' => $code . '_private_key',
+                'name' => $code.'_private_key',
                 'suffix' => $this->l('ex: 21e5723a97459f6a'),
                 'type' => 'text',
                 'size' => 60,
-                'label' => $this->l('Private Key ' . $code),
+                'label' => $this->l('Private Key '.$code),
                 'prefix' => '<i class="icon icon-key"></i>',
                 'col' => 6,
                 'required' => true,
             );
             if ($code !== "p4x") {
                 $inputs[] = array(
-                    'name' => $code . '_simulator_is_enabled',
-                    'type' => (version_compare(_PS_VERSION_, '1.6')<0) ?'radio' :'switch',
-                    'label' => $this->l('Simulator is enabled ' . $code),
+                    'name' => $code.'_simulator_is_enabled',
+                    'type' => (version_compare(_PS_VERSION_, '1.6') < 0) ? 'radio' : 'switch',
+                    'label' => $this->l('Simulator is enabled '.$code),
                     'prefix' => '<i class="icon icon-key"></i>',
                     'class' => 't',
                     'required' => true,
                     'values'=> array(
                         array(
-                            'id' => $code . '_simulator_is_enabled_on',
+                            'id' => $code.'_simulator_is_enabled_on',
                             'value' => 1,
                             'label' => $this->l('Yes'),
                         ),
                         array(
-                            'id' => $code . '_simulator_is_enabled_off',
+                            'id' => $code.'_simulator_is_enabled_off',
                             'value' => 0,
                             'label' => $this->l('No'),
                         ),
@@ -603,17 +603,17 @@ 
         $products = explode(',', Pagantis::getExtraConfig('PRODUCTS', null));
         foreach ($products as $product) {
             $code = Tools::strtolower(Pagantis::getExtraConfig('CODE', $product));
-            $settings[$code . '_public_key'] = Configuration::get($code . '_public_key');
-            $settings[$code . '_private_key'] = Configuration::get($code . '_private_key');
-            $settings[$code . '_is_enabled'] = Configuration::get($code . '_is_enabled');
+            $settings[$code.'_public_key'] = Configuration::get($code.'_public_key');
+            $settings[$code.'_private_key'] = Configuration::get($code.'_private_key');
+            $settings[$code.'_is_enabled'] = Configuration::get($code.'_is_enabled');
             if ($code !== 'p4x') {
-                $settings[$code . '_simulator_is_enabled'] = Configuration::get($code . '_simulator_is_enabled');
+                $settings[$code.'_simulator_is_enabled'] = Configuration::get($code.'_simulator_is_enabled');
             }
-            $settingsKeys[] = $code . '_is_enabled';
-            $settingsKeys[] = $code . '_public_key';
-            $settingsKeys[] = $code . '_private_key';
+            $settingsKeys[] = $code.'_is_enabled';
+            $settingsKeys[] = $code.'_public_key';
+            $settingsKeys[] = $code.'_private_key';
             if ($code !== 'p4x') {
-                $settingsKeys[] = $code . '_simulator_is_enabled';
+                $settingsKeys[] = $code.'_simulator_is_enabled';
             }
         }
 
@@ -684,43 +684,43 @@ 
             if ($this->isPaymentMethodAvailable($product)) {
                 $productConfigs = Pagantis::getExtraConfig($product, null);
                 $productConfigs = json_decode($productConfigs, true);
-                $publicKey = Configuration::get(Tools::strtolower($productConfigs['CODE']) . '_public_key');
-                $simulatorIsEnabled = Configuration::get(Tools::strtolower($productConfigs['CODE']) . '_simulator_is_enabled');
-                $isEnabled = Configuration::get(Tools::strtolower($productConfigs['CODE']) . '_is_enabled');
+                $publicKey = Configuration::get(Tools::strtolower($productConfigs['CODE']).'_public_key');
+                $simulatorIsEnabled = Configuration::get(Tools::strtolower($productConfigs['CODE']).'_simulator_is_enabled');
+                $isEnabled = Configuration::get(Tools::strtolower($productConfigs['CODE']).'_is_enabled');
 
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_TITLE'] = $this->l($productConfigs['TITLE']);
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_TITLE'] = $this->l($productConfigs['TITLE']);
                 unset($productConfigs['TITLE']);
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_AMOUNT'] = $orderTotal;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_PROMOTED_AMOUNT'] = $promotedAmount;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_LOCALE'] = $this->language;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_COUNTRY'] = $this->language;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_PUBLIC_KEY'] = $publicKey;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_SIMULATOR_IS_ENABLED'] = $simulatorIsEnabled;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_IS_ENABLED'] = $isEnabled;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_LOGO'] = 'https://cdn.digitalorigin.com/assets/master/logos/pg-favicon.png';
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_AMOUNT'] = $orderTotal;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_PROMOTED_AMOUNT'] = $promotedAmount;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_LOCALE'] = $this->language;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_COUNTRY'] = $this->language;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_PUBLIC_KEY'] = $publicKey;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_SIMULATOR_IS_ENABLED'] = $simulatorIsEnabled;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_IS_ENABLED'] = $isEnabled;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_LOGO'] = 'https://cdn.digitalorigin.com/assets/master/logos/pg-favicon.png';
                 $uri = $link->getModuleLink('pagantis', 'payment');
                 if (strpos($uri, '?') !== false) {
-                    $uri .= '&product=' . $productConfigs['CODE'];
+                    $uri .= '&product='.$productConfigs['CODE'];
                 } else {
-                    $uri .= '?product=' . $productConfigs['CODE'];
+                    $uri .= '?product='.$productConfigs['CODE'];
                 }
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_PAYMENT_URL'] = $uri;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_PS_VERSION'] = str_replace('.', '-', Tools::substr(_PS_VERSION_, 0, 3));
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_PAYMENT_URL'] = $uri;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_PS_VERSION'] = str_replace('.', '-', Tools::substr(_PS_VERSION_, 0, 3));
 
                 foreach ($productConfigs as $productConfigKey => $productConfigValue) {
-                    $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . "_" . $productConfigKey] = $productConfigValue;
+                    $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE']))."_".$productConfigKey] = $productConfigValue;
                 }
                 $this->context->smarty->assign($templateConfigs);
                 if ($supercheckout_enabled || $onepagecheckout_enabled || $onepagecheckoutps_enabled) {
                     $this->checkLogoExists();
                     $return .= $this->display(
                         __FILE__,
-                        'views/templates/hook/onepagecheckout-' . Tools::strtolower($productConfigs['CODE']) . '.tpl'
+                        'views/templates/hook/onepagecheckout-'.Tools::strtolower($productConfigs['CODE']).'.tpl'
                     );
                 } elseif (_PS_VERSION_ < 1.7) {
                     $return .= $this->display(
                         __FILE__,
-                        'views/templates/hook/checkout-' . Tools::strtolower($productConfigs['CODE']) . '.tpl'
+                        'views/templates/hook/checkout-'.Tools::strtolower($productConfigs['CODE']).'.tpl'
                     );
                 }
             }
@@ -753,12 +753,12 @@ 
             $productConfigs = Pagantis::getExtraConfig($product, null);
             $productConfigs = json_decode($productConfigs, true);
 
-            $publicKey = Configuration::get(Tools::strtolower($productConfigs['CODE']) . '_public_key');
-            $simulatorIsEnabled = Configuration::get(Tools::strtolower($productConfigs['CODE']) . '_simulator_is_enabled');
+            $publicKey = Configuration::get(Tools::strtolower($productConfigs['CODE']).'_public_key');
+            $simulatorIsEnabled = Configuration::get(Tools::strtolower($productConfigs['CODE']).'_simulator_is_enabled');
             if (Tools::strtolower($productConfigs['CODE']) === 'p4x') {
                 $simulatorIsEnabled = true;
             }
-            $isEnabled = Configuration::get(Tools::strtolower($productConfigs['CODE']) . '_is_enabled');
+            $isEnabled = Configuration::get(Tools::strtolower($productConfigs['CODE']).'_is_enabled');
             $availableSimulators = array(
                 'hookDisplayProductButtons' => array(
                     'sdk.simulator.types.SIMPLE',
@@ -781,30 +781,30 @@ 
                 in_array(Tools::strtolower($this->language), $allowedCountries) &&
                 (in_array($productConfigs['SIMULATOR_DISPLAY_TYPE'], $availableSimulators[$hookName]) || _PS_VERSION_ < 1.6)
             ) {
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_TITLE'] = $this->l($productConfigs['TITLE']);
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_SIMULATOR_TITLE'] = $this->l($productConfigs['SIMULATOR_TITLE']);
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_SIMULATOR_SUBTITLE'] = $this->l($productConfigs['SIMULATOR_SUBTITLE']);
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_TITLE'] = $this->l($productConfigs['TITLE']);
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_SIMULATOR_TITLE'] = $this->l($productConfigs['SIMULATOR_TITLE']);
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_SIMULATOR_SUBTITLE'] = $this->l($productConfigs['SIMULATOR_SUBTITLE']);
                 unset($productConfigs['TITLE']);
                 unset($productConfigs['SIMULATOR_TITLE']);
                 unset($productConfigs['SIMULATOR_SUBTITLE']);
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_AMOUNT'] = $amount;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_AMOUNT4X'] = number_format(($amount / 4), 2, '.', '');
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_IS_PROMOTED_PRODUCT'] = $isPromotedProduct;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_LOCALE'] = $this->language;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_COUNTRY'] = $this->language;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_PUBLIC_KEY'] = $publicKey;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_SIMULATOR_IS_ENABLED'] = $simulatorIsEnabled;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_IS_ENABLED'] = $isEnabled;
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_LOGO'] = 'https://cdn.digitalorigin.com/assets/master/logos/pg-favicon.png';
-                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . '_PS_VERSION'] = str_replace('.', '-', Tools::substr(_PS_VERSION_, 0, 3));
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_AMOUNT'] = $amount;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_AMOUNT4X'] = number_format(($amount / 4), 2, '.', '');
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_IS_PROMOTED_PRODUCT'] = $isPromotedProduct;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_LOCALE'] = $this->language;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_COUNTRY'] = $this->language;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_PUBLIC_KEY'] = $publicKey;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_SIMULATOR_IS_ENABLED'] = $simulatorIsEnabled;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_IS_ENABLED'] = $isEnabled;
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_LOGO'] = 'https://cdn.digitalorigin.com/assets/master/logos/pg-favicon.png';
+                $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])).'_PS_VERSION'] = str_replace('.', '-', Tools::substr(_PS_VERSION_, 0, 3));
                 foreach ($productConfigs as $productConfigKey => $productConfigValue) {
-                    $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE'])) . "_" . $productConfigKey] = $productConfigValue;
+                    $templateConfigs[Tools::strtoupper(Tools::strtolower($productConfigs['CODE']))."_".$productConfigKey] = $productConfigValue;
                 }
 
                 $this->context->smarty->assign($templateConfigs);
                 $return .= $this->display(
                     __FILE__,
-                    'views/templates/hook/product-simulator-' . Tools::strtolower($productConfigs['CODE']) . '.tpl'
+                    'views/templates/hook/product-simulator-'.Tools::strtolower($productConfigs['CODE']).'.tpl'
                 );
             }
         }
@@ -833,7 +833,7 @@ 
         // $params['type'] = weight | price | after_price
         if (isset($params['type']) && $params['type'] === 'price' &&
             isset($params['smarty']) && isset($params['smarty']->template_resource) &&
-            (strpos($params['smarty']->template_resource, 'product.tpl') !== false  ||
+            (strpos($params['smarty']->template_resource, 'product.tpl') !== false ||
             strpos($params['smarty']->template_resource, 'product-prices.tpl') !== false)
         ) {
             return $this->productPageSimulatorDisplay("hookDisplayProductPriceBlock");
@@ -866,16 +866,16 @@ 
         if (!in_array(PROMOTIONS_CATEGORY_NAME, $categories)) {
             /** @var CategoryCore $category */
             $category = new Category();
-            $categoryArray = array((int)Configuration::get('PS_LANG_DEFAULT')=> PROMOTIONS_CATEGORY );
+            $categoryArray = array((int) Configuration::get('PS_LANG_DEFAULT')=> PROMOTIONS_CATEGORY);
             $category->is_root_category = false;
             $category->link_rewrite = $categoryArray;
             $category->meta_description = $categoryArray;
             $category->meta_keywords = $categoryArray;
             $category->meta_title = $categoryArray;
-            $category->name = array((int)Configuration::get('PS_LANG_DEFAULT')=> PROMOTIONS_CATEGORY_NAME);
+            $category->name = array((int) Configuration::get('PS_LANG_DEFAULT')=> PROMOTIONS_CATEGORY_NAME);
             $category->id_parent = Configuration::get('PS_HOME_CATEGORY');
-            $category->active=0;
-            $description = 'Pagantis: Products with this category have free financing assumed by the merchant. ' .
+            $category->active = 0;
+            $description = 'Pagantis: Products with this category have free financing assumed by the merchant. '.
                 'Use it to promote your products or brands.';
             $category->description = $this->l($description);
             $category->save();
@@ -895,7 +895,7 @@ 
         }
 
         if (is_null($product)) {
-            $sql = 'SELECT value FROM '._DB_PREFIX_.'pagantis_config where config = \'' . pSQL($config) . '\' limit 1';
+            $sql = 'SELECT value FROM '._DB_PREFIX_.'pagantis_config where config = \''.pSQL($config).'\' limit 1';
             if ($results = Db::getInstance()->ExecuteS($sql)) {
                 if (is_array($results) && count($results) === 1 && isset($results[0]['value'])) {
                     return $results[0]['value'];
@@ -903,7 +903,7 @@ 
             }
         }
 
-        $sql = 'SELECT value FROM '._DB_PREFIX_.'pagantis_config where config = \'' . pSQL($product) . '\' limit 1';
+        $sql = 'SELECT value FROM '._DB_PREFIX_.'pagantis_config where config = \''.pSQL($product).'\' limit 1';
         if ($results = Db::getInstance()->ExecuteS($sql)) {
             if (is_array($results) && count($results) === 1 && isset($results[0]['value'])) {
                 $configs = json_decode($results[0]['value'], true);
@@ -923,10 +923,10 @@ 
      */
     public function checkLogoExists()
     {
-        $logoPg = _PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments/pagantis.png';
-        if (!file_exists($logoPg) && is_dir(_PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments')) {
+        $logoPg = _PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments/pagantis.png';
+        if (!file_exists($logoPg) && is_dir(_PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments')) {
             copy(
-                _PS_PAGANTIS_DIR . '/logo.png',
+                _PS_PAGANTIS_DIR.'/logo.png',
                 $logoPg
             );
         }
@@ -942,7 +942,7 @@ 
         if (count($langArray) != 2 && isset($lang['locale'])) {
             $langArray = explode("-", $lang['locale']);
         }
-        $this->language = Tools::strtoupper($langArray[count($langArray)-1]);
+        $this->language = Tools::strtoupper($langArray[count($langArray) - 1]);
         // Prevent null language detection
         if (in_array(Tools::strtolower($this->language), $this->allowedCountries)) {
             return;

controllers/front/api.php

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 
         header('HTTP/1.1 200 Ok', true, 200);
         header('Content-Type: application/json', true);
-        header('Content-Length: ' . Tools::strlen($result));
+        header('Content-Length: '.Tools::strlen($result));
 
         echo $result;
         exit();
@@ -83,7 +83,7 @@ 
     {
         $productCode = Tools::getValue('product', false);
         $products = explode(',', Pagantis::getExtraConfig('PRODUCTS', null));
-        $privateKey = Configuration::get(Tools::strtolower($productCode) . '_private_key');
+        $privateKey = Configuration::get(Tools::strtolower($productCode).'_private_key');
         $privateKeyGet = Tools::getValue('secret', false);
         if (!empty($privateKeyGet) && $privateKeyGet === $privateKey && in_array(Tools::strtoupper($productCode), $products)) {
             return true;
@@ -96,7 +96,7 @@ 
 
         header('HTTP/1.1 403 Forbidden', true, 403);
         header('Content-Type: application/json', true);
-        header('Content-Length: ' . Tools::strlen($result));
+        header('Content-Length: '.Tools::strlen($result));
 
         echo $result;
         exit();

controllers/front/log.php

Spacing +4 added lines, -4 removed lines

@@ -36,9 +36,9 @@ 
             $limit = Tools::getValue('limit');
         }
         if (Tools::getValue('from', false)) {
-            $where = 'WHERE createdAt >= \'' . Tools::getValue('from') . '\'';
+            $where = 'WHERE createdAt >= \''.Tools::getValue('from').'\'';
         }
-        $sql = 'SELECT * FROM ' . _DB_PREFIX_ . 'pagantis_log ' . $where . ' ORDER BY id desc LIMIT ' . $limit;
+        $sql = 'SELECT * FROM '._DB_PREFIX_.'pagantis_log '.$where.' ORDER BY id desc LIMIT '.$limit;
         if ($results = Db::getInstance()->ExecuteS($sql)) {
             foreach ($results as $row) {
                 $data = (is_null(json_decode($row['log']))) ? $row['log'] : json_decode($row['log']);
@@ -65,7 +65,7 @@ 
 
         header('HTTP/1.1 200 Ok', true, 200);
         header('Content-Type: application/json', true);
-        header('Content-Length: ' . Tools::strlen($result));
+        header('Content-Length: '.Tools::strlen($result));
 
         echo $result;
         exit();
@@ -78,7 +78,7 @@ 
     {
         $productCode = Tools::getValue('product', false);
         $products = explode(',', Pagantis::getExtraConfig('PRODUCTS', null));
-        $privateKey = Configuration::get(Tools::strtolower($productCode) . '_private_key');
+        $privateKey = Configuration::get(Tools::strtolower($productCode).'_private_key');
         $privateKeyGet = Tools::getValue('secret', false);
         if (!empty($privateKeyGet) && $privateKeyGet === $privateKey && in_array(Tools::strtoupper($productCode), $products)) {
             return true;

controllers/front/payment.php

Spacing +29 added lines, -29 removed lines

@@ -28,9 +28,9 @@ 
     {
         if (_PS_VERSION_ < 1.6) {
             Logger::addLog(
-                'Pagantis Exception For user ' .
-                $customer->email .
-                ' : ' .
+                'Pagantis Exception For user '.
+                $customer->email.
+                ' : '.
                 $exception->getMessage(),
                 3,
                 $exception->getCode(),
@@ -40,9 +40,9 @@ 
             );
         } else {
             PrestaShopLogger::addLog(
-                'Pagantis Exception For user ' .
-                $customer->email .
-                ' : ' .
+                'Pagantis Exception For user '.
+                $customer->email.
+                ' : '.
                 $exception->getMessage(),
                 3,
                 $exception->getCode(),
@@ -86,15 +86,15 @@ 
         $configs = json_decode(Pagantis::getExtraConfig($product, null), true);
         $iframe = Pagantis::getExtraConfig('FORM_DISPLAY_TYPE', $product);
 
-        $pagantisPublicKey = Configuration::get(Tools::strtolower($configs['CODE']) . '_public_key');
-        $pagantisPrivateKey = Configuration::get(Tools::strtolower($configs['CODE']) . '_private_key');
+        $pagantisPublicKey = Configuration::get(Tools::strtolower($configs['CODE']).'_public_key');
+        $pagantisPrivateKey = Configuration::get(Tools::strtolower($configs['CODE']).'_private_key');
 
         $okUrl = _PS_BASE_URL_SSL_.__PS_BASE_URI__
-            .'index.php?canonical=true&fc=module&module=pagantis&controller=notify&origin=redirect&product=' . Tools::strtolower($configs['CODE']) . '&'
+            .'index.php?canonical=true&fc=module&module=pagantis&controller=notify&origin=redirect&product='.Tools::strtolower($configs['CODE']).'&'
             .http_build_query($query)
         ;
         $notificationOkUrl = _PS_BASE_URL_SSL_.__PS_BASE_URI__
-            .'index.php?canonical=true&fc=module&module=pagantis&controller=notify&origin=notification&product=' . Tools::strtolower($configs['CODE']) . '&'
+            .'index.php?canonical=true&fc=module&module=pagantis&controller=notify&origin=notification&product='.Tools::strtolower($configs['CODE']).'&'
             .http_build_query($query)
         ;
 
@@ -109,27 +109,27 @@ 
 
         try {
             $shippingCountry = Country::getIsoById($shippingAddress->id_country);
-            $userAddress =  new \Pagantis\OrdersApiClient\Model\Order\User\Address();
+            $userAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address();
             $userAddress
                 ->setZipCode($shippingAddress->postcode)
-                ->setFullName($shippingAddress->firstname . ' ' . $shippingAddress->lastname)
+                ->setFullName($shippingAddress->firstname.' '.$shippingAddress->lastname)
                 ->setCountryCode($shippingCountry)
                 ->setCity($shippingAddress->city)
-                ->setAddress($shippingAddress->address1 . ' ' . $shippingAddress->address2)
+                ->setAddress($shippingAddress->address1.' '.$shippingAddress->address2)
                 ->setTaxId($this->getTaxId($customer, $shippingAddress, $billingAddress))
                 ->setNationalId($this->getNationalId($customer, $shippingAddress, $billingAddress))
                 ->setDni($this->getNationalId($customer, $shippingAddress, $billingAddress))
             ;
 
-            $orderShippingAddress =  new \Pagantis\OrdersApiClient\Model\Order\User\Address();
+            $orderShippingAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address();
             $shippingPhone = (empty($shippingAddress->phone_mobile)) ?
                 $shippingAddress->phone : $shippingAddress->phone_mobile;
             $orderShippingAddress
                 ->setZipCode($shippingAddress->postcode)
-                ->setFullName($shippingAddress->firstname . ' ' . $shippingAddress->lastname)
+                ->setFullName($shippingAddress->firstname.' '.$shippingAddress->lastname)
                 ->setCountryCode($shippingCountry)
                 ->setCity($shippingAddress->city)
-                ->setAddress($shippingAddress->address1 . ' ' . $shippingAddress->address2)
+                ->setAddress($shippingAddress->address1.' '.$shippingAddress->address2)
                 ->setTaxId($this->getTaxId($customer, $shippingAddress, $billingAddress))
                 ->setNationalId($this->getNationalId($customer, $shippingAddress, $billingAddress))
                 ->setDni($this->getNationalId($customer, $shippingAddress, $billingAddress))
@@ -143,10 +143,10 @@ 
                 $billingAddress->phone : $billingAddress->phone_mobile;
             $orderBillingAddress
                 ->setZipCode($billingAddress->postcode)
-                ->setFullName($billingAddress->firstname . ' ' . $billingAddress->lastname)
+                ->setFullName($billingAddress->firstname.' '.$billingAddress->lastname)
                 ->setCountryCode($billingCountry)
                 ->setCity($billingAddress->city)
-                ->setAddress($billingAddress->address1 . ' ' . $billingAddress->address2)
+                ->setAddress($billingAddress->address1.' '.$billingAddress->address2)
                 ->setTaxId($this->getTaxId($customer, $billingAddress, $shippingAddress))
                 ->setNationalId($this->getNationalId($customer, $billingAddress, $shippingAddress))
                 ->setDni($this->getNationalId($customer, $shippingAddress, $billingAddress))
@@ -169,7 +169,7 @@ 
                 ->setDni($this->getNationalId($customer, $shippingAddress, $billingAddress))
             ;
 
-            if ($customer->birthday!='0000-00-00') {
+            if ($customer->birthday != '0000-00-00') {
                 $orderUser->setDateOfBirth($customer->birthday);
             }
 
@@ -203,13 +203,13 @@ 
                     ->setQuantity($item['quantity'])
                     ->setDescription($item['name']);
                 if ($promotedProduct) {
-                    $promotedAmount+=$product->getAmount();
+                    $promotedAmount += $product->getAmount();
                     $productId = $item['id_product'];
                     $finalPrice = Product::getPriceStatic($productId);
-                    $promotedMessage = 'Promoted Item: ' . $product->getDescription() .
-                        ' Price: ' . $finalPrice .
-                        ' Qty: ' . $product->getQuantity() .
-                        ' Item ID: ' . $item['id_product'];
+                    $promotedMessage = 'Promoted Item: '.$product->getDescription().
+                        ' Price: '.$finalPrice.
+                        ' Qty: '.$product->getQuantity().
+                        ' Item ID: '.$item['id_product'];
                     $metadataOrder->addMetadata('promotedProduct', $promotedMessage);
                 }
                 $details->addProduct($product);
@@ -260,7 +260,7 @@ 
             Tools::redirect($cancelUrl);
         }
 
-        $url ='';
+        $url = '';
         try {
             $orderClient = new \Pagantis\OrdersApiClient\Client(
                 trim($pagantisPublicKey),
@@ -272,12 +272,12 @@ 
                 $url = $order->getActionUrls()->getForm();
                 /** @var string $orderId MD5 value */
                 $orderId = $order->getId();
-                $sql = "INSERT INTO `" . _DB_PREFIX_ . "pagantis_order` (`id`, `order_id`)
+                $sql = "INSERT INTO `"._DB_PREFIX_."pagantis_order` (`id`, `order_id`)
                      VALUES ('$cart->id','$orderId') 
                      ON DUPLICATE KEY UPDATE `order_id` = '$orderId'";
                 $result = Db::getInstance()->execute($sql);
                 if (!$result) {
-                    throw new UnknownException('Unable to save pagantis-order-id in database: '. $sql);
+                    throw new UnknownException('Unable to save pagantis-order-id in database: '.$sql);
                 }
             } else {
                 throw new OrderNotFoundException();
@@ -409,13 +409,13 @@ 
      */
     private function getUserLanguage($shippingAddress = null, $billingAddress = null)
     {
-        $allowedCountries    = unserialize(Pagantis::getExtraConfig('ALLOWED_COUNTRIES', null));
+        $allowedCountries = unserialize(Pagantis::getExtraConfig('ALLOWED_COUNTRIES', null));
         $lang = Language::getLanguage($this->context->language->id);
         $langArray = explode("-", $lang['language_code']);
         if (count($langArray) != 2 && isset($lang['locale'])) {
             $langArray = explode("-", $lang['locale']);
         }
-        $language = Tools::strtoupper($langArray[count($langArray)-1]);
+        $language = Tools::strtoupper($langArray[count($langArray) - 1]);
         // Prevent null language detection
         if (in_array(Tools::strtolower($language), $allowedCountries)) {
             return $language;

controllers/front/notify.php

Spacing +45 added lines, -45 removed lines

@@ -138,7 +138,7 @@ 
         } catch (\Exception $exception) {
             $thrownException = true;
             $this->getMerchantOrderId();
-            $theId = ($this->merchantOrderId)? $this->merchantOrderId : $this->merchantCartId;
+            $theId = ($this->merchantOrderId) ? $this->merchantOrderId : $this->merchantCartId;
             if ($this->isPost()) {
                 $this->jsonResponse = new JsonExceptionResponse();
                 $this->jsonResponse->setMerchantOrderId($theId);
@@ -152,7 +152,7 @@ 
             if (!$thrownException) {
                 $this->jsonResponse = new JsonSuccessResponse();
                 $this->getMerchantOrderId();
-                $theId = ($this->merchantOrderId)? $this->merchantOrderId : $this->merchantCartId;
+                $theId = ($this->merchantOrderId) ? $this->merchantOrderId : $this->merchantCartId;
                 $this->jsonResponse->setMerchantOrderId($theId);
                 $this->jsonResponse->setPagantisOrderId($this->pagantisOrderId);
                 $this->confirmPagantisOrder();
@@ -161,7 +161,7 @@ 
             $this->rollbackMerchantOrder();
             if ($this->isNotification()) {
                 $this->getMerchantOrderId();
-                $theId = ($this->merchantOrderId)? $this->merchantOrderId : $this->merchantCartId;
+                $theId = ($this->merchantOrderId) ? $this->merchantOrderId : $this->merchantCartId;
                 $this->jsonResponse = new JsonExceptionResponse();
                 $this->jsonResponse->setMerchantOrderId($theId);
                 $this->jsonResponse->setPagantisOrderId($this->pagantisOrderId);
@@ -228,13 +228,13 @@ 
         $products = explode(',', Pagantis::getExtraConfig('PRODUCTS', null));
         if (!in_array(Tools::strtoupper($productCode), $products)) {
             throw new UnknownException(
-                'No valid Pagantis product provided in the url: ' . Tools::getValue('product')
+                'No valid Pagantis product provided in the url: '.Tools::getValue('product')
             );
         }
-        $this->productName = "Pagantis " . Tools::strtolower($productCode);
+        $this->productName = "Pagantis ".Tools::strtolower($productCode);
 
-        $this->config['publicKey'] = trim(Configuration::get(Tools::strtolower($productCode) . '_public_key'));
-        $this->config['privateKey'] = trim(Configuration::get(Tools::strtolower($productCode) . '_private_key'));
+        $this->config['publicKey'] = trim(Configuration::get(Tools::strtolower($productCode).'_public_key'));
+        $this->config['privateKey'] = trim(Configuration::get(Tools::strtolower($productCode).'_private_key'));
 
         $this->merchantCartId = Tools::getValue('id_cart');
 
@@ -254,8 +254,8 @@ 
     public function getMerchantOrderId()
     {
         try {
-            $table = _DB_PREFIX_ .self::ORDERS_TABLE;
-            $sql = 'select ps_order_id from ' . $table .' where id = ' .(int)$this->merchantCartId;
+            $table = _DB_PREFIX_.self::ORDERS_TABLE;
+            $sql = 'select ps_order_id from '.$table.' where id = '.(int) $this->merchantCartId;
             $this->merchantOrderId = Db::getInstance()->getValue($sql);
         } catch (\Exception $exception) {
             $exceptionMessage = sprintf(
@@ -299,8 +299,8 @@ 
     private function getPagantisOrderId()
     {
         try {
-            $this->pagantisOrderId= Db::getInstance()->getValue(
-                'select order_id from '._DB_PREFIX_.self::ORDERS_TABLE.' where id = '.(int)$this->merchantCartId
+            $this->pagantisOrderId = Db::getInstance()->getValue(
+                'select order_id from '._DB_PREFIX_.self::ORDERS_TABLE.' where id = '.(int) $this->merchantCartId
             );
 
             if (is_null($this->pagantisOrderId)) {
@@ -334,7 +334,7 @@ 
     {
         if ($this->pagantisOrder->getStatus() === PagantisModelOrder::STATUS_CONFIRMED) {
             $this->getMerchantOrderId();
-            $theId = ($this->merchantOrderId)? $this->merchantOrderId : $this->merchantCartId;
+            $theId = ($this->merchantOrderId) ? $this->merchantOrderId : $this->merchantCartId;
             $this->jsonResponse = new JsonSuccessResponse();
             $this->jsonResponse->setMerchantOrderId($theId);
             $this->jsonResponse->setPagantisOrderId($this->pagantisOrderId);
@@ -366,7 +366,7 @@ 
                 $psTotalAmount = substr_replace(
                     $merchantAmount,
                     '.',
-                    (Tools::strlen($merchantAmount) -2),
+                    (Tools::strlen($merchantAmount) - 2),
                     0
                 );
 
@@ -374,14 +374,14 @@ 
                 $pgTotalAmount = substr_replace(
                     $pgTotalAmountInCents,
                     '.',
-                    (Tools::strlen($pgTotalAmountInCents) -2),
+                    (Tools::strlen($pgTotalAmountInCents) - 2),
                     0
                 );
 
-                $this->amountMismatchError = '. Amount mismatch in PrestaShop Cart #'. $this->merchantCartId .
-                    ' compared with Pagantis Order: ' . $this->pagantisOrderId .
-                    '. The Cart in PrestaShop has an amount of ' . $psTotalAmount . ' and in Pagantis ' .
-                    $pgTotalAmount . ' PLEASE REVIEW THE ORDER';
+                $this->amountMismatchError = '. Amount mismatch in PrestaShop Cart #'.$this->merchantCartId.
+                    ' compared with Pagantis Order: '.$this->pagantisOrderId.
+                    '. The Cart in PrestaShop has an amount of '.$psTotalAmount.' and in Pagantis '.
+                    $pgTotalAmount.' PLEASE REVIEW THE ORDER';
 
                 $this->saveLog(array(
                     'requestId' => $this->requestId,
@@ -421,11 +421,11 @@ 
             }
 
             // Double check
-            $tableName = _DB_PREFIX_ . self::ORDERS_TABLE;
+            $tableName = _DB_PREFIX_.self::ORDERS_TABLE;
             $fieldName = 'ps_order_id';
-            $sql = ('select ' . $fieldName . ' from `' . $tableName . '` where `id` = ' . (int)$this->merchantCartId
-                . ' and `order_id` = \'' . $this->pagantisOrderId . '\''
-                . ' and `' . $fieldName . '` is not null');
+            $sql = ('select '.$fieldName.' from `'.$tableName.'` where `id` = '.(int) $this->merchantCartId
+                . ' and `order_id` = \''.$this->pagantisOrderId.'\''
+                . ' and `'.$fieldName.'` is not null');
             $results = Db::getInstance()->ExecuteS($sql);
             if (is_array($results) && count($results) === 1) {
                 $this->getMerchantOrderId();
@@ -465,9 +465,9 @@ 
                 Configuration::get('PS_OS_PAYMENT'),
                 $this->merchantCart->getOrderTotal(true),
                 $this->productName,
-                'pagantisOrderId: ' . $this->pagantisOrder->getId() . ' ' .
-                'pagantisOrderStatus: '. $this->pagantisOrder->getStatus() .
-                $this->amountMismatchError .
+                'pagantisOrderId: '.$this->pagantisOrder->getId().' '.
+                'pagantisOrderStatus: '.$this->pagantisOrder->getStatus().
+                $this->amountMismatchError.
                 $metadataInfo,
                 array('transaction_id' => $this->pagantisOrderId),
                 null,
@@ -481,7 +481,7 @@ 
             Db::getInstance()->update(
                 self::ORDERS_TABLE,
                 array('ps_order_id' => $this->module->currentOrder),
-                'id = '. (int)$this->merchantCartId . ' and order_id = \'' . $this->pagantisOrderId . '\''
+                'id = '.(int) $this->merchantCartId.' and order_id = \''.$this->pagantisOrderId.'\''
             );
 
         } catch (\Exception $exception) {
@@ -508,9 +508,9 @@ 
             $this->orderClient->confirmOrder($this->pagantisOrderId);
             try {
                 $mode = ($this->isPost()) ? 'NOTIFICATION' : 'REDIRECTION';
-                $message = 'Order CONFIRMED. The order was confirmed by a ' . $mode .
-                    '. Pagantis OrderId=' . $this->pagantisOrderId .
-                    '. Prestashop OrderId=' . $this->module->currentOrder;
+                $message = 'Order CONFIRMED. The order was confirmed by a '.$mode.
+                    '. Pagantis OrderId='.$this->pagantisOrderId.
+                    '. Prestashop OrderId='.$this->module->currentOrder;
                 $this->saveLog(array('requestId' => $this->requestId, 'message' => $message));
             } catch (\Exception $exception) {
                 $exceptionMessage = sprintf(
@@ -537,16 +537,16 @@ 
     {
         try {
             $this->getMerchantOrderId();
-            $message = 'Roolback method: ' .
-                '. Pagantis OrderId=' . $this->pagantisOrderId .
-                '. Prestashop CartId=' . $this->merchantCartId .
-                '. Prestashop OrderId=' . $this->merchantOrderId;
+            $message = 'Roolback method: '.
+                '. Pagantis OrderId='.$this->pagantisOrderId.
+                '. Prestashop CartId='.$this->merchantCartId.
+                '. Prestashop OrderId='.$this->merchantOrderId;
             if ($this->module->currentOrder) {
                 $objOrder = new Order($this->module->currentOrder);
                 $history = new OrderHistory();
-                $history->id_order = (int)$objOrder->id;
-                $history->changeIdOrderState(8, (int)($objOrder->id));
-                $message .= ' Prestashop OrderId=' . $this->merchantCartId;
+                $history->id_order = (int) $objOrder->id;
+                $history->changeIdOrderState(8, (int) ($objOrder->id));
+                $message .= ' Prestashop OrderId='.$this->merchantCartId;
             }
             $this->saveLog(array(
                 'requestId' => $this->requestId,
@@ -571,7 +571,7 @@ 
     {
         try {
             $table = self::CART_TABLE;
-            $insertBlock = Db::getInstance()->insert($table, array('id' =>(int)$orderId, 'timestamp' =>(time())));
+            $insertBlock = Db::getInstance()->insert($table, array('id' =>(int) $orderId, 'timestamp' =>(time())));
             if ($insertBlock === false) {
                 if ($this->isNotification()) {
                     throw new ConcurrencyException();
@@ -581,11 +581,11 @@ 
                               as rest FROM %s WHERE %s",
                         self::CONCURRENCY_TIMEOUT,
                         _DB_PREFIX_.$table,
-                        'id='.(int)$orderId
+                        'id='.(int) $orderId
                     );
                     $resultSeconds = Db::getInstance()->getValue($query);
                     $restSeconds = isset($resultSeconds) ? ($resultSeconds) : 0;
-                    $secondsToExpire = ($restSeconds>self::CONCURRENCY_TIMEOUT) ?
+                    $secondsToExpire = ($restSeconds > self::CONCURRENCY_TIMEOUT) ?
                         self::CONCURRENCY_TIMEOUT : $restSeconds;
                     if ($secondsToExpire > 0) {
                         sleep($secondsToExpire + 1);
@@ -594,7 +594,7 @@ 
                     $this->getMerchantOrderId();
                     $this->getPagantisOrderId();
 
-                    $logMessage  = sprintf(
+                    $logMessage = sprintf(
                         "User has waited %s seconds, default %s, bd time to expire %s [cartId=%s][origin=%s]",
                         $secondsToExpire,
                         self::CONCURRENCY_TIMEOUT,
@@ -623,10 +623,10 @@ 
     {
         try {
             if (is_null($orderId)) {
-                Db::getInstance()->delete(self::CART_TABLE, 'timestamp < ' . (time() - self::CONCURRENCY_TIMEOUT));
+                Db::getInstance()->delete(self::CART_TABLE, 'timestamp < '.(time() - self::CONCURRENCY_TIMEOUT));
                 return;
             }
-            Db::getInstance()->delete(self::CART_TABLE, 'id = ' . (int)$orderId);
+            Db::getInstance()->delete(self::CART_TABLE, 'id = '.(int) $orderId);
         } catch (\Exception $exception) {
             throw new ConcurrencyException();
         }
@@ -651,8 +651,8 @@ 
             'merchantCartId' => $this->merchantCartId,
             'merchantOrderId' => $this->merchantOrderId,
             'pagantisOrderId' => $this->pagantisOrderId,
-            'message' => ($exception)? $exception->getMessage() : 'Unable to get Exception message',
-            'statusCode' => ($exception)? $exception->getCode() : 'Unable to get Exception statusCode',
+            'message' => ($exception) ? $exception->getMessage() : 'Unable to get Exception message',
+            'statusCode' => ($exception) ? $exception->getCode() : 'Unable to get Exception statusCode',
             'method' => $method,
             'file' => __FILE__,
             'line' => $line,
@@ -688,7 +688,7 @@ 
                 'id_module' => $this->module->id,
                 'id_order' => ($this->pagantisOrder) ? $this->pagantisOrder->getId() : null,
             );
-            $url = ($error)? $this->config['urlKO'] : $this->config['urlOK'];
+            $url = ($error) ? $this->config['urlKO'] : $this->config['urlOK'];
             $returnMessage = sprintf(
                 "[origin=%s][cartId=%s][prestashopOrderId=%s][pagantisOrderId=%s][returnUrl=%s]",
                 $this->getOrigin(),

controllers/front/config.php

Spacing +11 added lines, -11 removed lines

@@ -18,13 +18,13 @@ 
     public function initContent()
     {
         $this->authorize();
-        $method = Tools::strtolower($_SERVER['REQUEST_METHOD']) . "Method";
+        $method = Tools::strtolower($_SERVER['REQUEST_METHOD'])."Method";
         $params = (_PS_VERSION_ < 1.6) ? $_POST + $_GET : Tools::getAllValues();
         if (method_exists($this, $method)) {
             header('HTTP/1.1 200 Ok', true, 200);
             header('Content-Type: application/json', true);
             $result = json_encode($this->{$method}($params['product']));
-            header('Content-Length: ' . Tools::strlen($result));
+            header('Content-Length: '.Tools::strlen($result));
             echo $result;
             exit();
         }
@@ -40,17 +40,17 @@ 
      */
     public function getExtraConfigs($product = null)
     {
-        $availableProductsSQL = 'select * from ' . _DB_PREFIX_. 'pagantis_config where config = \'PRODUCTS\'';
+        $availableProductsSQL = 'select * from '._DB_PREFIX_.'pagantis_config where config = \'PRODUCTS\'';
         $dbProducts = Db::getInstance()->executeS($availableProductsSQL);
         $availableProductsArray = explode(',', $dbProducts[0]['value']);
         $unrequestedProducts = array_diff($availableProductsArray, array($product));
         $unrequestedProductSQL = '';
         foreach ($unrequestedProducts as $unrequestedProduct) {
-            $unrequestedProductSQL .= "'". $unrequestedProduct . "',";
+            $unrequestedProductSQL .= "'".$unrequestedProduct."',";
         }
         $unrequestedProductSQL = rtrim($unrequestedProductSQL, ",");
-        $sql_content = 'select * from ' . _DB_PREFIX_.
-            'pagantis_config where config not in (' . $unrequestedProductSQL . ') 
+        $sql_content = 'select * from '._DB_PREFIX_.
+            'pagantis_config where config not in ('.$unrequestedProductSQL.') 
              and config not like (\'PAGANTIS_%\')  and config not like (\'PMT_%\') ';
 
         $dbConfigs = Db::getInstance()->executeS($sql_content);
@@ -81,8 +81,8 @@ 
         unset($params['secret']);
         $product = $params['product'];
         unset($params['product']);
-        $productConfigsSQL = 'select * from ' . _DB_PREFIX_.
-            'pagantis_config where config = \''. pSQL($product) . '\'';
+        $productConfigsSQL = 'select * from '._DB_PREFIX_.
+            'pagantis_config where config = \''.pSQL($product).'\'';
         $productConfigs = Db::getInstance()->executeS($productConfigsSQL);
         $availableProductsArray = json_decode($productConfigs[0]['value'], true);
         if (count($params) > 0) {
@@ -96,7 +96,7 @@ 
                             Db::getInstance()->update(
                                 'pagantis_config',
                                 array('value' => pSQL($value)),
-                                'config = \''. pSQL($config) .'\''
+                                'config = \''.pSQL($config).'\''
                             );
                         }
                     } else {
@@ -106,7 +106,7 @@ 
                 Db::getInstance()->update(
                     'pagantis_config',
                     array('value' => json_encode($availableProductsArray)),
-                    'config = \''. pSQL($product) .'\''
+                    'config = \''.pSQL($product).'\''
                 );
             }
         } else {
@@ -138,7 +138,7 @@ 
     {
         $productCode = Tools::getValue('product', false);
         $products = explode(',', Pagantis::getExtraConfig('PRODUCTS', null));
-        $privateKey = Configuration::get(Tools::strtolower($productCode) . '_private_key');
+        $privateKey = Configuration::get(Tools::strtolower($productCode).'_private_key');
         $privateKeyGet = Tools::getValue('secret', false);
         if (!empty($privateKeyGet) && $privateKeyGet === $privateKey && in_array(Tools::strtoupper($productCode), $products)) {
             return true;