Change direct payment flow

Controller/Adminhtml/Cancellation/Cancel.php

@@ -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'),

Controller/Adminhtml/Cancellation/Request.php

@@ -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 {

Controller/Adminhtml/Conciliation/Conciliate.php

@@ -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 {

Controller/Adminhtml/Conciliation/Request.php

@@ -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());

Controller/Adminhtml/Refund/Request.php

@@ -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 {

Controller/Direct/Payment.php

@@ -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
 {

Controller/Payment/Cancel.php

@@ -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('/');
+
+    }
+}

Controller/Payment/Checkout.php

@@ -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')