' AS `open`, CONCAT('') AS `auswahl`";
+ $dropnbox = "'' AS `open`, CONCAT('') AS `auswahl`";
$menu = "| " . " |
' AS `open`, CONCAT('') AS `auswahl`";
+ $menucol = 1;
+ $moreinfoaction = "lieferschein";
+ $moreinfo = true; // Allow drop down details
$menu = "Der Eintrag wurde storniert.
");
$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,24 +513,26 @@ 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("Das Element wurde erfolgreich angelegt.
");
- header("Location: index.php?module=versandpakete&action=edit&id=".$id."&msg=$msg");
- } else {
- $this->app->Tpl->Set('MESSAGE', "Die Einstellungen wurden erfolgreich übernommen.
");
- }
+ $this->app->Tpl->Set('MESSAGE', "Die Einstellungen wurden erfolgreich übernommen.
");
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 = "'' AS `open`, CONCAT('') 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);
}
-
+
// Check for only one delivery adress
$this->app->YUI->AutoComplete("lieferschein", "lieferschein");
$sql = "SELECT DISTINCT a.name, l.adresse FROM (".self::SQL_VERSANDPAKETE_LIEFERSCHEIN.") vpl INNER JOIN lieferschein l ON vpl.lieferschein = l.id INNER JOIN adresse a ON l.adresse = a.id WHERE vpl.versandpaket = ".$id;
@@ -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 {
- $this->app->Tpl->Set('LIEFERSCHEIN_OHNE_POS_HIDDEN', 'hidden');
+ $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();
}
@@ -565,26 +699,34 @@ class Versandpakete {
break;
}
- $buchmenge_gesamt = 0;
+ $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;
+ }
+
+ $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;
}
- $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;
}
- if ($menge != $buchmenge_gesamt) {
+ if ($menge > 0) {
$msg = "Menge wurde angepasst auf ".$buchmenge_gesamt.".
";
}
@@ -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("Lieferschein hinzugefügt.
");
+ 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(
+ '',
+ ['sql' => 'versandpaket'],
+ ''
+ );
+
+ $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ü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');
-
+ $input['bemerkung'] = $this->app->Secure->GetPOST('bemerkung');
return $input;
}