pagantis / magento-2X

Controller/Payment/Index.php

Spacing +19 added lines, -22 removed lines

@@ -125,12 +125,12 @@ 
             $customer = $quote->getCustomer();
             $shippingAddress = $quote->getShippingAddress();
 
-            if (isset($params['email']) && $params['email']!='') {
+            if (isset($params['email']) && $params['email'] != '') {
                 $this->session->setEmail($params['email']); //Get guest email after refresh page
                 $customer->setEmail($params['email']);
                 $quote->setCheckoutMethod('guest');
                 $quote->getBillingAddress()->setEmail($params['email']);
-            } elseif ($customer->getEmail()=='') {
+            } elseif ($customer->getEmail() == '') {
                 $customer->setEmail($this->session->getEmail());
                 $quote->setCheckoutMethod('guest');
                 $quote->getBillingAddress()->setEmail($this->session->getEmail());
@@ -141,7 +141,7 @@ 
             $currentQuote->setCustomerEmail($customer->getEmail());
             $this->quoteRepository->save($currentQuote);
 
-            $userAddress =  new Address();
+            $userAddress = new Address();
             $userAddress
                 ->setZipCode($shippingAddress->getPostcode())
                 ->setFullName($shippingAddress->getFirstname()." ".$shippingAddress->getLastname())
@@ -163,7 +163,7 @@ 
                 ->setTaxId($tax_id)
             ;
 
-            $orderBillingAddress =  new Address();
+            $orderBillingAddress = new Address();
             $billingAddress = $quote->getBillingAddress();
             $orderBillingAddress
                 ->setZipCode($billingAddress->getPostcode())
@@ -192,7 +192,7 @@ 
             if ($customer->getDob()) {
                 $orderUser->setDateOfBirth($customer->getDob());
             }
-            if ($customer->getTaxvat()!='') {
+            if ($customer->getTaxvat() != '') {
                 $orderUser->setDni($customer->getTaxvat());
                 $orderBillingAddress->setDni($customer->getTaxvat());
                 $orderShippingAddress->setDni($customer->getTaxvat());
@@ -232,11 +232,11 @@ 
 
                 $promotedProduct = $this->isPromoted($item);
                 if ($promotedProduct == 'true') {
-                    $promotedAmount+=$product->getAmount()*$item->getQty();
-                    $promotedMessage = 'Promoted Item: ' . $item->getName() .
-                                       ' Price: ' . $item->getPrice() .
-                                       ' Qty: ' . $item->getQty() .
-                                       ' Item ID: ' . $item->getItemId();
+                    $promotedAmount += $product->getAmount() * $item->getQty();
+                    $promotedMessage = 'Promoted Item: '.$item->getName().
+                                       ' Price: '.$item->getPrice().
+                                       ' Qty: '.$item->getQty().
+                                       ' Item ID: '.$item->getItemId();
                     $metadataOrder->addMetadata('promotedProduct', $promotedMessage);
                 }
             }
@@ -261,8 +261,8 @@ 
                 $okUrlRoute = 'pagantis/notify/indexV2';
             }
 
-            $okUrlUser = $this->_url->getUrl($okUrlRoute, ['_query' => ['quoteId'=>$quoteId,'origin'=>'redirect']]);
-            $okUrlNot  = $this->_url->getUrl($okUrlRoute, ['_query' => ['quoteId'=>$quoteId,'origin'=>'notification']]);
+            $okUrlUser = $this->_url->getUrl($okUrlRoute, ['_query' => ['quoteId'=>$quoteId, 'origin'=>'redirect']]);
+            $okUrlNot  = $this->_url->getUrl($okUrlRoute, ['_query' => ['quoteId'=>$quoteId, 'origin'=>'notification']]);
 
             $orderConfigurationUrls
                 ->setCancel($cancelUrl)
@@ -277,15 +277,12 @@ 
                 ->setType(Channel::ONLINE)
             ;
 
-            $haystack  = ($this->store->getLocale()!=null) ? $this->store->getLocale() : $this->getResolverCountry();
+            $haystack = ($this->store->getLocale() != null) ? $this->store->getLocale() : $this->getResolverCountry();
             $langCountry = strtolower(strstr($haystack, '_', true));
             $allowedCountries = unserialize($this->extraConfig['PAGANTIS_ALLOWED_COUNTRIES']);
 
             $purchaseCountry =
-                in_array($langCountry, $allowedCountries) ? $langCountry :
-                in_array(strtolower($shippingAddress->getCountry()), $allowedCountries)? $shippingAddress->getCountry():
-                in_array(strtolower($billingAddress->getCountry()), $allowedCountries)? $billingAddress->getCountry() :
-                null;
+                in_array($langCountry, $allowedCountries) ? $langCountry : in_array(strtolower($shippingAddress->getCountry()), $allowedCountries) ? $shippingAddress->getCountry() : in_array(strtolower($billingAddress->getCountry()), $allowedCountries) ? $billingAddress->getCountry() : null;
 
             $orderConfiguration = new Configuration();
             $orderConfiguration
@@ -303,7 +300,7 @@ 
                 ->setUser($orderUser)
             ;
 
-            if ($this->config['pagantis_public_key']=='' || $this->config['pagantis_private_key']=='') {
+            if ($this->config['pagantis_public_key'] == '' || $this->config['pagantis_private_key'] == '') {
                 throw new \Exception('Public and Secret Key not found');
             }
 
@@ -329,7 +326,7 @@ 
         }
 
         $displayMode = $this->extraConfig['PAGANTIS_FORM_DISPLAY_TYPE'];
-        if ($displayMode==='0') {
+        if ($displayMode === '0') {
             echo $url;
             exit;
         } else {
@@ -351,11 +348,11 @@ 
     private function getOrders($customerId)
     {
         $orderCollection = array();
-        if ($customerId!='') {
+        if ($customerId != '') {
             $this->orderCollection->addAttributeToFilter('customer_id', $customerId)
                             ->addAttributeToFilter(
                                 'status',
-                                ['in' => ['processing','pending','complete']]
+                                ['in' => ['processing', 'pending', 'complete']]
                             )
                             ->load();
             $orderCollection = $this->orderCollection->getData();
@@ -398,7 +395,7 @@ 
         $tableName = $this->dbObject->getTableName(self::ORDERS_TABLE);
         return $dbConnection->insertOnDuplicate(
             $tableName,
-            array('id'=>$quoteId,'order_id'=>$pagantisOrderId),
+            array('id'=>$quoteId, 'order_id'=>$pagantisOrderId),
             array('order_id')
         );
     }

Controller/Notify/IndexV2.php

Spacing +14 added lines, -14 removed lines

@@ -291,7 +291,7 @@ 
             $this->checkPagantisStatus(array('AUTHORIZED'));
         } catch (\Exception $e) {
             $this->getMagentoOrderId();
-            if ($this->magentoOrderId!='') {
+            if ($this->magentoOrderId != '') {
                 throw new AlreadyProcessedException();
             } else {
                 throw new WrongStatusException($this->pagantisOrder->getStatus());
@@ -304,7 +304,7 @@ 
      */
     private function checkMerchantOrderStatus()
     {
-        if ($this->quote->getIsActive()=='0') {
+        if ($this->quote->getIsActive() == '0') {
             $this->getMagentoOrderId();
             throw new AlreadyProcessedException();
         }
@@ -436,7 +436,7 @@ 
             $tableName    = $this->dbObject->getTableName(self::CONCURRENCY_TABLE);
             if ($mode == false) {
                 $dbConnection->delete($tableName, "timestamp<".(time() - 5));
-            } elseif ($this->quoteId!='') {
+            } elseif ($this->quoteId != '') {
                 $dbConnection->delete($tableName, "id=".$this->quoteId);
             }
         } catch (Exception $exception) {
@@ -472,7 +472,7 @@ 
                     sleep($expirationSec + 1);
                 }
 
-                $logMessage  = sprintf(
+                $logMessage = sprintf(
                     "User waiting %s seconds, default seconds %s, bd time to expire %s seconds",
                     $expirationSec,
                     self::CONCURRENCY_TIMEOUT,
@@ -522,14 +522,14 @@ 
                 $this->getPagantisOrderId();
             }
 
-            $pagantisOrderId   = $this->pagantisOrderId;
-            $query        = sprintf(
+            $pagantisOrderId = $this->pagantisOrderId;
+            $query = sprintf(
                 "select mg_order_id from %s where id='%s' and order_id='%s'",
                 $tableName,
                 $this->quoteId,
                 $pagantisOrderId
             );
-            $queryResult  = $dbConnection->fetchRow($query);
+            $queryResult = $dbConnection->fetchRow($query);
             $this->magentoOrderId = $queryResult['mg_order_id'];
         } catch (\Exception $e) {
             throw new UnknownException($e->getMessage());
@@ -552,7 +552,7 @@ 
             $metadataInfo = null;
             foreach ($metadataOrder as $metadataKey => $metadataValue) {
                 if ($metadataKey == 'promotedProduct') {
-                    $metadataInfo.= "/Producto promocionado = $metadataValue";
+                    $metadataInfo .= "/Producto promocionado = $metadataValue";
                 }
             }
 
@@ -561,9 +561,9 @@ 
                                ->setEntityName('order')
                                ->save();
 
-            $comment = 'pagantisOrderId: ' . $this->pagantisOrder->getId(). ' ' .
-                       'pagantisOrderStatus: '. $this->pagantisOrder->getStatus(). ' ' .
-                       'via: '. $this->origin;
+            $comment = 'pagantisOrderId: '.$this->pagantisOrder->getId().' '.
+                       'pagantisOrderStatus: '.$this->pagantisOrder->getStatus().' '.
+                       'via: '.$this->origin;
             $this->magentoOrder->addStatusHistoryComment($comment)
                                ->setIsCustomerNotified(false)
                                ->setEntityName('order')
@@ -586,7 +586,7 @@ 
             /** @var \Magento\Framework\DB\Adapter\AdapterInterface $dbConnection */
             $dbConnection = $this->dbObject->getConnection();
             $tableName    = $this->dbObject->getTableName(self::ORDERS_TABLE);
-            $pagantisOrderId   = $this->pagantisOrder->getId();
+            $pagantisOrderId = $this->pagantisOrder->getId();
             $dbConnection->update(
                 $tableName,
                 array('mg_order_id' => $this->magentoOrderId),
@@ -640,7 +640,7 @@ 
             $this->getPagantisOrderId();
         }
 
-        if ($this->magentoOrderId!='') {
+        if ($this->magentoOrderId != '') {
             /** @var Order $this->magentoOrder */
             $this->magentoOrder = $this->orderRepositoryInterface->get($this->magentoOrderId);
             if (!$this->_objectManager->get(\Magento\Checkout\Model\Session\SuccessValidator::class)->isValid()) {
@@ -657,7 +657,7 @@ 
             $orderStatus    = strtolower($this->magentoOrder->getStatus());
             $acceptedStatus = array('processing', 'completed');
             if (in_array($orderStatus, $acceptedStatus)) {
-                if (isset($this->extraConfig['PAGANTIS_OK_URL']) &&  $this->extraConfig['PAGANTIS_OK_URL']!= '') {
+                if (isset($this->extraConfig['PAGANTIS_OK_URL']) && $this->extraConfig['PAGANTIS_OK_URL'] != '') {
                     $returnUrl = $this->extraConfig['PAGANTIS_OK_URL'];
                 } else {
                     $returnUrl = 'checkout/onepage/success';

Controller/Notify/Index.php

Spacing +11 added lines, -11 removed lines

@@ -277,7 +277,7 @@ 
             $this->checkPagantisStatus(array('AUTHORIZED'));
         } catch (\Exception $e) {
             $this->getMagentoOrderId();
-            if ($this->magentoOrderId!='') {
+            if ($this->magentoOrderId != '') {
                 throw new AlreadyProcessedException();
             } else {
                 throw new WrongStatusException($this->pagantisOrder->getStatus());
@@ -290,7 +290,7 @@ 
      */
     private function checkMerchantOrderStatus()
     {
-        if ($this->quote->getIsActive()=='0') {
+        if ($this->quote->getIsActive() == '0') {
             $this->getMagentoOrderId();
             throw new AlreadyProcessedException();
         }
@@ -422,7 +422,7 @@ 
             $tableName    = $this->dbObject->getTableName(self::CONCURRENCY_TABLE);
             if ($mode == false) {
                 $dbConnection->delete($tableName, "timestamp<".(time() - 5));
-            } elseif ($this->quoteId!='') {
+            } elseif ($this->quoteId != '') {
                 $dbConnection->delete($tableName, "id=".$this->quoteId);
             }
         } catch (Exception $exception) {
@@ -458,7 +458,7 @@ 
                     sleep($expirationSec + 1);
                 }
 
-                $logMessage  = sprintf(
+                $logMessage = sprintf(
                     "User waiting %s seconds, default seconds %s, bd time to expire %s seconds",
                     $expirationSec,
                     self::CONCURRENCY_TIMEOUT,
@@ -507,7 +507,7 @@ 
             if ($this->pagantisOrderId == '') {
                 $this->getPagantisOrderId();
             }
-            $pagantisOrderId   = $this->pagantisOrderId;
+            $pagantisOrderId = $this->pagantisOrderId;
 
             $query        = "select mg_order_id from $tableName where id='$this->quoteId' and order_id='$pagantisOrderId'";
             $queryResult  = $dbConnection->fetchRow($query);
@@ -534,7 +534,7 @@ 
             $metadataInfo = null;
             foreach ($metadataOrder as $metadataKey => $metadataValue) {
                 if ($metadataKey == 'promotedProduct') {
-                    $metadataInfo.= " Producto promocionado = $metadataValue //";
+                    $metadataInfo .= " Producto promocionado = $metadataValue //";
                 }
             }
 
@@ -543,8 +543,8 @@ 
                                ->setEntityName('order')
                                ->save();
 
-            $comment = 'pagantisOrderId: '.$this->pagantisOrder->getId(). ' ' .
-                       'pagantisOrderStatus: '.$this->pagantisOrder->getStatus(). ' ' .
+            $comment = 'pagantisOrderId: '.$this->pagantisOrder->getId().' '.
+                       'pagantisOrderStatus: '.$this->pagantisOrder->getStatus().' '.
                        'via: '.$this->origin;
             $this->magentoOrder->addStatusHistoryComment($comment)
                                ->setIsCustomerNotified(false)
@@ -568,7 +568,7 @@ 
             /** @var \Magento\Framework\DB\Adapter\AdapterInterface $dbConnection */
             $dbConnection = $this->dbObject->getConnection();
             $tableName    = $this->dbObject->getTableName(self::ORDERS_TABLE);
-            $pagantisOrderId   = $this->pagantisOrder->getId();
+            $pagantisOrderId = $this->pagantisOrder->getId();
             $dbConnection->update(
                 $tableName,
                 array('mg_order_id' => $this->magentoOrderId),
@@ -622,7 +622,7 @@ 
             $this->getPagantisOrderId();
         }
 
-        if ($this->magentoOrderId!='') {
+        if ($this->magentoOrderId != '') {
             /** @var Order $this->magentoOrder */
             $this->magentoOrder = $this->orderRepositoryInterface->get($this->magentoOrderId);
             if (!$this->_objectManager->get(\Magento\Checkout\Model\Session\SuccessValidator::class)->isValid()) {
@@ -639,7 +639,7 @@ 
             $orderStatus    = strtolower($this->magentoOrder->getStatus());
             $acceptedStatus = array('processing', 'completed');
             if (in_array($orderStatus, $acceptedStatus)) {
-                if (isset($this->extraConfig['PAGANTIS_OK_URL']) &&  $this->extraConfig['PAGANTIS_OK_URL']!= '') {
+                if (isset($this->extraConfig['PAGANTIS_OK_URL']) && $this->extraConfig['PAGANTIS_OK_URL'] != '') {
                     $returnUrl = $this->extraConfig['PAGANTIS_OK_URL'];
                 } else {
                     $returnUrl = 'checkout/onepage/success';