Skip to content
GitLab
Commit 13b38a81 authored by Reinhold Kainhofer's avatar Reinhold Kainhofer
Browse files

V1.3: Fix month messup, license, fix some more issues => Ready for productions...

parent 3f5bf8d7
Expand all Hide whitespace changes
Inline Side-by-side
LICENSE.txt 0 → 100644
View file @ 13b38a81
This diff is collapsed.
Makefile
View file @ 13b38a81
BASE=eurecap
PLUGINTYPE=vmextended
VERSION=0.1
VERSION=0.3
PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html
# $(BASE)/
......@@ -21,7 +21,7 @@ $(NONSYSTRANSLATIONS): %.ini: %.sys.ini
zip: $(PLUGINFILES) $(TRANSLATIONS) $(SYSTRANSLATIONS) $(NONSYSTRANSLATIONS)
@echo "Packing all files into distribution file $(ZIPFILE):"
@zip -r $(ZIPFILE) $(PLUGINFILES) $(MVCFILES) $(TRANSLATIONS) $(FIELDS) $(ELEMENTS)
@zip -r $(ZIPFILE) $(PLUGINFILES) $(MVCFILES) $(TRANSLATIONS) $(FIELDS) $(ELEMENTS) LICENSE.txt
clean:
rm -f $(ZIPFILE)
controllers/eurecap.php
View file @ 13b38a81
......@@ -3,16 +3,14 @@ if( !defined( '_JEXEC' ) ) die( 'Direct Access to '.basename(__FILE__).' is not
/**
*
* @version
* @package VirtueMart
* @subpackage EU Recapitulative Statement
* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* See /administrator/components/com_virtuemart/COPYRIGHT.php for copyright notices and details.
*
* http://www.open-tools.net
*/
......
controllers/index.html 0 → 100644
View file @ 13b38a81
<!DOCTYPE html><title></title>
elements/eucountries.php
View file @ 13b38a81
......@@ -2,32 +2,20 @@
defined('_JEXEC') or die();
/**
*
* @package VirtueMart
* @subpackage Plugins - Elements
* @author Valérie Isaksen, adapted by Reinhold Kainhofer for EU countries
* @link http://www.virtuemart.net
* @copyright Copyright (c) 2004 - 2011 VirtueMart Team. All rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* @version $Id: $
*/
/*
* This class is used by VirtueMart Payment or Shipment Plugins
* which uses JParameter
* So It should be an extension of JElement
* Those plugins cannot be configured througth the Plugin Manager anyway.
*/
class JElementEUCountries extends JElement {
*
* @package VirtueMart
* @subpackage EU Recapitulative Statement
* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
*
* http://www.open-tools.net
*/
/**
* Element name
* @access protected
* @var string
*/
class JElementEUCountries extends JElement {
var $_name = 'euCountries';
function fetchElement($name, $value, &$node, $control_name) {
......
elements/index.html 0 → 100644
View file @ 13b38a81
<!DOCTYPE html><title></title>
elements/vmorderstates.php
View file @ 13b38a81
<?php
defined ('_JEXEC') or die();
/**
*
* @package VirtueMart
* @subpackage Plugins - Elements
* @author Valérie Isaksen
* @link http://www.virtuemart.net
* @copyright Copyright (c) 2004 - 2011 VirtueMart Team. All rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* @version $Id:$
*/
*
* @package VirtueMart
* @subpackage EU Recapitulative Statement
* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
*
* http://www.open-tools.net
*/
if (!class_exists('VmConfig')) require(JPATH_VM_ADMINISTRATOR.DS.'components'.DS.'com_virtuemart'.DS.'helpers'.DS.'config.php');
if(!class_exists('VmModel')) require(JPATH_VM_ADMINISTRATOR.DS.'helpers'.DS.'vmmodel.php');
/*
* This class is used by VirtueMart Payment or Shipment Plugins
* which uses JParameter
* So It should be an extension of JElement
* Those plugins cannot be configured througth the Plugin Manager anyway.
*/
class JElementVmOrderStates extends JElement {
/**
* Element name
*
* @access protected
* @var string
*/
var $_name = 'OrderStates';
function fetchElement ($name, $value, &$node, $control_name) {
......
elements/vmshoppergroups.php
View file @ 13b38a81
<?php
defined('_JEXEC') or die();
/**
*
* @package VirtueMart
* @subpackage Plugins - Elements
* @author Valérie Isaksen
* @link http://www.virtuemart.net
* @copyright ${PHING.VM.COPYRIGHT}
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* @version $Id$
*/
*
* @package VirtueMart
* @subpackage EU Recapitulative Statement
* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
*
* http://www.open-tools.net
*/
if (!class_exists('JElementList')) require_once(JPATH_LIBRARIES.DS.'joomla'.DS.'html'.DS.'parameter'.DS.'element'.DS.'list.php');
class JELementVmShopperGroups extends JElementList {
......
elements/vmuserfields.php
View file @ 13b38a81
......@@ -7,7 +7,7 @@ defined('_JEXEC') or die();
* @author Reinhold Kainhofer, Open Tools
* @link http://www.open-tools.net
* @copyright Copyright (c) 2015 Reinhold Kainhofer. All rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
......
eurecap.php
View file @ 13b38a81
......@@ -2,15 +2,19 @@
if( !defined( '_JEXEC' ) ) die( 'Direct Access to '.basename(__FILE__).' is not allowed.' );
/**
* Abstract class for extended plugins
* This class provides some standard methods that can implemented to add features into the VM core
* Be sure to include this line in the plugin file:
* require(VMPATH_ADMIN.DS.'helpers'.DS.'vmextendedplugin.php');
*
* @package VirtueMart
* @subpackage Plugins
* @author Reinhold Kainhofer, Open Tools
*/
*
* @package VirtueMart
* @subpackage EU Recapitulative Statement
* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
*
* http://www.open-tools.net
*/
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');
......@@ -40,7 +44,7 @@ class plgVmExtendedEuRecap extends vmExtendedPlugin {
* @return True if this loads a file (null otherwise)
*/
public function onVmAdminController ($controller) {
if ($controller = 'eurecap') {
if ($controller == 'eurecap') {
VmModel::addIncludePath($this->_path . DS . 'models');
// TODO: Make sure the model exists. We probably should find a better way to load this automatically!
......
eurecap.xml
View file @ 13b38a81
......@@ -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.1</version>
<version>0.3</version>
<releaseDate>2015-04-01</releaseDate>
<releaseType>Initial Release</releaseType>
<downloadUrl>http://www.open-tools.net</downloadUrl>
......@@ -38,7 +38,7 @@
<field name="countries" type="eucountries" multiple="true" scope="com_virtuemart" default="" label="VMEXT_EU_RECAP_COUNTRIES" description="VMEXT_EU_RECAP_COUNTRIES_DESC"/>
<field name="order_status" type="orderstatus" default="C,S" multiple="multiple" label="VMEXT_EU_RECAP_ORDERSTATUS" description="VMEXT_EU_RECAP_ORDERSTATUS_DESC "/>
<field name="shopper_groups" type="vmshoppergroups" multiple="multiple" label="VMEXT_EU_RECAP_SHOPPERGROUP" description="VMEXT_EU_RECAP_SHOPPERGROUP_DESC" />
<field name="vatid_userfield" type="vmuserfields" label="VMEXT_EU_RECAP_VATID_USERFIELD" multiple="multiple" default="opc_vat" description="VMEXT_EU_RECAP_VATID_USERFIELD_DESC" />
<field name="vatid_userfield" type="vmuserfields" label="VMEXT_EU_RECAP_VATID_USERFIELD" multiple="multiple" default="" description="VMEXT_EU_RECAP_VATID_USERFIELD_DESC" />
<!-- <field name="include_taxed_orders" type="radio" default="0" class="btn-group btn-group-yesno" label="VMEXT_EU_RECAP_INCLUDE_TAXED" description="VMEXT_EU_RECAP_INCLUDE_TAXED_DESC" >
<option value="1">JYES</option>
<option value="0">JNO</option>
......@@ -79,7 +79,7 @@
<param type="vmjpluginwarning" />
<param name="order_status" type="vmorderstates" default="C,S" multiple="multiple" label="VMEXT_EU_RECAP_ORDERSTATUS" description="VMEXT_EU_RECAP_ORDERSTATUS_DESC "/>
<param name="shopper_groups" type="vmshoppergroups" multiple="multiple" label="VMEXT_EU_RECAP_SHOPPERGROUP" description="VMEXT_EU_RECAP_SHOPPERGROUP_DESC" />
<param name="vatid_userfield" type="vmuserfields" label="VMEXT_EU_RECAP_VATID_USERFIELD" multiple="multiple" default="opc_vat" description="VMEXT_EU_RECAP_VATID_USERFIELD_DESC" />
<param name="vatid_userfield" type="vmuserfields" label="VMEXT_EU_RECAP_VATID_USERFIELD" multiple="multiple" default="" description="VMEXT_EU_RECAP_VATID_USERFIELD_DESC" />
<!-- <param name="include_taxed_orders" type="radio" default="0" class="btn-group btn-group-yesno" label="VMEXT_EU_RECAP_INCLUDE_TAXED" description="VMEXT_EU_RECAP_INCLUDE_TAXED_DESC" >
<option value="1">JYES</option>
<option value="0">JNO</option>
......
fields/eucountries.php
View file @ 13b38a81
......@@ -2,30 +2,23 @@
defined('_JEXEC') or die();
/**
*
* @package VirtueMart
* @subpackage Plugins - Elements
* @author Valérie Isaksen, Adapted by Reinhold Kainhofer for EU countries
* @link http://www.virtuemart.net
* @copyright Copyright (c) 2004 - 2011 VirtueMart Team. All rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* @version $Id: $
*/
*
* @package VirtueMart
* @subpackage EU Recapitulative Statement
* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
*
* http://www.open-tools.net
*/
JFormHelper::loadFieldClass('list');
jimport('joomla.form.formfield');
class JFormFieldEUCountries extends JFormFieldList {
/**
* Element name
* @access protected
* @var string
*/
var $type = 'euCountries';
protected function getInput() {
......
fields/index.html 0 → 100644
View file @ 13b38a81
<!DOCTYPE html><title></title>
fields/vmshoppergroups.php
View file @ 13b38a81
<?php
defined('_JEXEC') or die();
/**
*
* @package VirtueMart
* @subpackage Plugins - Elements
* @author Valérie Isaksen
* @link http://www.virtuemart.net
* @copyright ${PHING.VM.COPYRIGHT}
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* @version $Id$
*/
*
* @package VirtueMart
* @subpackage EU Recapitulative Statement
* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
*
* http://www.open-tools.net
*/
JFormHelper::loadFieldClass('list');
jimport('joomla.form.formfield');
if (!class_exists( 'VmConfig' ))
......
fields/vmuserfields.php
View file @ 13b38a81
......@@ -7,7 +7,7 @@ defined('_JEXEC') or die();
* @author Reinhold Kainhofer, Open Tools
* @link http://www.open-tools.net
* @copyright Copyright (c) 2015 Reinhold Kainhofer. All rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
......
language/en-GB/index.html 0 → 100644
View file @ 13b38a81
<!DOCTYPE html><title></title>
models/eurecap.php
View file @ 13b38a81
<?php
if (!defined ('_JEXEC')) {
die('Direct Access to ' . basename (__FILE__) . ' is not allowed.');
}
if (!defined ('_JEXEC')) die('Direct Access is not allowed.');
/**
*
* EU Recapitulative Statement Model
*
* @author Reinhold Kainhofer
* @version $Id$
* @package VirtueMart
* @subpackage EU Recapitulative Statement
* @copyright Copyright (C) 2011 - 2014VirtueMart Team - All rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* See /administrator/components/com_virtuemart/COPYRIGHT.php for copyright notices and details.
*
* http://www.open-tools.net
*/
*
* @package VirtueMart
* @subpackage EU Recapitulative Statement
* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
*
* http://www.open-tools.net
*/
if (!class_exists ('VmModel')) {
require(VMPATH_ADMIN . DS . 'helpers' . DS . 'vmmodel.php');
......@@ -74,7 +67,7 @@ class VirtuemartModelEuRecap extends VmModel {
$this->setFrequency($frequency);
$this->from = mktime(0,0,0, $month, 1, $year);
$this->until = strtotime('+'.$this->frequency.' months -1 day', $this->from);
$this->until = strtotime('+'.$this->frequency.' months -1 second', $this->from);
$this->from_date = date ('Y-m-d', $this->from);
$this->until_date = date ('Y-m-d', $this->until);
......@@ -197,6 +190,7 @@ class VirtuemartModelEuRecap extends VmModel {
$whereString = 'WHERE ' . join(' AND ', $where);
$groupBy = "GROUP BY `vatid`";
$orderBy = $this->_getOrdering ();
vmDebug("SQL: SELECT ".$selectString.$joinedTables.$whereString.$groupBy.$orderBy);
return $this->exeSortSearchListQuery (1, $selectString, $joinedTables, $whereString, $groupBy, $orderBy);
}
......@@ -222,9 +216,9 @@ class VirtuemartModelEuRecap extends VmModel {
case 3: // quartely
$vals[1] = vmText::_('First Quarter');
$vals[3] = vmText::_('Second Quarter');
$vals[6] = vmText::_('Third Quarter');
$vals[9] = vmText::_('Forth Quarter');
$vals[4] = vmText::_('Second Quarter');
$vals[7] = vmText::_('Third Quarter');
$vals[10] = vmText::_('Forth Quarter');
break;
case 12: // yearly
......
models/eurecap_config.php
View file @ 13b38a81
<?php
if (!defined ('_JEXEC')) {
die('Direct Access to ' . basename (__FILE__) . ' is not allowed.');
}
if (!defined ('_JEXEC')) die('Direct Access to ' . basename (__FILE__) . ' is not allowed.');
/**
*
* EU Recapitulative Statement Model
*
* @author Reinhold Kainhofer
* @version $Id$
* @package VirtueMart
* @subpackage EU Recapitulative Statement
* @copyright Copyright (C) 2011 - 2014VirtueMart Team - All rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* See /administrator/components/com_virtuemart/COPYRIGHT.php for copyright notices and details.
*
* http://www.open-tools.net
*/
*
* @package VirtueMart
* @subpackage EU Recapitulative Statement
* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
* VirtueMart is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
*
* http://www.open-tools.net
*/
if (!class_exists ('VmModel')) {
require(VMPATH_ADMIN . DS . 'helpers' . DS . 'vmmodel.php');
......
models/index.html 0 → 100644
View file @ 13b38a81
<!DOCTYPE html><title></title>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment