diff --git a/Makefile b/Makefile
index 754c24822e4e9687d34c946c7a160e7b51b55d30..7ebf7a4013140b5a65b5023ca8f49f6d8444f3c3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
BASE=donation
PLUGINTYPE=vmcustom
-VERSION=1.0.1
+VERSION=1.1.0
PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html
diff --git a/donation.php b/donation.php
index 16b34af8a93443d904de68e7df877ae6d2018ae4..4c85ac6fdd41e887cc49bc02675341cf79e89ff3 100644
--- a/donation.php
+++ b/donation.php
@@ -29,17 +29,32 @@ class plgVmCustomDonation extends vmCustomPlugin {
function __construct(& $subject, $config) {
parent::__construct($subject, $config);
$varsToPush = array(
+ 'min_amount'=>array('0.0', 'char'),
+ 'max_amount'=>array('', 'char'),
);
$this->setConfigParameterable('custom_params',$varsToPush);
}
-
/**
* @see Form displayed in the product edit page in the BE, configure the download file
* @author Reinhold Kainhofer
*/
function plgVmOnProductEdit($field, $product_id, &$row,&$retValue) {
if ($field->custom_element != $this->_name) return '';
+
+ $this->parseCustomParams($field);
+ $html ='
+ <fieldset>
+ <legend>'. JText::_('VMCUSTOM_DONATION') .'</legend>
+ <table class="admintable">
+ '.VmHTML::row('input','VMCUSTOM_DONATION_MIN','custom_param['.$row.'][min_amount]',$field->min_amount).
+ VmHTML::row('input','VMCUSTOM_DONATION_MAX','custom_param['.$row.'][max_amount]',$field->max_amount).
+ '<tr>
+ </table>
+ </fieldset>';
+ $retValue .= $html;
+ $row++;
+ return true ;
}
/**
@@ -125,7 +140,18 @@ class plgVmCustomDonation extends vmCustomPlugin {
public function plgVmCalculateCustomVariant($product, &$productCustomsPrice, $selected){
if ($productCustomsPrice->custom_element !==$this->_name) return ;
$customVariant = $this->getCustomVariant($product, $productCustomsPrice, $selected);
+ // TODO: Implement bounds for "donation": max/min value.
if (!empty($customVariant['customprice'])) {
+ if (!empty($productCustomsPrice->min_amount) && ($customVariant['customprice']<$productCustomsPrice->min_amount)) {
+ $customVariant['customprice'] = $productCustomsPrice->min_amount;
+ }
+ if (!empty($productCustomsPrice->max_amount) && ($customVariant['customprice']<$productCustomsPrice->max_amount)) {
+ $customVariant['customprice'] = $productCustomsPrice->max_amount;
+ }
+
+// if ($customVariant['customprice']<0) {
+// $customVariant['customprice'] = 0;
+// }
$productCustomsPrice->custom_price = $customVariant['customprice'];
} else {
$productCustomsPrice->custom_price = 0.0;
diff --git a/donation.script.php b/donation.script.php
index 87815a1dc3777c0453eed4fbeb7c599c35360f97..5ebeb553941604edfb45038527e78592239b5026 100644
--- a/donation.script.php
+++ b/donation.script.php
@@ -12,6 +12,12 @@
-------------------------------------------------------------------------*/
// no direct access
defined('_JEXEC') or die('Restricted access');
+/**
+ * Installation script for the plugin
+ *
+ * @copyright Copyright (C) 2013 Reinhold Kainhofer, office@open-tools.net
+ * @license GPL v3+, http://www.gnu.org/copyleft/gpl.html
+ */
class plgVmCustomDonationInstallerScript
{
diff --git a/donation.xml b/donation.xml
index f69ae70e3268370d3895b2168b95f9e7e49e3cf6..52b44f0f7066bf177b640a7f5ac9ea568092cad6 100644
--- a/donation.xml
+++ b/donation.xml
@@ -6,7 +6,7 @@
<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>1.0.1</version>
+ <version>1.1.0</version>
<description>VMCUSTOM_DONATION_DESC</description>
<files>
<filename plugin="donation">donation.php</filename>
diff --git a/donation/tmpl/default.php b/donation/tmpl/default.php
index f5c23200fb0baef61854c818b1c938cf36541848..13c65c316e7af9dce0e2e6881ab632c584f5727c 100644
--- a/donation/tmpl/default.php
+++ b/donation/tmpl/default.php
@@ -11,7 +11,7 @@
// no direct access
defined( '_JEXEC' ) or die( 'Restricted access' );
- $class='vmcustom-settext';
+ $class='vmcustom-settext'; ?>
<input class="<?php echo $class ?>" type="text" value="" size="4" name="customPlugin[<?php echo $viewData[0]->virtuemart_customfield_id ?>][<?php echo $this->_name?>][customprice]"><?php echo CurrencyDisplay::getInstance ()->getSymbol(); ?><br />
<?php
diff --git a/language/de-DE/de-DE.plg_vmcustom_donation.ini b/language/de-DE/de-DE.plg_vmcustom_donation.ini
index bf0fdf92f5cec0e997dabc237bead17c77bbcdec..8f197810eece551c8a3f52e4db6de9afec85dc30 100644
--- a/language/de-DE/de-DE.plg_vmcustom_donation.ini
+++ b/language/de-DE/de-DE.plg_vmcustom_donation.ini
@@ -6,3 +6,7 @@
VMCUSTOM_DONATION="Spenden für VirtueMart"
VMCUSTOM_DONATION_DESC="VirtueMart Benutzerfeld Erweiterung, die Benutzern einen Spendenbetrag zum Produktpreis hinzufügen oder den Preis des Produktes selbst festlegen lässt."
+VMCUSTOM_DONATION_MIN="Minimaler Betrag"
+VMCUSTOM_DONATION_MIN_TIP="Dies ist der minimale Betrag, der eingegeben werden kann. Kleinere Beträge werden auf diesen Wert gesetzt. Leer lassen (nicht auf 0 setzen!), um keine untere Schranke zu setzen. Auf 0 setzen, um negative Werte zu verhindern (Standardeinstellung)."
+VMCUSTOM_DONATION_MAX="Maximaler Betrag"
+VMCUSTOM_DONATION_MAX_TIP="Dies ist der maximale Betrag, der eingegeben werden kann. Größere Betrage werden auf diesen Wert gesetzt. Leer lassen (nicht auf 0 setzen!), um keine obere Schranke zu setzen. Auf 0 setzen, um nur negative Werte zu erlauben."
diff --git a/language/en-GB/en-GB.plg_vmcustom_donation.ini b/language/en-GB/en-GB.plg_vmcustom_donation.ini
index 1ad333a217059b83ebd980a1f3cefbc6c0158bf9..79c20cea4a591896d9ba750877eefb4b5045ab7e 100644
--- a/language/en-GB/en-GB.plg_vmcustom_donation.ini
+++ b/language/en-GB/en-GB.plg_vmcustom_donation.ini
@@ -6,3 +6,8 @@
VMCUSTOM_DONATION="Donations for VirtueMart"
VMCUSTOM_DONATION_DESC="VirtueMart customfield plugin to let the user add a donation or set the price of a product."
+VMCUSTOM_DONATION_MIN="Minimal amount allowed"
+VMCUSTOM_DONATION_MIN_TIP="This is the minimum amount that the user is allowed to enter. Values smaller than this value will be reset to this value. Leave this field empty if you don't want to set any lower limit. Set this value to 0 to prohibit negative values (default)."
+VMCUSTOM_DONATION_MAX="Maximum amount allowed"
+VMCUSTOM_DONATION_MAX_TIP="This is the maximum amount that the user is allowed to enter. Values larger than this value will be reset to this value. Leave this field empty if you don't want to impose any upper limit."
+
diff --git a/releases/plg_vmcustom_donation_v1.0.1.zip b/releases/plg_vmcustom_donation_v1.0.1.zip
index 9e965cfee5b985530cb67434c946897cc743af88..7d527e3c349012378ae350831e456d6341b1593e 100644
Binary files a/releases/plg_vmcustom_donation_v1.0.1.zip and b/releases/plg_vmcustom_donation_v1.0.1.zip differ
diff --git a/releases/plg_vmcustom_donation_v1.1.0.zip b/releases/plg_vmcustom_donation_v1.1.0.zip
new file mode 100644
index 0000000000000000000000000000000000000000..ee113b1111da7b22863ababb4bf1eb406ef72e0e
Binary files /dev/null and b/releases/plg_vmcustom_donation_v1.1.0.zip differ