pagantis / prestashop

controllers/front/payment.php

Spacing +18 added lines, -18 removed lines

@@ -25,9 +25,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(),
@@ -37,9 +37,9 @@ 
             );
         } else {
             PrestaShopLogger::addLog(
-                'Pagantis Exception For user ' .
-                $customer->email .
-                ' : ' .
+                'Pagantis Exception For user '.
+                $customer->email.
+                ' : '.
                 $exception->getMessage(),
                 3,
                 $exception->getCode(),
@@ -98,22 +98,22 @@ 
         );
 
         try {
-            $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('ES')
                 ->setCity($shippingAddress->city)
-                ->setAddress($shippingAddress->address1 . ' ' . $shippingAddress->address2)
+                ->setAddress($shippingAddress->address1.' '.$shippingAddress->address2)
             ;
 
-            $orderShippingAddress =  new \Pagantis\OrdersApiClient\Model\Order\User\Address();
+            $orderShippingAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address();
             $orderShippingAddress
                 ->setZipCode($shippingAddress->postcode)
-                ->setFullName($shippingAddress->firstname . ' ' . $shippingAddress->lastname)
+                ->setFullName($shippingAddress->firstname.' '.$shippingAddress->lastname)
                 ->setCountryCode('ES')
                 ->setCity($shippingAddress->city)
-                ->setAddress($shippingAddress->address1 . ' ' . $shippingAddress->address2)
+                ->setAddress($shippingAddress->address1.' '.$shippingAddress->address2)
                 ->setDni($shippingAddress->dni)
                 ->setFixPhone($shippingAddress->phone)
                 ->setMobilePhone($shippingAddress->phone_mobile)
@@ -122,10 +122,10 @@ 
             $orderBillingAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address();
             $orderBillingAddress
                 ->setZipCode($billingAddress->postcode)
-                ->setFullName($billingAddress->firstname . ' ' . $billingAddress->lastname)
+                ->setFullName($billingAddress->firstname.' '.$billingAddress->lastname)
                 ->setCountryCode('ES')
                 ->setCity($billingAddress->city)
-                ->setAddress($billingAddress->address1 . ' ' . $billingAddress->address2)
+                ->setAddress($billingAddress->address1.' '.$billingAddress->address2)
                 ->setDni($billingAddress->dni)
                 ->setFixPhone($billingAddress->phone)
                 ->setMobilePhone($billingAddress->phone_mobile)
@@ -143,7 +143,7 @@ 
                 ->setDni($shippingAddress->dni)
             ;
 
-            if ($customer->birthday!='0000-00-00') {
+            if ($customer->birthday != '0000-00-00') {
                 $orderUser->setDateOfBirth($customer->birthday);
             }
 
@@ -219,7 +219,7 @@ 
             Tools::redirect($cancelUrl);
         }
 
-        $url ='';
+        $url = '';
         try {
             $orderClient = new \Pagantis\OrdersApiClient\Client(
                 $pagantisPublicKey,
@@ -229,12 +229,12 @@ 
             if ($order instanceof \Pagantis\OrdersApiClient\Model\Order) {
                 $url = $order->getActionUrls()->getForm();
                 $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();

Indentation +2 added lines, -2 removed lines

@@ -83,8 +83,8 @@
         $pagantisPublicKey = Configuration::get('pagantis_public_key');
         $pagantisPrivateKey = Configuration::get('pagantis_private_key');
         $okUrl = _PS_BASE_URL_.__PS_BASE_URI__
-                 .'index.php?canonical=true&fc=module&module=pagantis&controller=notify&'
-                 .http_build_query($query)
+                    .'index.php?canonical=true&fc=module&module=pagantis&controller=notify&'
+                    .http_build_query($query)
         ;
 
         $shippingAddress = new Address($cart->id_address_delivery);

pagantis.php

Spacing +39 added lines, -39 removed lines

@@ -11,7 +11,7 @@ 
     exit;
 }
 
-define('_PS_PAYLATER_DIR', _PS_MODULE_DIR_. '/pagantis');
+define('_PS_PAYLATER_DIR', _PS_MODULE_DIR_.'/pagantis');
 
 require _PS_PAYLATER_DIR.'/vendor/autoload.php';
 
@@ -67,13 +67,13 @@ 
     {
         $this->name = 'pagantis';
         $this->tab = 'payments_gateways';
-<<<<<<< HEAD:pagantis.php
+<< << << < HEAD:pagantis.php
         $this->version = '8.0.0';
         $this->author = 'Pagantis';
-=======
+=== === =
         $this->version = '7.2.2';
         $this->author = 'Paga+Tarde';
->>>>>>> baa9ffd6dc8be8aa8739e095731c2af1e9011fdf:paylater.php
+>> >> >> > baa9ffd6dc8be8aa8739e095731c2af1e9011fdf:paylater.php
         $this->currencies = true;
         $this->currencies_mode = 'checkbox';
         $this->module_key = '2b9bc901b4d834bb7069e7ea6510438f';
@@ -199,18 +199,18 @@ 
     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);
             }
@@ -224,7 +224,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
@@ -243,15 +243,15 @@ 
             }
             Db::getInstance()->insert('pagantis_config', $data);
         }
-<<<<<<< HEAD:pagantis.php
+<< << << < HEAD:pagantis.php
 
         foreach (array_merge($this->defaultConfigs, $simpleDbConfigs) as $key => $value) {
-            putenv($key . '=' . $value);
+            putenv($key.'='.$value);
         }
 
-        putenv("PAGANTIS_DEFAULT_CONFIGS" . '=' . json_encode($this->defaultConfigs));
-=======
->>>>>>> baa9ffd6dc8be8aa8739e095731c2af1e9011fdf:paylater.php
+        putenv("PAGANTIS_DEFAULT_CONFIGS".'='.json_encode($this->defaultConfigs));
+=== === =
+>> >> >> > baa9ffd6dc8be8aa8739e095731c2af1e9011fdf:paylater.php
     }
 
     /**
@@ -288,15 +288,15 @@ 
         $cart                       = $this->context->cart;
         $currency                   = new Currency($cart->id_currency);
         $availableCurrencies        = array('EUR');
-<<<<<<< HEAD:pagantis.php
+<< << << < HEAD:pagantis.php
         $pagantisDisplayMinAmount        = getenv('PAGANTIS_DISPLAY_MIN_AMOUNT');
         $pagantisPublicKey               = Configuration::get('pagantis_public_key');
         $pagantisPrivateKey              = Configuration::get('pagantis_private_key');
-=======
+=== === =
         $pmtDisplayMinAmount        = Paylater::getExtraConfig('PMT_DISPLAY_MIN_AMOUNT');
         $pmtPublicKey               = Configuration::get('pmt_public_key');
         $pmtPrivateKey              = Configuration::get('pmt_private_key');
->>>>>>> baa9ffd6dc8be8aa8739e095731c2af1e9011fdf:paylater.php
+>> >> >> > baa9ffd6dc8be8aa8739e095731c2af1e9011fdf:paylater.php
 
         return (
             $cart->getOrderTotal() >= $pagantisDisplayMinAmount &&
@@ -337,7 +337,7 @@ 
         } else {
             $this->context->controller->addJS('https://cdn.pagamastarde.com/js/pmt-v2/sdk.js');
         }
-        $this->context->controller->addJS($this->getPathUri(). 'views/js/simulator.js');
+        $this->context->controller->addJS($this->getPathUri().'views/js/simulator.js');
     }
 
     /**
@@ -351,7 +351,7 @@ 
         }
 
         /** @var Cart $cart */
