s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-25 06:00:28 +01:00
Code Issues Projects Releases Wiki Activity

versandpakete improvements

Browse Source
This commit is contained in:
OpenXE 2023-10-20 15:47:37 +02:00
parent e899b1c389
commit a35ab21f7c
5 changed files with 361 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3650,8 +3650,8 @@ class YUI {
$paketmarke = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/portogo.png\" style=\"margin-right:1px\" title=\"Paketmarke\" border=\"0\">";
$paketmarke_keine = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/portostop.png\" style=\"margin-right:1px\" title=\"Keine Paketmarke\" border=\"0\">";
$ausgeliefert = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/grey.png\" style=\"margin-right:1px\" title=\"Ausgeliefert\" border=\"0\">";
$ausgeliefert_nicht = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/nicht_eingelagert.png\" style=\"margin-right:1px\" title=\"Nicht ausgeliefert\" border=\"0\">";
$ausgeliefert = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/delivery_ok.png\" style=\"margin-right:1px\" title=\"Ausgeliefert\" border=\"0\">";
$ausgeliefert_nicht = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/delivery.png\" style=\"margin-right:1px\" title=\"Nicht ausgeliefert\" border=\"0\">";
$storno = "<img src=\"./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/storno.png\" style=\"margin-right:1px\" title=\"Storniert\" border=\"0\">";
@ -3662,12 +3662,12 @@ class YUI {
return "CONCAT('<table><tr><td nowrap>',
CASE
WHEN v.status = 'abgeschlossen' THEN '$abgeschlossen'
WHEN v.status = 'storniert' THEN '$storniert'
WHEN status = 'storniert' THEN '$storniert'
ELSE CONCAT(
CASE
WHEN lieferschein_ohne_pos <> '' THEN '$lieferschein_ohne_pos'
WHEN lieferschein <> '' THEN '$lieferschein_voll'
WHEN lieferscheine <> '' AND vmenge = lmenge THEN '$lieferschein_voll'
WHEN lieferscheine <> '' THEN '$lieferschein_teil'
ELSE
'$lieferschein_kein'
END,
@ -3677,11 +3677,16 @@ class YUI {
'$paketmarke_keine'
END,
CASE
WHEN v.status = 'versendet' THEN '$versendet'
WHEN status = 'versendet' THEN '$versendet'
WHEN status = 'abgeschlossen' THEN '$versendet'
ELSE
'$versendet_nicht'
END,
'$ausgeliefert_nicht'
CASE
WHEN status = 'abgeschlossen' THEN '$ausgeliefert'
ELSE
'$ausgeliefert_nicht'
END
)
END,
'</td></tr></table>')";

4
upgrade/data/db_schema.json
View File

@ -112967,9 +112967,9 @@
"Field": "lieferschein_ohne_pos",
"Type": "int(11)",
"Collation": null,
"Null": "NO",
"Null": "YES",
"Key": "",
"Default": "0",
"Default": null,
"Extra": "",
"Privileges": "select,insert,update,references",
"Comment": ""

106
www/lib/class.versanddienstleister.php
View File

@ -370,7 +370,7 @@ abstract class Versanddienstleister
return true;
}
public function Paketmarke(string $target, string $docType, int $docId): void
public function Paketmarke(string $target, string $docType, int $docId, $versandpaket = null): void
{
$address = $this->GetAdressdaten($docId, $docType);
if (isset($_SERVER['CONTENT_TYPE']) && ($_SERVER['CONTENT_TYPE'] === 'application/json')) {
@ -379,59 +379,65 @@ abstract class Versanddienstleister
if ($json->submit == 'print') {
$result = $this->CreateShipment($json, $address);
if ($result->Success) {
/* $sql = "INSERT INTO versand
(
adresse,
lieferschein,
versandunternehmen,
gewicht,
tracking,
tracking_link,
anzahlpakete
)
VALUES
(
{$address['addressId']},
{$address['lieferscheinId']},
'$this->type',
'$json->weight',
'$result->TrackingNumber',
'$result->TrackingUrl',
1
)";*/
$sql = "INSERT INTO versandpakete
(
lieferschein_ohne_pos,
gewicht,
tracking,
tracking_link,
status,
versandart
)
VALUES
(
{$address['lieferscheinId']},
'$json->weight',
'$result->TrackingNumber',
'$result->TrackingUrl',
'versendet',
'$this->type'
)";
if (empty($versandpaket)) {
$sql = "INSERT INTO versandpakete
(
lieferschein_ohne_pos,
gewicht,
tracking,
tracking_link,
status,
versandart,
versender
)
VALUES
(
{$address['lieferscheinId']},
'$json->weight',
'$result->TrackingNumber',
'$result->TrackingUrl',
'neu',
'$this->type',
'".$this->app->User->GetName()."'
)";
$this->app->DB->Insert($sql);
$versandpaket = $this->app->DB->GetInsertID();
}
else {
$sql = "UPDATE versandpakete SET
gewicht = '".$json->weight."',
tracking = '".$result->TrackingNumber."',
tracking_link = '".$result->TrackingUrl."'
WHERE id = '".$versandpaket."'
";
$this->app->DB->Update($sql);
}
$this->app->DB->Insert($sql);
$filename = join('_', [$this->type, 'Label', $result->TrackingNumber]) . '.pdf';
$filefullpath = $this->app->erp->GetTMP() . $filename;
file_put_contents($filefullpath, $result->Label);
$this->app->erp->CreateDateiWithStichwort(
$filename,
'Paketmarke '.$this->type.' '.$result->TrackingNumber,
'Paketmarke Versandpaket Nr. '.$versandpaket,
'',
$filefullpath,
$this->app->User->GetName(),
'paketmarke',
'versandpaket',
$versandpaket
);
$filename = $this->app->erp->GetTMP() . join('_', [$this->type, 'Label', $result->TrackingNumber]) . '.pdf';
file_put_contents($filename, $result->Label);
$this->app->printer->Drucken($this->labelPrinterId, $filename);
$this->app->printer->Drucken($this->labelPrinterId, $filefullpath);
if (isset($result->ExportDocuments)) {
$filename = $this->app->erp->GetTMP() . join('_', [$this->type, 'ExportDoc', $result->TrackingNumber]) . '.pdf';
file_put_contents($filename, $result->ExportDocuments);
$this->app->printer->Drucken($this->documentPrinterId, $filename);
}
$ret['messages'][] = ['class' => 'info', 'text' => "Paketmarke wurde erfolgreich erstellt: $result->TrackingNumber"];
if (isset($result->ExportDocuments)) {
$filefullpath = $this->app->erp->GetTMP() . join('_', [$this->type, 'ExportDoc', $result->TrackingNumber]) . '.pdf';
file_put_contents($filefullpath, $result->ExportDocuments);
$this->app->printer->Drucken($this->documentPrinterId, $filefullpath);
}
$ret['messages'][] = ['class' => 'info', 'text' => "Paketmarke wurde erfolgreich erstellt: $result->TrackingNumber"];
} else {
$ret['messages'] = array_map(fn(string $item) => ['class' => 'error', 'text' => $item], array_unique($result->Errors));
$ret['messages'] = array_map(fn(string $item) => ['class' => 'error', 'text' => $item], array_unique($result->Errors));
}
}
header('Content-Type: application/json');

44
www/pages/content/versandpakete_edit.tpl
View File

@ -11,7 +11,10 @@
<div class="col-xs-14 col-md-6 col-md-height">
<div class="inside inside-full-height">
<fieldset>
<legend>{|Versandpaket <b>Nr. [ID]</b> vom [DATUM] f&uuml;r Adresse '[ADRESSE]'|}</legend>
<legend>
{|<b>Versandpaket Nr. [ID]</b> vom [DATUM]<span [NO_ADDRESS_HIDDEN]> f&uuml;r Adresse '[ADRESSE]'|}</span>
</legend>
[ICONS]
<table width="100%" border="0" class="mkTableFormular">
<tr>
<td>
@ -42,7 +45,13 @@
{|Tracking|}:
</td>
<td>
<input type="text" name="" id="" value="[TRACKING]" size="40" disabled><a href="[TRACKING_LINK]"><img src="themes/new/images/forward.svg" border="0" style="top:6px; position:relative"></a>
<input type="text" name="" id="" value="[TRACKING]" size="40" disabled>
<a href="[PAKETMARKE_LINK]" [PAKETMARKE_HIDDEN]>
<img src="themes/new/images/portogo.png" border="0" style="top:6px; position:relative">
</a>
<a href="[TRACKING_LINK]" [PAKETMARKE_HIDDEN]>
<img src="themes/new/images/forward.svg" border="0" style="top:6px; position:relative">
</a>
</td>
</tr>
<tr>
@ -67,31 +76,26 @@
</div>
<div class="col-xs-14 col-md-6 col-md-height">
<div class="inside inside-full-height">
<fieldset [LIEFERSCHEIN_ADD_POS_HIDDEN]>
<legend>{|Artikel aus Lieferschein hinzuf&uuml;gen|}</legend>
<table width="100%" border="0" class="mkTableFormular">
<tr>
<td>
{|Lieferschein|}:
</td>
<td>
<input form="add" type="text" name="lieferschein" id="lieferschein" value="[LIEFERSCHEIN]" autofocus style="width:99%;">
</td>
</tr>
</table>
</fieldset>
<fieldset [LIEFERSCHEIN_OHNE_POS_HIDDEN]>
<fieldset >
<legend>{|Lieferschein|}</legend>
<table width="100%" border="0" class="mkTableFormular">
<tr>
<tr [LIEFERSCHEIN_OHNE_POS_HIDDEN]>
<td>
{|Lieferschein|}:
{|Lieferschein ohne Positionen|}:
</td>
<td>
<input form="add" type="text" name="" id="" value="[LIEFERSCHEIN_OHNE_POS]" size="40" disabled>
<a href="index.php?module=lieferschein&action=edit&id=[LIEFERSCHEIN_OHNE_POS_ID]"><img src="themes/new/images/forward.svg" border="0" style="top:6px; position:relative"></a>
</td>
</tr>
<tr [LIEFERSCHEIN_ADD_POS_HIDDEN]>
<td>
{|Lieferschein|}:
</td>
<td>
<input form="add" type="text" name="lieferschein" id="lieferschein" value="[LIEFERSCHEIN]" autofocus size="40">
</td>
</tr>
</table>
</fieldset>
</div>
@ -104,7 +108,9 @@
<tr><td><button form="save" name="submit" value="speichern" class="ui-button-icon" style="width:100%;">Speichern</button></td></tr>
<tr [LIEFERSCHEIN_ADD_POS_HIDDEN]><td><button form="add" name="submit" value="lieferschein_hinzufuegen" class="ui-button-icon" style="width:100%;">Artikel hinzuf&uuml;gen</button></td></tr>
<tr [LIEFERSCHEIN_ADD_POS_HIDDEN]><td><button form="add" name="submit" value="lieferschein_komplett_hinzufuegen" class="ui-button-icon" style="width:100%;">Kompletten Lieferschein hinzuf&uuml;gen</button></td></tr>
<tr [PAKETMARKE_HIDDEN]><td><button form="paketmarke" name="submit" value="paketmarke" class="ui-button-icon" style="width:100%;">Parketmarke drucken und absenden</button></td></tr>
<tr [PAKETMARKE_ADD_HIDDEN]><td><button form="paketmarke" name="submit" value="paketmarke" class="ui-button-icon" style="width:100%;">Paketmarke drucken</button></td></tr>
<tr [ABSENDEN_HIDDEN]><td><button name="submit" value="absenden" class="ui-button-icon" style="width:100%;">Absenden</button></td></tr>
<tr [ABSCHLIESSEN_HIDDEN]><td><button name="submit" value="abschliessen" class="ui-button-icon" style="width:100%;">Abschlie&szlig;en</button></td></tr>
</table>
</fieldset>
</div>

347
www/pages/versandpakete.php
View File

@ -42,7 +42,9 @@ class Versandpakete {
$this->app->ActionHandler("stapelverarbeitung", "versandpakete_stapelverarbeitung");
$this->app->ActionHandler("paketmarke", "versandpakete_paketmarke");
$this->app->ActionHandler("delete", "versandpakete_delete");
$this->app->ActionHandler("deletepos", "versandpakete_deletepos");
$this->app->ActionHandler("minidetail", "versandpakete_minidetail");
$this->app->ActionHandler("minidetaillieferschein", "versandpakete_minidetaillieferschein");
$this->app->DefaultActionHandler("list");
$this->app->ActionHandlerListen($app);
}
@ -55,22 +57,22 @@ class Versandpakete {
switch ($name) {
case "versandpakete_list":
$allowed['versandpakete_list'] = array('list');
$heading = array('','', 'Paket-Nr.','Datum','Adresse', 'Lieferschein', 'Versandart', 'Tracking', 'Gewicht','Versender', 'Bemerkung', 'Status', 'Monitor', 'Men&uuml;');
$width = array('1%','1%','1%'); // Fill out manually later
$heading = array('', '', 'Paket-Nr.','Datum','Adresse', 'Lieferschein', 'Versandart', 'Tracking', 'Menge auf Lieferscheinen', 'Menge', 'Gewicht','Versender', 'Bemerkung', 'Status', 'Monitor', 'Men&uuml;');
$width = array( '1%','1%','1%', '1%', '10%', '1%', '2%', '2%', '1%', '1%', '1%', '2%', '10%', '1%', '1%', '1%');
// columns that are aligned right (numbers etc)
// $alignright = array(4,5,6,7,8);
$findcols = array('v.id','v.id','v.id','a.name','l.belegnr','v.tracking', 'v.versender', 'v.gewicht', 'v.bemerkung', 'v.status');
$findcols = array('id','id','id','datum');
$searchsql = array('v.versand', 'v.nr', 'v.tracking', 'v.versender', 'v.gewicht', 'v.bemerkung', 'v.status');
$defaultorder = 1;
$defaultorderdesc = 0;
$dropnbox = "'<img src=./themes/new/images/details_open.png class=details>' AS `open`, CONCAT('<input type=\"checkbox\" name=\"auswahl[]\" value=\"',v.id,'\" />') AS `auswahl`";
$dropnbox = "'<img src=./themes/new/images/details_open.png class=details>' AS `open`, CONCAT('<input type=\"checkbox\" name=\"auswahl[]\" value=\"',id,'\" />') AS `auswahl`";
$menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=versandpakete&action=edit&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=DeleteDialog(\"index.php?module=versandpakete&action=delete&id=%value%\");>" . "<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>" . "</td></tr></table>";
$menucol = 12;
$menucol = 1;
$moreinfo = true; // Allow drop down details
$lieferschein_link = array(
@ -81,6 +83,14 @@ class Versandpakete {
'</a>'
);
$lieferschein_ohne_pos_link = array(
'<a href="index.php?module=lieferschein&action=edit&id=',
['sql' => 'lop.id'],
'">',
['sql' => 'lop.belegnr'],
'</a>'
);
$tracking_link = array(
'<a href="',
['sql' => 'v.tracking_link'],
@ -90,32 +100,60 @@ class Versandpakete {
);
$sql = "SELECT SQL_CALC_FOUND_ROWS
v.id,
id,
$dropnbox,
v.id,
".$app->erp->FormatDateTimeShort('v.datum').",
a.name,
GROUP_CONCAT(DISTINCT ".$app->erp->ConcatSQL($lieferschein_link)." SEPARATOR ', ') as lieferschein,
".$app->erp->FormatUCfirst('v.versandart')." as versandart,
".$app->erp->ConcatSQL($tracking_link)." as tracking_link,
v.gewicht,
v.versender,
v.bemerkung,
v.status,
id,
datum,
if (lieferscheine IS NULL,alop_name,name),
if (lieferscheine IS NULL, lieferscheine_ohne_pos, lieferscheine),
versandart,
tracking_link,
lmenge,
vmenge,
gewicht,
versender,
bemerkung,
status,
".$app->YUI->IconsSQL_versandpaket().",
v.id
FROM
versandpakete v
LEFT JOIN
(".self::SQL_VERSANDPAKETE_LIEFERSCHEIN.") vl ON v.id = vl.versandpaket
LEFT JOIN
lieferschein l on vl.lieferschein = l.id
LEFT JOIN
adresse a on a.id = l.adresse
id
FROM
(
SELECT
v.id,
".$app->erp->FormatDateTimeShort('v.datum')." AS datum,
a.name,
alop.name alop_name,
GROUP_CONCAT(DISTINCT ".$app->erp->ConcatSQL($lieferschein_link)." SEPARATOR ', ') as lieferscheine,
v.lieferschein_ohne_pos,
GROUP_CONCAT(DISTINCT ".$app->erp->ConcatSQL($lieferschein_ohne_pos_link)." SEPARATOR ', ') as lieferscheine_ohne_pos,
".$app->erp->FormatUCfirst('v.versandart')." as versandart,
".$app->erp->ConcatSQL($tracking_link)." as tracking_link,
tracking,
".$app->erp->FormatMenge('SUM(lp.menge)')." as lmenge,
".$app->erp->FormatMenge('SUM(vlp.menge)')." AS vmenge,
v.gewicht,
v.versender,
v.bemerkung,
v.status
FROM
versandpakete v
LEFT JOIN
versandpaket_lieferschein_position vlp ON vlp.versandpaket = v.id
LEFT JOIN
lieferschein_position lp ON vlp.lieferschein_position = lp.id
LEFT JOIN
lieferschein l ON lp.lieferschein = l.id
LEFT JOIN
adresse a ON a.id = l.adresse
LEFT JOIN
lieferschein lop ON v.lieferschein_ohne_pos = lop.id
LEFT JOIN
adresse alop ON lop.adresse = alop.id
GROUP BY v.id
) temp
";
$where = "v.status IN ('neu', 'versendet')";
$where = "status IN ('neu', 'versendet')";
// Toggle filters
$app->Tpl->Add('JQUERYREADY', "$('#geschlossene').click( function() { fnFilterColumn1( 0 ); } );");
$app->Tpl->Add('JQUERYREADY', "$('#stornierte').click( function() { fnFilterColumn2( 0 ); } );");
@ -141,28 +179,28 @@ class Versandpakete {
$more_data1 = $app->Secure->GetGET("more_data1");
if ($more_data1 == 1) {
$where .= " OR v.status IN ('abgeschlossen')";
$where .= " OR status IN ('abgeschlossen')";
} else {
}
$more_data2 = $app->Secure->GetGET("more_data2");
if ($more_data2 == 1) {
$where .= " OR v.status IN ('storniert')";
$where .= " OR status IN ('storniert')";
}
else {
}
// END Toggle filters
// $count = "SELECT count(DISTINCT id) FROM versandpakete v WHERE $where";
$groupby = "GROUP BY v.id";
$count = "SELECT count(DISTINCT id) FROM versandpakete v";
$groupby = "";
break;
case "versandpakete_lieferscheine":
$allowed['versandpakete_lieferscheine'] = array('lieferscheine');
$heading = array( 'Lieferschein', 'Adresse','Menge','Menge in Versandpaketen','Paket-Nr.', 'Paket erstellen');
$width = array( '10%', '10%', '10%', '10%' ,'10%', '1%'); // Fill out manually later
$heading = array('','', 'Lieferschein', 'Adresse','Menge','Menge in Versandpaketen', 'Paket erstellen');
$width = array('1%','1%', '10%', '10%', '10%', '10%' ,'10%', '1%'); // Fill out manually later
// columns that are aligned right (numbers etc)
// $alignright = array(4,5,6,7,8);
@ -173,25 +211,21 @@ class Versandpakete {
$defaultorder = 1;
$defaultorderdesc = 0;
$menu = "<a href=\"index.php?module=versandpakete&action=add&lieferschein=%value%\"><img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/forward.svg\" border=\"0\"></a>";
$menucol = 5;
$dropnbox = "'<img src=./themes/new/images/details_open.png class=details>' AS `open`, CONCAT('<input type=\"checkbox\" name=\"auswahl[]\" value=\"',id,'\" />') AS `auswahl`";
$menucol = 1;
$moreinfoaction = "lieferschein";
$moreinfo = true; // Allow drop down details
$paket_link = array(
'<a href="index.php?module=versandpakete&action=edit&id=',
['sql' => 'versandpaket'],
'">',
['sql' => 'versandpaket'],
'</a>'
);
$menu = "<a href=\"index.php?module=versandpakete&action=add&lieferschein=%value%\"><img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/forward.svg\" border=\"0\"></a>";
$sql = "
SELECT
SELECT SQL_CALC_FOUND_ROWS
id,
".$dropnbox.",
CONCAT('<a href=\"index.php?module=lieferschein&action=edit&id=',id,'\">',belegnr,'</a>'),
name,
".$app->erp->FormatMenge("SUM(lmenge)")." as lmenge,
".$app->erp->FormatMenge("SUM(vmenge)")." as vmenge,
pakete,
id
FROM
(
@ -200,15 +234,14 @@ class Versandpakete {
l.belegnr,
l.name,
lp.menge lmenge,
SUM(vlp.menge) vmenge,
GROUP_CONCAT(".$app->erp->ConcatSQL($paket_link)." SEPARATOR ', ') as pakete
SUM(vlp.menge) vmenge
FROM
lieferschein l
INNER JOIN lieferschein_position lp ON lp.lieferschein = l.id
LEFT JOIN versandpaket_lieferschein_position vlp ON vlp.lieferschein_position = lp.id
LEFT JOIN versandpakete v ON vlp.versandpaket = v.id
WHERE
l.belegnr <> '' AND l.versendet <> 1 AND (v.status IS NULL OR v.status != 'storniert')
l.belegnr <> '' AND l.versendet <> 1 AND (v.status IS NULL OR (v.status != 'storniert' AND v.status <> 'abgeschlossen'))
GROUP BY lp.id
) l_mengen
";
@ -223,7 +256,7 @@ class Versandpakete {
$id = (int) $app->Secure->GetGET('id');
$allowed['versandpakete_paketinhalt_list'] = array('list');
$heading = array('Lieferschein','Pos', 'Artikel', 'Artikel-Nr.','Menge Lieferschein', 'Menge Paket', 'Men&uuml;');
$heading = array('Lieferschein','Pos', 'Artikel', 'Artikel-Nr.','Menge Lieferschein', 'Menge Paket', 'Men&uuml;','');
$width = array('10%','10%','10%'); // Fill out manually later
// columns that are aligned right (numbers etc)
@ -235,7 +268,16 @@ class Versandpakete {
$defaultorder = 1;
$defaultorderdesc = 0;
$menu = "<a href=\"index.php?module=versandpakete&action=deletepos&pos=%value%\"><img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>";
$paket_link = array(
'<a href="index.php?module=versandpakete&action=edit&id=',
['sql' => 'vlp.versandpaket'],
'">',
['sql' => 'vlp.versandpaket'],
'</a>'
);
// $menu = "<a href=\"index.php?module=versandpakete&action=deletepos&pos=%value%\"><img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>";
$menu = "";
$menucol = 6;
$lieferschein_link = array(
@ -246,6 +288,16 @@ class Versandpakete {
'</a>'
);
$delete_link = array(
'<a href="index.php?module=versandpakete&action=deletepos&id=',
['sql' => 'v.id'],
'&pos=',
['sql' => 'vlp.id'],
'">',
"<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\">",
'</a>'
);
$sql = "SELECT SQL_CALC_FOUND_ROWS
lp.id,
".$app->erp->ConcatSQL($lieferschein_link)." as lieferschein,
@ -254,6 +306,7 @@ class Versandpakete {
a.nummer,
".$app->erp->FormatMenge('lp.menge')." as l_menge,
".$app->erp->FormatMenge('SUM(vlp.menge)')." as v_menge,
".$app->erp->ConcatSQL($delete_link)." as delete_link,
vlp.id
FROM
versandpakete v
@ -306,7 +359,7 @@ class Versandpakete {
a.nummer,
".$app->erp->FormatMenge('lp.menge')." as l_menge,
".$app->erp->FormatMenge('SUM(vlp.menge)')." as v_menge,
".$app->erp->ConcatSQL($paket_link).",
GROUP_CONCAT(".$app->erp->ConcatSQL($paket_link)." SEPARATOR ', ') as pakete,
vlp.id
FROM lieferschein l
INNER JOIN lieferschein_position lp ON
@ -337,7 +390,6 @@ class Versandpakete {
$this->app->erp->MenuEintrag("index.php?module=versandpakete&action=list", "&Uuml;bersicht");
$this->app->erp->MenuEintrag("index.php?module=versandpakete&action=lieferscheine", "Offene Lieferscheine");
$this->app->erp->MenuEintrag("index.php?module=versandpakete&action=create", "Neu anlegen");
$this->app->erp->MenuEintrag("index.php", "Zur&uuml;ck");
}
function versandpakete_list() {
@ -383,12 +435,22 @@ class Versandpakete {
public function versandpakete_delete() {
$id = (int) $this->app->Secure->GetGET('id');
$this->app->DB->Delete("UPDATE `versandpakete` SET status='storniert' WHERE `id` = '{$id}'");
$this->app->DB->Delete("UPDATE `versandpakete` SET status='storniert' WHERE `id` = '{$id}' AND `status` IN ('neu', 'versendet')");
$this->app->Tpl->Set('MESSAGE', "<div class=\"error\">Der Eintrag wurde storniert.</div>");
$this->versandpakete_list();
}
public function versandpakete_deletepos() {
$id = (int) $this->app->Secure->GetGET('id');
$pos = (int) $this->app->Secure->GetGET('pos');
$sql = "DELETE vlp FROM `versandpaket_lieferschein_position` vlp INNER JOIN versandpakete v ON vlp.versandpaket = v.id WHERE vlp.`id` = '{$pos}' AND v.status = 'neu'";
$this->app->DB->Delete($sql);
header("Location: index.php?module=versandpakete&action=edit&id=".$id);
}
/*
* Edit versandpakete item
* If id is empty, create a new one
@ -414,14 +476,30 @@ class Versandpakete {
// New item
$new_item = true;
$id = 'NULL';
$input['status'] = 'neu';
$input['versender'] = $this->app->User->GetName();
$sql = "INSERT INTO versandpakete (status, versender) VALUES ('neu','".$this->app->User->GetName()."')";
$this->app->DB->Insert($sql);
$id = $this->app->DB->GetInsertId();
header("Location: index.php?module=versandpakete&action=edit&id=".$id);
}
// Check versandart
if (empty($input['versandart'])) {
$sql = "UPDATE versandpakete SET versandart = (SELECT versandart FROM (".self::SQL_VERSANDPAKETE_LIEFERSCHEIN.") v INNER JOIN lieferschein l ON v.lieferschein = l.id WHERE versandpaket = ".$id." LIMIT 1)";
$this->app->DB->Update($sql);
}
switch ($submit) {
case 'speichern':
// Write to database
// Add checks here
$sql = "SELECT status FROM versandpakete WHERE id = ".$id;
$input['status'] = $this->app->DB->SelectArr($sql)[0]['status'];
if ($input['status'] != 'neu') {
$input = Array('bemerkung' => $input['bemerkung']);
}
$columns = "id, ";
$values = "$id, ";
$update = "";
@ -435,19 +513,21 @@ class Versandpakete {
}
$sql = "INSERT INTO versandpakete (".$columns.") VALUES (".$values.") ON DUPLICATE KEY UPDATE ".$update;
$this->app->DB->Insert($sql);
$id = $this->app->DB->GetInsertId();
if ($id == 'NULL') {
$msg = $this->app->erp->base64_url_encode("<div class=\"success\">Das Element wurde erfolgreich angelegt.</div>");
header("Location: index.php?module=versandpakete&action=edit&id=".$id."&msg=$msg");
} else {
$this->app->Tpl->Set('MESSAGE', "<div class=\"success\">Die Einstellungen wurden erfolgreich &uuml;bernommen.</div>");
}
$this->app->Tpl->Set('MESSAGE', "<div class=\"success\">Die Einstellungen wurden erfolgreich &uuml;bernommen.</div>");
break;
case 'absenden':
$sql = "UPDATE versandpakete SET status = 'versendet' WHERE id = ".$id;
$this->app->DB->Update($sql);
break;
case 'abschliessen':
$sql = "UPDATE versandpakete SET status = 'abgeschlossen' WHERE id = ".$id;
$this->app->DB->Update($sql);
break;
}
// 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=\"',v.id,'\" />') AS `auswahl`";
$result = $this->app->DB->SelectArr("SELECT SQL_CALC_FOUND_ROWS v.id, $dropnbox, ".$this->app->erp->FormatDate('datum')." as datum, v.versand, ".$this->app->erp->FormatUCfirst('v.versandart')." as versandart, v.nr, v.tracking, v.tracking_link, v.versender, v.gewicht, v.bemerkung, v.status, v.id FROM versandpakete v"." WHERE id=$id");
$result = $this->app->DB->SelectArr("SELECT SQL_CALC_FOUND_ROWS v.id, $dropnbox, ".$this->app->erp->FormatDate('datum')." as datum, v.versand, v.versandart, v.nr, v.tracking, v.tracking_link, v.versender, v.gewicht, v.bemerkung, v.status, v.id FROM versandpakete v"." WHERE id=$id");
foreach ($result[0] as $key => $value) {
$this->app->Tpl->Set(strtoupper($key), $value);
@ -468,25 +548,79 @@ class Versandpakete {
if ($new_item) {
$this->app->Tpl->Set('LIEFERSCHEIN_POS_HIDDEN', 'hidden');
}
$sql = "SELECT lieferschein_ohne_pos, belegnr FROM versandpakete v INNER JOIN lieferschein l ON v.lieferschein_ohne_pos = l.id WHERE v.id = ".$id;
$lieferschein_ohne_pos = $this->app->DB->SelectArr($sql);
if (!empty($lieferschein_ohne_pos[0]['lieferschein_ohne_pos'])) {
$this->app->Tpl->Set('LIEFERSCHEIN_ADD_POS_HIDDEN', 'hidden');
$this->app->Tpl->Set('LIEFERSCHEIN_OHNE_POS', $lieferschein_ohne_pos[0]['belegnr']);
$this->app->Tpl->Set('LIEFERSCHEIN_OHNE_POS_ID', $lieferschein_ohne_pos[0]['lieferschein_ohne_pos']);
$this->app->Tpl->Set('LIEFERSCHEIN_POS_HIDDEN', 'hidden');
} else {
$sql = "SELECT
lieferschein_ohne_pos,
belegnr,
lieferschein_position,
l.versandart
FROM versandpakete v
LEFT JOIN lieferschein l ON v.lieferschein_ohne_pos = l.id
LEFT JOIN versandpaket_lieferschein_position vlp ON vlp.versandpaket = v.id
WHERE v.id = ".$id;
$lieferschein_check = $this->app->DB->SelectArr($sql);
if (empty($lieferschein_check[0]['lieferschein_position']) && empty($lieferschein_check[0]['lieferschein_ohne_pos'])) {
$this->app->Tpl->Set('NO_ADDRESS_HIDDEN', 'hidden');
$this->app->Tpl->Set('PAKETMARKE_ADD_HIDDEN', 'hidden');
}
if (empty($lieferschein_check[0]['lieferschein_ohne_pos'])) {
$this->app->Tpl->Set('LIEFERSCHEIN_OHNE_POS_HIDDEN', 'hidden');
} else {
$this->app->Tpl->Set('LIEFERSCHEIN_ADD_POS_HIDDEN', 'hidden');
}
if (empty($lieferschein_check[0]['lieferschein_position'])) {
$this->app->Tpl->Set('LIEFERSCHEIN_OHNE_POS', $lieferschein_check[0]['belegnr']);
$this->app->Tpl->Set('LIEFERSCHEIN_OHNE_POS_ID', $lieferschein_check[0]['lieferschein_ohne_pos']);
$this->app->Tpl->Set('LIEFERSCHEIN_POS_HIDDEN', 'hidden');
}
if ($result[0]['status'] != 'neu') {
$this->app->Tpl->Set('LIEFERSCHEIN_ADD_POS_HIDDEN', 'hidden');
$this->app->Tpl->Set('LIEFERSCHEIN_GEWICHT_DISABLED', 'disabled');
$this->app->Tpl->Set('PAKETMARKE_HIDDEN', 'hidden');
$this->app->Tpl->Set('PAKETMARKE_ADD_HIDDEN', 'hidden');
}
if ($result[0]['status'] != 'versendet') {
$this->app->Tpl->Set('ABSCHLIESSEN_HIDDEN', 'hidden');
} else {
$this->app->Tpl->Set('ABSENDEN_HIDDEN', 'hidden');
}
if (!empty($result[0]['tracking'])) {
$this->app->Tpl->Set('PAKETMARKE_ADD_HIDDEN', 'hidden');
} else {
$this->app->Tpl->Set('PAKETMARKE_HIDDEN', 'hidden');
$this->app->Tpl->Set('ABSENDEN_HIDDEN', 'hidden');
}
$file_attachments = $this->app->erp->GetDateiSubjektObjekt('paketmarke','versandpaket',$id);
if (!empty($file_attachments)) {
foreach ($file_attachments as $file_attachment) {
$this->app->Tpl->Add('PAKETMARKE_LINK', "index.php?module=dateien&action=send&id=".$file_attachment);
}
}
$sql = "SELECT SQL_CALC_FOUND_ROWS
".$this->app->YUI->IconsSQL_versandpaket()." icons
FROM
(
SELECT
".$this->app->erp->FormatMenge('SUM(lp.menge)')." as lmenge,
".$this->app->erp->FormatMenge('SUM(vlp.menge)')." AS vmenge,
v.status,
v.lieferschein_ohne_pos,
GROUP_CONCAT(DISTINCT lieferschein SEPARATOR ', ') as lieferscheine,
tracking
FROM
versandpakete v
LEFT JOIN
versandpaket_lieferschein_position vlp ON vlp.versandpaket = v.id
LEFT JOIN
lieferschein_position lp ON vlp.lieferschein_position = lp.id
WHERE v.id = ".$id."
GROUP BY v.id
) temp
";
$icons = $this->app->DB->SelectArr($sql);
$this->app->Tpl->Set('ICONS', $icons[0]['icons']);
$this->app->YUI->TableSearch('PAKETINHALT', 'versandpakete_paketinhalt_list', "show", "", "", basename(__FILE__), __CLASS__);
$this->app->Tpl->Parse('PAGE', "versandpakete_edit.tpl");
}
@ -502,7 +636,7 @@ class Versandpakete {
} else {
$lieferschein_belegnr = $this->app->erp->ReplaceLieferschein(false, $lieferschein, false); // Parameters: Target db?, value, from form?
/* Create new paket and add the given lieferschein */
$sql = "INSERT INTO versandpakete (status) VALUES ('neu')";
$sql = "INSERT INTO versandpakete (status, versender) VALUES ('neu','".$this->app->User->GetName()."')";
$this->app->DB->Insert($sql);
$id = $this->app->DB->GetInsertId();
}
@ -566,25 +700,33 @@ class Versandpakete {
}
$buchmenge_gesamt = 0;
$buchmenge = 0;
foreach($lieferschein_positionen as $lieferschein_position) {
$restmenge = $lieferschein_position['lp_menge']-$lieferschein_position['v_menge'];
$buchmenge = $menge;
if ($restmenge <= 0) {
continue;
}
if ($menge > $restmenge) {
$buchmenge = $restmenge;
$menge -= $buchmenge;
} else {
$buchmenge = $menge;
}
$sql = "INSERT INTO versandpaket_lieferschein_position (versandpaket, lieferschein_position, menge) VALUES (".$id.",".$lieferschein_position['lp_id'].",".$buchmenge.") ON DUPLICATE KEY UPDATE menge = '".$buchmenge."'";
$this->app->DB->Insert($sql);
$buchmenge_gesamt += $buchmenge;
$menge -= $buchmenge;
$sql = "INSERT INTO versandpaket_lieferschein_position (versandpaket, lieferschein_position, menge) VALUES (".$id.",".$lieferschein_position['lp_id'].",".$buchmenge.") ON DUPLICATE KEY UPDATE menge = menge+".$buchmenge."";
$this->app->DB->Insert($sql);
if ($menge <= 0) {
break;
}
}
if ($menge != $buchmenge_gesamt) {
if ($menge > 0) {
$msg = "<div class=\"error\">Menge wurde angepasst auf ".$buchmenge_gesamt.".</div>";
}
@ -609,9 +751,11 @@ class Versandpakete {
foreach($lieferschein_positionen as $lieferschein_position) {
$buchmenge = $lieferschein_position['lp_menge']-$lieferschein_position['v_menge'];
$sql = "INSERT INTO versandpaket_lieferschein_position (versandpaket, lieferschein_position, menge) VALUES (".$id.",".$lieferschein_position['lp_id'].",".$buchmenge.") ON DUPLICATE KEY UPDATE menge = '".$buchmenge."'";
$sql = "INSERT INTO versandpaket_lieferschein_position (versandpaket, lieferschein_position, menge) VALUES (".$id.",".$lieferschein_position['lp_id'].",".$buchmenge.") ON DUPLICATE KEY UPDATE menge = menge+'".$buchmenge."'";
$this->app->DB->Insert($sql);
}
$msg = $this->app->erp->base64_url_encode("<div class=\"info\">Lieferschein hinzugef&uuml;gt.</div>");
header("Location: index.php?module=versandpakete&action=edit&id=".$id."&msg=$msg");
break;
}
@ -662,24 +806,55 @@ class Versandpakete {
$this->app->ExitXentral();
}
function versandpakete_minidetaillieferschein() {
$id = $this->app->Secure->GetGET('id');
$table = new EasyTable($this->app);
$paket_link = array(
'<a href="index.php?module=versandpakete&action=edit&id=',
['sql' => 'versandpaket'],
'">',
['sql' => 'versandpaket'],
'</a>'
);
$table->Query("
SELECT
lp.sort AS Pos,
lp.bezeichnung,
".$this->app->erp->FormatMenge('lp.menge')." AS 'Menge',
".$this->app->erp->FormatMenge('SUM(vlp.menge)')." AS 'Menge in Versandpaketen',
GROUP_CONCAT(DISTINCT ".$this->app->erp->ConcatSQL($paket_link)." SEPARATOR ', ')
FROM
lieferschein l
INNER JOIN lieferschein_position lp ON lp.lieferschein = l.id
INNER JOIN versandpaket_lieferschein_position vlp ON vlp.lieferschein_position = lp.id
WHERE l.id = ".$id."
GROUP BY lp.id"
);
$table->DisplayNew('TABLE', 'Paket', 'noAction');
$this->app->Tpl->Output('table.tpl');
$this->app->ExitXentral();
}
function versandpakete_paketmarke()
{
$this->versandpakete_menu();
$id = $this->app->Secure->GetGET('id');
$this->app->erp->MenuEintrag("index.php?module=versandpakete&action=edit&id=".$id, "Zur&uuml;ck");
$this->app->Tpl->Set('TABTEXT',"Paketmarke");
$result = $this->app->DB->SelectRow("SELECT va.id, va.modul FROM versandpakete vp INNER JOIN versandarten va ON vp.versandart = va.type LIMIT 1");
print_r($result);
if (empty($result['modul']) || empty($result['id'])) {
$this->app->Tpl->addMessage('error', 'Bitte zuerst eine gültige Versandart auswählen', false, 'PAGE');
return;
}
$lieferschein = $this->app->DB->SelectRow("SELECT * FROM (".self::SQL_VERSANDPAKETE_LIEFERSCHEIN.") temp WHERE versandpaket = ".$id." LIMIT 1");
$versandmodul = $this->app->erp->LoadVersandModul($result['modul'], $result['id']);
$versandmodul->Paketmarke('TAB1', 'lieferschein', $lieferschein['lieferschein']);
$versandmodul->Paketmarke('TAB1', 'lieferschein', $lieferschein['lieferschein'], $id);
$this->app->Tpl->Parse('PAGE',"tabview.tpl");
}
@ -688,16 +863,8 @@ class Versandpakete {
*/
public function GetInput(): array {
$input = array();
//$input['EMAIL'] = $this->app->Secure->GetPOST('email');
$input['versand'] = $this->app->Secure->GetPOST('versand');
$input['nr'] = $this->app->Secure->GetPOST('nr');
$input['tracking'] = $this->app->Secure->GetPOST('tracking');
$input['versender'] = $this->app->Secure->GetPOST('versender');
$input['gewicht'] = $this->app->Secure->GetPOST('gewicht');
$input['bemerkung'] = $this->app->Secure->GetPOST('bemerkung');
$input['status'] = $this->app->Secure->GetPOST('status');
return $input;
}