From 5da04902606d1ac826777e997c05247e3c6313d9 Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Fri, 16 Jun 2023 12:20:21 +0200
Subject: [PATCH] bugfix mahnwesen neu

---
 www/pages/content/mahnwesen_edit.tpl | 4 ++--
 www/pages/mahnwesen.php              | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/www/pages/content/mahnwesen_edit.tpl b/www/pages/content/mahnwesen_edit.tpl
index eb207ecf..40c33516 100644
--- a/www/pages/content/mahnwesen_edit.tpl
+++ b/www/pages/content/mahnwesen_edit.tpl
@@ -17,14 +17,14 @@
 	        		<div class="col-xs-12 col-md-12 col-md-height">
 	        			<div class="inside inside-full-height">
 	        				<fieldset>
-                                <legend>{|<!--Legend for this form area goes here>-->Mahnwesen-Einstellungen|}</legend><i>Info like this.</i>
+                                <legend>{|<!--Legend for this form area goes here>-->Mahnwesen-Einstellungen|}</legend>
                                 <table width="100%" border="0" class="mkTableFormular">
                                     <tr>
                                         <td>
                                             {|Name|}:
                                         </td>
                                         <td>
-                                            <input type="text" name="name" id="name" value="[NAME]" size="20">
+                                            <input type="text" name="name" id="name" value="[NAME]" size="20"><i>Entspricht "Typ" in der Gesch&auml;ftsbrief-Vorlage</i>
                                         </td>
                                     </tr>
                                     <tr>
diff --git a/www/pages/mahnwesen.php b/www/pages/mahnwesen.php
index dd4bf70e..ed5230c4 100644
--- a/www/pages/mahnwesen.php
+++ b/www/pages/mahnwesen.php
@@ -139,7 +139,7 @@ class Mahnwesen {
                     // $alignright = array(4,5,6,7,8); 
 
                     $findcols = array('m.id', 'm.tage','m.name', 'm.gebuehr', 'm.mail','m.druck');
-                    $searchsql = array('m.stufe','m.name','m.tage', 'm.gebuehr', 'm.versandmethode');
+                    $searchsql = array('m.name','m.tage', 'm.gebuehr', 'm.versandmethode');
 
                     $defaultorder = 1;
                     $defaultorderdesc = 1;
@@ -447,7 +447,7 @@ class Mahnwesen {
     
         // Load values again from database
     	$dropnbox = "'<img src=./themes/new/images/details_open.png class=details>' AS `open`, CONCAT('<input type=\"checkbox\" name=\"auswahl[]\" value=\"',m.id,'\" />') AS `auswahl`";
-        $result = $this->app->DB->SelectArr("SELECT SQL_CALC_FOUND_ROWS m.id, $dropnbox, m.stufe, m.name, m.tage, m.gebuehr, m.mail, m.druck, m.id FROM mahnwesen m"." WHERE id=$id");
+        $result = $this->app->DB->SelectArr("SELECT SQL_CALC_FOUND_ROWS m.id, $dropnbox, m.name, m.tage, m.gebuehr, m.mail, m.druck, m.id FROM mahnwesen m"." WHERE id=$id");
 
         foreach ($result[0] as $key => $value) {
             $this->app->Tpl->Set(strtoupper($key), $value);   
@@ -474,7 +474,6 @@ class Mahnwesen {
     public function GetInput(): array {
         $input = array();
         $input['name'] = $this->app->Secure->GetPOST('name');
-        $input['stufe'] = $this->app->Secure->GetPOST('stufe');
     	$input['tage'] = $this->app->Secure->GetPOST('tage');
     	$input['gebuehr'] = $this->app->Secure->GetPOST('gebuehr');
     	$input['mail'] = $this->app->Secure->GetPOST('mail')?'1':'0';
@@ -487,7 +486,6 @@ class Mahnwesen {
      */
     function SetInput($input) {
         $this->app->Tpl->Set('NAME', $input['name']);
-        $this->app->Tpl->Set('STUFE', $input['stufe']);
     	$this->app->Tpl->Set('TAGE', $input['tage']);
 	    $this->app->Tpl->Set('GEBUEHR', $input['gebuehr']);
     	$this->app->Tpl->Set('MAIL', $input['mail']);