-<<<<<<< HEAD:pagantis.php
+<< << << < HEAD:pagantis.php
         $cart                            = $this->context->cart;
         $orderTotal                      = $cart->getOrderTotal();
         $link                            = $this->context->link;
@@ -365,7 +365,7 @@ 
         $pagantisSimulatorSkin           = getenv('PAGANTIS_SIMULATOR_DISPLAY_SKIN');
         $pagantisSimulatorPosition       = getenv('PAGANTIS_SIMULATOR_DISPLAY_CSS_POSITION');
         $pagantisTitle                   = $this->l(getenv('PAGANTIS_TITLE'));
-=======
+=== === =
         $cart                       = $this->context->cart;
         $orderTotal                 = $cart->getOrderTotal();
         $link                       = $this->context->link;
@@ -379,7 +379,7 @@ 
         $pmtSimulatorSkin           = Paylater::getExtraConfig('PMT_SIMULATOR_DISPLAY_SKIN');
         $pmtSimulatorPosition       = Paylater::getExtraConfig('PMT_SIMULATOR_DISPLAY_CSS_POSITION');
         $pmtTitle                   = $this->l(Paylater::getExtraConfig('PMT_TITLE'));
->>>>>>> baa9ffd6dc8be8aa8739e095731c2af1e9011fdf:paylater.php
+>> >> >> > baa9ffd6dc8be8aa8739e095731c2af1e9011fdf:paylater.php
 
         $this->context->smarty->assign($this->getButtonTemplateVars($cart));
         $this->context->smarty->assign(array(
@@ -402,7 +402,7 @@ 
         $paymentOption
             ->setCallToActionText($pagantisTitle)
             ->setAction($link->getModuleLink('pagantis', 'payment'))
-            ->setLogo($this->getPathUri(). 'logo.gif')
+            ->setLogo($this->getPathUri().'logo.gif')
             ->setModuleName(__CLASS__)
         ;
 
@@ -432,7 +432,7 @@ 
                 'input' => array(
                     array(
                         'name' => 'pagantis_is_enabled',
-                        'type' =>  (version_compare(_PS_VERSION_, '1.6')<0) ?'radio' :'switch',
+                        'type' =>  (version_compare(_PS_VERSION_, '1.6') < 0) ? 'radio' : 'switch',
                         'label' => $this->l('Module is enabled'),
                         'prefix' => '<i class="icon icon-key"></i>',
                         'class' => 't',
@@ -472,7 +472,7 @@ 
                     ),
                     array(
                         'name' => 'pagantis_simulator_is_enabled',
-                        'type' => (version_compare(_PS_VERSION_, '1.6')<0) ?'radio' :'switch',
+                        'type' => (version_compare(_PS_VERSION_, '1.6') < 0) ? 'radio' : 'switch',
                         'label' => $this->l('Simulator is enabled'),
                         'prefix' => '<i class="icon icon-key"></i>',
                         'class' => 't',
@@ -588,7 +588,7 @@ 
             $message = $this->displayError($error);
         }
 
-        $logo = $this->getPathUri(). 'views/img/logo_pagantis.png';
+        $logo = $this->getPathUri().'views/img/logo_pagantis.png';
         $tpl = $this->local_path.'views/templates/admin/config-info.tpl';
         $this->context->smarty->assign(array(
             'logo' => $logo,
@@ -614,7 +614,7 @@ 
         }
 
         /** @var Cart $cart */
-<<<<<<< HEAD:pagantis.php
+<< << << < HEAD:pagantis.php
         $cart                            = $params['cart'];
         $orderTotal                      = $cart->getOrderTotal();
         $link                            = $this->context->link;
@@ -628,7 +628,7 @@ 
         $pagantisSimulatorSkin           = getenv('PAGANTIS_SIMULATOR_DISPLAY_SKIN');
         $pagantisSimulatorPosition       = getenv('PAGANTIS_SIMULATOR_DISPLAY_CSS_POSITION');
         $pagantisTitle                   = $this->l(getenv('PAGANTIS_TITLE'));
-=======
+=== === =
         $cart                       = $params['cart'];
         $orderTotal                 = $cart->getOrderTotal();
         $link                       = $this->context->link;
@@ -642,7 +642,7 @@ 
         $pmtSimulatorSkin           = Paylater::getExtraConfig('PMT_SIMULATOR_DISPLAY_SKIN');
         $pmtSimulatorPosition       = Paylater::getExtraConfig('PMT_SIMULATOR_DISPLAY_CSS_POSITION');
         $pmtTitle                   = $this->l(Paylater::getExtraConfig('PMT_TITLE'));
->>>>>>> baa9ffd6dc8be8aa8739e095731c2af1e9011fdf:paylater.php
+>> >> >> > baa9ffd6dc8be8aa8739e095731c2af1e9011fdf:paylater.php
         $this->context->smarty->assign($this->getButtonTemplateVars($cart));
         $this->context->smarty->assign(array(
             'amount'                     => $orderTotal,
@@ -683,7 +683,7 @@ 
      */
     public function productPageSimulatorDisplay($functionName)
     {
-<<<<<<< HEAD:pagantis.php
+<< << << < HEAD:pagantis.php
         $productConfiguration = getenv('PAGANTIS_SIMULATOR_DISPLAY_POSITION');
         /** @var ProductCore $product */
         $product = new Product(Tools::getValue('id_product'));
@@ -699,7 +699,7 @@ 
         $pagantisSimulatorSkin             = getenv('PAGANTIS_SIMULATOR_DISPLAY_SKIN');
         $pagantisSimulatorPosition         = getenv('PAGANTIS_SIMULATOR_DISPLAY_CSS_POSITION');
         $pagantisDisplayMinAmount          = getenv('PAGANTIS_DISPLAY_MIN_AMOUNT');
-=======
+=== === =
         $productConfiguration = Paylater::getExtraConfig('PMT_SIMULATOR_DISPLAY_POSITION');
         /** @var ProductCore $product */
         $product = new Product(Tools::getValue('id_product'));
@@ -715,7 +715,7 @@ 
         $pmtSimulatorSkin             = Paylater::getExtraConfig('PMT_SIMULATOR_DISPLAY_SKIN');
         $pmtSimulatorPosition         = Paylater::getExtraConfig('PMT_SIMULATOR_DISPLAY_CSS_POSITION');
         $pmtDisplayMinAmount          = Paylater::getExtraConfig('PMT_DISPLAY_MIN_AMOUNT');
->>>>>>> baa9ffd6dc8be8aa8739e095731c2af1e9011fdf:paylater.php
+>> >> >> > baa9ffd6dc8be8aa8739e095731c2af1e9011fdf:paylater.php
 
         if ($functionName != $productConfiguration ||
             $amount <= 0 ||
@@ -814,10 +814,10 @@ 
      */
     public function checkLogoExists()
     {
-        $logo = _PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments/'. Tools::strtolower(__CLASS__). '.png';
-        if (!file_exists($logo) && is_dir(_PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments')) {
+        $logo = _PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments/'.Tools::strtolower(__CLASS__).'.png';
+        if (!file_exists($logo) && is_dir(_PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments')) {
             copy(
-                _PS_PAYLATER_DIR . '/views/img/logo-64x64.png',
+                _PS_PAYLATER_DIR.'/views/img/logo-64x64.png',
                 $logo
             );
         }
@@ -829,7 +829,7 @@ 
             return '';
         }
 
-        $sql = 'SELECT value FROM '._DB_PREFIX_.'pmt_config where config = \'' . pSQL($config) . '\' limit 1';
+        $sql = 'SELECT value FROM '._DB_PREFIX_.'pmt_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'];

controllers/front/config.php

Spacing +5 added lines, -5 removed lines

@@ -18,12 +18,12 @@ 
     public function initContent()
     {
         $this->authorize();
-        $method = Tools::strtolower($_SERVER['REQUEST_METHOD']) . "Method";
+        $method = Tools::strtolower($_SERVER['REQUEST_METHOD'])."Method";
         if (method_exists($this, $method)) {
             header('HTTP/1.1 200 Ok', true, 200);
             header('Content-Type: application/json', true);
             $result = json_encode($this->{$method}());
-            header('Content-Length: ' . Tools::strlen($result));
+            header('Content-Length: '.Tools::strlen($result));
             echo $result;
             exit();
         }
@@ -38,7 +38,7 @@ 
      */
     public function getExtraConfigs()
     {
-        $sql_content = 'select * from ' . _DB_PREFIX_. 'pagantis_config';
+        $sql_content = 'select * from '._DB_PREFIX_.'pagantis_config';
         $dbConfigs = Db::getInstance()->executeS($sql_content);
 
         $simpleDbConfigs = array();
@@ -67,7 +67,7 @@ 
                     Db::getInstance()->update(
                         'pagantis_config',
                         array('value' => pSQL($value)),
-                        'config = \''. pSQL($config) .'\''
+                        'config = \''.pSQL($config).'\''
                     );
                 } else {
                     $errors[$config] = $value;
@@ -91,7 +91,7 @@ 
      */
     public function getMethod()
     {
-        $sql_content = 'select * from ' . _DB_PREFIX_. 'pagantis_config';
+        $sql_content = 'select * from '._DB_PREFIX_.'pagantis_config';
         $dbConfigs = Db::getInstance()->executeS($sql_content);
 
         $simpleDbConfigs = array();

controllers/front/notify.php

Spacing +10 added lines, -10 removed lines

@@ -196,7 +196,7 @@ 
     private function getPagantisOrderId()
     {
         try {
-            $this->pagantisOrderId= Db::getInstance()->getValue(
+            $this->pagantisOrderId = Db::getInstance()->getValue(
                 'select order_id from '._DB_PREFIX_.'pagantis_order where id = '.$this->merchantOrderId
             );
 
@@ -278,8 +278,8 @@ 
                 Configuration::get('PS_OS_PAYMENT'),
                 $this->merchantOrder->getOrderTotal(true),
                 $this->module->displayName,
-                'pagantisOrderId: ' . $this->pagantisOrder->getId().
-                'pagantisOrderStatus: '. $this->pagantisOrder->getStatus(),
+                'pagantisOrderId: '.$this->pagantisOrder->getId().
+                'pagantisOrderStatus: '.$this->pagantisOrder->getStatus(),
                 array('transaction_id' => $this->pagantisOrderId),
                 null,
                 false,
@@ -338,7 +338,7 @@ 
     protected function unblockConcurrency()
     {
         try {
-            Db::getInstance()->delete('pagantis_cart_process', 'timestamp < ' . (time() - 6));
+            Db::getInstance()->delete('pagantis_cart_process', 'timestamp < '.(time() - 6));
         } catch (\Exception $exception) {
             throw new ConcurrencyException();
         }
@@ -356,15 +356,15 @@ 
     {
         if ($this->merchantOrder && $this->processError === true) {
             sleep(5);
-            $id = (!is_null($this->pagantisOrder))?$this->pagantisOrder->getId():null;
-            $status = (!is_null($this->pagantisOrder))?$this->pagantisOrder->getStatus():null;
+            $id = (!is_null($this->pagantisOrder)) ? $this->pagantisOrder->getId() : null;
+            $status = (!is_null($this->pagantisOrder)) ? $this->pagantisOrder->getStatus() : null;
             $this->module->validateOrder(
                 $this->merchantOrderId,
                 Configuration::get('PS_OS_ERROR'),
                 $this->merchantOrder->getOrderTotal(true),
                 $this->module->displayName,
-                ' pagantisOrderId: ' . $id.
-                ' pagantisOrderStatus: '. $status,
+                ' pagantisOrderId: '.$id.
+                ' pagantisOrderStatus: '.$status,
                 null,
                 null,
                 false,
@@ -400,9 +400,9 @@ 
             'id_cart' => $this->merchantOrderId,
             'key' => $this->config['secureKey'],
             'id_module' => $this->module->id,
-            'id_order' => ($this->pagantisOrder)?$this->pagantisOrder->getId(): null,
+            'id_order' => ($this->pagantisOrder) ? $this->pagantisOrder->getId() : null,
         );
-        $url = ($error)? $this->config['urlKO'] : $this->config['urlOK'];
+        $url = ($error) ? $this->config['urlKO'] : $this->config['urlOK'];
         return $this->redirect($url, $parameters);
     }
 }