diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe
old mode 100755
new mode 100644
index 925b8b4..af178c0
Binary files a/printserver/OrderSprinterPrintserver.exe and b/printserver/OrderSprinterPrintserver.exe differ
diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe
old mode 100755
new mode 100644
index 925b8b4..af178c0
Binary files a/webapp/OrderSprinterPrintserver.exe and b/webapp/OrderSprinterPrintserver.exe differ
diff --git a/webapp/css/bestformat.css b/webapp/css/bestformat.css
index d623e60..981baf2 100644
--- a/webapp/css/bestformat.css
+++ b/webapp/css/bestformat.css
@@ -552,4 +552,10 @@ table.prodtable .prodpriceC {
width: 20px;
border: 0;
background-color: rgb(246, 246, 246, 0.0) !important;
+}
+
+.changetableprodlist {
+ width:100%;
+ background-color: LightCyan;
+ resize: none;
}
\ No newline at end of file
diff --git a/webapp/install.html b/webapp/install.html
index ecb38f1..7f73f73 100644
--- a/webapp/install.html
+++ b/webapp/install.html
@@ -679,7 +679,7 @@ $(document).ready(function() {
';
@@ -846,6 +854,113 @@ $(document).on("pagebeforeshow", "#tables-page", function () {
});
+$(document).on("pagebeforeshow", "#changetablewhatdialog", function () {
+ var fromTableId = $("#changetablewhatdialog").data("fromtableid");
+ doJsonAjax("GET","php/contenthandler.php?module=queue&command=getProdsForTableChange",{ tableId: fromTableId },insertProductsToChangeTableDlg,"Tischartikel");
+});
+
+function insertProductsToChangeTableDlg(jsonContent) {
+ if (jsonContent.status != "OK") {
+ alert("Fehler");
+ return;
+ }
+
+ $("#changetablewhatdialog").data("unpaid",jsonContent.unpaid);
+ $("#changetablewhatdialog").data("undelivered",jsonContent.undeliveredunpaid);
+
+ $("#changetablewhatdialog").data("show_unpaid",1);
+ $("#changetablewhatdialog").data("show_undelivered",1);
+
+ updateChangeTableDialog();
+}
+
+function updateChangeTableDialog() {
+ var txtUnpaid = createTextAreaForChangeTable($("#changetablewhatdialog").data("unpaid"));
+ var txtUndelivered = createTextAreaForChangeTable($("#changetablewhatdialog").data("undelivered"));
+
+ var show_unpaid = $("#changetablewhatdialog").data("show_unpaid");
+ var show_undelivered = $("#changetablewhatdialog").data("show_undelivered");
+ if (show_unpaid == 1) {
+ $('#change_unpaid').buttonMarkup({ icon: "check" });
+ } else {
+ $('#change_unpaid').buttonMarkup({ icon: "delete" });
+ }
+ if (show_undelivered == 1) {
+ $('#change_undelivered').buttonMarkup({ icon: "check" });
+ } else {
+ $('#change_undelivered').buttonMarkup({ icon: "delete" });
+ }
+
+ var txt = "";
+ if (show_unpaid) {
+ txt += W_UNPAID[lang] + ":
" + txtUnpaid + "
";
+ }
+
+ if (show_undelivered) {
+ txt += W_UNDELIVERED[lang] + ":
" + txtUndelivered;
+ }
+
+ $("#changetablecontent").html(txt);
+
+ $("#change_unpaid").off("click").on("click", function (e) {
+ e.stopImmediatePropagation();
+ e.preventDefault();
+ $("#changetablewhatdialog").data("show_unpaid",1-show_unpaid);
+ updateChangeTableDialog();
+ });
+ $("#change_undelivered").off("click").on("click", function (e) {
+ e.stopImmediatePropagation();
+ e.preventDefault();
+ $("#changetablewhatdialog").data("show_undelivered",1-show_undelivered);
+ updateChangeTableDialog();
+ });
+
+ $("#moveprods").off("click").on("click", function (e) {
+ e.stopImmediatePropagation();
+ e.preventDefault();
+
+ var show_unpaid = $("#changetablewhatdialog").data("show_unpaid");
+ var show_undelivered = $("#changetablewhatdialog").data("show_undelivered");
+
+ var entries = [];
+ if (show_unpaid == 1) {
+ var unpaids = $("#changetablewhatdialog").data("unpaid");
+ for (var i=0;i
";
+ return txt;
+}
function displayTablesListOrMap(listToFill) {
var roomdetail = $("#tables-page").data("roomdetail");
@@ -1664,33 +1779,6 @@ function bindSendNewOrdersButton() {
}
}
- function moveOrderItemsFromTables(alsoNotPayedItems) {
- var fromTableId = $("#changetablewhatdialog").data("fromtableid");
- var toTableId = $("#changetablewhatdialog").data("totableid");
-
- var notDelProd = [];
- $(".notdelprod").each(function() {
- var el = $(this);
- var queueid = $(this).data("queueid");
- notDelProd[notDelProd.length] = queueid;
- });
- var data = {
- fromTableId : fromTableId,
- toTableId : toTableId,
- alsoNotPayed : (alsoNotPayedItems ? 1 : 0),
- queueids : notDelProd
- };
- doJsonAjax("POST",
- "php/contenthandler.php?module=queue&command=changeTable",
- data, resultOfChangeTable, "Fehler Tischwechsel");
- }
- function moveNotDeliveredItems() {
- moveOrderItemsFromTables(false);
- }
-
- function moveNotPayedAndNotDeliveredItems() {
- moveOrderItemsFromTables(true);
- }
function resultOfChangeTable(jsonResult) {
if (jsonResult.status != "OK") {
@@ -1750,18 +1838,6 @@ function bindSendNewOrdersButton() {
}
});
-
- $("#move_not_del_items").off("click").on("click", function(e) {
- e.stopImmediatePropagation();
- e.preventDefault();
- moveNotDeliveredItems();
- });
-
- $("#move_notDel_notPayed_items").off("click").on("click", function(e) {
- e.stopImmediatePropagation();
- e.preventDefault();
- moveNotPayedAndNotDeliveredItems();
- });
}
function createHtmlOfKind(workItems, kind, printer) {
@@ -2350,13 +2426,19 @@ function bindSendNewOrdersButton() {
Auswahl der Orderelemente
-
Welche Orderelemente sollen dem neuen Tisch zugewiesen werden?
-
+
Welche Orderelemente sollen dem neuen Tisch zugewiesen werden?
+
+
+
-
Zurück
+
+