Skip to content
This repository has been archived by the owner on Apr 24, 2023. It is now read-only.

Commit

Permalink
Merge pull request #88 from pagseguro/desenvolvimento
Browse files Browse the repository at this point in the history
Change direct payment flow and general improvements and fixes
  • Loading branch information
s2it-moscou committed Dec 26, 2017
2 parents 85595c3 + 1ab1129 commit 400f94b
Show file tree
Hide file tree
Showing 52 changed files with 3,315 additions and 2,567 deletions.
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Cancellation/Cancel.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function execute()
{
$cancellation = new Cancellation(
$this->_objectManager->create('Magento\Framework\App\Config\ScopeConfigInterface'),
$this->_objectManager->create('Magento\Framework\App\ResourceConnection'),
$this->_objectManager->create('\Magento\Framework\App\ResourceConnection'),
$this->_objectManager->create('Magento\Framework\Model\ResourceModel\Db\Context'),
$this->_objectManager->create('Magento\Backend\Model\Session'),
$this->_objectManager->create('Magento\Sales\Model\Order'),
Expand Down
16 changes: 8 additions & 8 deletions Controller/Adminhtml/Cancellation/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ public function __construct(
public function execute()
{
$cancellation = new Cancellation(
$this->_objectManager->create('Magento\Framework\App\Config\ScopeConfigInterface'),
$this->_objectManager->create('Magento\Framework\App\ResourceConnection'),
$this->_objectManager->create('Magento\Framework\Model\ResourceModel\Db\Context'),
$this->_objectManager->create('Magento\Backend\Model\Session'),
$this->_objectManager->create('Magento\Sales\Model\Order'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Library'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Crypt'),
$this->getRequest()->getParam('days')
$this->_objectManager->create('Magento\Framework\App\Config\ScopeConfigInterface'),
$this->_objectManager->create('\Magento\Framework\App\ResourceConnection'),
$this->_objectManager->create('Magento\Framework\Model\ResourceModel\Db\Context'),
$this->_objectManager->create('Magento\Backend\Model\Session'),
$this->_objectManager->create('Magento\Sales\Model\Order'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Library'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Crypt'),
$this->getRequest()->getParam('days')
);

try {
Expand Down
14 changes: 7 additions & 7 deletions Controller/Adminhtml/Conciliation/Conciliate.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ public function __construct(
public function execute()
{
$conciliation = new Conciliation(
$this->_objectManager->create('Magento\Framework\App\Config\ScopeConfigInterface'),
$this->_objectManager->create('Magento\Framework\App\ResourceConnection'),
$this->_objectManager->create('Magento\Framework\Model\ResourceModel\Db\Context'),
$this->_objectManager->create('Magento\Backend\Model\Session'),
$this->_objectManager->create('Magento\Sales\Model\Order'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Library'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Crypt')
$this->_objectManager->create('Magento\Framework\App\Config\ScopeConfigInterface'),
$this->_objectManager->create('\Magento\Framework\App\ResourceConnection'),
$this->_objectManager->create('Magento\Framework\Model\ResourceModel\Db\Context'),
$this->_objectManager->create('Magento\Backend\Model\Session'),
$this->_objectManager->create('Magento\Sales\Model\Order'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Library'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Crypt')
);

try {
Expand Down
16 changes: 8 additions & 8 deletions Controller/Adminhtml/Conciliation/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ public function __construct(
public function execute()
{
$conciliation = new Conciliation(
$this->_objectManager->create('Magento\Framework\App\Config\ScopeConfigInterface'),
$this->_objectManager->create('Magento\Framework\App\ResourceConnection'),
$this->_objectManager->create('Magento\Framework\Model\ResourceModel\Db\Context'),
$this->_objectManager->create('Magento\Backend\Model\Session'),
$this->_objectManager->create('Magento\Sales\Model\Order'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Library'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Crypt'),
$this->getRequest()->getParam('days')
$this->_objectManager->create('Magento\Framework\App\Config\ScopeConfigInterface'),
$this->_objectManager->create('\Magento\Framework\App\ResourceConnection'),
$this->_objectManager->create('Magento\Framework\Model\ResourceModel\Db\Context'),
$this->_objectManager->create('Magento\Backend\Model\Session'),
$this->_objectManager->create('Magento\Sales\Model\Order'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Library'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Crypt'),
$this->getRequest()->getParam('days')
);
try {
return $this->whenSuccess($conciliation->request());
Expand Down
16 changes: 8 additions & 8 deletions Controller/Adminhtml/Refund/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ public function __construct(
public function execute()
{
$refund = new Methods\Refund(
$this->_objectManager->create('Magento\Framework\App\Config\ScopeConfigInterface'),
$this->_objectManager->create('Magento\Framework\App\ResourceConnection'),
$this->_objectManager->create('Magento\Framework\Model\ResourceModel\Db\Context'),
$this->_objectManager->create('Magento\Backend\Model\Session'),
$this->_objectManager->create('Magento\Sales\Model\Order'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Library'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Crypt'),
$this->getRequest()->getParam('days')
$this->_objectManager->create('Magento\Framework\App\Config\ScopeConfigInterface'),
$this->_objectManager->create('Magento\Framework\App\ResourceConnection'),
$this->_objectManager->create('Magento\Framework\Model\ResourceModel\Db\Context'),
$this->_objectManager->create('Magento\Backend\Model\Session'),
$this->_objectManager->create('Magento\Sales\Model\Order'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Library'),
$this->_objectManager->create('UOL\PagSeguro\Helper\Crypt'),
$this->getRequest()->getParam('days')
);

try {
Expand Down
4 changes: 2 additions & 2 deletions Controller/Direct/Payment.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
use UOL\PagSeguro\Model\PaymentMethod;

/**
* Class Checkout
* @package UOL\PagSeguro\Controller\Payment
* Class Payment
* @package UOL\PagSeguro\Controller\Direct\Payment
*/
class Payment extends \Magento\Framework\App\Action\Action
{
Expand Down
85 changes: 85 additions & 0 deletions Controller/Payment/Cancel.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?php
/**
* 2007-2017 [PagSeguro Internet Ltda.]
*
* NOTICE OF LICENSE
*
*Licensed under the Apache License, Version 2.0 (the "License");
*you may not use this file except in compliance with the License.
*You may obtain a copy of the License at
*
*http://www.apache.org/licenses/LICENSE-2.0
*
*Unless required by applicable law or agreed to in writing, software
*distributed under the License is distributed on an "AS IS" BASIS,
*WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
*See the License for the specific language governing permissions and
*limitations under the License.
*
* @author PagSeguro Internet Ltda.
* @copyright 2017 PagSeguro Internet Ltda.
* @license http://www.apache.org/licenses/LICENSE-2.0
*/

namespace UOL\PagSeguro\Controller\Payment;

use UOL\PagSeguro\Model\PaymentMethod;

/**
* Class Checkout
* @package UOL\PagSeguro\Controller\Payment
*/
class Cancel extends \Magento\Framework\App\Action\Action
{
/**
* @var \Magento\Framework\View\Result\PageFactory
*/
protected $_resultPageFactory;

/**
* @var \Magento\Sales\Model\OrderFactory
*/
protected $_orderFactory;
/**
* @var \Magento\Checkout\Model\Session
*/
protected $_checkoutSession;

/**
* Checkout constructor.
*
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
\Magento\Framework\View\Result\PageFactory $resultPageFactory
) {
parent::__construct($context);
/** @var \Magento\Framework\View\Result\PageFactory _resultPageFactory*/
$this->_resultPageFactory = $resultPageFactory;

}
/**
* Show cancel page
*
* @return \Magento\Framework\View\Result\PageFactory
*/
public function execute()
{

$this->_orderFactory = $this->_objectManager->get('\Magento\Sales\Model\OrderFactory');
$this->_checkoutSession = $this->_objectManager->get('\Magento\Checkout\Model\Session');
/** @var \Magento\Sales\Model\Order $order */
$order = $this->_objectManager->create('\Magento\Sales\Model\Order')->load(
$this->_checkoutSession->getLastRealOrderId());

/** change payment status in magento */
$order->addStatusToHistory('pagseguro_cancelada', null, true);
/** save order */
$order->save();

return $this->_redirect('/');

}
}
1 change: 0 additions & 1 deletion Controller/Payment/Checkout.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ public function __construct(
public function execute()
{
$result = $this->payment->createPaymentRequest();

$resultPage = $this->resultPageFactory->create();
$code = $result->getCode();
$resultPage->getLayout()->getBlock('pagseguro.payment.checkout')
Expand Down
Loading

0 comments on commit 400f94b

Please sign in to comment.