diff --git a/Layout/default/Preorder/include/preorder-detail.php b/Layout/default/Preorder/include/preorder-detail.php index 602ededbe..6b8a53efa 100644 --- a/Layout/default/Preorder/include/preorder-detail.php +++ b/Layout/default/Preorder/include/preorder-detail.php @@ -313,21 +313,25 @@

Workorder

- - - - - - - - - - - - - - -
Nameadb_wohneinheit->rimo_workorder->rimo_name?>
External IDadb_wohneinheit->rimo_workorder->rimo_id?>
Statusadb_wohneinheit->rimo_workorder->rimo_status?>
Erstelltadb_wohneinheit->rimo_workorder->id) ? date("d.m.Y H:i:s", $preorder->adb_wohneinheit->rimo_workorder->create) : ""?>
+ adb_wohneinheit->rimo_workorder) && $preorder->adb_wohneinheit->rimo_workorder->id): ?> + Workorder löschen + + + + + + + + + + + + + + +
Nameadb_wohneinheit->rimo_workorder->rimo_name?>
External IDadb_wohneinheit->rimo_workorder->rimo_id?>
Statusadb_wohneinheit->rimo_workorder->rimo_status?>
Erstelltadb_wohneinheit->rimo_workorder)) ? date("d.m.Y H:i:s", $preorder->adb_wohneinheit->rimo_workorder->create) : ""?>
+ +
@@ -388,9 +392,11 @@ } if("building" in update) { + // update building status text $("#preorder-detail-building-status-" + pid).text(update.building.status.code + " - " + update.building.status.text); } if("unit" in update) { + // update unit status text $("#preorder-detail-unit-status-" + pid).text(update.unit.status.code + " - " + update.unit.status.text); } @@ -400,4 +406,29 @@ }, 'json'); } + + function deleteWorkorder(pid) { + console.log("in delete workorder"); + if(!Number.isInteger(pid) || pid < 1) { + return false; + } + + $.post("", + { + 'do': "deleteWorkorder", + id: pid, + }, + function(success) { + if(success.status == "OK") { + $("#preorder-detail-" + success.result.id + "-workorder td").each(function() { + $(this).html("--gelöscht--"); + }); + + $("#preorder-detail-" + success.result.id + "-workorder-del").remove(); + } + }, + 'json'); + + return false; + } \ No newline at end of file diff --git a/Layout/default/Preorderlogistics/Index.php b/Layout/default/Preorderlogistics/Index.php new file mode 100644 index 000000000..ea7b2af82 --- /dev/null +++ b/Layout/default/Preorderlogistics/Index.php @@ -0,0 +1,154 @@ +getUrl($Mod,"Index"); + $pagination_baseurl_params = ["filter" => $filter]; + $pagination_entity_name = "Bestellungen"; +?> + + + +
+
+
+
+
    +
  1. ">
    2. +
  2. ">Vorbestellkampagnen
    3. +
  3. Vorbestellungen
    4. +
+
+

Vorbestellungenname : ""?>

+
+
+
+ + +
+
+ +
+
+

Filter

+ +
"> + +
+
+ + " /> +
+ +
+ + " /> +
+ +
+ + " /> +
+ +
+ + " /> +
+ +
+ + + +
+
+ + id): ?> + ['preordercampaign_id' => $campaign->id], "resetFilter" => 1])?>">Filter zurücksetzen + + ">Filter zurücksetzen + +
+
+
+ +
+
+ + +
+
+
+
+
+

Bestellungen

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + building_id): ?> + + adb_hausnummer_id): ?> + + + + + + + + + + + +
Bestelltyp
Bestellcode		OAIDAnschlussadresseKundeKontakt
+ + + type, "preorder")?>
+ ucode?>
+ 		oaid?>building->street?>
building->zip?> building->city?>		address_created) ? "class='alert-warning' title='Adresse manuell angelegt'" : ""?>"> + adb_hausnummer->strasse->name?> + adb_hausnummer->hausnummer?>
+ adb_wohneinheit_id) ? ((string)$preorder->adb_wohneinheit ? $preorder->adb_wohneinheit."
" : "") : "<keine Wohneinheit>
"?> + adb_hausnummer->plz->plz?> + adb_hausnummer->ortschaft->name?>
+ adb_hausnummer->strasse->gemeinde->name?> + 		+ company) ? $preorder->company : $preorder->firstname." ".$preorder->lastname?>
+ street?>housenumber) ? " ".$preorder->housenumber : ""?>
+ zip?> city?> + 		+ phone) ? $preorder->phone."
" : ""?> + email) ? $preorder->email : ""?> + 		+ +
+ + + + +
+
+ +
+
+ + + + diff --git a/Layout/default/User/Form.php b/Layout/default/User/Form.php index ac05318d5..e2eaa2e9f 100644 --- a/Layout/default/User/Form.php +++ b/Layout/default/User/Form.php @@ -85,6 +85,14 @@ z.B. Meridiam +
+ + +
+
diff --git a/Layout/default/menu.php b/Layout/default/menu.php index edb139d32..c12b3af27 100644 --- a/Layout/default/menu.php +++ b/Layout/default/menu.php @@ -105,13 +105,13 @@ - is(["Admin","netowner","salespartner"]) && $me->can(["Order", "Preorder"])): ?> + is(["Admin","netowner","salespartner"]) || $me->can(["Order", "Preorder"])): ?>
  • Verkauf