Merge pull request #15 from AdelanteFinancialHoldings/wolf_validation…

…_fix

Class and validation fix. Display of plug-in settings in the Adobe da…

Block/Adminhtml/System/Config/Fieldset/Payment.php

@@ -8,26 +8,34 @@
 use Magento\Config\Model\Config;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\View\Helper\Js;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 class Payment extends Fieldset
 {
     /**
      * @var Config
      */
-    protected $_config;
+    private $config;
+
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
 
     /**
      * @param Context            $context
      * @param Session            $authSession
      * @param Js                 $jsHelper
      * @param Config             $config
+     * @param SecureHtmlRenderer $secureRenderer
      * @param array              $data
      */
     public function __construct(
         Context $context,
         Session $authSession,
         Js $jsHelper,
         Config $config,
+        SecureHtmlRenderer $secureRenderer,
         array $data = array()
     ) {
         parent::__construct(
@@ -36,7 +44,9 @@ public function __construct(
             $jsHelper,
             $data
         );
-        $this->_config         = $config;
+
+        $this->config         = $config;
+        $this->secureRenderer = $secureRenderer;
     }
 
     /**
@@ -59,43 +69,22 @@ protected function _getFrontendClass($element)
     protected function _getHeaderTitleHtml($element)
     {
         $html = '<div class="config-heading" >';
-
-        $groupConfig = $element->getGroup();
-
-        $disabledAttributeString = $this->_isPaymentEnabled($element) ? '' : ' disabled="disabled"';
-        $disabledClassString = $this->_isPaymentEnabled($element) ? '' : ' disabled';
         $htmlId = $element->getHtmlId();
         $html .= '<div class="button-container"><button type="button"' .
-            $disabledAttributeString .
             ' class="button action-configure' .
-            (empty($groupConfig['paypal_ec_separate']) ? '' : ' paypal-ec-separate') .
-            $disabledClassString .
-            '" id="' .
-            $htmlId .
-            '-head" onclick="paypalToggleSolution.call(this, \'' .
-            $htmlId .
-            "', '" .
-            $this->getUrl(
-                'adminhtml/*/state'
-            ) . '\'); return false;"><span class="state-closed">' . __(
+            '" id="' . $htmlId . '-head" >' .
+            '<span class="state-closed">' . __(
                 'Configure'
             ) . '</span><span class="state-opened">' . __(
                 'Close'
             ) . '</span></button>';
 
-        if (!empty($groupConfig['more_url'])) {
-            $html .= '<a class="link-more" href="' . $groupConfig['more_url'] . '" target="_blank">'
-                . __(
-                    'Learn More'
-                ) . '</a>';
-        }
-
-        if (!empty($groupConfig['demo_url'])) {
-            $html .= '<a class="link-demo" href="' . $groupConfig['demo_url'] . '" target="_blank">'
-                . __(
-                    'View Demo'
-                ) . '</a>';
-        }
+        $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "addiToggleSolution.call(this, '" . $htmlId . "', '" . $this->getUrl('adminhtml/*/state') .
+            "');event.preventDefault();",
+            'button#' . $htmlId . '-head'
+        );
 
         $html .= '</div>';
         $html .= '<div class="heading"><strong>' . $element->getLegend() . '</strong>';
@@ -143,9 +132,8 @@ protected function _isCollapseState($element)
      */
     protected function _getExtraJs($element)
     {
-        $element = '';
         $script = "require(['jquery', 'prototype'], function(jQuery){
-            window.AddiToggleSolution = function (id, url) {
+            window.addiToggleSolution = function (id, url) {
                 var doScroll = false;
                 Fieldset.toggleCollapse(id, url);
                 if ($(this).hasClassName(\"open\")) {
@@ -165,28 +153,4 @@ protected function _getExtraJs($element)
 
         return $this->_jsHelper->getScript($script);
     }
-
-    /**
-     * Check whether current payment method is enabled
-     *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
-     * @return bool
-     */
-    protected function _isPaymentEnabled($element)
-    {
-        $groupConfig = $element->getGroup();
-        $activityPaths = isset($groupConfig['activity_path']) ? $groupConfig['activity_path'] : array();
-
-        if (!is_array($activityPaths)) {
-            $activityPaths = array($activityPaths);
-        }
-
-        $isPaymentEnabled = false;
-        foreach ($activityPaths as $activityPath) {
-            $isPaymentEnabled = $isPaymentEnabled
-                || (bool)(string)$this->_backendConfig->getConfigDataValue($activityPath);
-        }
-
-        return $isPaymentEnabled;
-    }
 }

composer.json

@@ -3,7 +3,7 @@
     "description": "Magento 2 Payment Module",
     "type": "magento2-module",
     "license": "proprietary",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "minimum-stability": "stable",
     "prefer-stable": true,
     "autoload": {