Merge branch 'release/1.0.0'

Author: alessiodionisi

Controller/Satispay/Callback.php

@@ -1,21 +1,33 @@
 <?php
+/*
+Satispay Magento2 Plugin
+Copyright (C) 2017  Satispay
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 namespace Satispay\Satispay\Controller\Satispay;
 
 class Callback extends \Magento\Framework\App\Action\Action {
   protected $_order;
-  protected $_satispayPayment;
-  protected $_logger;
 
   public function __construct(
     \Magento\Framework\App\Action\Context $context,
-    \Magento\Sales\Model\Order $order,
-    \Satispay\Satispay\Model\Payment $satispayPayment,
-    \Psr\Log\LoggerInterface $logger
+    \Magento\Sales\Model\Order $order
   ) {
     parent::__construct($context);
     $this->_order = $order;
-    $this->_satispayPayment = $satispayPayment;
-    $this->_logger = $logger;
   }
 
   public function execute() {

Controller/Satispay/Payment.php

@@ -1,21 +1,33 @@
 <?php
+/*
+Satispay Magento2 Plugin
+Copyright (C) 2017  Satispay
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 namespace Satispay\Satispay\Controller\Satispay;
 
 class Payment extends \Magento\Framework\App\Action\Action {
-  protected $_satispayPayment;
   protected $_checkoutSession;
-  protected $_logger;
 
   public function __construct(
     \Magento\Framework\App\Action\Context $context,
-    \Satispay\Satispay\Model\Payment $satispayPayment,
-    \Magento\Checkout\Model\Session $checkoutSession,
-    \Psr\Log\LoggerInterface $logger
+    \Magento\Checkout\Model\Session $checkoutSession
   ) {
     parent::__construct($context);
-    $this->_satispayPayment = $satispayPayment;
     $this->_checkoutSession = $checkoutSession;
-    $this->_logger = $logger;
   }
 
   public function execute() {
@@ -25,9 +37,9 @@ public function execute() {
         'description' => '#'.$lastOrder->getIncrementId(),
         'phone_number' => $lastOrder->getBillingAddress()->getTelephone(),
         'redirect_url' => $this->_url->getUrl('satispay/satispay/redirect'),
-        'callback_url' => $this->_url->getUrl('satispay/satispay/callback', $this->_redirect->updatePathParams([
+        'callback_url' => $this->_url->getUrl('satispay/satispay/callback', array(
           'charge' => '{uuid}'
-        ])),
+        )),
         'amount_unit' => $lastOrder->getGrandTotal() * 100,
         'currency' => $lastOrder->getOrderCurrencyCode(),
         'metadata' => array(

Controller/Satispay/Redirect.php

@@ -1,21 +1,33 @@
 <?php
+/*
+Satispay Magento2 Plugin
+Copyright (C) 2017  Satispay
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 namespace Satispay\Satispay\Controller\Satispay;
 
 class Redirect extends \Magento\Framework\App\Action\Action {
-  protected $_satispayPayment;
   protected $_checkoutSession;
-  protected $_logger;
 
   public function __construct(
     \Magento\Framework\App\Action\Context $context,
-    \Satispay\Satispay\Model\Payment $satispayPayment,
-    \Magento\Checkout\Model\Session $checkoutSession,
-    \Psr\Log\LoggerInterface $logger
+    \Magento\Checkout\Model\Session $checkoutSession
   ) {
     parent::__construct($context);
-    $this->_satispayPayment = $satispayPayment;
     $this->_checkoutSession = $checkoutSession;
-    $this->_logger = $logger;
   }
 
   public function execute() {