diff --git a/Makefile b/Makefile index 917164c5bbed12ef2abccb8ae3a79c63610709bf..4100fb4521346a3d26e860a88f39ce9b0abb2622 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ BASE=eurecap PLUGINTYPE=vmextended -VERSION=0.8 +VERSION=0.9 PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html # $(BASE)/ diff --git a/eurecap.php b/eurecap.php index b6b594019ce150410aba29439c7178fd9a0b3173..4007457233c2b00c2965aad722a5189f5e33b2aa 100644 --- a/eurecap.php +++ b/eurecap.php @@ -15,6 +15,10 @@ if( !defined( '_JEXEC' ) ) die( 'Direct Access to '.basename(__FILE__).' is not * http://www.open-tools.net */ +if (!class_exists( 'VmConfig' )) { + require(JPATH_ADMINISTRATOR .'/components/com_virtuemart/helpers/config.php'); + VmConfig::loadConfig(); +} defined ('VMPATH_ADMIN') or define ('VMPATH_ADMIN', JPATH_VM_ADMINISTRATOR); defined ('VMPATH_PLUGINLIBS') or define ('VMPATH_PLUGINLIBS', JPATH_VM_PLUGINS); if (!class_exists('vmExtendedPlugin')) require(VMPATH_PLUGINLIBS . DS . 'vmextendedplugin.php'); @@ -109,4 +113,4 @@ class plgVmExtendedEuRecap extends vmExtendedPlugin { } } -} \ No newline at end of file +} diff --git a/eurecap.script.php b/eurecap.script.php index 055df6eb31fec5ae3365c192c011b71c7ea3051c..b327a7fdbda67e0ca820c862de77be3cc6251178 100644 --- a/eurecap.script.php +++ b/eurecap.script.php @@ -7,8 +7,6 @@ defined('_JEXEC') or die('Restricted access'); * @license GPL v3+, http://www.gnu.org/copyleft/gpl.html */ defined('DS') or define('DS', DIRECTORY_SEPARATOR); -if (!class_exists( 'VmConfig' )) - require(JPATH_ROOT.DS.'administrator'.DS.'components'.DS.'com_virtuemart'.DS.'helpers'.DS.'config.php'); class plgVmExtendedEuRecapInstallerScript { @@ -38,10 +36,18 @@ class plgVmExtendedEuRecapInstallerScript * @return boolean True on success */ public function postflight ($type, $parent = null) { - if(!class_exists( 'plgVmExtendedEuRecap' )) + if(!class_exists( 'plgVmExtendedEuRecap' )) { +// JPluginHelper::importPlugin('vmextended', 'eurecap'); require JPATH_ROOT.DS.'plugins'.DS.'vmextended'.DS.'eurecap'.DS.'eurecap.php'; + } + if (!class_exists( 'VmConfig' )) { + require(JPATH_ROOT.DS.'administrator'.DS.'components'.DS.'com_virtuemart'.DS.'helpers'.DS.'config.php'); + VmConfig::loadConfig(); + } $dispatcher = new JDispatcher(); $config = array('name' => 'eurecap', 'type' => 'vmextended'); +// $plugin = JPluginHelper::importPlugin('vmextended', 'eurecap'); + $plugin = new plgVmExtendedEuRecap($dispatcher, $config); $plugin->onInstallCheckAdminMenuEntries(); // $plugin->plgVmOnStoreInstallPluginTable('extended'); @@ -98,4 +104,4 @@ class plgVmExtendedEuRecapInstallerScript // $db->setQuery('DROP TABLE IF EXISTS `#__virtuemart_shopper_plg_ordernumber`;'); // $db->query(); } -} \ No newline at end of file +} diff --git a/eurecap.xml b/eurecap.xml index 1a8552aafe414aed0c1cba9269572203126a1aeb..6c3f5da32d72e5f1159d9068d0d71aad9f756790 100644 --- a/eurecap.xml +++ b/eurecap.xml @@ -7,7 +7,7 @@ <authorUrl>http://www.open-tools.net/</authorUrl> <copyright>Copyright (C) 2015 Reinhold Kainhofer. All rights reserved.</copyright> <license>http://www.gnu.org/licenses/gpl-3.0.html GNU/GPLv3</license> - <version>0.8</version> + <version>0.9</version> <releaseDate>2016-01-01</releaseDate> <releaseType>Update</releaseType> <downloadUrl>http://www.open-tools.net</downloadUrl> diff --git a/releases/plg_vmextended_eurecap_v0.9.zip b/releases/plg_vmextended_eurecap_v0.9.zip new file mode 100644 index 0000000000000000000000000000000000000000..dfd3c0a05af7de1f0f09422593c7b498968dcd58 Binary files /dev/null and b/releases/plg_vmextended_eurecap_v0.9.zip differ