1.2.0

mollie · Feb 12, 2018 · b6710f2 · b6710f2
1 parent 72c5ea1
commit b6710f2
Show file tree

Hide file tree

Showing 59 changed files with 894 additions and 184 deletions.
diff --git a/Block/Adminhtml/Render/Header.php b/Block/Adminhtml/Render/Header.php
@@ -1,37 +1,30 @@
 <?php
 /**
- * Copyright © 2017 Mollie.eu. All rights reserved.
+ * Copyright © 2018 Mollie.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Mollie\Payment\Block\Adminhtml\Render;
 
 use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Framework\Data\Form\Element\AbstractElement;
-use Mollie\Payment\Helper\General as GeneralHelper;
-use Magento\Backend\Block\Template\Context;
 
+/**
+ * Class Header
+ *
+ * @package Mollie\Payment\Block\Adminhtml\Render
+ */
 class Header extends Field
 {
 
-    protected $general;
-    protected $_template = 'Mollie_Payment::system/config/fieldset/header.phtml';
-
     /**
-     * Header constructor.
-     * @param Context $context
-     * @param GeneralHelper $general
+     * @var string
      */
-    public function __construct(
-        Context $context,
-        GeneralHelper $general
-    ) {
-        $this->general = $general;
-        parent::__construct($context);
-    }
+    protected $_template = 'Mollie_Payment::system/config/fieldset/header.phtml';
 
     /**
      * @param AbstractElement $element
+     *
      * @return string
      */
     public function render(AbstractElement $element)

diff --git a/Block/Adminhtml/Render/Heading.php b/Block/Adminhtml/Render/Heading.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magmodules.eu. All rights reserved.
+ * Copyright © 2018 Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
 
@@ -9,6 +9,11 @@
 use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 
+/**
+ * Class Heading
+ *
+ * @package Mollie\Payment\Block\Adminhtml\Render
+ */
 class Heading extends Field
 {
 
@@ -22,14 +27,14 @@ class Heading extends Field
     public function render(AbstractElement $element)
     {
         $html = '<tr id="row_' . $element->getHtmlId() . '">';
-        $html .= '  <td class="label"></td>';
-        $html .= '  <td class="value">';
-        $html .= '    <div class="mm-heading-mollie">' . $element->getData('label') . '</div>';
-        $html .= '	  <div class="mm-comment-mollie">';
-        $html .= '        <div id="content">' . $element->getData('comment') . '</div>';
-        $html .= '    </div>';
-        $html .= '  </td>';
-        $html .= '  <td></td>';
+        $html .= ' <td class="label"></td>';
+        $html .= ' <td class="value">';
+        $html .= '  <div class="mm-heading-mollie">' . $element->getData('label') . '</div>';
+        $html .= '   <div class="mm-comment-mollie">';
+        $html .= '    <div id="content">' . $element->getData('comment') . '</div>';
+        $html .= '   </div>';
+        $html .= ' </td>';
+        $html .= ' <td></td>';
         $html .= '</tr>';
 
         return $html;

diff --git a/Block/Adminhtml/Render/Version.php b/Block/Adminhtml/Render/Version.php
@@ -1,20 +1,28 @@
 <?php
 /**
- * Copyright © 2017 Magmodules.eu. All rights reserved.
+ * Copyright © 2018 Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Mollie\Payment\Block\Adminhtml\Render;
 
 use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Backend\Block\Template\Context;
-use Mollie\Payment\Helper\General as MollieHelper;
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Mollie\Payment\Helper\General as MollieHelper;
 
+/**
+ * Class Version
+ *
+ * @package Mollie\Payment\Block\Adminhtml\Render
+ */
 class Version extends Field
 {
 
-    protected $mollieHelper;
+    /**
+     * @var MollieHelper
+     */
+    private $mollieHelper;
 
     /**
      * Version constructor.

diff --git a/Block/Adminhtml/System/Config/Form/Apikey/Checker.php b/Block/Adminhtml/System/Config/Form/Apikey/Checker.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magmodules.eu. All rights reserved.
+ * Copyright © 2018 Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
 
@@ -10,11 +10,22 @@
 use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 
+/**
+ * Class Checker
+ *
+ * @package Mollie\Payment\Block\Adminhtml\System\Config\Form\Apikey
+ */
 class Checker extends Field
 {
 
-    protected $request;
+    /**
+     * @var string
+     */
     protected $_template = 'Mollie_Payment::system/config/button/apikey.phtml';
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    private $request;
 
     /**
      * Checker constructor.
@@ -65,9 +76,12 @@ public function getAjaxUrl()
      */
     public function getButtonHtml()
     {
-        $buttonData = ['id' => 'apikey_button', 'label' => __('Test Apikey')];
-        $button = $this->getLayout()->createBlock('Magento\Backend\Block\Widget\Button')->setData($buttonData);
-
-        return $button->toHtml();
+        try {
+            $buttonData = ['id' => 'apikey_button', 'label' => __('Test Apikey')];
+            $button = $this->getLayout()->createBlock('Magento\Backend\Block\Widget\Button')->setData($buttonData);
+            return $button->toHtml();
+        } catch (\Exception $e) {
+            return '';
+        }
     }
 }
diff --git a/Block/Adminhtml/System/Config/Form/Apikey/Result.php b/Block/Adminhtml/System/Config/Form/Apikey/Result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magmodules.eu. All rights reserved.
+ * Copyright © 2018 Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
 
@@ -10,11 +10,22 @@
 use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 
+/**
+ * Class Result
+ *
+ * @package Mollie\Payment\Block\Adminhtml\System\Config\Form\Apikey
+ */
 class Result extends Field
 {
 
-    protected $request;
+    /**
+     * @var string
+     */
     protected $_template = 'Mollie_Payment::system/config/fieldset/result_apikey.phtml';
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    private $request;
 
     /**
      * Result constructor.

diff --git a/Block/Adminhtml/System/Config/Form/Compatibility/Checker.php b/Block/Adminhtml/System/Config/Form/Compatibility/Checker.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magmodules.eu. All rights reserved.
+ * Copyright © 2018 Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
 
@@ -10,11 +10,22 @@
 use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 
+/**
+ * Class Checker
+ *
+ * @package Mollie\Payment\Block\Adminhtml\System\Config\Form\Compatibility
+ */
 class Checker extends Field
 {
 
-    protected $request;
+    /**
+     * @var string
+     */
     protected $_template = 'Mollie_Payment::system/config/button/compatibility.phtml';
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    private $request;
 
     /**
      * Checker constructor.
@@ -66,9 +77,13 @@ public function getAjaxUrl()
      */
     public function getButtonHtml()
     {
-        $buttonData = ['id' => 'compatibility_button', 'label' => __('Self Test')];
-        $button = $this->getLayout()->createBlock('Magento\Backend\Block\Widget\Button')->setData($buttonData);
+        try {
+            $buttonData = ['id' => 'compatibility_button', 'label' => __('Self Test')];
+            $button = $this->getLayout()->createBlock('Magento\Backend\Block\Widget\Button')->setData($buttonData);
 
-        return $button->toHtml();
+            return $button->toHtml();
+        } catch (\Exception $e) {
+            return '';
+        }
     }
 }
diff --git a/Block/Adminhtml/System/Config/Form/Compatibility/Result.php b/Block/Adminhtml/System/Config/Form/Compatibility/Result.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magmodules.eu. All rights reserved.
+ * Copyright © 2018 Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
 
@@ -10,11 +10,22 @@
 use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 
+/**
+ * Class Result
+ *
+ * @package Mollie\Payment\Block\Adminhtml\System\Config\Form\Compatibility
+ */
 class Result extends Field
 {
 
-    protected $request;
+    /**
+     * @var string
+     */
     protected $_template = 'Mollie_Payment::system/config/fieldset/result_compatibility.phtml';
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    private $request;
 
     /**
      * Result constructor.

diff --git a/Block/Loading.php b/Block/Loading.php
@@ -1,32 +1,49 @@
 <?php
 /**
- * Copyright © 2017 Magmodules.eu. All rights reserved.
+ * Copyright © 2018 Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Mollie\Payment\Block;
- 
+
 use Magento\Checkout\Model\Session;
 use Magento\Backend\Block\Template\Context;
 use Magento\Framework\View\Element\Template;
+use Mollie\Payment\Helper\General as MollieHelper;
 
+/**
+ * Class Loading
+ *
+ * @package Mollie\Payment\Block
+ */
 class Loading extends Template
 {
-    protected $checkoutSession;
+
+    /**
+     * @var Session
+     */
+    private $checkoutSession;
+    /**
+     * @var MollieHelper
+     */
+    private $mollieHelper;
 
     /**
      * Loading constructor.
      *
-     * @param Context $context
-     * @param Session $checkoutSession
-     * @param array   $data
+     * @param Context      $context
+     * @param Session      $checkoutSession
+     * @param MollieHelper $mollieHelper
+     * @param array        $data
      */
     public function __construct(
         Context $context,
         Session $checkoutSession,
+        MollieHelper $mollieHelper,
         array $data = []
     ) {
         $this->checkoutSession = $checkoutSession;
+        $this->mollieHelper = $mollieHelper;
         parent::__construct($context, $data);
     }
 
@@ -54,4 +71,13 @@ public function getRedirectUrl()
             return $this->getMollieRedirect();
         }
     }
+
+    /**
+     * @return string
+     */
+    public function getBackUrl()
+    {
+        return $this->mollieHelper->getRestartUrl();
+    }
+
 }
diff --git a/Controller/Adminhtml/Action/Apikey.php b/Controller/Adminhtml/Action/Apikey.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magmodules.eu. All rights reserved.
+ * Copyright © 2018 Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
 
@@ -11,25 +11,30 @@
 use Magento\Framework\Controller\Result\JsonFactory;
 use Mollie\Payment\Helper\General as MollieHelper;
 
+/**
+ * Class Apikey
+ *
+ * @package Mollie\Payment\Controller\Adminhtml\Action
+ */
 class Apikey extends Action
 {
 
     /**
      * @var \Magento\Framework\App\RequestInterface
      */
-    protected $request;
+    private $request;
     /**
      * @var JsonFactory
      */
-    protected $resultJsonFactory;
+    private $resultJsonFactory;
     /**
      * @var \Magento\Framework\ObjectManagerInterface
      */
-    protected $objectManager;
+    private $objectManager;
     /**
      * @var MollieHelper
      */
-    protected $mollieHelper;
+    private $mollieHelper;
 
     /**
      * ApiKey constructor.