pagantis / prestashop

controllers/front/payment.php

Spacing +25 added lines, -25 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(),
@@ -107,24 +107,24 @@ 
 
         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))
             ;
 
-            $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($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))
                 ->setFixPhone($shippingAddress->phone)
@@ -135,10 +135,10 @@ 
             $orderBillingAddress = new \Pagantis\OrdersApiClient\Model\Order\User\Address();
             $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))
                 ->setFixPhone($billingAddress->phone)
@@ -158,7 +158,7 @@ 
                 ->setNationalId($this->getNationalId($customer, $shippingAddress, $billingAddress))
             ;
 
-            if ($customer->birthday!='0000-00-00') {
+            if ($customer->birthday != '0000-00-00') {
                 $orderUser->setDateOfBirth($customer->birthday);
             }
 
@@ -192,13 +192,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);
@@ -249,7 +249,7 @@ 
             Tools::redirect($cancelUrl);
         }
 
-        $url ='';
+        $url = '';
         try {
             $orderClient = new \Pagantis\OrdersApiClient\Client(
                 $pagantisPublicKey,
@@ -263,12 +263,12 @@ 
                  * @var string $orderId Pagantis Order id
                  */
                 $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();
@@ -391,13 +391,13 @@ 
 
     private function getUserLanguage($shippingAddress = null, $billingAddress = null)
     {
-        $allowedCountries    = unserialize(Pagantis::getExtraConfig('PAGANTIS_ALLOWED_COUNTRIES'));
+        $allowedCountries = unserialize(Pagantis::getExtraConfig('PAGANTIS_ALLOWED_COUNTRIES'));
         $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 +40 added lines, -40 removed lines

@@ -213,8 +213,8 @@ 
     private function getPagantisOrderId()
     {
         try {
-            $this->pagantisOrderId= Db::getInstance()->getValue(
-                'select order_id from '._DB_PREFIX_.'pagantis_order where id = ' . intval($this->merchantOrderId)
+            $this->pagantisOrderId = Db::getInstance()->getValue(
+                'select order_id from '._DB_PREFIX_.'pagantis_order where id = '.intval($this->merchantOrderId)
             );
 
             if (is_null($this->pagantisOrderId)) {
@@ -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,21 +308,21 @@ 
         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';
+            $tableName = _DB_PREFIX_.'pagantis_order';
             $fieldName = 'ps_order_id';
-            $sql = ('select ' . $fieldName . ' from `' . $tableName . '` where `id` = ' . intval($this->merchantOrderId)
-                . ' and `order_id` = \'' . $this->pagantisOrderId . '\''
-                . ' and `' . $fieldName . '` is not null');
+            $sql = ('select '.$fieldName.' from `'.$tableName.'` where `id` = '.intval($this->merchantOrderId)
+                . ' and `order_id` = \''.$this->pagantisOrderId.'\''
+                . ' and `'.$fieldName.'` 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());
@@ -351,9 +351,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,
@@ -367,7 +367,7 @@ 
             Db::getInstance()->update(
                 'pagantis_order',
                 array('ps_order_id' => $this->module->currentOrder),
-                'id = '. intval($this->merchantOrderId) . ' and order_id = \'' . $this->pagantisOrderId . '\''
+                'id = '.intval($this->merchantOrderId).' and order_id = \''.$this->pagantisOrderId.'\''
             );
         } catch (\Exception $exception) {
             // Do nothing
@@ -385,9 +385,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,15 +405,15 @@ 
     public function rollbackMerchantOrder()
     {
         try {
-            $message = 'Roolback method: ' .
-                '. Pagantis OrderId=' . $this->pagantisOrderId .
-                '. Prestashop CartId=' . $this->merchantOrderId;
+            $message = 'Roolback method: '.
+                '. Pagantis OrderId='.$this->pagantisOrderId.
+                '. Prestashop CartId='.$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->merchantOrderId;
+                $history->id_order = (int) $objOrder->id;
+                $history->changeIdOrderState(8, (int) ($objOrder->id));
+                $message .= ' Prestashop OrderId='.$this->merchantOrderId;
             }
             $this->saveLog(array('message' => $message));
         } catch (\Exception $exception) {
@@ -442,14 +442,14 @@ 
                             FROM %s WHERE %s",
                     self::CONCURRENCY_TIMEOUT,
                     _DB_PREFIX_.$table,
-                    "id=" . intval($orderId)
+                    "id=".intval($orderId)
                 );
                 $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. CartId=" . $orderId,
+                    "Redirect concurrency, User have to wait %s seconds, default seconds %s. CartId=".$orderId,
                     $secondsToExpire,
                     self::CONCURRENCY_TIMEOUT,
                     $restSeconds
@@ -458,7 +458,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;
             }
@@ -478,11 +478,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 = ' . intval($orderId));
+            Db::getInstance()->delete('pagantis_cart_process', 'id = '.intval($orderId));
         } catch (\Exception $exception) {
             throw new ConcurrencyException();
         }
@@ -504,8 +504,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,
@@ -530,9 +530,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);
     }
 }