From 8b36d7955fe0fa92e2353c4d933fdb64e091fa28 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Mon, 29 Dec 2014 23:59:57 +0100
Subject: [PATCH] Fix some remaining warnings/bugs/translations
---
.../OpenTools/Ordernumber/Block/Counters.php | 6 +-
.../Ordernumber/Block/Replacements.php | 11 ++--
.../OpenTools/Ordernumber/Helper/Data.php | 10 +--
.../Ordernumber/Model/Backend/Counters.php | 62 ++++++++++++-------
.../OpenTools/Ordernumber/Model/Observer.php | 22 ++++---
.../Ordernumber/Model/Ordernumber.php | 12 +++-
.../Model/Resource/Ordernumber.php | 16 ++++-
.../install-0.1.0.php | 4 +-
app/locale/de_DE/OpenTools_Ordernumber.csv | 13 ++++
app/locale/en_US/OpenTools_Ordernumber.csv | 2 +-
var/connect/OpenTools_Ordernumber.xml | 20 ++++--
11 files changed, 123 insertions(+), 55 deletions(-)
diff --git a/app/code/community/OpenTools/Ordernumber/Block/Counters.php b/app/code/community/OpenTools/Ordernumber/Block/Counters.php
index 750fca7..272b00c 100644
--- a/app/code/community/OpenTools/Ordernumber/Block/Counters.php
+++ b/app/code/community/OpenTools/Ordernumber/Block/Counters.php
@@ -37,7 +37,7 @@ class OpenTools_Ordernumber_Block_Counters extends Mage_Adminhtml_Block_System_C
*
* @param Varien_Data_Form_Element_Abstract $element
* @return string
- */
+ */
public function render(Varien_Data_Form_Element_Abstract $element)
{
$this->setElement($element);
@@ -50,7 +50,7 @@ class OpenTools_Ordernumber_Block_Counters extends Mage_Adminhtml_Block_System_C
$html .= '<div class="grid"><table id="ordernumber_counters_table" class="data" style="width: 100%;">';
$html .= $this->_getRowHeader();
- $collection = $this->getModel()->getCollection();
+ $collection = $this->getModel()->getCollection()->addOrder('number_type', Varien_Data_Collection::SORT_ORDER_ASC)->addOrder('number_format', Varien_Data_Collection::SORT_ORDER_ASC);
foreach ($collection as $counter) {
$html .= $this->_getRowHtml($counter);
}
@@ -121,7 +121,7 @@ class OpenTools_Ordernumber_Block_Counters extends Mage_Adminhtml_Block_System_C
* @param array $websiteIds
* @return array
*/
- public function _getScoreStructureOptions($isAll = false)
+ public function _getScoreStructureOptions($isAll = false, $websiteIds = array(), $groupIds = array(), $storeIds = array())
{
$sstore = Mage::getSingleton('adminhtml/system_store');
$nonEscapableNbspChar = html_entity_decode(' ', ENT_NOQUOTES, 'UTF-8');
diff --git a/app/code/community/OpenTools/Ordernumber/Block/Replacements.php b/app/code/community/OpenTools/Ordernumber/Block/Replacements.php
index 0f812f5..64e811d 100644
--- a/app/code/community/OpenTools/Ordernumber/Block/Replacements.php
+++ b/app/code/community/OpenTools/Ordernumber/Block/Replacements.php
@@ -78,6 +78,7 @@ class OpenTools_Ordernumber_Block_Replacements extends Mage_Adminhtml_Block_Syst
}
}
+ $html = '';
if ($element->getTooltip()) {
$html .= '<td class="value with-tooltip" colspan="2">';
$html .= $this->_getElementHtml($element);
@@ -145,7 +146,7 @@ class OpenTools_Ordernumber_Block_Replacements extends Mage_Adminhtml_Block_Syst
{
$html = '<tr class="headings">';
$html .= '<th>'. $this->__('If Variable ...') . '</th>';
- $html .= '<th>'. $this->__('is / contains ...') . '</th>';
+ $html .= '<th>'. $this->__('is ...') . '</th>';
$html .= '<th></th>';
$html .= '<th>'. $this->__('Set this variable ..') . '</th>';
$html .= '<th>'. $this->__('to value ...') . '</th>';
@@ -167,11 +168,11 @@ class OpenTools_Ordernumber_Block_Replacements extends Mage_Adminhtml_Block_Syst
$disabled = $this->_getDisabled($rowIndex == -1);
$html = '<tr class="'.$class.'">';
$class = ($class=='odd')?'even':'odd';
- $html .= '<td class="oton-replacement-variable"><input name="' . $this->getElement()->getName() . '[conditionvar][]" value="' . $values['conditionvar'] . '" ' . $disabled . '/></td>';
- $html .= '<td class="oton-replacement-value" ><input name="' . $this->getElement()->getName() . '[conditionval][]" value="' . $values['conditionval'] . '" ' . $disabled . '/></td>';
+ $html .= '<td class="oton-replacement-variable"><input name="' . $this->getElement()->getName() . '[conditionvar][]" value="' . (($rowIndex>=0)?$values['conditionvar']:'') . '" ' . $disabled . '/></td>';
+ $html .= '<td class="oton-replacement-value" ><input name="' . $this->getElement()->getName() . '[conditionval][]" value="' . (($rowIndex>=0)?$values['conditionval']:'') . '" ' . $disabled . '/></td>';
$html .= '<td>=></td>';
- $html .= '<td class="oton-replacement-variable"><input name="' . $this->getElement()->getName() . '[newvar][]" value="' . $values['newvar'] . '" ' . $disabled . '/></td>';
- $html .= '<td class="oton-replacement-newvalue"><input name="' . $this->getElement()->getName() . '[newval][]" value="' . $values['newval'] . '" ' . $disabled . '/></td>';
+ $html .= '<td class="oton-replacement-variable"><input name="' . $this->getElement()->getName() . '[newvar][]" value="' . (($rowIndex>=0)?$values['newvar']:'') . '" ' . $disabled . '/></td>';
+ $html .= '<td class="oton-replacement-newvalue"><input name="' . $this->getElement()->getName() . '[newval][]" value="' . (($rowIndex>=0)?$values['newval']:'') . '" ' . $disabled . '/></td>';
$html .= '<td>' . $this->_getDeleteRowButtonHtml() . '</td>';
$html .= '</tr>';
diff --git a/app/code/community/OpenTools/Ordernumber/Helper/Data.php b/app/code/community/OpenTools/Ordernumber/Helper/Data.php
index 07ca2c3..719a5bc 100644
--- a/app/code/community/OpenTools/Ordernumber/Helper/Data.php
+++ b/app/code/community/OpenTools/Ordernumber/Helper/Data.php
@@ -150,16 +150,16 @@ function logitem($label, $item) {
// TODO: Handle lists
$found = true;
$compareval = null /* TODO */;
- } elseif ($compareval = $order->getData($conditionvar)) {
+ } elseif ($order && $compareval = $order->getData($conditionvar)) {
// TODO: Handle order property
$found = true;
- } elseif ($compareval = $customer->getData($conditionvar)) {
+ } elseif ($customer && $compareval = $customer->getData($conditionvar)) {
// TODO: Handle customer property
$found = true;
- } elseif ($compareval = $address->getData($conditionvar)) {
+ } elseif ($address && $compareval = $address->getData($conditionvar)) {
// TODO: Handle address property
$found = true;
- } elseif ($compareval = $store->getData($conditionvar)) {
+ } elseif ($store && $compareval = $store->getData($conditionvar)) {
// TODO: Handle store property
$found = true;
} else {
@@ -184,7 +184,7 @@ function logitem($label, $item) {
}
function doReplacements ($fmt, $reps) {
- // First, replace all randomXXX[n] fields. This needs to be done with a regexp and a callback:
+ // First, replace all random...[n] fields. This needs to be done with a regexp and a callback:
$fmt = preg_replace_callback ('/\[(random)(.*?)([0-9]*?)\]/', array($this, 'replaceRandom'), $fmt);
return str_ireplace (array_keys($reps), array_values($reps), $fmt);
}
diff --git a/app/code/community/OpenTools/Ordernumber/Model/Backend/Counters.php b/app/code/community/OpenTools/Ordernumber/Model/Backend/Counters.php
index 67c8187..a6fcbab 100644
--- a/app/code/community/OpenTools/Ordernumber/Model/Backend/Counters.php
+++ b/app/code/community/OpenTools/Ordernumber/Model/Backend/Counters.php
@@ -22,7 +22,40 @@ class OpenTools_Ordernumber_Model_Backend_Counters extends Mage_Core_Model_Confi
$helper = Mage::helper('ordernumber');
$session = Mage::getSingleton('core/session');
if (is_array($vals)) {
+// $helper->logitem("counter form values: ", $vals);
$model = $this->getModel();
+ // First, handle new counters
+ // If we already have a counter with the same type, scope and name, treat it like a counter edit
+ foreach ($vals['new_counter_type'] as $nr =>$countertype) {
+ // TODO: Check whether a counter with these name, scope and type already exists!
+ $countername = $vals['new_counter_name'][$nr];
+ $counterscope = $vals['new_counter_scope'][$nr];
+ $countervalue = $vals['new_counter_value'][$nr];
+ $counter = $model->loadNumberCounter($countertype, $countername, $counterscope);
+ if ($id = $counter->getId()) {
+// $helper->logitem("Existing Counter for new: ", $counter);
+ if (isset($vals['counter'][$id]) && ($vals['counter'][$id] != $vals['oldcounter'][$id])) {
+ // The counter to be added already exists, and is manually changed
+ $session->addSuccess($helper->__('Counter \'%s\' (type: %s, scope: %s) already exists and is being modified. Will not add again.',
+ $countername, $model->readableType($countertype), $model->readableScope($counterscope)));
+ } else {
+ // Counter already exists, add it to the modifications
+ $session->addSuccess($helper->__('Counter \'%s\' (type: %s, scope: %s) already exists, modifying it to value %d',
+ $countername, $model->readableType($countertype), $model->readableScope($counterscope), $countervalue));
+ $vals['counter'][$id] = $countervalue;
+ $vals['oldcounter'][$id] = $counter->getCount();
+ }
+ } else {
+ $counter = $model->unsetData()
+ ->setNumberType($countertype)
+ ->setNumberScope($vals['new_counter_scope'][$nr])
+ ->setNumberFormat($countername)
+ ->setCount($countervalue)
+ ->save();
+ $session->addSuccess($helper->__('Successfully created counter \'%s\' (type: %s, scope: %s) with value %d',
+ $counter->getNumberFormat(), $model->readableType($counter->getNumberType()), $model->readableScope($counter->getNumberScope()), $counter->getCount()));
+ }
+ }
// First check each existing counter
foreach ($vals['counter'] as $countid => $newval) {
$oldval = $vals['oldcounter'][$countid];
@@ -30,13 +63,13 @@ class OpenTools_Ordernumber_Model_Backend_Counters extends Mage_Core_Model_Confi
if ($oldval != $newval) {
$counter = $model->load($countid);
if ($counter->getCount() != $oldval) {
- $session->addWarning($helper->__('Counter "%s" (type: %s, scope: %s) was changed in the background in the dabase from %d to %d. Overwriting with %d.',
- $counter->getNumberFormat(), $model->readableType($counter->getNumberType()), $counter->getNumberScope(), $oldval, $counter->getCount(), $newval));
+ $session->addWarning($helper->__('Counter \'%s\' (type: %s, scope: %s) was changed in the background in the dabase from %d to %d. Overwriting with %d.',
+ $counter->getNumberFormat(), $model->readableType($counter->getNumberType()), $model->readableScope($counter->getNumberScope()), $oldval, $counter->getCount(), $newval));
}
$counter->setCount($newval)
->save();
- $session->addSuccess($helper->__('Successfully changed counter "%s" (type: %s, scope: %s) from %d to %d',
- $counter->getNumberFormat(), $model->reNadableType($counter->getNumberType()), $counter->getNumberScope(), $oldval, $counter->getCount()));
+ $session->addSuccess($helper->__('Successfully changed counter \'%s\' (type: %s, scope: %s) from %d to %d',
+ $counter->getNumberFormat(), $model->readableType($counter->getNumberType()), $model->readableScope($counter->getNumberScope()), $oldval, $counter->getCount()));
}
}
// Deleting counters:
@@ -45,25 +78,12 @@ class OpenTools_Ordernumber_Model_Backend_Counters extends Mage_Core_Model_Confi
// Check if the counter has changed meanwhile in the DB!
$counter = $model->load($countid);
if ($counter->getCount() != $oldval) {
- $session->addWarning($helper->__('Counter "%s" (type: %s, scope: %s) was changed in the background in the dabase from %d to %d. Deleting it nonetheless.',
- $counter->getNumberFormat(), $model->readableType($counter->getNumberType()), $counter->getNumberScope(), $oldval, $counter->getCount()));
+ $session->addWarning($helper->__('Counter \'%s\' (type: %s, scope: %s) was changed in the background in the dabase from %d to %d. Deleting it nonetheless.',
+ $counter->getNumberFormat(), $model->readableType($counter->getNumberType()), $model->readableScope($counter->getNumberScope()), $oldval, $counter->getCount()));
}
$counter->delete();
- $session->addSuccess($helper->__('Successfully deleted counter "%s" (type: %s, scope: %s) with value %d',
- $counter->getNumberFormat(), $model->readableType($counter->getNumberType()), $counter->getNumberScope(), $counter->getCount()));
- }
- // New counters
- foreach ($vals['new_counter_type'] as $nr =>$countertype) {
- // TODO: Check whether a counter with these name, scope and type already exists!
- $scope = $vals['new_counter_scope'][$nr];
- $counter = $model->unsetData()
- ->setNumberType($countertype)
- ->setNumberScope($vals['new_counter_scope'][$nr])
- ->setNumberFormat($vals['new_counter_name'][$nr])
- ->setCount($vals['new_counter_value'][$nr])
- ->save();
- $session->addSuccess($helper->__('Successfully created counter "%s" (type: %s, scope: %s) with value %d',
- $counter->getNumberFormat(), $model->readableType($counter->getNumberType()), $counter->getNumberScope(), $counter->getCount()));
+ $session->addSuccess($helper->__('Successfully deleted counter \'%s\' (type: %s, scope: %s) with value %d',
+ $counter->getNumberFormat(), $model->readableType($counter->getNumberType()), $model->readableScope($counter->getNumberScope()), $counter->getCount()));
}
}
}
diff --git a/app/code/community/OpenTools/Ordernumber/Model/Observer.php b/app/code/community/OpenTools/Ordernumber/Model/Observer.php
index 0c97c8d..787941d 100644
--- a/app/code/community/OpenTools/Ordernumber/Model/Observer.php
+++ b/app/code/community/OpenTools/Ordernumber/Model/Observer.php
@@ -39,9 +39,13 @@ class OpenTools_Ordernumber_Model_Observer extends Mage_Core_Model_Abstract
return $this->_dbModel;
}
- // This trigger is called directly after the increment ID is reserved for an order
- // TODO: Ideally, we would overwrite the reserveOrderId function!
- // Then magento would not create/reserve an order number in the first place
+ /** This trigger is called directly after the increment ID is reserved for an order
+ * Ideally, we would overwrite the reserveOrderId function, so that magento does not
+ * create/reserve an order number in the first place
+ * Problem is, no order information is passed to the increment id model,
+ * so we would have to hack (i.e. rewrite) many more models to pass on this information,
+ * which will in the end lead to an even worse code quality...
+ */
public function sales_model_service_quote_submit_before ($observer) {
$order = $observer->getEvent()->getOrder();
return $this->handle_new_number('order', $order, $order);
@@ -87,15 +91,13 @@ class OpenTools_Ordernumber_Model_Observer extends Mage_Core_Model_Abstract
$helper = Mage::helper('ordernumber');
$info = array('order'=>$order, $nrtype=>$object);
-// TODO: foreach ($customvars)
-
- // The ordernumber/XXXnumbers/reset contains some pre-defined counter names as
+ // The ordernumber/...numbers/reset contains some pre-defined counter names as
// well as enum values indicating certain behavior. Replace those by the actual
// counter names for the current counter:
switch ($reset) {
case 0: $format = $format . '|'; break;
case 1: $format = $format . '|' . $format; break;
- case -1: $format = $foramt . '|' . $counterfmt; break;
+ case -1: $format = $format . '|' . $counterfmt; break;
default: /* Pre-defined counter formats saved in the /reset config field */
$counterfmt = $format . '|' . $reset; break;
}
@@ -104,7 +106,7 @@ class OpenTools_Ordernumber_Model_Observer extends Mage_Core_Model_Abstract
$customvars = $customvars['replacements'];
if ($customvars)
$customvars = unserialize($customvars);
-Mage::Log('customvars: '.print_r($customvars,1), null, 'ordernumber.log');
+// Mage::Log('customvars: '.print_r($customvars,1), null, 'ordernumber.log');
// Now apply the replacements
$nr = $helper->replace_fields ($format, $nrtype, $info, $customvars);
@@ -122,7 +124,7 @@ Mage::Log('customvars: '.print_r($customvars,1), null, 'ordernumber.log');
$count = 0;
$created = false;
// Make up to 150 attempts to create a number...
- while (empty($newnumber) && (count<150)) {
+ while (empty($newnumber) && ($count<150)) {
$count += 1;
// Find the next counter value
@@ -146,7 +148,7 @@ Mage::Log('customvars: '.print_r($customvars,1), null, 'ordernumber.log');
}
}
if (!$created) {
- Mage::Log("Unable to create $nrtype number for counter format $nr (name $counterfmt)...", null, 'ordernumber.log');
+ Mage::Log("Unable to create $nrtype number for counter format $nr (name $counterfmt, scope $scope_id)...", null, 'ordernumber.log');
}
}
}
diff --git a/app/code/community/OpenTools/Ordernumber/Model/Ordernumber.php b/app/code/community/OpenTools/Ordernumber/Model/Ordernumber.php
index 1ed04ab..77fd249 100644
--- a/app/code/community/OpenTools/Ordernumber/Model/Ordernumber.php
+++ b/app/code/community/OpenTools/Ordernumber/Model/Ordernumber.php
@@ -46,4 +46,14 @@ class OpenTools_Ordernumber_Model_Ordernumber extends Mage_Core_Model_Abstract
return $this->getNumberTypes()[$type];
}
-}
\ No newline at end of file
+ public function readableScope($scope)
+ {
+ if (empty($scope)) {
+ $helper = Mage::helper('ordernumber');
+
+ return $helper->__('Global');
+ } else
+ return $scope;
+ }
+
+}
diff --git a/app/code/community/OpenTools/Ordernumber/Model/Resource/Ordernumber.php b/app/code/community/OpenTools/Ordernumber/Model/Resource/Ordernumber.php
index 1c5b177..a0ad25d 100644
--- a/app/code/community/OpenTools/Ordernumber/Model/Resource/Ordernumber.php
+++ b/app/code/community/OpenTools/Ordernumber/Model/Resource/Ordernumber.php
@@ -14,9 +14,19 @@ class OpenTools_Ordernumber_Model_Resource_Ordernumber extends Mage_Core_Model_R
$select = $read->select()
->from($this->getMainTable())
- ->where($typefield . '=?', $nrtype)
- ->where($formatfield .'=?', $format)
- ->where($scopefield . '=?', $scope);
+ ->where($typefield . '=?', $nrtype);
+ if (empty($format)) {
+ // Treat both null and '' as "Global counter"; Magento will currently store '' as NULL, but who knows what the future brings.
+ $select = $select->where('(' . $formatfield.' IS NULL OR '.$formatfield.'=\'\')');
+ } else {
+ $select = $select->where($formatfield .'=?', $format);
+ }
+ if (empty($scope)) {
+ // Treat both null and '' as "Global scope"; Magento will currently store '' as NULL, but who knows what the future brings.
+ $select = $select->where('(' . $scopefield .' IS NULL OR '.$scopefield .'=\'\')');
+ } else {
+ $select = $select->where($scopefield . '=?', $scope);
+ }
$data = $read->fetchRow($select);
if ($data) {
$object->setData($data);
diff --git a/app/code/community/OpenTools/Ordernumber/sql/opentools_ordernumber_setup/install-0.1.0.php b/app/code/community/OpenTools/Ordernumber/sql/opentools_ordernumber_setup/install-0.1.0.php
index 7d9ea96..2de52cb 100644
--- a/app/code/community/OpenTools/Ordernumber/sql/opentools_ordernumber_setup/install-0.1.0.php
+++ b/app/code/community/OpenTools/Ordernumber/sql/opentools_ordernumber_setup/install-0.1.0.php
@@ -19,8 +19,8 @@ $table = $installer->getConnection()
'primary' => true,
), 'Ordernumber id')
->addColumn('number_type', Varien_Db_Ddl_Table::TYPE_TEXT, 63, array('nullable'=> false), 'Number Type')
- ->addColumn('number_scope', Varien_Db_Ddl_Table::TYPE_TEXT, 20, array('nullable'=> false, 'default'=>''), 'Number Scope')
- ->addColumn('number_format',Varien_Db_Ddl_Table::TYPE_TEXT, 255, array('nullable'=> true), 'Number Format')
+ ->addColumn('number_scope', Varien_Db_Ddl_Table::TYPE_TEXT, 20, array('nullable'=> true, 'default'=>''), 'Number Scope')
+ ->addColumn('number_format',Varien_Db_Ddl_Table::TYPE_TEXT, 255, array('nullable'=> true, 'default'=>''), 'Number Format')
->addColumn('count', Varien_Db_Ddl_Table::TYPE_INTEGER, null, array('unsigned'=>true,'nullable'=>false), 'Counter')
->addIndex($installer->getIdxName(
$installer->getTable('opentools_ordernumber/ordernumber'),
diff --git a/app/locale/de_DE/OpenTools_Ordernumber.csv b/app/locale/de_DE/OpenTools_Ordernumber.csv
index 15943a4..9660991 100644
--- a/app/locale/de_DE/OpenTools_Ordernumber.csv
+++ b/app/locale/de_DE/OpenTools_Ordernumber.csv
@@ -60,3 +60,16 @@
"Variable Replacements", "Variablenersetzung"
"Website #", "Webseite #"
+"If Variable ...", "Wenn Variable ..."
+"is ...", "gleich ..."
+"Set this variable ..", "Setze Variable ..."
+"to value ...", "auf Wert ..."
+
+"Counter '%s' (type: %s, scope: %s) already exists and is being modified. Will not add again.", "Zähler '%s' (Typ: %s, Anwendungsbereich: %s) existiert bereits und wird modifiziert. Wird daher nicht neu hinzugefügt."
+"Counter '%s' (type: %s, scope: %s) already exists, modifying it to value %d", "Zähler '%s' (Typ: %s, Anwendungsbereich: %s) existiert bereits, modifiziere Wert auf %d."
+"Successfully created counter '%s' (type: %s, scope: %s) with value %d", "Zähler '%s' (Typ: %s, Anwendungsbereich: %s) mit Wert %d erfolgreich hinzugefügt."
+"Counter '%s' (type: %s, scope: %s) was changed in the background in the dabase from %d to %d. Overwriting with %d.", "Zähler '%s' (Typ: %s, Anwendungsbereich: %s) wurde im Hintergrund in der Datenbank von Wert %d auf %d verändert. Diese Änderungen werden mit dem Wert %d überschrieben."
+"Successfully changed counter '%s' (type: %s, scope: %s) from %d to %d", "Zähler '%s' (Typ: %s, Anwendungsbereich: %s) erfolgreich von %d auf %d gesetzt."
+"Counter '%s' (type: %s, scope: %s) was changed in the background in the dabase from %d to %d. Deleting it nonetheless.", "Zähler %s (Typ: %s, Anwendungsbereich: %s) wurde im Hintergrund in der Datenbank von Wert %d auf %d verändert. Wird dennoch entfernt."
+"Successfully deleted counter '%s' (type: %s, scope: %s) with value %d", "Zähler '%s' (Typ: %s, Anwendungsbereich: %s) mit Wert %d erfolgreich entfernt."
+
diff --git a/app/locale/en_US/OpenTools_Ordernumber.csv b/app/locale/en_US/OpenTools_Ordernumber.csv
index 243f355..fa3c7cd 100644
--- a/app/locale/en_US/OpenTools_Ordernumber.csv
+++ b/app/locale/en_US/OpenTools_Ordernumber.csv
@@ -1,7 +1,7 @@
# Translation file for the OpenTools Ordernumber Module for Magento
# (C) 2014-2015 Reinhold Kainhofer, Open Tools
# office@open-tools.net, http://www.open-tools.net/
-"ORDERNUMBER_COUNTERTABLE_WARNING", "All changes made to the counter values will be applied when you press save. Please be aware that in the meantime an order might have been created, so the counter might already be out of date!"
+"ORDERNUMBER_COUNTERTABLE_WARNING", "NOTE: Counters will be created automatically starting with 1 whenever needed. There is no need to create a counter manually, unless you need a new counter to start from a value different from 1!<br> All changes made to the counter values will be applied when you press save. Please be aware that in the meantime an order might have been created, so the counter might already be out of date!"
"ORDERNUMBER_FORMAT_COMMENT","For help, see <a href='http://open-tools.net/documentation/ordernumber-plugin-for-virtuemart.html'>our homepage</a>."
"ORDERNUMBER_FORMAT_TOOLTIP","A string, where [...] indicates a variable and # is replaced with the counter. Possible (case-insensitive) variables are:<table>
<tr><td>[year], [year2], [month], [day], [hour], [hour12], [ampm], [minute], [second]</td><td>Components of the current date when the number is generated</td></tr>
diff --git a/var/connect/OpenTools_Ordernumber.xml b/var/connect/OpenTools_Ordernumber.xml
index caf4e59..5c281e4 100644
--- a/var/connect/OpenTools_Ordernumber.xml
+++ b/var/connect/OpenTools_Ordernumber.xml
@@ -1,5 +1,5 @@
<_>
- <form_key>ZV49LPLMxTBr5Syu</form_key>
+ <form_key>BdrKY2F3O8Sn4JoR</form_key>
<name>OpenTools_Ordernumber</name>
<channel>community</channel>
<version_ids>
@@ -10,8 +10,10 @@
<license>OSL</license>
<license_uri/>
<version>0.1.0</version>
- <stability>devel</stability>
- <notes>Very first released version, should correctly assign all numbers, though.</notes>
+ <stability>alpha</stability>
+ <notes>Initial Release of the OpenTools Ordernumber Module for Magento.
+
+All number types should be correctly implemented, variable substitutions are available and manually setting the counter(s) is alspo available.</notes>
<authors>
<name>
<name>Reinhold Kainhofer</name>
@@ -40,7 +42,7 @@
<max/>
</max>
<files>
- <files> </files>
+ <files> </files>
</files>
</package>
<extension>
@@ -60,26 +62,36 @@
<target>magelocal</target>
<target>magecommunity</target>
<target>mageetc</target>
+ <target>magelocale</target>
+ <target>magelocale</target>
</target>
<path>
<path/>
<path>OpenTools/Ordernumber/</path>
<path>modules/OpenTools_Ordernumber.xml</path>
+ <path>de_DE/OpenTools_Ordernumber.csv</path>
+ <path>en_US/OpenTools_Ordernumber.csv</path>
</path>
<type>
<type>file</type>
<type>dir</type>
<type>file</type>
+ <type>file</type>
+ <type>file</type>
</type>
<include>
<include/>
<include/>
<include/>
+ <include/>
+ <include/>
</include>
<ignore>
<ignore/>
<ignore/>
<ignore/>
+ <ignore/>
+ <ignore/>
</ignore>
</contents>
</_>
--
GitLab