diff --git a/www/pages/content/versandpakete_list.tpl b/www/pages/content/versandpakete_list.tpl
index 394c103a..544d08e4 100644
--- a/www/pages/content/versandpakete_list.tpl
+++ b/www/pages/content/versandpakete_list.tpl
@@ -4,7 +4,50 @@
+
+
diff --git a/www/pages/lieferschein.php b/www/pages/lieferschein.php
index a5141680..49a9a594 100644
--- a/www/pages/lieferschein.php
+++ b/www/pages/lieferschein.php
@@ -1021,7 +1021,8 @@ class Lieferschein extends GenLieferschein
}
*/
- $sql = "SELECT SQL_CALC_FOUND_ROWS
+ $sql = "SELECT SQL_CALC_FOUND_ROWS
+ v.id,
v.tracking as tracking,
v.tracking_link
FROM
@@ -1034,15 +1035,16 @@ class Lieferschein extends GenLieferschein
lieferschein l ON lp.lieferschein = l.id
WHERE l.id = ".$id." OR v.lieferschein_ohne_pos = ".$id."
GROUP BY
- v.tracking
+ v.id
";
$tracking = $this->app->DB->SelectArr($sql);
$tracking_list = array();
foreach ($tracking as $single_tracking) {
- $tracking_list[] = ''.$single_tracking['tracking'].'';
+ $tracking_list[] = 'Paket Nr.'.$single_tracking['id'].''.
+ ' ('.''.$single_tracking['tracking'].''.')';
}
- $this->app->Tpl->Set('TRACKING',implode(', ',$tracking_list));
+ $this->app->Tpl->Set('TRACKING',implode('
[MESSAGE]
- [TAB1]
+
+
+
[TAB1NEXT]
+
+ {|Filter|}
+ -
+ [STATUSFILTER]
+
- + + + +
- + + + +
',$tracking_list)); $returnOrders = (array)$this->app->DB->SelectArr( sprintf( diff --git a/www/pages/versandpakete.php b/www/pages/versandpakete.php index e29187e9..63934075 100644 --- a/www/pages/versandpakete.php +++ b/www/pages/versandpakete.php @@ -8,10 +8,7 @@ use Xentral\Components\Database\Exception\QueryFailureException; class Versandpakete { - const VERSANDPAKETE_STATUS_NEU = 'neu'; - const VERSANDPAKETE_STATUS_VERSENDET = 'versendet'; - const VERSANDPAKETE_STATUS_ABGESCHLOSSEN = 'abgeschlossen'; - const VERSANDPAKETE_STATUS_STORNIERT = 'storniert'; + const STATUS = ARRAY ('neu','versendet','abgeschlossen','storniert'); const SQL_VERSANDPAKETE_LIEFERSCHEIN = " SELECT DISTINCT @@ -42,6 +39,8 @@ class Versandpakete { $this->app->ActionHandler("edit", "versandpakete_edit"); $this->app->ActionHandler("add", "versandpakete_add"); $this->app->ActionHandler("lieferscheine", "versandpakete_lieferscheine"); + $this->app->ActionHandler("stapelverarbeitung", "versandpakete_stapelverarbeitung"); + $this->app->ActionHandler("paketmarke", "versandpakete_paketmarke"); $this->app->ActionHandler("delete", "versandpakete_delete"); $this->app->ActionHandler("minidetail", "versandpakete_minidetail"); $this->app->DefaultActionHandler("list"); @@ -56,8 +55,8 @@ class Versandpakete { switch ($name) { case "versandpakete_list": $allowed['versandpakete_list'] = array('list'); - $heading = array('','', 'Paket-Nr.','Datum','Adresse', 'Lieferschein', 'Tracking', 'Versender', 'Gewicht', 'Bemerkung', 'Status', 'Menü'); - $width = array('1%','1%','10%'); // Fill out manually later + $heading = array('','', 'Paket-Nr.','Datum','Adresse', 'Lieferschein', 'Versandart', 'Tracking', 'Gewicht','Versender', 'Bemerkung', 'Status', 'Monitor', 'Menü'); + $width = array('1%','1%','1%'); // Fill out manually later // columns that are aligned right (numbers etc) // $alignright = array(4,5,6,7,8); @@ -71,21 +70,39 @@ class Versandpakete { $dropnbox = "'
' AS `open`, CONCAT('') AS `auswahl`";
$menu = "| " . " |
Der Eintrag wurde storniert.
");
$this->versandpakete_list();
@@ -329,8 +412,9 @@ class Versandpakete {
if (empty($id)) {
// New item
+ $new_item = true;
$id = 'NULL';
- $input['status'] = self::VERSANDPAKETE_STATUS_NEU;
+ $input['status'] = 'neu';
$input['versender'] = $this->app->User->GetName();
}
@@ -358,12 +442,12 @@ class Versandpakete {
} else {
$this->app->Tpl->Set('MESSAGE', "Die Einstellungen wurden erfolgreich übernommen.
");
}
- break;
+ 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, v.nr, v.tracking, 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, ".$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");
foreach ($result[0] as $key => $value) {
$this->app->Tpl->Set(strtoupper($key), $value);
@@ -381,26 +465,34 @@ class Versandpakete {
$this->app->YUI->AutoComplete("lieferschein", "kundenlieferschein",0,"&adresse=".$adress_check[0]['adresse']);
}
}
-
- $sql = "SELECT lieferschein_ohne_pos FROM versandpakete WHERE 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');
- }
- if ($result[0]['status'] != self::VERSANDPAKETE_STATUS_NEU) {
- $this->app->Tpl->Set('LIEFERSCHEIN_ADD_POS_HIDDEN', 'hidden');
+ 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');
+ }
+ 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');
+ }
+ if (!empty($result[0]['tracking'])) {
+ $this->app->Tpl->Set('PAKETMARKE_HIDDEN', 'hidden');
+ }
$this->app->YUI->TableSearch('PAKETINHALT', 'versandpakete_paketinhalt_list', "show", "", "", basename(__FILE__), __CLASS__);
$this->app->Tpl->Parse('PAGE', "versandpakete_edit.tpl");
}
- function versandpakete_add() {
-
+ function versandpakete_add() {
$this->versandpakete_menu();
-
$id = $this->app->Secure->GetGET('id');
if (empty($id)) {
$lieferschein = $this->app->Secure->GetGET('lieferschein');
@@ -410,7 +502,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 ('".self::VERSANDPAKETE_STATUS_NEU."')";
+ $sql = "INSERT INTO versandpakete (status) VALUES ('neu')";
$this->app->DB->Insert($sql);
$id = $this->app->DB->GetInsertId();
}
@@ -439,9 +531,12 @@ class Versandpakete {
$submit = $this->app->Secure->GetPOST('submit');
// Check Status
- $sql = "SELECT status FROM versandpakete WHERE id = ".$id." LIMIT 1";
+ $sql = "SELECT status, lieferschein_ohne_pos FROM versandpakete WHERE id = ".$id." LIMIT 1";
$result = $this->app->DB->SelectArr($sql);
- if ($result[0]['status'] != self::VERSANDPAKETE_STATUS_NEU) {
+ if ($result[0]['status'] != 'neu') {
+ return;
+ }
+ if (!empty($result[0]['lieferschein_ohne_pos'])) {
return;
}
@@ -565,8 +660,29 @@ class Versandpakete {
$table->DisplayNew('TABLE', 'Menge 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->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']);
+ $this->app->Tpl->Parse('PAGE',"tabview.tpl");
+ }
+
/**
* Get all paramters from html form and save into $input
*/