CHANGELOG

Author: mariolorenz

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### NEW
 
 - All PayPal payment methods have "PayPal" as a prefix in a fresh installation to better identify them in the admin panel. When setting up payment methods, the merchant can decide which name best fits their needs.
+- Move PayPal-Config to Config-Section in Admin > Module-List > Module > Options
 
 ### FIX
 

views/smarty/admin/blocks/admin_headitem_inccss.tpl

@@ -1,6 +1,8 @@
 [{if
-    $oViewConf->getTopActiveClassName()|lower=="module_config" ||
-    $oViewConf->getTopActiveClassName()|lower=="oscpaypalconfig" ||
+    (
+        $oViewConf->getTopActiveClassName()|lower == "module_config" &&
+        $oModule->getInfo('id') == "osc_paypal"
+    ) ||
     $oViewConf->getTopActiveClassName()|lower=="oscpaypalorder"
 }]
     [{oxstyle include=$oViewConf->getModuleUrl('osc_paypal','css/bootstrap.min.css') priority=10}]

views/smarty/admin/blocks/admin_headitem_incjs.tpl

@@ -1,13 +1,14 @@
 [{if
-    $oViewConf->getTopActiveClassName()|lower=="module_config" ||
-    $oViewConf->getTopActiveClassName()|lower=="oscpaypalconfig" ||
+    (
+        $oViewConf->getTopActiveClassName()|lower == "module_config" &&
+        $oModule->getInfo('id') == "osc_paypal"
+    ) ||
     $oViewConf->getTopActiveClassName()|lower=="oscpaypalorder"
 }]
     [{oxscript include="js/libs/jquery.min.js" priority=1}]
     [{oxscript add="$.noConflict();" priority=10}]
     [{if
-        $oViewConf->getTopActiveClassName()|lower=="module_config" ||
-        $oViewConf->getTopActiveClassName()|lower == "oscpaypalconfig"
+        $oViewConf->getTopActiveClassName()|lower=="module_config"
     }]
         [{oxscript include="js/libs/jquery-ui.min.js"}]
         [{oxscript include="js/widgets/oxmoduleconfiguration.js"}]

views/twig/extensions/themes/admin_twig/headitem.html.twig

@@ -1,18 +1,24 @@
 {% extends "headitem.html.twig" %}
 
 {% block admin_headitem_inccss %}
-    {% if oViewConf.getTopActiveClassName()|lower == "oscpaypalconfig" or oViewConf.getTopActiveClassName()|lower == "oscpaypalorder" or oViewConf.getTopActiveClassName()|lower == "module_config" %}
+    {% if (
+        oViewConf.getTopActiveClassName()|lower == "module_config" and oModule.getInfo('id') == 'osc_paypal'
+        ) or oViewConf.getTopActiveClassName()|lower == "oscpaypalorder"
+    %}
         <link rel="stylesheet" type="text/css" href="{{ oViewConf.getModuleUrl('osc_paypal','css/bootstrap.min.css') }}">
         <link rel="stylesheet" type="text/css" href="{{ oViewConf.getModuleUrl('osc_paypal','css/paypal-admin.min.css') }}">
     {% endif %}
     {{ parent() }}
 {% endblock %}
 
 {% block admin_headitem_incjs %}
-    {% if oViewConf.getTopActiveClassName()|lower == "oscpaypalconfig" or oViewConf.getTopActiveClassName()|lower == "oscpaypalorder" or oViewConf.getTopActiveClassName()|lower == "module_config"  %}
+    {% if (
+        oViewConf.getTopActiveClassName()|lower == "module_config" and oModule.getInfo('id') == 'osc_paypal'
+        ) or oViewConf.getTopActiveClassName()|lower == "oscpaypalorder"
+    %}
         {{ script({ include: "js/libs/jquery.min.js", dynamic: __oxid_include_dynamic }) }}
         {{ script({ add: "$.noConflict();", priority: 10, dynamic: __oxid_include_dynamic }) }}
-        {% if oViewConf.getTopActiveClassName()|lower == "oscpaypalconfig" or oViewConf.getTopActiveClassName()|lower == "module_config" %}
+        {% if oViewConf.getTopActiveClassName()|lower == "module_config" %}
             {{ script({ include: "js/libs/jquery-ui.min.js", dynamic: __oxid_include_dynamic }) }}
             {{ script({ include: "js/widgets/oxmoduleconfiguration.js", dynamic: __oxid_include_dynamic }) }}