edekakam/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2025-03-05 22:49:48 +01:00
Code Issues Projects Releases Wiki Activity

Some improvements in adresse CRM

Browse Source
This commit is contained in:
Xenomporio 2022-08-06 10:57:29 +02:00
parent 4c98f6966b
commit a10933583c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpwf/plugins/class.yui.php
View File

@ -9518,7 +9518,7 @@ a.land as land, p.abkuerzung as projekt, a.zahlungsweise as zahlungsweise,
tn.zeit, tn.zeit,
tn.betreff, tn.betreff,
ifnull((SELECT name FROM ansprechpartner ap WHERE ap.adresse = a.id AND ap.email = tn.mail LIMIT 1),tn.mail) as ansprechpartner, ifnull((SELECT name FROM ansprechpartner ap WHERE ap.adresse = a.id AND ap.email = tn.mail LIMIT 1),tn.mail) as ansprechpartner,
t.projekt, p.abkuerzung,
tn.verfasser, tn.verfasser,
\'Ticketnachricht\' as art, \'Ticketnachricht\' as art,
CONCAT(IF(tn.versendet = 1, "JA", "NEIN"),"<a data-type=ticket_nachricht data-id=", t.id, "></a>") as gesendet, CONCAT(IF(tn.versendet = 1, "JA", "NEIN"),"<a data-type=ticket_nachricht data-id=", t.id, "></a>") as gesendet,
@ -9531,6 +9531,7 @@ a.land as land, p.abkuerzung as projekt, a.zahlungsweise as zahlungsweise,
INNER JOIN ticket t ON INNER JOIN ticket t ON
tn.ticket = t.schluessel tn.ticket = t.schluessel
INNER JOIN adresse a ON t.adresse = a.id INNER JOIN adresse a ON t.adresse = a.id
LEFT JOIN projekt p on t.projekt = p.id
WHERE t.adresse = '.$adresseId.' AND !(tn.versendet = 1 AND tn.zeitausgang IS NULL) WHERE t.adresse = '.$adresseId.' AND !(tn.versendet = 1 AND tn.zeitausgang IS NULL)
) )
'; ';

6
www/pages/adresse.php
View File

@ -3746,6 +3746,9 @@ function AdresseBriefErstellen() {
} }
$this->app->Tpl->Add('CONTENT',$anschreiben); $this->app->Tpl->Add('CONTENT',$anschreiben);
$projekt = $this->app->DB->Select("SELECT abkuerzung FROM projekt INNER JOIN adresse ON adresse.projekt = projekt.id WHERE adresse.id='".$id."' LIMIT 1");
$this->app->Tpl->Set('PROJEKT', $projekt);
$anhaenge = ''; $anhaenge = '';
$anhaenge .= '<tr><td nowrap>Datei:</td><td><input type="file" name="upload[]" id="file" /></td></tr>'; $anhaenge .= '<tr><td nowrap>Datei:</td><td><input type="file" name="upload[]" id="file" /></td></tr>';
// $anhaenge .= '<tr><td nowrap>Datei 2:</td><td><input type="file" name="upload[]" /></td></tr>'; // $anhaenge .= '<tr><td nowrap>Datei 2:</td><td><input type="file" name="upload[]" /></td></tr>';
@ -6540,7 +6543,7 @@ function AdresseVerein()
tn.zeit, tn.zeit,
tn.betreff, tn.betreff,
ifnull((SELECT name FROM ansprechpartner ap WHERE ap.adresse = a.id AND ap.email = tn.mail LIMIT 1),tn.mail) as ansprechpartner, ifnull((SELECT name FROM ansprechpartner ap WHERE ap.adresse = a.id AND ap.email = tn.mail LIMIT 1),tn.mail) as ansprechpartner,
t.projekt, p.abkuerzung,
tn.verfasser, tn.verfasser,
\'Ticketnachricht\' as art, \'Ticketnachricht\' as art,
CONCAT(IF(tn.versendet = 1, "JA", "NEIN"),"<a data-type=ticket_nachricht data-id=", t.id, "></a>") as gesendet, CONCAT(IF(tn.versendet = 1, "JA", "NEIN"),"<a data-type=ticket_nachricht data-id=", t.id, "></a>") as gesendet,
@ -6553,6 +6556,7 @@ function AdresseVerein()
INNER JOIN ticket t ON INNER JOIN ticket t ON
tn.ticket = t.schluessel tn.ticket = t.schluessel
INNER JOIN adresse a ON t.adresse = a.id INNER JOIN adresse a ON t.adresse = a.id
LEFT JOIN projekt p ON t.projekt = p.id
WHERE t.adresse = '.$adresseId.' AND !(tn.versendet = 1 AND tn.zeitausgang IS NULL) WHERE t.adresse = '.$adresseId.' AND !(tn.versendet = 1 AND tn.zeitausgang IS NULL)
) )
'; ';