Merge pull request #4 from PayEx/marketplace-validation

Adds config validation
PayEx · Jun 17, 2019 · b181ce7 · b181ce7
2 parents f42af7a + b4378e7
commit b181ce7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/Model/ConsumerSession.php b/Model/ConsumerSession.php
@@ -136,6 +136,4 @@ public function setActionType($actionType)
     {
         $this->storage->setData(self::ACTION_TYPE, $actionType);
     }
-
-
 }
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -1,20 +1,32 @@
 <?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <section id="payment" translate="label" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
-            <group id="payex" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="1">
-                <group id="checkin" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="1">
+        <section id="payment">
+            <group id="payex" translate="label" type="text"
+                   sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+                <group id="checkin" translate="label" type="text"
+                       sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Checkin Configuration</label>
-                    <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="active" translate="label" type="select"
+                           sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Enabled</label>
                         <config_path>payex/checkin/active</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        <depends>
+                            <field id="payex/client/active">1</field>
+                            <field id="payex/checkout/active">1</field>
+                        </depends>
                     </field>
-                    <field id="required" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="required" translate="label" type="select"
+                           sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Required</label>
                         <config_path>payex/checkin/required</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <comment>Require login through checkin widget</comment>
+                        <comment><![CDATA[Require login through checkin widget.]]></comment>
+                        <depends>
+                            <field id="active">1</field>
+                        </depends>
                     </field>
                 </group>
             </group>
-Original file line number
+Diff line change
@@ Expand Up / @@ -136,6 +136,4 @@ public function setActionType($actionType) @@
         {
             $this->storage->setData(self::ACTION_TYPE, $actionType);
         }
     }