@@ -531,17 +531,17 @@  | 
                                                    ||
| 531 | 531 | }  | 
                                                        
| 532 | 532 | |
| 533 | 533 | $this->magentoOrder->addStatusHistoryComment($metadataInfo)  | 
                                                        
| 534 | - ->setIsCustomerNotified(false)  | 
                                                        |
| 535 | -                               ->setEntityName('order') | 
                                                        |
| 536 | - ->save();  | 
                                                        |
| 534 | + ->setIsCustomerNotified(false)  | 
                                                        |
| 535 | +                                ->setEntityName('order') | 
                                                        |
| 536 | + ->save();  | 
                                                        |
| 537 | 537 | |
| 538 | 538 | $comment = 'pagantisOrderId: '.$this->pagantisOrder->getId(). ' ' .  | 
                                                        
| 539 | - 'pagantisOrderStatus: '.$this->pagantisOrder->getStatus(). ' ' .  | 
                                                        |
| 540 | - 'via: '.$this->origin;  | 
                                                        |
| 539 | + 'pagantisOrderStatus: '.$this->pagantisOrder->getStatus(). ' ' .  | 
                                                        |
| 540 | + 'via: '.$this->origin;  | 
                                                        |
| 541 | 541 | $this->magentoOrder->addStatusHistoryComment($comment)  | 
                                                        
| 542 | - ->setIsCustomerNotified(false)  | 
                                                        |
| 543 | -                               ->setEntityName('order') | 
                                                        |
| 544 | - ->save();  | 
                                                        |
| 542 | + ->setIsCustomerNotified(false)  | 
                                                        |
| 543 | +                                ->setEntityName('order') | 
                                                        |
| 544 | + ->save();  | 
                                                        |
