From 3ba0517b91c3860c308c479dc7888ffc68f9a869 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Fri, 31 Oct 2014 00:53:28 +0100
Subject: [PATCH] V1.2: Removed custm formfield (not needed), cleanup of xml
---
buyer_assign_group.xml | 7 +-
fields/index.html | 0
fields/vmorderstates.php | 84 ------------------
..._opentools_vm2_buyer_assign_group_v1.2.zip | Bin 10568 -> 8988 bytes
4 files changed, 3 insertions(+), 88 deletions(-)
delete mode 100644 fields/index.html
delete mode 100644 fields/vmorderstates.php
diff --git a/buyer_assign_group.xml b/buyer_assign_group.xml
index 61d9f09..846b38c 100644
--- a/buyer_assign_group.xml
+++ b/buyer_assign_group.xml
@@ -14,7 +14,6 @@
<filename>index.html</filename>
<folder>language</folder>
<folder>elements</folder>
- <folder>fields</folder>
</files>
<languages folder="language">
<language tag="en-GB">en-GB/en-GB.plg_vmcustom_buyer_assign_group.ini</language>
@@ -24,9 +23,9 @@
<vmconfig>
<fields name="params" addfieldpath="/administrator/components/com_virtuemart/fields/">
- <fieldset name="order_status" addfieldpath="/plugins/vmcustom/buyer_assign_group/fields/">
- <field name="purchased_status" type="orderstatus" default="C,S" multiple="multiple" label="VMCUSTOM_BUYER_GROUP_STATUS" description="VMCUSTOM_BUYER_GROUP_STATUS_DESC"/>
- </fieldset>
+ <fieldset name="order_status" addfieldpath="/plugins/vmcustom/buyer_assign_group/fields/">
+ <field name="purchased_status" type="orderstatus" default="C,S" multiple="multiple" label="VMCUSTOM_BUYER_GROUP_STATUS" description="VMCUSTOM_BUYER_GROUP_STATUS_DESC"/>
+ </fieldset>
</fields>
</vmconfig>
diff --git a/fields/index.html b/fields/index.html
deleted file mode 100644
index e69de29..0000000
diff --git a/fields/vmorderstates.php b/fields/vmorderstates.php
deleted file mode 100644
index 1deb593..0000000
--- a/fields/vmorderstates.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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:$
- */
-// 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) {
-// $statusModel = VmModel::getModel('OrderStatus');
-// $fields = $statusModel->getOrderStatusNames();
-// $class = 'class="inputbox" multiple="multiple" size="6" ';
-//
-// return JHTML::_ ('select.genericlist', $fields, $control_name . '[' . $name . '][]', $class, 'order_status_code', 'order_status_name', $value, $control_name . $name, true);
-// }
-// }
-// <?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:$
- */
-
-class JFormFieldVmOrderStates extends JFormField {
- var $type = 'VmOrderStates';
- function getInput () {
-
- 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');
-
- if (!class_exists ('VmModel')) {
- require(VMPATH_ADMIN . DS . 'helpers' . DS . 'vmmodel.php');
- }
- VmConfig::loadConfig ();
- VmConfig::loadJLang('com_virtuemart');
- $key = ($this->element['key_field'] ? $this->element['key_field'] : 'value');
- $val = ($this->element['value_field'] ? $this->element['value_field'] : $this->name);
- $model = VmModel::getModel ('Orderstatus');
- $orderStatus = $model->getOrderStatusList ();
- foreach ($orderStatus as $orderState) {
- $orderState->order_status_name = vmText::_ ($orderState->order_status_name);
- }
- return JHtml::_ ('select.genericlist', $orderStatus, $this->name, 'class="inputbox" multiple="true" size="6"', 'order_status_code', 'order_status_name', $this->value, $this
-->id);
- }
-
-}
diff --git a/releases/plg_opentools_vm2_buyer_assign_group_v1.2.zip b/releases/plg_opentools_vm2_buyer_assign_group_v1.2.zip
index 1caf393933f6cec70a6aa82da7e85b9575d0e684..f61cef6c6e7fd98c4e6b995f02cc2b6ded155857 100644
GIT binary patch
delta 872
zcmX>RG{<ejKOx?!VF9iarP&v5V`5-9KABrssXnURJ_LkIE4UdLSza(RFo21pp|Saw
z4Mb|)Z`E)3!_su@H$!8<q|DcD@(DRn(JJ$l*6;M~k-5ETZrR`O7M*j`vd!CCTtc^=
z`}%R`_2)mVKEA9ydXZ~OVvx!Y4XYy@N1UGdh;Yt3zpuwGv1FFqp00=Ynlb{SzZ8C9
ztXJM0I3eNa>n6?~F5T>@4??%D=$$I+CVC_28Rxptg_(Re0u{e^vaVJ5TWC7ZKmB_6
z&7XgsKg~7Uxp&_EBTMFf+R)0D6}yQ$OVQTOrpn%`<bJ<lrNP64TgrBpRB`)Ene_aH
zb}pOu1;dZQ{0+rtFJFrKI&;F;Dp^m~q?Dyk)Pxf1JtHnJa54<aHPQB(-FKK{uiSpe
zb?YVv2Fu*?m0f6jF0k9wqnUAUlTFdr?=kb{Y;L_Q-X<!#sBej0$9$tD0XAA|jdMQL
z`l*@UzwqiwuFNv#iQCm}yZVxa<o?9)r7fJ9)pA?AuB^~f_IL`%XYJ`d%^&$|7Zh@p
zUQ_?E?q0*W74?Q|1R|^X3U*0%hpbEz5__+FXZs56=d9T?Pdwar^#$hwWA>6$D>bsB
z8kkEPV>t>|I7EErxO8#WJyZXbfOfBfjt7eA97^7?(L0OHERSdYcE5Gs<D(L{@8q|F
z4V=$<zUlm*ax>>l+_&5X_j8^*ZT@dxY2qNahwJ&KD36UPN1gB2H#}!E)!S*^k`*P{
zlQD05p=<8U1gFoZuBNY97M6A0eCnh{hRY<=w3p@bie8;o5|gsxw*q^_eAle>;541B
zU-Q<z(~%ZpQQrN#M(ey;_zl0c;;N<-zMtH+dXug~OHst7S+`mG@B7|Oec9$y$j+tQ
zW3iWc-h;h&t>(@>`|NVt()U5v(<kOuCx41i6jG6jdffasQ{u*R=ehB{E%giIGPIil
zS0qn=v2<Gg$+oH6OXA*yeqFsf%Xe$R`z^WG7{65R4-0)S@hAOw(k0KUd-^^9JC*tG
zXWYyvX2dypvC2ub)LyA-z#P?XKRG~EY;v}`*yJ0kd@R3285k!2RyUd~qb9{@H`!dR
zmg$|uWD7O($#2y>nX9E3CeN1=o9wUdz<6Tv1ob#Z>B;ZaBbYO!87B8g%TAWjl;h)K
R;9|JL%)p=}&%nUI001E^iqrrA
delta 2272
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
--
GitLab