@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | $this->assertNotEmpty($orderUrl); |
84 | 84 | |
85 | 85 | $orderArray = explode('/', $orderUrl); |
86 | - $magentoOrderId = (int)$orderArray['8']; |
|
86 | + $magentoOrderId = (int) $orderArray['8']; |
|
87 | 87 | $this->assertNotEmpty($magentoOrderId); |
88 | 88 | $notifyFile = 'index/'; |
89 | 89 | $quoteId = ($magentoOrderId) - 1; |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | { |
136 | 136 | $version = ''; |
137 | 137 | if (version_compare($this->version, '23') >= 0) { |
138 | - $version = "V2"; |
|
138 | + $version = "V2"; |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | $logUrl = sprintf( |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | $condition = WebDriverExpectedCondition::visibilityOfElementLocated($elementSearch); |
78 | 78 | $this->webDriver->wait()->until($condition); |
79 | 79 | $otherElement = $this->findById('payment_us_other_payment_methods-head'); |
80 | - if ($otherElement->getAttribute('class')!='open') { |
|
80 | + if ($otherElement->getAttribute('class') != 'open') { |
|
81 | 81 | $otherElement->click(); |
82 | 82 | } |
83 | 83 | |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $this->webDriver->wait()->until($condition); |
87 | 87 | $this->assertTrue((bool) $condition, "PR4"); |
88 | 88 | $pagantisElement = $this->findById('payment_us_pagantis-head'); |
89 | - if ($pagantisElement->getAttribute('class')!='open') { |
|
89 | + if ($pagantisElement->getAttribute('class') != 'open') { |
|
90 | 90 | $pagantisElement->click(); |
91 | 91 | } |
92 | 92 | |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | $this->webDriver->get($this->configuration['magentoUrl'].self::CHECKOUT_FOLDER); |
279 | 279 | $condition = WebDriverExpectedCondition::titleContains(self::CHECKOUT_TITLE); |
280 | 280 | $this->webDriver->wait()->until($condition); |
281 | - $this->assertTrue((bool)$condition, $this->configuration['magentoUrl'].self::CHECKOUT_FOLDER); |
|
281 | + $this->assertTrue((bool) $condition, $this->configuration['magentoUrl'].self::CHECKOUT_FOLDER); |
|
282 | 282 | } |
283 | 283 | |
284 | 284 | /** |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | $this->webDriver->wait()->until($condition); |
292 | 292 | $this->assertTrue((bool) $condition); |
293 | 293 | $this->assertSame( |
294 | - $this->configuration['firstname'] . ' ' . $this->configuration['lastname'], |
|
294 | + $this->configuration['firstname'].' '.$this->configuration['lastname'], |
|
295 | 295 | $this->findByClass('FieldsPreview-desc')->getText() |
296 | 296 | ); |
297 | 297 | } |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | { |
306 | 306 | $condition = WebDriverExpectedCondition::titleContains(self::PAGANTIS_TITLE); |
307 | 307 | $this->webDriver->wait(300)->until($condition, $this->webDriver->getCurrentURL()); |
308 | - $this->assertTrue((bool)$condition, "PR32"); |
|
308 | + $this->assertTrue((bool) $condition, "PR32"); |
|
309 | 309 | |
310 | 310 | SeleniumHelper::finishForm($this->webDriver); |
311 | 311 | } |
@@ -16,7 +16,7 @@ |
||
16 | 16 | public function execute(\Magento\Framework\Event\Observer $observer) |
17 | 17 | { |
18 | 18 | try { |
19 | - if ($observer->getEvent()->getMethodInstance()->getCode()=="pagantis") { |
|
19 | + if ($observer->getEvent()->getMethodInstance()->getCode() == "pagantis") { |
|
20 | 20 | $checkResult = $observer->getEvent()->getResult(); |
21 | 21 | $objectManager = \Magento\Framework\App\ObjectManager::getInstance(); |
22 | 22 | $config = $objectManager->create('Pagantis\Pagantis\Helper\Config')->getConfig(); |
@@ -26,9 +26,9 @@ |
||
26 | 26 | { |
27 | 27 | $originalData = $element->getOriginalData(); |
28 | 28 | $label = __($originalData['button_label']); |
29 | - $url = $this->escapeHtml($originalData['button_url']); |
|
29 | + $url = $this->escapeHtml($originalData['button_url']); |
|
30 | 30 | $labelCredentials = __($originalData['button_credentials_label']); |
31 | - $urlCredentials = $this->escapeHtml($originalData['button_credentials_url']); |
|
31 | + $urlCredentials = $this->escapeHtml($originalData['button_credentials_url']); |
|
32 | 32 | return <<<EOD |
33 | 33 | <div class="pp-buttons-container"> |
34 | 34 | <button onclick="javascript:window.open('$url')" class="scalable" type="button" id="bo_pagantis"> |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | $this->checkPagantisStatus(array('AUTHORIZED')); |
263 | 263 | } catch (\Exception $e) { |
264 | 264 | $this->getMagentoOrderId(); |
265 | - if ($this->magentoOrderId!='') { |
|
265 | + if ($this->magentoOrderId != '') { |
|
266 | 266 | throw new AlreadyProcessedException(); |
267 | 267 | } else { |
268 | 268 | throw new WrongStatusException($this->pagantisOrder->getStatus()); |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | */ |
276 | 276 | private function checkMerchantOrderStatus() |
277 | 277 | { |
278 | - if ($this->quote->getIsActive()=='0') { |
|
278 | + if ($this->quote->getIsActive() == '0') { |
|
279 | 279 | $this->getMagentoOrderId(); |
280 | 280 | throw new AlreadyProcessedException(); |
281 | 281 | } |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | $tableName = $this->dbObject->getTableName(self::CONCURRENCY_TABLE); |
398 | 398 | if ($mode == false) { |
399 | 399 | $dbConnection->delete($tableName, "timestamp<".(time() - 5)); |
400 | - } elseif ($this->quoteId!='') { |
|
400 | + } elseif ($this->quoteId != '') { |
|
401 | 401 | $dbConnection->delete($tableName, "id=".$this->quoteId); |
402 | 402 | } |
403 | 403 | } catch (Exception $exception) { |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | /** @var \Magento\Framework\DB\Adapter\AdapterInterface $dbConnection */ |
453 | 453 | $dbConnection = $this->dbObject->getConnection(); |
454 | 454 | $tableName = $this->dbObject->getTableName(self::ORDERS_TABLE); |
455 | - $pagantisOrderId = $this->pagantisOrderId; |
|
455 | + $pagantisOrderId = $this->pagantisOrderId; |
|
456 | 456 | |
457 | 457 | $query = "select mg_order_id from $tableName where id='$this->quoteId' and order_id='$pagantisOrderId'"; |
458 | 458 | $queryResult = $dbConnection->fetchRow($query); |
@@ -492,7 +492,7 @@ discard block |
||
492 | 492 | /** @var \Magento\Framework\DB\Adapter\AdapterInterface $dbConnection */ |
493 | 493 | $dbConnection = $this->dbObject->getConnection(); |
494 | 494 | $tableName = $this->dbObject->getTableName(self::ORDERS_TABLE); |
495 | - $pagantisOrderId = $this->pagantisOrder->getId(); |
|
495 | + $pagantisOrderId = $this->pagantisOrder->getId(); |
|
496 | 496 | $dbConnection->update( |
497 | 497 | $tableName, |
498 | 498 | array('mg_order_id' => $this->magentoOrderId), |
@@ -525,7 +525,7 @@ discard block |
||
525 | 525 | { |
526 | 526 | //$returnUrl = 'checkout/#payment'; |
527 | 527 | $returnUrl = $this->_url->getUrl('checkout', ['_fragment' => 'payment']); |
528 | - if ($this->magentoOrderId!='') { |
|
528 | + if ($this->magentoOrderId != '') { |
|
529 | 529 | /** @var Order $this->magentoOrder */ |
530 | 530 | $this->magentoOrder = $this->orderRepositoryInterface->get($this->magentoOrderId); |
531 | 531 | if (!$this->_objectManager->get(\Magento\Checkout\Model\Session\SuccessValidator::class)->isValid()) { |
@@ -542,7 +542,7 @@ discard block |
||
542 | 542 | $orderStatus = strtolower($this->magentoOrder->getStatus()); |
543 | 543 | $acceptedStatus = array('processing', 'completed'); |
544 | 544 | if (in_array($orderStatus, $acceptedStatus)) { |
545 | - if (isset($this->extraConfig['PAGANTIS_OK_URL']) && $this->extraConfig['PAGANTIS_OK_URL']!= '') { |
|
545 | + if (isset($this->extraConfig['PAGANTIS_OK_URL']) && $this->extraConfig['PAGANTIS_OK_URL'] != '') { |
|
546 | 546 | $returnUrl = $this->extraConfig['PAGANTIS_OK_URL']; |
547 | 547 | } else { |
548 | 548 | $returnUrl = 'checkout/onepage/success'; |
@@ -44,7 +44,7 @@ |
||
44 | 44 | $secretKey = $this->getRequest()->getParam('secret'); |
45 | 45 | $privateKey = isset($this->config['pagantis_private_key']) ? $this->config['pagantis_private_key'] : null; |
46 | 46 | |
47 | - if ($secretKey!='' && $privateKey!='') { |
|
47 | + if ($secretKey != '' && $privateKey != '') { |
|
48 | 48 | $this->checkDbLogTable(); |
49 | 49 | /** @var \Magento\Framework\DB\Adapter\AdapterInterface $dbConnection */ |
50 | 50 | $dbConnection = $this->dbObject->getConnection(); |
@@ -107,12 +107,12 @@ discard block |
||
107 | 107 | $customer = $quote->getCustomer(); |
108 | 108 | $shippingAddress = $quote->getShippingAddress(); |
109 | 109 | |
110 | - if (isset($params['email']) && $params['email']!='') { |
|
110 | + if (isset($params['email']) && $params['email'] != '') { |
|
111 | 111 | $this->session->setEmail($params['email']); //Get guest email after refresh page |
112 | 112 | $customer->setEmail($params['email']); |
113 | 113 | $quote->setCheckoutMethod('guest'); |
114 | 114 | $quote->getBillingAddress()->setEmail($params['email']); |
115 | - } elseif ($customer->getEmail()=='') { |
|
115 | + } elseif ($customer->getEmail() == '') { |
|
116 | 116 | $customer->setEmail($this->session->getEmail()); |
117 | 117 | $quote->setCheckoutMethod('guest'); |
118 | 118 | $quote->getBillingAddress()->setEmail($this->session->getEmail()); |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | $currentQuote->setCustomerEmail($customer->getEmail()); |
124 | 124 | $this->quoteRepository->save($currentQuote); |
125 | 125 | |
126 | - $userAddress = new Address(); |
|
126 | + $userAddress = new Address(); |
|
127 | 127 | $userAddress |
128 | 128 | ->setZipCode($shippingAddress->getPostcode()) |
129 | 129 | ->setFullName($shippingAddress->getFirstname()." ".$shippingAddress->getLastname()) |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | ->setMobilePhone($shippingAddress->getTelephone()) |
144 | 144 | ; |
145 | 145 | |
146 | - $orderBillingAddress = new Address(); |
|
146 | + $orderBillingAddress = new Address(); |
|
147 | 147 | $billingAddress = $quote->getBillingAddress(); |
148 | 148 | $orderBillingAddress |
149 | 149 | ->setZipCode($billingAddress->getPostcode()) |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | if ($customer->getDob()) { |
171 | 171 | $orderUser->setDateOfBirth($customer->getDob()); |
172 | 172 | } |
173 | - if ($customer->getTaxvat()!='') { |
|
173 | + if ($customer->getTaxvat() != '') { |
|
174 | 174 | $orderUser->setDni($customer->getTaxvat()); |
175 | 175 | $orderBillingAddress->setDni($customer->getTaxvat()); |
176 | 176 | $orderShippingAddress->setDni($customer->getTaxvat()); |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | ->setUser($orderUser) |
251 | 251 | ; |
252 | 252 | |
253 | - if ($this->config['pagantis_public_key']=='' || $this->config['pagantis_private_key']=='') { |
|
253 | + if ($this->config['pagantis_public_key'] == '' || $this->config['pagantis_private_key'] == '') { |
|
254 | 254 | throw new \Exception('Public and Secret Key not found'); |
255 | 255 | } |
256 | 256 | |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | } |
277 | 277 | |
278 | 278 | $displayMode = $this->extraConfig['PAGANTIS_FORM_DISPLAY_TYPE']; |
279 | - if ($displayMode==='0') { |
|
279 | + if ($displayMode === '0') { |
|
280 | 280 | echo $url; |
281 | 281 | exit; |
282 | 282 | } else { |
@@ -298,11 +298,11 @@ discard block |
||
298 | 298 | private function getOrders($customerId) |
299 | 299 | { |
300 | 300 | $orderCollection = array(); |
301 | - if ($customerId!='') { |
|
301 | + if ($customerId != '') { |
|
302 | 302 | $this->orderCollection->addAttributeToFilter('customer_id', $customerId) |
303 | 303 | ->addAttributeToFilter( |
304 | 304 | 'status', |
305 | - ['in' => ['processing','pending','complete']] |
|
305 | + ['in' => ['processing', 'pending', 'complete']] |
|
306 | 306 | ) |
307 | 307 | ->load(); |
308 | 308 | $orderCollection = $this->orderCollection->getData(); |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | $tableName = $this->dbObject->getTableName(self::ORDERS_TABLE); |
346 | 346 | return $dbConnection->insertOnDuplicate( |
347 | 347 | $tableName, |
348 | - array('id'=>$quoteId,'order_id'=>$pagantisOrderId), |
|
348 | + array('id'=>$quoteId, 'order_id'=>$pagantisOrderId), |
|
349 | 349 | array('order_id') |
350 | 350 | ); |
351 | 351 | } |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | $curlVersion = $curlInfo['version']; |
360 | 360 | $magentoVersion = $this->productMetadataInterface->getVersion(); |
361 | 361 | $moduleInfo = $this->moduleList->getOne('Pagantis_Pagantis'); |
362 | - return array( 'magento' => $magentoVersion, |
|
362 | + return array('magento' => $magentoVersion, |
|
363 | 363 | 'pagantis' => $moduleInfo['setup_version'], |
364 | 364 | 'php' => phpversion(), |
365 | 365 | 'curl' => $curlVersion); |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | $this->checkPagantisStatus(array('AUTHORIZED')); |
263 | 263 | } catch (\Exception $e) { |
264 | 264 | $this->getMagentoOrderId(); |
265 | - if ($this->magentoOrderId!='') { |
|
265 | + if ($this->magentoOrderId != '') { |
|
266 | 266 | throw new AlreadyProcessedException(); |
267 | 267 | } else { |
268 | 268 | throw new WrongStatusException($this->pagantisOrder->getStatus()); |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | */ |
276 | 276 | private function checkMerchantOrderStatus() |
277 | 277 | { |
278 | - if ($this->quote->getIsActive()=='0') { |
|
278 | + if ($this->quote->getIsActive() == '0') { |
|
279 | 279 | $this->getMagentoOrderId(); |
280 | 280 | throw new AlreadyProcessedException(); |
281 | 281 | } |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | $tableName = $this->dbObject->getTableName(self::CONCURRENCY_TABLE); |
398 | 398 | if ($mode == false) { |
399 | 399 | $dbConnection->delete($tableName, "timestamp<".(time() - 5)); |
400 | - } elseif ($this->quoteId!='') { |
|
400 | + } elseif ($this->quoteId != '') { |
|
401 | 401 | $dbConnection->delete($tableName, "id=".$this->quoteId); |
402 | 402 | } |
403 | 403 | } catch (Exception $exception) { |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | /** @var \Magento\Framework\DB\Adapter\AdapterInterface $dbConnection */ |
453 | 453 | $dbConnection = $this->dbObject->getConnection(); |
454 | 454 | $tableName = $this->dbObject->getTableName(self::ORDERS_TABLE); |
455 | - $pagantisOrderId = $this->pagantisOrderId; |
|
455 | + $pagantisOrderId = $this->pagantisOrderId; |
|
456 | 456 | |
457 | 457 | $query = "select mg_order_id from $tableName where id='$this->quoteId' and order_id='$pagantisOrderId'"; |
458 | 458 | $queryResult = $dbConnection->fetchRow($query); |
@@ -492,7 +492,7 @@ discard block |
||
492 | 492 | /** @var \Magento\Framework\DB\Adapter\AdapterInterface $dbConnection */ |
493 | 493 | $dbConnection = $this->dbObject->getConnection(); |
494 | 494 | $tableName = $this->dbObject->getTableName(self::ORDERS_TABLE); |
495 | - $pagantisOrderId = $this->pagantisOrder->getId(); |
|
495 | + $pagantisOrderId = $this->pagantisOrder->getId(); |
|
496 | 496 | $dbConnection->update( |
497 | 497 | $tableName, |
498 | 498 | array('mg_order_id' => $this->magentoOrderId), |
@@ -525,7 +525,7 @@ discard block |
||
525 | 525 | { |
526 | 526 | //$returnUrl = 'checkout/#payment'; |
527 | 527 | $returnUrl = $this->_url->getUrl('checkout', ['_fragment' => 'payment']); |
528 | - if ($this->magentoOrderId!='') { |
|
528 | + if ($this->magentoOrderId != '') { |
|
529 | 529 | /** @var Order $this->magentoOrder */ |
530 | 530 | $this->magentoOrder = $this->orderRepositoryInterface->get($this->magentoOrderId); |
531 | 531 | if (!$this->_objectManager->get(\Magento\Checkout\Model\Session\SuccessValidator::class)->isValid()) { |
@@ -542,7 +542,7 @@ discard block |
||
542 | 542 | $orderStatus = strtolower($this->magentoOrder->getStatus()); |
543 | 543 | $acceptedStatus = array('processing', 'completed'); |
544 | 544 | if (in_array($orderStatus, $acceptedStatus)) { |
545 | - if (isset($this->extraConfig['PAGANTIS_OK_URL']) && $this->extraConfig['PAGANTIS_OK_URL']!= '') { |
|
545 | + if (isset($this->extraConfig['PAGANTIS_OK_URL']) && $this->extraConfig['PAGANTIS_OK_URL'] != '') { |
|
546 | 546 | $returnUrl = $this->extraConfig['PAGANTIS_OK_URL']; |
547 | 547 | } else { |
548 | 548 | $returnUrl = 'checkout/onepage/success'; |
@@ -44,7 +44,7 @@ |
||
44 | 44 | $secretKey = $this->getRequest()->getParam('secret'); |
45 | 45 | $privateKey = isset($this->config['pagantis_private_key']) ? $this->config['pagantis_private_key'] : null; |
46 | 46 | |
47 | - if ($secretKey!='' && $privateKey!='') { |
|
47 | + if ($secretKey != '' && $privateKey != '') { |
|
48 | 48 | $this->checkDbLogTable(); |
49 | 49 | /** @var \Magento\Framework\DB\Adapter\AdapterInterface $dbConnection */ |
50 | 50 | $dbConnection = $this->dbObject->getConnection(); |