| 545 | 545 | |
| 546 | 546 |              if ($this->magentoOrderId == '') { | 
                                                        
| 547 | 547 |                  throw new UnknownException('Order can not be saved'); | 
                                                        
@@ -273,7 +273,7 @@ discard block  | 
                                                    ||
| 273 | 273 |              $this->checkPagantisStatus(array('AUTHORIZED')); | 
                                                        
| 274 | 274 |          } catch (\Exception $e) { | 
                                                        
| 275 | 275 | $this->getMagentoOrderId();  | 
                                                        
| 276 | -            if ($this->magentoOrderId!='') { | 
                                                        |
| 276 | +            if ($this->magentoOrderId != '') { | 
                                                        |
| 277 | 277 | throw new AlreadyProcessedException();  | 
                                                        
| 278 | 278 |              } else { | 
                                                        
| 279 | 279 | throw new WrongStatusException($this->pagantisOrder->getStatus());  | 
                                                        
@@ -286,7 +286,7 @@ discard block  | 
                                                    ||
| 286 | 286 | */  | 
                                                        
| 287 | 287 | private function checkMerchantOrderStatus()  | 
                                                        
| 288 | 288 |      { | 
                                                        
| 289 | -        if ($this->quote->getIsActive()=='0') { | 
                                                        |
| 289 | +        if ($this->quote->getIsActive() == '0') { | 
                                                        |
| 290 | 290 | $this->getMagentoOrderId();  | 
                                                        
| 291 | 291 | throw new AlreadyProcessedException();  | 
                                                        
| 292 | 292 | }  | 
                                                        
@@ -418,7 +418,7 @@ discard block  | 
                                                    ||
| 418 | 418 | $tableName = $this->dbObject->getTableName(self::CONCURRENCY_TABLE);  | 
                                                        
| 419 | 419 |              if ($mode == false) { | 
                                                        
| 420 | 420 | $dbConnection->delete($tableName, "timestamp<".(time() - 5));  | 
                                                        
| 421 | -            } elseif ($this->quoteId!='') { | 
                                                        |
| 421 | +            } elseif ($this->quoteId != '') { | 
                                                        |
| 422 | 422 | $dbConnection->delete($tableName, "id=".$this->quoteId);  | 
                                                        
| 423 | 423 | }  | 
                                                        
| 424 | 424 |          } catch (Exception $exception) { | 
                                                        
@@ -454,7 +454,7 @@ discard block  | 
                                                    ||
| 454 | 454 | sleep($expirationSec + 1);  | 
                                                        
| 455 | 455 | }  | 
                                                        
| 456 | 456 | |
| 457 | - $logMessage = sprintf(  | 
                                                        |
| 457 | + $logMessage = sprintf(  | 
                                                        |
| 458 | 458 | "User waiting %s seconds, default seconds %s, bd time to expire %s seconds",  | 
                                                        
| 459 | 459 | $expirationSec,  | 
                                                        
| 460 | 460 | self::CONCURRENCY_TIMEOUT,  | 
                                                        
@@ -499,7 +499,7 @@ discard block  | 
                                                    ||
| 499 | 499 | /** @var \Magento\Framework\DB\Adapter\AdapterInterface $dbConnection */  | 
                                                        
| 500 | 500 | $dbConnection = $this->dbObject->getConnection();  | 
                                                        
| 501 | 501 | $tableName = $this->dbObject->getTableName(self::ORDERS_TABLE);  | 
                                                        
| 502 | - $pagantisOrderId = $this->pagantisOrderId;  | 
                                                        |
| 502 | + $pagantisOrderId = $this->pagantisOrderId;  | 
                                                        |
| 503 | 503 | |
| 504 | 504 | $query = "select mg_order_id from $tableName where id='$this->quoteId' and order_id='$pagantisOrderId'";  | 
                                                        
| 505 | 505 | $queryResult = $dbConnection->fetchRow($query);  | 
                                                        
@@ -526,7 +526,7 @@ discard block  | 
                                                    ||
| 526 | 526 | $metadataInfo = null;  | 
                                                        
| 527 | 527 |              foreach ($metadataOrder as $metadataKey => $metadataValue) { | 
                                                        
| 528 | 528 |                  if ($metadataKey == 'promotedProduct') { | 
                                                        
| 529 | - $metadataInfo.= " Producto promocionado = $metadataValue //";  | 
                                                        |
| 529 | + $metadataInfo .= " Producto promocionado = $metadataValue //";  | 
                                                        |
| 530 | 530 | }  | 
                                                        
| 531 | 531 | }  | 
                                                        
| 532 | 532 | |
@@ -535,8 +535,8 @@ discard block  | 
                                                    ||
| 535 | 535 |                                 ->setEntityName('order') | 
                                                        
| 536 | 536 | ->save();  | 
                                                        
| 537 | 537 | |
| 538 | - $comment = 'pagantisOrderId: '.$this->pagantisOrder->getId(). ' ' .  | 
                                                        |
| 539 | - 'pagantisOrderStatus: '.$this->pagantisOrder->getStatus(). ' ' .  | 
                                                        |
| 538 | + $comment = 'pagantisOrderId: '.$this->pagantisOrder->getId().' '.  | 
                                                        |
| 539 | + 'pagantisOrderStatus: '.$this->pagantisOrder->getStatus().' '.  | 
                                                        |
| 540 | 540 | 'via: '.$this->origin;  | 
                                                        
| 541 | 541 | $this->magentoOrder->addStatusHistoryComment($comment)  | 
                                                        
| 542 | 542 | ->setIsCustomerNotified(false)  | 
                                                        
@@ -560,7 +560,7 @@ discard block  | 
                                                    ||
| 560 | 560 | /** @var \Magento\Framework\DB\Adapter\AdapterInterface $dbConnection */  | 
                                                        
| 561 | 561 | $dbConnection = $this->dbObject->getConnection();  | 
                                                        
| 562 | 562 | $tableName = $this->dbObject->getTableName(self::ORDERS_TABLE);  | 
                                                        
| 563 | - $pagantisOrderId = $this->pagantisOrder->getId();  | 
                                                        |
| 563 | + $pagantisOrderId = $this->pagantisOrder->getId();  | 
                                                        |
| 564 | 564 | $dbConnection->update(  | 
                                                        
| 565 | 565 | $tableName,  | 
                                                        
| 566 | 566 |                  array('mg_order_id' => $this->magentoOrderId), | 
                                                        
@@ -610,7 +610,7 @@ discard block  | 
                                                    ||
| 610 | 610 |      { | 
                                                        
| 611 | 611 | //$returnUrl = 'checkout/#payment';  | 
                                                        
| 612 | 612 |          $returnUrl = $this->_url->getUrl('checkout', ['_fragment' => 'payment']); | 
                                                        
| 613 | -        if ($this->magentoOrderId!='') { | 
                                                        |
| 613 | +        if ($this->magentoOrderId != '') { | 
                                                        |
| 614 | 614 | /** @var Order $this->magentoOrder */  | 
                                                        
| 615 | 615 | $this->magentoOrder = $this->orderRepositoryInterface->get($this->magentoOrderId);  | 
                                                        
| 616 | 616 |              if (!$this->_objectManager->get(\Magento\Checkout\Model\Session\SuccessValidator::class)->isValid()) { | 
                                                        
@@ -627,7 +627,7 @@ discard block  | 
                                                    ||
| 627 | 627 | $orderStatus = strtolower($this->magentoOrder->getStatus());  | 
                                                        
| 628 | 628 |              $acceptedStatus = array('processing', 'completed'); | 
                                                        
| 629 | 629 |              if (in_array($orderStatus, $acceptedStatus)) { | 
                                                        
| 630 | -                if (isset($this->extraConfig['PAGANTIS_OK_URL']) &&  $this->extraConfig['PAGANTIS_OK_URL']!= '') { | 
                                                        |
| 630 | +                if (isset($this->extraConfig['PAGANTIS_OK_URL']) && $this->extraConfig['PAGANTIS_OK_URL'] != '') { | 
                                                        |
| 631 | 631 | $returnUrl = $this->extraConfig['PAGANTIS_OK_URL'];  | 
                                                        
| 632 | 632 |                  } else { | 
                                                        
| 633 | 633 | $returnUrl = 'checkout/onepage/success';  | 
                                                        
@@ -537,17 +537,17 @@  | 
                                                    ||
| 537 | 537 | }  | 
                                                        
| 538 | 538 | |
| 539 | 539 | $this->magentoOrder->addStatusHistoryComment($metadataInfo)  | 
                                                        
| 540 | - ->setIsCustomerNotified(false)  | 
                                                        |
| 541 | -                               ->setEntityName('order') | 
                                                        |
| 542 | - ->save();  | 
                                                        |
| 540 | + ->setIsCustomerNotified(false)  | 
                                                        |
| 541 | +                                ->setEntityName('order') | 
                                                        |
| 542 | + ->save();  | 
                                                        |
| 543 | 543 | |
| 544 | 544 | $comment = 'pagantisOrderId: ' . $this->pagantisOrder->getId(). ' ' .  | 
                                                        
| 545 | - 'pagantisOrderStatus: '. $this->pagantisOrder->getStatus(). ' ' .  | 
                                                        |
| 546 | - 'via: '. $this->origin;  | 
                                                        |
| 545 | + 'pagantisOrderStatus: '. $this->pagantisOrder->getStatus(). ' ' .  | 
                                                        |
| 546 | + 'via: '. $this->origin;  | 
                                                        |
| 547 | 547 | $this->magentoOrder->addStatusHistoryComment($comment)  | 
                                                        
| 548 | - ->setIsCustomerNotified(false)  | 
                                                        |
| 549 | -                               ->setEntityName('order') | 
                                                        |
| 550 | - ->save();  | 
                                                        |
| 548 | + ->setIsCustomerNotified(false)  | 
                                                        |
| 549 | +                                ->setEntityName('order') | 
                                                        |
| 550 | + ->save();  | 
                                                        |
| 551 | 551 | |
| 552 | 552 |              if ($this->magentoOrderId == '') { | 
                                                        
| 553 | 553 |                  throw new UnknownException('Order can not be saved'); | 
                                                        
@@ -276,7 +276,7 @@ discard block  | 
                                                    ||
| 276 | 276 |              $this->checkPagantisStatus(array('AUTHORIZED')); | 
                                                        
| 277 | 277 |          } catch (\Exception $e) { | 
                                                        
| 278 | 278 | $this->getMagentoOrderId();  | 
                                                        
| 279 | -            if ($this->magentoOrderId!='') { | 
                                                        |
| 279 | +            if ($this->magentoOrderId != '') { | 
                                                        |
| 280 | 280 | throw new AlreadyProcessedException();  | 
                                                        
| 281 | 281 |              } else { | 
                                                        
| 282 | 282 | throw new WrongStatusException($this->pagantisOrder->getStatus());  | 
                                                        
@@ -289,7 +289,7 @@ discard block  | 
                                                    ||
| 289 | 289 | */  | 
                                                        
| 290 | 290 | private function checkMerchantOrderStatus()  | 
                                                        
| 291 | 291 |      { | 
                                                        
| 292 | -        if ($this->quote->getIsActive()=='0') { | 
                                                        |
| 292 | +        if ($this->quote->getIsActive() == '0') { | 
                                                        |
| 293 | 293 | $this->getMagentoOrderId();  | 
                                                        
| 294 | 294 | throw new AlreadyProcessedException();  | 
                                                        
| 295 | 295 | }  | 
                                                        
@@ -421,7 +421,7 @@ discard block  | 
                                                    ||
| 421 | 421 | $tableName = $this->dbObject->getTableName(self::CONCURRENCY_TABLE);  | 
                                                        
| 422 | 422 |              if ($mode == false) { | 
                                                        
| 423 | 423 | $dbConnection->delete($tableName, "timestamp<".(time() - 5));  | 
                                                        
| 424 | -            } elseif ($this->quoteId!='') { | 
                                                        |
| 424 | +            } elseif ($this->quoteId != '') { | 
                                                        |
| 425 | 425 | $dbConnection->delete($tableName, "id=".$this->quoteId);  | 
                                                        
| 426 | 426 | }  | 
                                                        
| 427 | 427 |          } catch (Exception $exception) { | 
                                                        
@@ -457,7 +457,7 @@ discard block  | 
                                                    ||
| 457 | 457 | sleep($expirationSec + 1);  | 
                                                        
| 458 | 458 | }  | 
                                                        
| 459 | 459 | |
| 460 | - $logMessage = sprintf(  | 
                                                        |
| 460 | + $logMessage = sprintf(  | 
                                                        |
| 461 | 461 | "User waiting %s seconds, default seconds %s, bd time to expire %s seconds",  | 
                                                        
| 462 | 462 | $expirationSec,  | 
                                                        
| 463 | 463 | self::CONCURRENCY_TIMEOUT,  | 
                                                        
@@ -502,14 +502,14 @@ discard block  | 
                                                    ||
| 502 | 502 | /** @var \Magento\Framework\DB\Adapter\AdapterInterface $dbConnection */  | 
                                                        
| 503 | 503 | $dbConnection = $this->dbObject->getConnection();  | 
                                                        
| 504 | 504 | $tableName = $this->dbObject->getTableName(self::ORDERS_TABLE);  | 
                                                        
| 505 | - $pagantisOrderId = $this->pagantisOrderId;  | 
                                                        |
| 505 | + $pagantisOrderId = $this->pagantisOrderId;  | 
                                                        |
| 506 | 506 | $query = sprintf(  | 
                                                        
| 507 | 507 | "select mg_order_id from %s where id='%s' and order_id='%s'",  | 
                                                        
| 508 | 508 | $tableName,  | 
                                                        
| 509 | 509 | $this->quoteId,  | 
                                                        
| 510 | 510 | $pagantisOrderId  | 
                                                        
| 511 | 511 | );  | 
                                                        
| 512 | - $queryResult = $dbConnection->fetchRow($query);  | 
                                                        |
| 512 | + $queryResult = $dbConnection->fetchRow($query);  | 
                                                        |
| 513 | 513 | $this->magentoOrderId = $queryResult['mg_order_id'];  | 
                                                        
| 514 | 514 |          } catch (\Exception $e) { | 
                                                        
| 515 | 515 | throw new UnknownException($e->getMessage());  | 
                                                        
@@ -532,7 +532,7 @@ discard block  | 
                                                    ||
| 532 | 532 | $metadataInfo = null;  | 
                                                        
| 533 | 533 |              foreach ($metadataOrder as $metadataKey => $metadataValue) { | 
                                                        
| 534 | 534 |                  if ($metadataKey == 'promotedProduct') { | 
                                                        
| 535 | - $metadataInfo.= "/Producto promocionado = $metadataValue";  | 
                                                        |
| 535 | + $metadataInfo .= "/Producto promocionado = $metadataValue";  | 
                                                        |
| 536 | 536 | }  | 
                                                        
| 537 | 537 | }  | 
                                                        
| 538 | 538 | |
@@ -541,9 +541,9 @@ discard block  | 
                                                    ||
| 541 | 541 |                                 ->setEntityName('order') | 
                                                        
| 542 | 542 | ->save();  | 
                                                        
| 543 | 543 | |
| 544 | - $comment = 'pagantisOrderId: ' . $this->pagantisOrder->getId(). ' ' .  | 
                                                        |
| 545 | - 'pagantisOrderStatus: '. $this->pagantisOrder->getStatus(). ' ' .  | 
                                                        |
| 546 | - 'via: '. $this->origin;  | 
                                                        |
| 544 | + $comment = 'pagantisOrderId: '.$this->pagantisOrder->getId().' '.  | 
                                                        |
| 545 | + 'pagantisOrderStatus: '.$this->pagantisOrder->getStatus().' '.  | 
                                                        |
| 546 | + 'via: '.$this->origin;  | 
                                                        |
| 547 | 547 | $this->magentoOrder->addStatusHistoryComment($comment)  | 
                                                        
| 548 | 548 | ->setIsCustomerNotified(false)  | 
                                                        
| 549 | 549 |                                 ->setEntityName('order') | 
                                                        
@@ -566,7 +566,7 @@ discard block  | 
                                                    ||
| 566 | 566 | /** @var \Magento\Framework\DB\Adapter\AdapterInterface $dbConnection */  | 
                                                        
| 567 | 567 | $dbConnection = $this->dbObject->getConnection();  | 
                                                        
| 568 | 568 | $tableName = $this->dbObject->getTableName(self::ORDERS_TABLE);  | 
                                                        
| 569 | - $pagantisOrderId = $this->pagantisOrder->getId();  | 
                                                        |
| 569 | + $pagantisOrderId = $this->pagantisOrder->getId();  | 
                                                        |
| 570 | 570 | $dbConnection->update(  | 
                                                        
| 571 | 571 | $tableName,  | 
                                                        
| 572 | 572 |                  array('mg_order_id' => $this->magentoOrderId), | 
                                                        
@@ -599,7 +599,7 @@ discard block  | 
                                                    ||
| 599 | 599 |      { | 
                                                        
| 600 | 600 | //$returnUrl = 'checkout/#payment';  | 
                                                        
| 601 | 601 |          $returnUrl = $this->_url->getUrl('checkout', ['_fragment' => 'payment']); | 
                                                        
| 602 | -        if ($this->magentoOrderId!='') { | 
                                                        |
| 602 | +        if ($this->magentoOrderId != '') { | 
                                                        |
| 603 | 603 | /** @var Order $this->magentoOrder */  | 
                                                        
| 604 | 604 | $this->magentoOrder = $this->orderRepositoryInterface->get($this->magentoOrderId);  | 
                                                        
| 605 | 605 |              if (!$this->_objectManager->get(\Magento\Checkout\Model\Session\SuccessValidator::class)->isValid()) { | 
                                                        
@@ -616,7 +616,7 @@ discard block  | 
                                                    ||
| 616 | 616 | $orderStatus = strtolower($this->magentoOrder->getStatus());  | 
                                                        
| 617 | 617 |              $acceptedStatus = array('processing', 'completed'); | 
                                                        
| 618 | 618 |              if (in_array($orderStatus, $acceptedStatus)) { | 
                                                        
| 619 | -                if (isset($this->extraConfig['PAGANTIS_OK_URL']) &&  $this->extraConfig['PAGANTIS_OK_URL']!= '') { | 
                                                        |
| 619 | +                if (isset($this->extraConfig['PAGANTIS_OK_URL']) && $this->extraConfig['PAGANTIS_OK_URL'] != '') { | 
                                                        |
| 620 | 620 | $returnUrl = $this->extraConfig['PAGANTIS_OK_URL'];  | 
                                                        
| 621 | 621 |                  } else { | 
                                                        
| 622 | 622 | $returnUrl = 'checkout/onepage/success';  |