pagantis / prestashop

pagantis.php

Spacing +31 added lines, -31 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');
 
@@ -97,7 +97,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
         $this->language = ($this->language) ? $this->language : 'ES';
@@ -202,18 +202,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);
             }
@@ -227,7 +227,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
@@ -330,7 +330,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');
     }
 
     /**
@@ -394,7 +394,7 @@ 
         $paymentOption
             ->setCallToActionText($pagantisTitle)
             ->setAction($link->getModuleLink('pagantis', 'payment'))
-            ->setLogo($this->getPathUri(). 'views/img/' . $logo)
+            ->setLogo($this->getPathUri().'views/img/'.$logo)
             ->setModuleName(__CLASS__)
         ;
 
@@ -421,7 +421,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',
@@ -461,7 +461,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',
@@ -577,9 +577,9 @@ 
             $message = $this->displayError($error);
         }
 
-        $logo = $this->getPathUri(). 'views/img/logo_pagantis.png';
+        $logo = $this->getPathUri().'views/img/logo_pagantis.png';
         if ($this->language == 'ES' || $this->language == null) {
-            $logo = $this->getPathUri(). 'views/img/logo_pagamastarde.png';
+            $logo = $this->getPathUri().'views/img/logo_pagamastarde.png';
         }
         $tpl = $this->local_path.'views/templates/admin/config-info.tpl';
         $this->context->smarty->assign(array(
@@ -627,7 +627,7 @@ 
         $items = $cart->getProducts(true);
         foreach ($items as $key => $item) {
             $itemCategories = ProductCore::getProductCategoriesFull($item['id_product']);
-            if(in_array(PROMOTIONS_CATEGORY_NAME, array_column($itemCategories, 'name')) !== false) {
+            if (in_array(PROMOTIONS_CATEGORY_NAME, array_column($itemCategories, 'name')) !== false) {
                 $promotedAmount += Product::getPriceStatic($item['id_product']);
             }
         }
@@ -803,17 +803,17 @@ 
      */
     public function checkLogoExists()
     {
-        $logoPmt = _PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments/pagamastarde.png';
-        $logoPg = _PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments/pagantis.png';
-        if (!file_exists($logoPmt) && is_dir(_PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments')) {
+        $logoPmt = _PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments/pagamastarde.png';
+        $logoPg = _PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments/pagantis.png';
+        if (!file_exists($logoPmt) && is_dir(_PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments')) {
             copy(
-                _PS_PAGANTIS_DIR . '/views/img/logo_pagamastarde.png',
+                _PS_PAGANTIS_DIR.'/views/img/logo_pagamastarde.png',
                 $logoPmt
             );
         }
-        if (!file_exists($logoPg) && is_dir(_PS_MODULE_DIR_ . '/onepagecheckoutps/views/img/payments')) {
+        if (!file_exists($logoPg) && is_dir(_PS_MODULE_DIR_.'/onepagecheckoutps/views/img/payments')) {
             copy(
-                _PS_PAGANTIS_DIR . '/views/img/logo_pagantis.png',
+                _PS_PAGANTIS_DIR.'/views/img/logo_pagantis.png',
                 $logoPg
             );
         }
@@ -829,13 +829,13 @@ 
             /** @var CategoryCore $category */
             $category = new Category();
             $category->is_root_category = false;
-            $category->link_rewrite = array( 1=> PROMOTIONS_CATEGORY );
-            $category->meta_description = array( 1=> PROMOTIONS_CATEGORY );
-            $category->meta_keywords = array( 1=> PROMOTIONS_CATEGORY );
-            $category->meta_title = array( 1=> PROMOTIONS_CATEGORY );
-            $category->name = array( 1=> PROMOTIONS_CATEGORY_NAME );
+            $category->link_rewrite = array(1=> PROMOTIONS_CATEGORY);
+            $category->meta_description = array(1=> PROMOTIONS_CATEGORY);
+            $category->meta_keywords = array(1=> PROMOTIONS_CATEGORY);
+            $category->meta_title = array(1=> PROMOTIONS_CATEGORY);
+            $category->name = array(1=> PROMOTIONS_CATEGORY_NAME);
             $category->id_parent = Configuration::get('PS_HOME_CATEGORY');
-            $category->active=0;
+            $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();
@@ -849,7 +849,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'];

controllers/front/payment.php

Indentation +5 added lines, -5 removed lines

@@ -89,8 +89,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);
@@ -192,9 +192,9 @@ 
                     $promotedAmount+=$product->getAmount();
                     $finalPrice = Product::getPriceStatic($item['id_product']);
                     $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);

Spacing +23 added lines, -23 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(),
@@ -105,24 +105,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)
@@ -132,10 +132,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)
@@ -155,7 +155,7 @@ 
                 ->setNationalId($this->getNationalId($customer, $shippingAddress, $billingAddress))
             ;
 
-            if ($customer->birthday!='0000-00-00') {
+            if ($customer->birthday != '0000-00-00') {
                 $orderUser->setDateOfBirth($customer->birthday);
             }
 
@@ -189,12 +189,12 @@ 
                     ->setQuantity($item['quantity'])
                     ->setDescription($item['name']);
                 if ($promotedProduct) {
-                    $promotedAmount+=$product->getAmount();
+                    $promotedAmount += $product->getAmount();
                     $finalPrice = Product::getPriceStatic($item['id_product']);
-                    $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);
@@ -244,7 +244,7 @@ 
             Tools::redirect($cancelUrl);
         }
 
-        $url ='';
+        $url = '';
         try {
             $orderClient = new \Pagantis\OrdersApiClient\Client(
                 $pagantisPublicKey,
@@ -255,12 +255,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();

controllers/front/notify.php

Spacing +15 added lines, -15 removed lines

@@ -195,7 +195,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
             );
 
@@ -277,14 +277,14 @@ 
         $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), 0);
+                $pgTotalAmount = substr_replace($pgTotalAmountInCents, '.', (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
                 ));
@@ -315,9 +315,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,
@@ -340,9 +340,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->merchantOrderId;
+                $message = 'Order CONFIRMED. The order was confirmed by a '.$mode.
+                    '. Pagantis OrderId='.$this->pagantisOrderId.
+                    '. Prestashop OrderId='.$this->merchantOrderId;
                 $this->saveLog(array(
                     'message' => $message
                 ));
@@ -398,7 +398,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();
         }
@@ -442,9 +442,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);
     }
 }