diff --git a/Makefile b/Makefile index 5200894eb7b896eb89c2e77cc6c608b0a2179c44..33dc12cc2f6bf2ec4f6351808adcbf56a9144611 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ BASE=ordernumber PLUGINTYPE=vmshopper -VERSION=3.3 +VERSION=3.4 PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html $(BASE)/ diff --git a/ordernumber.php b/ordernumber.php index 8f07d294f73af6f56aebef88cf00c01623563a95..300ad8a79c907453d7c6ee26a2fa276fa4bcb8d5 100644 --- a/ordernumber.php +++ b/ordernumber.php @@ -551,7 +551,7 @@ class plgVmShopperOrdernumber extends vmShopperPlugin { $html[] = "<tr class='counter_row counter_type_$nrtype'>"; $html[] = " <td class='counter_format'>" . (string)$displayfmt . "</td>"; $html[] = " <td class='counter_value'>" . (string)$value . "</td>"; - $html[] = " <td class='counter_buttons'><img src='" .JURI::root(true).$pluginpath . "assets/images/icon-16-edit.png' class='vmordernumber-counter-editbtn vmordernumber-btn' onClick='ajaxEditCounter(this, $nrtype, ".json_encode($counter).", $value)' /><img src='" . JURI::root(true).$pluginpath . "assets/images/icon-16-delete.png' class='vmordernumber-counter-deletebtn vmordernumber-btn' onClick='ajaxDeleteCounter(this, $nrtype, ".json_encode($counter).", $value)' /></td>"; + $html[] = " <td class='counter_buttons'><img src='" .JURI::root(true).$pluginpath . "assets/images/icon-16-edit.png' class='vmordernumber-counter-editbtn vmordernumber-btn' onClick='ajaxEditCounter(this, ".json_encode($nrtype).", ".json_encode($counter).", $value)' /><img src='" . JURI::root(true).$pluginpath . "assets/images/icon-16-delete.png' class='vmordernumber-counter-deletebtn vmordernumber-btn' onClick='ajaxDeleteCounter(this, ".json_encode($nrtype).", ".json_encode($counter).", $value)' /></td>"; $html[] = "</tr>"; $json['newrow'] = implode("\n", $html); } diff --git a/ordernumber.script.php b/ordernumber.script.php index 6cd4de3da9e383988f819127218b731d5cd82b85..2cfd86cca81a387c52963622daf1e9d5a8a45837 100644 --- a/ordernumber.script.php +++ b/ordernumber.script.php @@ -10,6 +10,10 @@ 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'); +// function on_debug($message) { +// file_put_contents("vm-invoice-ordernumber.log", date("c").": ".$message, FILE_APPEND); +// } + class plgVmShopperOrdernumberInstallerScript { /** @@ -86,7 +90,9 @@ class plgVmShopperOrdernumberInstallerScript 'order_password' => 3, ); foreach ($countertypes as $new => $old) { - $db->setQuery('update `#__virtuemart_shopper_plg_ordernumber` SET `number_type`="'.$new.'" WHERE `number_type`='.(int)$old.';'); + $query = 'update `#__virtuemart_shopper_plg_ordernumber` SET `number_type`="'.$new.'" WHERE `number_type`="'.(int)$old.'";'; +// on_debug($query); + $db->setQuery($query); $db->query(); } // jimport( 'joomla.filesystem.file' ); diff --git a/ordernumber.xml b/ordernumber.xml index 5ae321d02ee02658fad4fb5fb011054ef14be439..9bda6ec18b1980edc27e2df5f56c43f0e264bd35 100644 --- a/ordernumber.xml +++ b/ordernumber.xml @@ -7,7 +7,7 @@ <authorUrl>http://www.open-tools.net/</authorUrl> <copyright>Copyright (C) 2012-2015 Reinhold Kainhofer. All rights reserved.</copyright> <license>http://www.gnu.org/licenses/gpl-3.0.html GNU/GPLv3</license> - <version>3.3</version> + <version>3.4</version> <releaseDate>2015-05-23</releaseDate> <releaseType>Minor update</releaseType> <downloadUrl>http://open-tools.net/virtuemart/advanced-ordernumbers.html</downloadUrl> diff --git a/releases/plg_vmshopper_ordernumber_v3.4.zip b/releases/plg_vmshopper_ordernumber_v3.4.zip new file mode 100644 index 0000000000000000000000000000000000000000..509b336b96fdfab383a7a4d9f74fcae925cd6102 Binary files /dev/null and b/releases/plg_vmshopper_ordernumber_v3.4.zip differ