Skip to content

Commit

Permalink
Thanks to Stephan Deglow for PHP 5.5 compatibility fix and translatio…
Browse files Browse the repository at this point in the history
…n extension into German
  • Loading branch information
uoziod committed Aug 25, 2014
1 parent d61633c commit 9ef02d0
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 20 deletions.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,9 @@ This extension for [TYPO3 CMS](http://typo3.org) created in addition to another
* With **Catalog Items** you can manage shop categories and items pretty simple;
* **Categories Manager** is for managing order status with customers e-mail notification support.

You can find out details in [this manual](http://docs.typo3.org/typo3cms/extensions/shop_manager/).
You can find out details in [this manual](http://docs.typo3.org/typo3cms/extensions/shop_manager/).

Feedback
--------

For feedback, bug report & feature request use [GitHub Issues](https://github.com/uoziod/shop_manager/issues) please.
Binary file modified doc/manual.sxw
Binary file not shown.
10 changes: 5 additions & 5 deletions ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
########################################################################
# Extension Manager/Repository config file for ext "shop_manager".
#
# Auto generated 22-08-2014 06:21
# Auto generated 25-08-2014 13:29
#
# Manual updates:
# Only the data in the array - everything else is removed by next
Expand All @@ -15,7 +15,7 @@
'description' => 'Shop System (tt_products) management system. This is backend module with 2 sections. With "Catalog Items" you can manage shop categories and items pretty simple. "Categories Manager" is a useful order status manager with customers e-mail notification support.',
'category' => 'module',
'shy' => 0,
'version' => '1.0.4',
'version' => '1.0.5',
'dependencies' => '',
'conflicts' => '',
'priority' => '',
Expand All @@ -35,16 +35,16 @@
'constraints' => array(
'depends' => array(
'php' => '5.2.0-0.0.0',
'typo3' => '4.5.17-6.2.99',
'typo3' => '4.1.0-6.2.99',
),
'conflicts' => array(
),
'suggests' => array(
),
),
'_md5_values_when_last_written' => 'a:14:{s:21:"ext_conf_template.txt";s:4:"dbfc";s:12:"ext_icon.gif";s:4:"a39a";s:14:"ext_tables.php";s:4:"6598";s:14:"doc/manual.sxw";s:4:"cfee";s:13:"mod1/conf.php";s:4:"18a3";s:14:"mod1/footer.js";s:4:"cc95";s:14:"mod1/header.js";s:4:"403d";s:14:"mod1/index.php";s:4:"4698";s:14:"mod1/jquery.js";s:4:"73a9";s:18:"mod1/locallang.xml";s:4:"9ad7";s:22:"mod1/locallang_mod.xml";s:4:"d353";s:22:"mod1/mod_template.html";s:4:"6122";s:19:"mod1/moduleicon.gif";s:4:"a39a";s:15:"mod1/styles.css";s:4:"0adf";}',
'_md5_values_when_last_written' => 'a:15:{s:9:"README.md";s:4:"4386";s:21:"ext_conf_template.txt";s:4:"7283";s:12:"ext_icon.gif";s:4:"a39a";s:14:"ext_tables.php";s:4:"6598";s:14:"doc/manual.sxw";s:4:"2ca5";s:13:"mod1/conf.php";s:4:"18a3";s:14:"mod1/footer.js";s:4:"e151";s:14:"mod1/header.js";s:4:"b57d";s:14:"mod1/index.php";s:4:"b03b";s:14:"mod1/jquery.js";s:4:"73a9";s:18:"mod1/locallang.xml";s:4:"426f";s:22:"mod1/locallang_mod.xml";s:4:"3ea7";s:22:"mod1/mod_template.html";s:4:"6122";s:19:"mod1/moduleicon.gif";s:4:"a39a";s:15:"mod1/styles.css";s:4:"2a7a";}',
'suggests' => array(
),
);

?>
?>
28 changes: 14 additions & 14 deletions mod1/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,9 @@ function moduleContent() {
'',
'title'
);
$res = $TYPO3_DB->sql(TYPO3_db, $query);
$res = $TYPO3_DB->sql_query($query);
$categories = Array();
while($row = mysql_fetch_assoc($res)) {
while($row = $TYPO3_DB->sql_fetch_assoc($res)) {
$categories[$row['uid']] = $row['title'];
}
$TYPO3_DB->sql_free_result($res);
Expand All @@ -301,8 +301,8 @@ function moduleContent() {
'sys_products_orders',
'uid=' . $detailed
);
$res = $TYPO3_DB->sql(TYPO3_db, $query);
$row = mysql_fetch_assoc($res);
$res = $TYPO3_DB->sql_query($query);
$row = $TYPO3_DB->sql_fetch_assoc($res);
$TYPO3_DB->sql_free_result($res);

$template_full_path = t3lib_div::getFileAbsFileName($extConf['ttproductsTemplate']);
Expand Down Expand Up @@ -372,9 +372,9 @@ function moduleContent() {
'',
'category, title'
);
$res = $TYPO3_DB->sql(TYPO3_db, $query);
$res = $TYPO3_DB->sql_query($query);
$counter = 0;
while($row = mysql_fetch_assoc($res)) {
while($row = $TYPO3_DB->sql_fetch_assoc($res)) {
if ($extConf['iconsInsteadImages'])
$table[$counter][0] = '<div class="hiddenImage">' . $this->pictureGenerator($row['image'], $extConf['imagesWidth'], 600) . '</div><span class="t3-icon t3-icon-tcarecords t3-icon-tcarecords-tt_products t3-icon-tt_products-default">&nbsp;</span>';
else
Expand Down Expand Up @@ -427,13 +427,13 @@ function moduleContent() {
'',
'title'
);
$res = $TYPO3_DB->sql(TYPO3_db, $query);
$res = $TYPO3_DB->sql_query($query);
$counter = 0;
while($row = mysql_fetch_assoc($res)) {
while($row = $TYPO3_DB->sql_fetch_assoc($res)) {
$table[$counter][0] = $row['title'];
$table[$counter][1] = '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick('&edit[tt_products_cat]['.$row['uid'].']=edit',$GLOBALS['BACK_PATH'])).'">'.'<img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/edit2.gif').' title="' . $LANG->getLL('act.edit') . '" border="0" alt="" /></a>';
$counter++;
}
};
$TYPO3_DB->sql_free_result($res);

$content .= $this->doc->getDynTabMenu(Array(
Expand Down Expand Up @@ -473,8 +473,8 @@ function moduleContent() {
'tstamp DESC',
$extConf['limitItems']
);
$res = $TYPO3_DB->sql(TYPO3_db, $query);
while($row = mysql_fetch_assoc($res)) {
$res = $TYPO3_DB->sql_query($query);
while($row = $TYPO3_DB->sql_fetch_assoc($res)) {
if ($row['status'] > 0) {
$list_orders[$row['status']][$row['uid']]['feusers_uid'] = $row['feusers_uid'];
$list_orders[$row['status']][$row['uid']]['name'] = $row['name'];
Expand Down Expand Up @@ -532,8 +532,8 @@ function moduleContent() {
'sys_products_orders',
'uid=' . $detailed
);
$res = $TYPO3_DB->sql(TYPO3_db, $query);
$row = mysql_fetch_assoc($res);
$res = $TYPO3_DB->sql_query($query);
$row = $TYPO3_DB->sql_fetch_assoc($res);
$TYPO3_DB->sql_free_result($res);

// Order details
Expand Down Expand Up @@ -702,7 +702,7 @@ function pictureGenerator($file, $size_w, $size_h) {
$size_h . 'm',
'',
'',
'',
array(),
1
);
$imageInfo[3] = '/' . str_replace(PATH_site, '', $imageInfo[3]);
Expand Down
48 changes: 48 additions & 0 deletions mod1/locallang.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,54 @@
<label index="change">Change</label>
<label index="comment">Comment</label>
</languageKey>
<languageKey index="de" type="array">
<label index="title">Shop Manager</label>
<label index="act.apply">Änderungen speichern</label>
<label index="act.edit">bearbeiten</label>
<label index="act.add">hinzufügen</label>
<label index="act.add_new_record">Neuen Eintrag erstellen</label>
<label index="sys.list_empty">keine Einträge vorhanden</label>
<label index="function1">Online Shop Struktur</label>
<label index="function1.items">Produkte</label>
<label index="function1.filter">Zeige nur Produkte der Kategorie</label>
<label index="function1.filter.unset">alle</label>
<label index="function1.categories">Kategorien</label>
<label index="function2">Bestellungen verwalten</label>
<label index="function2.status">Status</label>
<label index="function2.status.1">Bestellung eingegangen</label>
<label index="function2.status.2">Bestellung eingegangen und aktzeptiert</label>
<label index="function2.status.10">Shop wartet auf Lieferung Dritter</label>
<label index="function2.status.11">Shop wartet auf Zahlung des Kunden</label>
<label index="function2.status.12">Shop wartet auf TeileLieferung des Kunden</label>
<label index="function2.status.13">Bestellung ist bezahlt</label>
<label index="function2.status.20">Bestellung wurde versendet</label>
<label index="function2.status.21">Geschenkgutschein versandt an Kunde</label>
<label index="function2.status.30">Andere Nachricht des Shops</label>
<label index="function2.status.50">Kunde wünscht Stornierung</label>
<label index="function2.status.51">Nachricht des Kunden</label>
<label index="function2.status.60">Sende Geschenknachricht an Empfänger</label>
<label index="function2.status.100">Bestellung versandt und abgeschlossen</label>
<label index="function2.status.101">Bestellung abgeschlossen</label>
<label index="function2.status.200">Bestellung storniert</label>
<label index="function2.jumpTo">Zeige Bestellung</label>
<label index="function2.jumpToText">Zeige Bestellung Nr.</label>
<label index="function2.jump">Los</label>
<label index="function2.orderItems">bestellte Produkte</label>
<label index="function2.detailed">Details zur Bestellung Nr.</label>
<label index="function2.created">Erstellt</label>
<label index="function2.updated">geupdated</label>
<label index="function2.customer">Kunde</label>
<label index="function2.address">Adresse</label>
<label index="function2.city">Stadt</label>
<label index="function2.country">Land</label>
<label index="function2.phone">Telefon</label>
<label index="function2.email">E-Mail</label>
<label index="function2.sum">Summe</label>
<label index="function2.ip">IP Addresse d. Kunden</label>
<label index="function2.zip">PLZ</label>
<label index="change">Änderung</label>
<label index="comment">Komentar</label>
</languageKey>
<languageKey index="ru" type="array">
<label index="title">Менеджер магазина</label>
<label index="act.apply">Применить изменения</label>
Expand Down
5 changes: 5 additions & 0 deletions mod1/locallang_mod.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
<label index="mlang_labels_tabdescr">Managing goods categories and items of online shop. Viewing and edit current orders statuses.</label>
<label index="mlang_labels_tablabel">Shop System Manager Module</label>
</languageKey>
<languageKey index="de" type="array">
<label index="mlang_tabs_tab">Shop Manager</label>
<label index="mlang_labels_tabdescr">Verwaltung von Produkten und Kategorien. Bestellungen einsehen und deren Status ändern.</label>
<label index="mlang_labels_tablabel">Shop System Manager Module</label>
</languageKey>
<languageKey index="ru" type="array">
<label index="mlang_tabs_tab">Менеджер магазина</label>
<label index="mlang_labels_tabdescr">Управление категориями и товарами Интернет-магазина. Просмотр и изменение статусов текущих заказов.</label>
Expand Down

0 comments on commit 9ef02d0

Please sign in to comment.