pagantis / prestashop

controllers/front/notify.php

Spacing +46 added lines, -46 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);
@@ -153,7 +153,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();
@@ -162,7 +162,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);
@@ -179,7 +179,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);
@@ -247,13 +247,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');
 
@@ -273,8 +273,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(
@@ -318,8 +318,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)) {
@@ -353,7 +353,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);
@@ -385,7 +385,7 @@ 
                 $psTotalAmount = substr_replace(
                     $merchantAmount,
                     '.',
-                    (Tools::strlen($merchantAmount) -2),
+                    (Tools::strlen($merchantAmount) - 2),
                     0
                 );
 
@@ -393,14 +393,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,
@@ -440,11 +440,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();
@@ -484,9 +484,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,
@@ -500,7 +500,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) {
@@ -527,9 +527,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(
@@ -556,16 +556,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,
@@ -590,7 +590,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();
@@ -600,11 +600,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);
@@ -613,7 +613,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,
@@ -642,10 +642,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();
         }
@@ -670,8 +670,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,
@@ -707,7 +707,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(),