Skip to content
Snippets Groups Projects
Commit 5d6bafdf authored by Reinhold Kainhofer's avatar Reinhold Kainhofer
Browse files

V3.4: Fix JS call with string arg; Fix SQL update script, which so far erased...

V3.4: Fix JS call with string arg; Fix SQL update script, which so far erased the invoice number counters
parent f03fd3ef
No related branches found
No related tags found
No related merge requests found
BASE=ordernumber BASE=ordernumber
PLUGINTYPE=vmshopper PLUGINTYPE=vmshopper
VERSION=3.3 VERSION=3.4
PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html $(BASE)/ PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html $(BASE)/
......
...@@ -551,7 +551,7 @@ class plgVmShopperOrdernumber extends vmShopperPlugin { ...@@ -551,7 +551,7 @@ class plgVmShopperOrdernumber extends vmShopperPlugin {
$html[] = "<tr class='counter_row counter_type_$nrtype'>"; $html[] = "<tr class='counter_row counter_type_$nrtype'>";
$html[] = " <td class='counter_format'>" . (string)$displayfmt . "</td>"; $html[] = " <td class='counter_format'>" . (string)$displayfmt . "</td>";
$html[] = " <td class='counter_value'>" . (string)$value . "</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>"; $html[] = "</tr>";
$json['newrow'] = implode("\n", $html); $json['newrow'] = implode("\n", $html);
} }
......
...@@ -10,6 +10,10 @@ defined('DS') or define('DS', DIRECTORY_SEPARATOR); ...@@ -10,6 +10,10 @@ defined('DS') or define('DS', DIRECTORY_SEPARATOR);
if (!class_exists( 'VmConfig' )) if (!class_exists( 'VmConfig' ))
require(JPATH_ROOT.DS.'administrator'.DS.'components'.DS.'com_virtuemart'.DS.'helpers'.DS.'config.php'); 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 class plgVmShopperOrdernumberInstallerScript
{ {
/** /**
...@@ -86,7 +90,9 @@ class plgVmShopperOrdernumberInstallerScript ...@@ -86,7 +90,9 @@ class plgVmShopperOrdernumberInstallerScript
'order_password' => 3, 'order_password' => 3,
); );
foreach ($countertypes as $new => $old) { 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(); $db->query();
} }
// jimport( 'joomla.filesystem.file' ); // jimport( 'joomla.filesystem.file' );
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<authorUrl>http://www.open-tools.net/</authorUrl> <authorUrl>http://www.open-tools.net/</authorUrl>
<copyright>Copyright (C) 2012-2015 Reinhold Kainhofer. All rights reserved.</copyright> <copyright>Copyright (C) 2012-2015 Reinhold Kainhofer. All rights reserved.</copyright>
<license>http://www.gnu.org/licenses/gpl-3.0.html GNU/GPLv3</license> <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> <releaseDate>2015-05-23</releaseDate>
<releaseType>Minor update</releaseType> <releaseType>Minor update</releaseType>
<downloadUrl>http://open-tools.net/virtuemart/advanced-ordernumbers.html</downloadUrl> <downloadUrl>http://open-tools.net/virtuemart/advanced-ordernumbers.html</downloadUrl>
......
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment