From 9d01e5a84f601d44d40f7d059cff147b7104c9b5 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Thu, 16 Dec 2021 15:34:18 +0200
Subject: [PATCH] update - v1.0.1

---
 componentbuilderfieldorderingcompiler.php                  | 2 +-
 componentbuilderfieldorderingcompiler.xml                  | 2 +-
 ...plg_extension_componentbuilderfieldorderingcompiler.ini | 2 +-
 ...extension_componentbuilderfieldorderingcompiler.sys.ini | 2 +-
 script.php                                                 | 7 ++++---
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/componentbuilderfieldorderingcompiler.php b/componentbuilderfieldorderingcompiler.php
index cafffb2..ce6bff4 100644
--- a/componentbuilderfieldorderingcompiler.php
+++ b/componentbuilderfieldorderingcompiler.php
@@ -22,7 +22,7 @@ JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/c
  * Extension - Componentbuilder Field Ordering Compiler plugin.
  *
  * @package   ComponentbuilderFieldOrderingCompiler
- * @since     1.0.0
+ * @since     1.0.1
  */
 class PlgExtensionComponentbuilderFieldOrderingCompiler extends CMSPlugin
 {
diff --git a/componentbuilderfieldorderingcompiler.xml b/componentbuilderfieldorderingcompiler.xml
index f9ea7a8..93b86b6 100644
--- a/componentbuilderfieldorderingcompiler.xml
+++ b/componentbuilderfieldorderingcompiler.xml
@@ -7,7 +7,7 @@
 	<authorUrl>https://dev.vdm.io</authorUrl>
 	<copyright>Copyright (C) 2015 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 	<description>PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER_XML_DESCRIPTION</description>
 
 	<!-- Scripts to run on installation -->
diff --git a/language/en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.ini b/language/en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.ini
index 90b7c87..ec2c768 100644
--- a/language/en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.ini
+++ b/language/en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.ini
@@ -2,6 +2,6 @@ PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER="Extension - Componentbuilde
 PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER_DESCRIPTION="This plugin is used to set the ordring for your component views during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
 
 Also be sure to set your admin views where you would like to use Field Ordering."
-PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Field Ordering Compiler (v.1.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to set the ordring for your component views during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
+PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Field Ordering Compiler (v.1.0.1)</h1> <div style='clear: both;'></div><p>This plugin is used to set the ordring for your component views during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
 
 Also be sure to set your admin views where you would like to use Field Ordering.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 21st May, 2020</small></p>"
\ No newline at end of file
diff --git a/language/en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.sys.ini b/language/en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.sys.ini
index 90b7c87..ec2c768 100644
--- a/language/en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.sys.ini
+++ b/language/en-GB/en-GB.plg_extension_componentbuilderfieldorderingcompiler.sys.ini
@@ -2,6 +2,6 @@ PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER="Extension - Componentbuilde
 PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER_DESCRIPTION="This plugin is used to set the ordring for your component views during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
 
 Also be sure to set your admin views where you would like to use Field Ordering."
-PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Field Ordering Compiler (v.1.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to set the ordring for your component views during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
+PLG_EXTENSION_COMPONENTBUILDERFIELDORDERINGCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Field Ordering Compiler (v.1.0.1)</h1> <div style='clear: both;'></div><p>This plugin is used to set the ordring for your component views during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
 
 Also be sure to set your admin views where you would like to use Field Ordering.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 21st May, 2020</small></p>"
\ No newline at end of file
diff --git a/script.php b/script.php
index 776eb3d..2cc1cc9 100644
--- a/script.php
+++ b/script.php
@@ -43,6 +43,7 @@ class plgExtensionComponentbuilderFieldOrderingCompilerInstallerScript
 
 		if ('install' === $route)
 		{
+
 			// check that componentbuilder is installed
 			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
 			if (!JFile::exists($pathToCore))
@@ -60,8 +61,8 @@ class plgExtensionComponentbuilderFieldOrderingCompilerInstallerScript
 			{
 				// get the version
 				$jcbVersion = explode('.', $manifest->version);
-				// check that we have JCB 2.11.1 or higher installed
-				if (count($jcbVersion) == 3 && (($jcbVersion[0] == 2 && $jcbVersion[1] >= 11 && (($jcbVersion[1] == 11 && $jcbVersion[2] >= 1) || ($jcbVersion[1] > 11))) || $jcbVersion[0] >= 3))
+				// check that we have JCB 3 or higher installed
+				if (count($jcbVersion) == 3 && $jcbVersion[0] >= 3)
 				{
 					$blockInstall = false;
 				}
@@ -69,7 +70,7 @@ class plgExtensionComponentbuilderFieldOrderingCompilerInstallerScript
 			// allow install if all conditions are met
 			if ($blockInstall)
 			{
-				$app->enqueueMessage('Please upgrade to JCB 2.11.1 or higher before installing this plugin.', 'error');
+				$app->enqueueMessage('Please upgrade to JCB-Pro v3.0.0 or higher before installing this plugin.', 'error');
 				return false;
 			}
 		}