s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-11-14 20:17:14 +01:00
Code Issues Projects Releases Wiki Activity

mahnwesen bugfix tab logic

Browse Source
This commit is contained in:
OpenXE 2024-10-15 15:31:21 +02:00
parent 1f7b1af1f1
commit bf242623c4
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/pages/content/mahnwesen_list.tpl
View File

@ -4,7 +4,7 @@
</ul> </ul>
<div id="tabs-1"> <div id="tabs-1">
<form method="post" action="#"> <form method="post" action="#">
<div class="filter-box filter-usersave"> <div class="filter-box filter-usersave" [ZU_MAHNEN_HIDDEN]>
<div class="filter-block filter-inline"> <div class="filter-block filter-inline">
<div class="filter-title">{|Filter|}</div> <div class="filter-title">{|Filter|}</div>
<ul class="filter-list"> <ul class="filter-list">

20
www/pages/mahnwesen.php
View File

@ -14,7 +14,8 @@ class Mahnwesen {
return; return;
$this->app->ActionHandlerInit($this); $this->app->ActionHandlerInit($this);
$this->app->ActionHandler("list", "mahnwesen_list"); $this->app->ActionHandler("list", "mahnwesen_list");
$this->app->ActionHandler("stufe_list", "mahnwesen_stufe_list");
$this->app->ActionHandler("create", "mahnwesen_edit"); // This automatically adds a "New" button $this->app->ActionHandler("create", "mahnwesen_edit"); // This automatically adds a "New" button
$this->app->ActionHandler("edit", "mahnwesen_edit"); $this->app->ActionHandler("edit", "mahnwesen_edit");
$this->app->ActionHandler("einstellungen", "mahnwesen_einstellungen"); $this->app->ActionHandler("einstellungen", "mahnwesen_einstellungen");
@ -90,7 +91,7 @@ class Mahnwesen {
$where = " r.belegnr <> ''"; $where = " r.belegnr <> ''";
if (!empty($mahnwesen_stufe_filter)) { if (!empty($mahnwesen_stufe_filter)) {
$where .= " AND m.id = '".$mahnwesen_stufe_filter."'"; $where .= " AND m.id = '".$mahnwesen_stufe_filter."' AND r.versendet_mahnwesen ";
} }
// Toggle filters // Toggle filters
@ -116,7 +117,7 @@ class Mahnwesen {
} }
$more_data1 = $app->Secure->GetGET("more_data1"); $more_data1 = $app->Secure->GetGET("more_data1");
if ($more_data1 == 1) { if ($more_data1 == 1 && empty($mahnwesen_stufe_filter)) {
$where .= " AND NOT r.versendet_mahnwesen AND r.mahnwesen <> ''"; $where .= " AND NOT r.versendet_mahnwesen AND r.mahnwesen <> ''";
} else { } else {
} }
@ -182,6 +183,11 @@ class Mahnwesen {
} }
return $erg; return $erg;
} }
// For Tab-highlighting
function mahnwesen_stufe_list() {
$this->mahnwesen_list();
}
function mahnwesen_list() { function mahnwesen_list() {
$this->app->erp->MenuEintrag("index.php?module=mahnwesen&action=list", "&Uuml;bersicht"); $this->app->erp->MenuEintrag("index.php?module=mahnwesen&action=list", "&Uuml;bersicht");
@ -351,8 +357,7 @@ class Mahnwesen {
ON ON
m.tage = id_tage.tage m.tage = id_tage.tage
) rid_mid ) rid_mid
ON r.id = rid_mid.id ON r.id = rid_mid.id
WHERE mahnwesen <> mahnwesen_neu OR versendet_mahnwesen = 0
ORDER BY rid_mid.tage ORDER BY rid_mid.tage
"; ";
$offene_rechnungen = $this->app->DB->SelectArr($sql); $offene_rechnungen = $this->app->DB->SelectArr($sql);
@ -365,9 +370,9 @@ class Mahnwesen {
$this->app->DB->Update($sql); $this->app->DB->Update($sql);
} }
if (!in_array($offene_rechnung['mahnwesen_neu'],$menus) && count($menus) < 5) { if (!in_array($offene_rechnung['mahnwesen_neu'],$menus) && ($offene_rechnung['versendet_mahnwesen']) && count($menus) < 5) {
$menus[] = $offene_rechnung['mahnwesen_neu']; $menus[] = $offene_rechnung['mahnwesen_neu'];
$this->app->erp->MenuEintrag("index.php?module=mahnwesen&action=list&stufe=".$offene_rechnung['mahnwesen_neu'], $this->app->DB->real_escape_string($offene_rechnung['name'])); $this->app->erp->MenuEintrag("index.php?module=mahnwesen&action=stufe_list&stufe=".$offene_rechnung['mahnwesen_neu'], $this->app->DB->real_escape_string($offene_rechnung['name']));
} }
} }
@ -385,6 +390,7 @@ class Mahnwesen {
$this->app->User->SetParameter('mahnwesen_stufe_filter', $mahnwesen_stufe_filter); $this->app->User->SetParameter('mahnwesen_stufe_filter', $mahnwesen_stufe_filter);
if (!empty($mahnwesen_stufe_filter)) { if (!empty($mahnwesen_stufe_filter)) {
$this->app->Tpl->Set('KURZUEBERSCHRIFT2',"Stufe: ".$this->app->DB->Select("SELECT name FROM mahnwesen WHERE id = ".$mahnwesen_stufe_filter." LIMIT 1")); $this->app->Tpl->Set('KURZUEBERSCHRIFT2',"Stufe: ".$this->app->DB->Select("SELECT name FROM mahnwesen WHERE id = ".$mahnwesen_stufe_filter." LIMIT 1"));
$this->app->Tpl->Set('ZU_MAHNEN_HIDDEN', 'hidden');
} }
$this->app->YUI->TableSearch('TAB1', 'mahnwesen_list', "show", "", "", basename(__FILE__), __CLASS__); $this->app->YUI->TableSearch('TAB1', 'mahnwesen_list', "show", "", "", basename(__FILE__), __CLASS__);