pagantis / prestashop

controllers/front/payment.php

Spacing +23 added lines, -23 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(),
@@ -102,24 +102,24 @@ 
         );
 
         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($this->language)
                 ->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))
             ;
 
-            $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($this->language)
                 ->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))
                 ->setFixPhone($shippingAddress->phone)
@@ -129,10 +129,10 @@ 
             $orderBillingAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address();
             $orderBillingAddress
                 ->setZipCode($billingAddress->postcode)
-                ->setFullName($billingAddress->firstname . ' ' . $billingAddress->lastname)
+                ->setFullName($billingAddress->firstname.' '.$billingAddress->lastname)
                 ->setCountryCode($this->language)
                 ->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))
                 ->setFixPhone($billingAddress->phone)
@@ -152,7 +152,7 @@ 
                 ->setNationalId($this->getNationalId($customer, $shippingAddress, $billingAddress))
             ;
 
-            if ($customer->birthday!='0000-00-00') {
+            if ($customer->birthday != '0000-00-00') {
                 $orderUser->setDateOfBirth($customer->birthday);
             }
 
@@ -186,13 +186,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);
@@ -242,7 +242,7 @@ 
             Tools::redirect($cancelUrl);
         }
 
-        $url ='';
+        $url = '';
         try {
             $orderClient = new \Pagantis\OrdersApiClient\Client(
                 $pagantisPublicKey,
@@ -253,12 +253,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 +5 added lines, -5 removed lines

@@ -86,8 +86,8 @@ 
         $pagantisPublicKey = Configuration::get('pagantis_public_key');
         $pagantisPrivateKey = Configuration::get('pagantis_private_key');
         $okUrl = _PS_BASE_URL_SSL_.__PS_BASE_URI__
-                 .'index.php?canonical=true&fc=module&module=pagantis&controller=notify&origin=redirect'
-                 .http_build_query($query)
+                    .'index.php?canonical=true&fc=module&module=pagantis&controller=notify&origin=redirect'
+                    .http_build_query($query)
         ;
         $notificationOkUrl = _PS_BASE_URL_SSL_.__PS_BASE_URI__
             .'index.php?canonical=true&fc=module&module=pagantis&controller=notify&origin=notification'
@@ -194,9 +194,9 @@ 
                     $productId = $item['id_product'];
                     $finalPrice = Product::getPriceStatic($productId);
                     $promotedMessage = 'Promoted Item: ' . $product->getDescription() .
-                         ' Price: ' . $finalPrice .
-                         ' Qty: ' . $product->getQuantity() .
-                         ' Item ID: ' . $item['id_product'];
+                            ' Price: ' . $finalPrice .
+                            ' Qty: ' . $product->getQuantity() .
+                            ' Item ID: ' . $item['id_product'];
                     $metadataOrder->addMetadata('promotedProduct', $promotedMessage);
                 }
                 $details->addProduct($product);

pagantis.php

Spacing +23 added lines, -23 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');
 
@@ -133,7 +133,7 @@ 
         Configuration::updateValue('pagantis_public_key', '');
         Configuration::updateValue('pagantis_private_key', '');
 
-        $return =  (parent::install()
+        $return = (parent::install()
             && $this->registerHook('displayShoppingCart')
             && $this->registerHook('paymentOptions')
             && $this->registerHook('displayRightColumn')
@@ -215,18 +215,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);
             }
@@ -240,7 +240,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
@@ -358,7 +358,7 @@ 
         } else {
             $this->context->controller->addJS($url);
         }
