From 95ca9be71eab0a82e467b149f0cc03e24a167422 Mon Sep 17 00:00:00 2001
From: Chukwuemeka Ihedoro <caihedoro@gmail.com>
Date: Thu, 24 May 2018 07:56:47 +0100
Subject: [PATCH] edits done

---
 Model/PaymentGateway.php |  2 +-
 composer.json            |  2 +-
 etc/adminhtml/system.xml | 23 ++++++++++-------------
 etc/config.xml           | 10 +++++-----
 etc/module.xml           |  3 ++-
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/Model/PaymentGateway.php b/Model/PaymentGateway.php
index 351f014..f6aae57 100644
--- a/Model/PaymentGateway.php
+++ b/Model/PaymentGateway.php
@@ -10,7 +10,7 @@
 
 class PaymentGateway extends \Magento\Payment\Model\Method\AbstractMethod
 {
-    protected $_code = 'payscrowgateway';
+//    protected $_code = 'payscrowgateway';
 //    protected $_formBlockType = 'payscrowgateway/form_payscrowGateway';
 //    protected $_infoBlockType = 'payscrowgateway/info_payscrowGateway';
 //    protected $_isInitializeNeeded      = true;
diff --git a/composer.json b/composer.json
index 065b025..ca2ca32 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
 		"php": "~5.5.0|~5.6.0|^7.0.0"
 	},
 	"type": "magento2-module",
-	"version": "1.0.3",
+	"version": "1.0.4",
 	"authors": [
 		{
 			"name": "Chukwuemeka Ihedoro",
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 4abd287..acec9e2 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -1,38 +1,35 @@
+<?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">
     <system>
-        <section id="payment">
-            <group id="payscrow_paymentgateway" translate="label comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+        <section id="payscrow">
+            <group id="paymentgateway" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Payscrow - Premium Payment Escrow Service</label>
                 <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="title" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="title" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Title</label>
                 </field>
-
-
-                <field id="access_key" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="access_key" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Access key</label>
                 </field>
-                <field id="order_status" translate="label" type="select" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="order_status" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>New order status</label>
                     <source_model>Magento\Sales\Model\Config\Source\Order\Status\NewStatus</source_model>
                 </field>
-                <field id="sandbox_mode" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="sandbox_mode" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Sandbox Mode</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="max_delivery_duration" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="max_delivery_duration" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Max. Delivery Duration</label>
                 </field>
-
-
-                <field id="allowspecific" translate="label" type="allowspecific" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="allowspecific" translate="label" type="allowspecific" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Payment from Applicable Countries</label>
                     <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
                 </field>
-                <field id="specificcountry" translate="label" type="multiselect" sortOrder="41" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="specificcountry" translate="label" type="multiselect" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Payment from Specific Countries</label>
                     <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
                     <can_be_empty>1</can_be_empty>
diff --git a/etc/config.xml b/etc/config.xml
index 25355ef..e082699 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
-        <payment>
-            <payscrow_paymentgateway>
+        <payscrow>
+            <paymentgateway>
                 <title>PayScrow - Premium Escrow Payment Service</title>
                 <model>Payscrow\PaymentGateway\Model\PaymentGateway</model>
                 <order_status>pending</order_status>
@@ -14,9 +14,9 @@
                 <gateway_demo_url>http://ps.ofekpc.com/</gateway_demo_url>
                 <access_key></access_key>
                 <access_demo_key>d1e5a982-fa05-414b-803c-b197307e4918</access_demo_key>
-                <sandbox_mode>0</sandbox_mode>
+                <sandbox_mode>1</sandbox_mode>
                 <max_delivery_duration></max_delivery_duration>
-            </payscrow_paymentgateway>
-        </payment>
+            </paymentgateway>
+        </payscrow>
     </default>
 </config>
\ No newline at end of file
diff --git a/etc/module.xml b/etc/module.xml
index 8d0bf49..3b0a275 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Payscrow_PaymentGateway" setup_version="1.0.0" >
+    <module name="Payscrow_PaymentGateway" setup_version="1.0.0">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Payment"/>