From b8abea28ecc17d2d28cdf95b552184b8ba0b558e Mon Sep 17 00:00:00 2001
From: Ihor Vansach <ihor@magefan.com>
Date: Sat, 11 Jul 2020 13:08:29 +0300
Subject: [PATCH] Changed naming in stores configuration

---
 Block/Adminhtml/System/Config/Form/CloudflareCheck.php | 2 +-
 Model/IpToCountryRepository.php                        | 6 +++---
 composer.json                                          | 2 +-
 etc/adminhtml/system.xml                               | 2 +-
 etc/config.xml                                         | 4 ++--
 etc/module.xml                                         | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Block/Adminhtml/System/Config/Form/CloudflareCheck.php b/Block/Adminhtml/System/Config/Form/CloudflareCheck.php
index 8e77134..f775883 100644
--- a/Block/Adminhtml/System/Config/Form/CloudflareCheck.php
+++ b/Block/Adminhtml/System/Config/Form/CloudflareCheck.php
@@ -26,7 +26,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
             "jquery",
             "domReady!"
         ], function($){
-            $("#geoip_cloudflare_cloudflare_ip_enable").change(function() {
+            $("#mfgeoip_cloudflare_cloudflare_ip_enable").change(function() {
                 var val = parseInt($(this).val());
                 if (val) {
                     $("#enable_cloudflare_ip").show();
diff --git a/Model/IpToCountryRepository.php b/Model/IpToCountryRepository.php
index c4c8975..78bc079 100644
--- a/Model/IpToCountryRepository.php
+++ b/Model/IpToCountryRepository.php
@@ -17,17 +17,17 @@ class IpToCountryRepository
     /**
      * Default path in system.xml
      */
-    const XML_PATH_CLOUDFLARE_ENABLED  = 'mf_geoip/cloudflare/cloudflare_ip_enable';
+    const XML_PATH_CLOUDFLARE_ENABLED  = 'mfgeoip/cloudflare/cloudflare_ip_enable';
 
     /**
      * Allow IPs path in system.xml
      */
-    const XML_PATH_ALLOW_IPS  = 'mf_geoip/developer/allow_ips';
+    const XML_PATH_ALLOW_IPS  = 'mfgeoip/developer/allow_ips';
 
     /**
      * Simulate country path in system.xml
      */
-    const XML_PATH_SIMULATE_COUNTRY  = 'mf_geoip/developer/simulate_country';
+    const XML_PATH_SIMULATE_COUNTRY  = 'mfgeoip/developer/simulate_country';
 
     /**
      * @var \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress
diff --git a/composer.json b/composer.json
index bc979da..f6dd8e4 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "geoip2/geoip2": "^2.9.0"
     },
     "type": "magento2-module",
-    "version": "2.1.6",
+    "version": "2.1.7",
     "autoload": {
         "psr-4": {
             "Magefan\\GeoIp\\": ""
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index e6773a8..e7f9cad 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -11,7 +11,7 @@
         <tab id="magefan" sortOrder="110" translate="label">
             <label>Magefan Extensions</label>
         </tab>
-        <section id="mf_geoip" translate="label" sortOrder="130" showInDefault="1" showInWebsite="0" showInStore="0">
+        <section id="mfgeoip" translate="label" sortOrder="130" showInDefault="1" showInWebsite="0" showInStore="0">
             <class>separator-top</class>
             <label>GeoIP Database</label>
             <tab>magefan</tab>
diff --git a/etc/config.xml b/etc/config.xml
index 4e5c13e..d7347ed 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -8,10 +8,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
-        <mf_geoip>
+        <mfgeoip>
             <cloudflare>
                 <cloudflare_ip_enable>1</cloudflare_ip_enable>
             </cloudflare>
-        </mf_geoip>
+        </mfgeoip>
     </default>
 </config>
diff --git a/etc/module.xml b/etc/module.xml
index cb9c003..8392548 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-	<module name="Magefan_GeoIp" setup_version="2.1.6"/>
+	<module name="Magefan_GeoIp" setup_version="2.1.7"/>
 </config>