-        $this->context->controller->addJS($this->getPathUri(). 'views/js/simulator.js');
+        $this->context->controller->addJS($this->getPathUri().'views/js/simulator.js');
     }
 
     /**
@@ -456,7 +456,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',
@@ -496,7 +496,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',
@@ -850,16 +850,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();
@@ -873,7 +873,7 @@ 
             return '';
         }
 
-        $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'];
@@ -888,10 +888,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
             );
         }
@@ -907,7 +907,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/notify.php

Spacing +34 added lines, -34 removed lines

@@ -213,7 +213,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
             );
 
@@ -275,20 +275,20 @@ 
         $merchantAmount = explode('.', explode(',', $merchantAmount)[0])[0];
         if ($totalAmount != $merchantAmount) {
             try {
-                $psTotalAmount = substr_replace($merchantAmount, '.', (Tools::strlen($merchantAmount) -2), 0);
+                $psTotalAmount = substr_replace($merchantAmount, '.', (Tools::strlen($merchantAmount) - 2), 0);
 
                 $pgTotalAmountInCents = (string) $this->pagantisOrder->getShoppingCart()->getTotalAmount();
                 $pgTotalAmount = substr_replace(
                     $pgTotalAmountInCents,
                     '.',
-                    (Tools::strlen($pgTotalAmountInCents) -2),
+                    (Tools::strlen($pgTotalAmountInCents) - 2),
                     0
                 );
 
-                $this->amountMismatchError = '. Amount mismatch in PrestaShop Order #'. $this->merchantOrderId .
-                    ' compared with Pagantis Order: ' . $this->pagantisOrderId .
-                    '. The order in PrestaShop has an amount of ' . $psTotalAmount . ' and in Pagantis ' .
-                    $pgTotalAmount . ' PLEASE REVIEW THE ORDER';
+                $this->amountMismatchError = '. Amount mismatch in PrestaShop Order #'.$this->merchantOrderId.
+                    ' compared with Pagantis Order: '.$this->pagantisOrderId.
+                    '. The order in PrestaShop has an amount of '.$psTotalAmount.' and in Pagantis '.
+                    $pgTotalAmount.' PLEASE REVIEW THE ORDER';
                 $this->saveLog(array(
                     'message' => $this->amountMismatchError
                 ));
@@ -308,20 +308,20 @@ 
         try {
             if ($this->merchantOrder->orderExists() !== false) {
                 throw new WrongStatusException('PS->orderExists() cart_id = '
-                    . $this->merchantOrderId . ' pagantis_id = '
-                    . $this->pagantisOrderId . '): already_processed');
+                    . $this->merchantOrderId.' pagantis_id = '
+                    . $this->pagantisOrderId.'): already_processed');
             }
 
             // Double check
-            $tableName = _DB_PREFIX_ . 'pagantis_order';
-            $sql = ('select ps_order_id from `' . $tableName . '` where `id` = ' . $this->merchantOrderId
-                . ' and `order_id` = \'' . $this->pagantisOrderId . '\''
+            $tableName = _DB_PREFIX_.'pagantis_order';
+            $sql = ('select ps_order_id from `'.$tableName.'` where `id` = '.$this->merchantOrderId
+                . ' and `order_id` = \''.$this->pagantisOrderId.'\''
                 . ' and `ps_order_id` is not null');
             $results = Db::getInstance()->ExecuteS($sql);
             if (is_array($results) && count($results) === 1) {
-                throw new WrongStatusException('PS->record found in ' . $tableName
-                    . ' (cart_id = ' . $this->merchantOrderId . ' pagantis_id = '
-                    . $this->pagantisOrderId . '): already_processed');
+                throw new WrongStatusException('PS->record found in '.$tableName
+                    . ' (cart_id = '.$this->merchantOrderId.' pagantis_id = '
+                    . $this->pagantisOrderId.'): already_processed');
             }
         } catch (\Exception $exception) {
             throw new UnknownException($exception->getMessage());
@@ -350,9 +350,9 @@ 
                 Configuration::get('PS_OS_PAYMENT'),
                 $this->merchantOrder->getOrderTotal(true),
                 $this->module->displayName,
-                '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,
@@ -366,7 +366,7 @@ 
             Db::getInstance()->update(
                 'pagantis_order',
                 array('ps_order_id' => $this->module->currentOrder),
-                'id = \''. $this->merchantOrderId . '\' and order_id = \'' . $this->pagantisOrderId . '\''
+                'id = \''.$this->merchantOrderId.'\' and order_id = \''.$this->pagantisOrderId.'\''
             );
         } catch (\Exception $exception) {
             // Do nothing
@@ -384,9 +384,9 @@ 
             $this->orderClient->confirmOrder($this->pagantisOrderId);
             try {
                 $mode = ($_SERVER['REQUEST_METHOD'] == 'POST') ? '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('message' => $message));
             } catch (\Exception $exception) {
                 // Do nothing
@@ -405,9 +405,9 @@ 
     {
         // Do nothing because the order is created only when the purchase was successfully
         try {
-            $message = 'Roolback method: ' .
-                '. Pagantis OrderId=' . $this->pagantisOrderId .
-                '. Prestashop CartId=' . $this->merchantOrderId;
+            $message = 'Roolback method: '.
+                '. Pagantis OrderId='.$this->pagantisOrderId.
+                '. Prestashop CartId='.$this->merchantOrderId;
             $this->saveLog(array('message' => $message));
             }
         } catch (\Exception $exception) {
@@ -439,10 +439,10 @@ 
                 );
                 $resultSeconds = Db::getInstance()->getValue($query);
                 $restSeconds = isset($resultSeconds) ? ($resultSeconds) : 0;
-                $secondsToExpire = ($restSeconds>self::CONCURRENCY_TIMEOUT) ? self::CONCURRENCY_TIMEOUT : $restSeconds;
+                $secondsToExpire = ($restSeconds > self::CONCURRENCY_TIMEOUT) ? self::CONCURRENCY_TIMEOUT : $restSeconds;
 
                 $logMessage = sprintf(
-                    "Redirect concurrency, User have to wait %s seconds, default seconds %s, bd time to expire %s seconds. CartId=" . $orderId,
+                    "Redirect concurrency, User have to wait %s seconds, default seconds %s, bd time to expire %s seconds. CartId=".$orderId,
                     $secondsToExpire,
                     self::CONCURRENCY_TIMEOUT,
                     $restSeconds
@@ -451,7 +451,7 @@ 
                 $this->saveLog(array(
                     'message' => $logMessage
                 ));
-                sleep($secondsToExpire+1);
+                sleep($secondsToExpire + 1);
                 // After waiting...user continue the confirmation, hoping that previous call have finished.
                 return true;
             }
@@ -471,11 +471,11 @@ 
             if (is_null($orderId)) {
                 Db::getInstance()->delete(
                     'pagantis_cart_process',
-                    'timestamp < ' . (time() - self::CONCURRENCY_TIMEOUT)
+                    'timestamp < '.(time() - self::CONCURRENCY_TIMEOUT)
                 );
                 return;
             }
-            Db::getInstance()->delete('pagantis_cart_process', 'id = \'' . $orderId . '\'');
+            Db::getInstance()->delete('pagantis_cart_process', 'id = \''.$orderId.'\'');
         } catch (\Exception $exception) {
             throw new ConcurrencyException();
         }
@@ -497,8 +497,8 @@ 
         $data = array(
             '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,
@@ -522,9 +522,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);
     }
 }
\ No newline at end of file