diff --git a/Makefile b/Makefile
index d57bbabc83400532109e26fc14aa1b4f5659cb9e..3cf57ebd1665a7dc060a726817acbfcd7d527890 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
BASE=buyer_assign_group
PLUGINTYPE=vmcustom
ZIPBASE=opentools_vm2
-VERSION=0.1
+VERSION=1.0
PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html
TRANSLATIONS=$(call wildcard,language/*/*.plg_$(PLUGINTYPE)_$(BASE).*ini) language/index.html $(call wildcard,language/*/index.html)
# INDEXFILES=$(BASE)/index.html
INDEXFILES=$(call wildcard,language/**/index.html) $(call wildcard,elements/*.html)
-# ELEMENTS=$(call wildcard,elements/*.php)
+ELEMENTS=$(call wildcard,elements/*)
# TMPLFILES=$(call wildcard,$(BASE)/tmpl/*.php) $(BASE)/index.html $(BASE)/tmpl/index.html
# ASSETS=$(call wildcard,$(BASE)/assets/*.png) $(call wildcard,$(BASE)/assets/*.css)
ZIPFILE=plg_$(ZIPBASE)_$(BASE)_v$(VERSION).zip
diff --git a/buyer_assign_group.xml b/buyer_assign_group.xml
index 55eadf8e4317831ceea98be11ae224ffe84601ad..17f65a247ded04552c492fb86e029dd4ae9146b9 100644
--- a/buyer_assign_group.xml
+++ b/buyer_assign_group.xml
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8" ?>
<install version="1.5" type="plugin" group="vmcustom" method="upgrade">
<name>VMCUSTOM_BUYER_GROUP</name>
- <creationDate>2013-02-24</creationDate>
+ <creationDate>2013-09-28</creationDate>
<author>Reinhold Kainhofer</author>
<authorUrl>http://www.open-tools.net/</authorUrl>
<copyright>Copyright (C) 2013 Reinhold Kainhofer. All rights reserved.</copyright>
<license>http://www.gnu.org/licenses/gpl.html GNU/GPL v3+</license>
- <version>0.1</version>
+ <version>1.0</version>
<description>VMCUSTOM_BUYER_GROUP_DESC</description>
<files>
<filename plugin="buyer_assign_group">buyer_assign_group.php</filename>
<filename>buyer_assign_group.script.php</filename>
<filename>index.html</filename>
<folder>language</folder>
+ <folder>elements</folder>
</files>
<languages folder="language">
<language tag="en-GB">en-GB/en-GB.plg_vmcustom_buyer_assign_group.ini</language>
@@ -22,7 +23,7 @@
<params addpath="/plugins/vmcustom/buyer_assign_group/elements/" />
<params addpath="/administrator/components/com_virtuemart/elements/">
<param type="vmjpluginwarning" />
- <param name="purchased_status" type="vmorderstates" default="C, S" multiple="multiple" label="VMCUSTOM_BUYER_GROUP_STATUS" description="VMCUSTOM_BUYER_GROUP_STATUS_DESC"/>
+ <param name="purchased_status" type="vmorderstates" default="C,S" multiple="multiple" label="VMCUSTOM_BUYER_GROUP_STATUS" description="VMCUSTOM_BUYER_GROUP_STATUS_DESC"/>
</params>
</install>
diff --git a/elements/index.html b/elements/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/elements/vmorderstates.php b/elements/vmorderstates.php
index c55b18fd82df7eeb720714bd49deece41ef5284f..25798b9fa8de35f7e14e0c807670ab1f01ec1a9c 100644
--- a/elements/vmorderstates.php
+++ b/elements/vmorderstates.php
@@ -14,13 +14,15 @@ defined ('_JEXEC') or die();
* other free or open source software licenses.
* @version $Id:$
*/
+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 {
/**
@@ -32,22 +34,10 @@ class JElementVmOrderStates extends JElement {
var $_name = 'OrderStates';
function fetchElement ($name, $value, &$node, $control_name) {
-
- $db = JFactory::getDBO ();
-
- $query = 'SELECT `order_status_code` AS value, `order_status_name` AS text
- FROM `#__virtuemart_orderstates`
- WHERE `virtuemart_vendor_id` = 1
- ORDER BY `ordering` ASC ';
-
- $db->setQuery ($query);
- $fields = $db->loadObjectList ();
+ $statusModel = VmModel::getModel('OrderStatus');
+ $fields = $statusModel->getOrderStatusNames();
$class = 'class="inputbox" multiple="multiple" size="6" ';
- foreach ($fields as $field) {
- $field->text= JText::_ ($field->text);
- }
- return JHTML::_ ('select.genericlist', $fields, $control_name . '[' . $name . '][]', $class, 'value', 'text', $value, $control_name . $name);
+ return JHTML::_ ('select.genericlist', $fields, $control_name . '[' . $name . '][]', $class, 'order_status_code', 'order_status_name', $value, $control_name . $name, true);
}
-
}
diff --git a/images/vm_buyer_groups_customfield_new.png b/images/vm_buyer_groups_customfield_new.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e7d5b02b3ee816b427020a73139ee5fa85588b5
Binary files /dev/null and b/images/vm_buyer_groups_customfield_new.png differ
diff --git a/images/vm_buyer_groups_customfield_product.png b/images/vm_buyer_groups_customfield_product.png
new file mode 100644
index 0000000000000000000000000000000000000000..4eb154d57aa08eff4ca36ce3f1450de6ecf64890
Binary files /dev/null and b/images/vm_buyer_groups_customfield_product.png differ
diff --git a/images/vm_buyer_groups_install.png b/images/vm_buyer_groups_install.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c1a9bfb27ed6b99e18ef04c80854c79ac7016bb
Binary files /dev/null and b/images/vm_buyer_groups_install.png differ
diff --git a/releases/plg_opentools_vm2_buyer_assign_group_v0.1.zip b/releases/plg_opentools_vm2_buyer_assign_group_v0.1.zip
index 925051084c99798dec6134b7b811ead03676e994..eaee8d3e2c6f9c8a4a83183deb52f37aebe951a4 100644
Binary files a/releases/plg_opentools_vm2_buyer_assign_group_v0.1.zip and b/releases/plg_opentools_vm2_buyer_assign_group_v0.1.zip differ
diff --git a/releases/plg_opentools_vm2_buyer_assign_group_v1.0.zip b/releases/plg_opentools_vm2_buyer_assign_group_v1.0.zip
new file mode 100644
index 0000000000000000000000000000000000000000..29b443b8da2d85ea7d766595a6ab8ae845e6907f
Binary files /dev/null and b/releases/plg_opentools_vm2_buyer_assign_group_v1.0.zip differ