diff --git a/webapp/install/installer.php b/webapp/install/installer.php
index 8570447..df51bd2 100644
--- a/webapp/install/installer.php
+++ b/webapp/install/installer.php
@@ -832,6 +832,18 @@ return false;
}
}
+function updateUserTable1113_1114($prefix,$version) {
+$ret = true;
+if ($version != "1.1.13") {
+$ret = $this->updateUserTable1112_1113($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.1.14');
+return $ret;
+}
+
function setVersion($prefix,$theVersion) {
$pdo = $this->pdo;
try {
@@ -903,7 +915,7 @@ $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VAL
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'billlanguage', $billlanguage)");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'currency', '$currency')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'receiptfontsize', '12')");
-$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.13')");
+$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.14')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'paymentconfig', '0')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'remoteaccesscode', null)");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'decpoint', '$decpoint')");
@@ -1276,7 +1288,7 @@ return;
$supportedVersions = array("1.0.22","1.0.23","1.0.24","1.0.25","1.0.26","1.0.27","1.0.28","1.0.29",
"1.0.30","1.0.31","1.0.32","1.0.33","1.0.34","1.0.35","1.0.36","1.0.37","1.0.38","1.0.39",
"1.0.40","1.0.41","1.0.42","1.0.43",
-"1.1.0","1.1.1","1.1.2","1.1.3","1.1.4","1.1.5","1.1.6","1.1.7","1.1.8", "1.1.9","1.1.10","1.1.11","1.1.12"
+"1.1.0","1.1.1","1.1.2","1.1.3","1.1.4","1.1.5","1.1.6","1.1.7","1.1.8", "1.1.9","1.1.10","1.1.11","1.1.12","1.1.13"
);
if (!in_array($version, $supportedVersions)) {
@@ -1284,7 +1296,7 @@ echo json_encode("Quellversion nicht unterstützt");
return;
}
-$ret = $admin->updateUserTable1112_1113($_POST['prefix'], $version);
+$ret = $admin->updateUserTable1113_1114($_POST['prefix'], $version);
if(session_id() == '') {
session_start();
diff --git a/webapp/kitchen.html b/webapp/kitchen.html
index eb5bc1f..5504b7d 100644
--- a/webapp/kitchen.html
+++ b/webapp/kitchen.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/manager.html b/webapp/manager.html
index a2708bf..2bea823 100644
--- a/webapp/manager.html
+++ b/webapp/manager.html
@@ -5,7 +5,7 @@
-
+
@@ -172,6 +172,10 @@ var MAN_WORKFLOW = ["Arbeitsablauf","Workflow","Modo de trabajar"];
var MAN_WORKFLOW_BOTH = ["Digital und Arbeitsbons","Digital and work receipts","Digital y tiques de trabajar"];
var MAN_WORKFLOW_ONLY_DIGI = ["Nur digital","Only digital","Solo digital"];
var MAN_WORKFLOW_ONLY_WR = ["Nur Arbeitsbons","Only work receipts","Solo tiques de trabajar"];
+var MAN_WORKFLOW_WR_AND_TRANSFER = ["Arbeitsbons mit Serverübermittlung", "Work receipts and server transmit","Tiques de trabajar y enviar a servidor"];
+var MAN_WORKFLOW_WR_AND_TRANSFER_HLP = ["Hinweis: 'Arbeitsbons mit Serverübermittlung': In der Bestellansicht werden die Artikel bei Druck auf 'Bestellung senden' an den Server übermittelt, durchlaufen aber nicht die Ansichten Küche/Bar und Bereitstellung und es wird in diesem Fall kein Arbeitsbon gedruckt.",
+ "Hint: 'Work receipts and server transmit': In the waiter's view the orders can be sent to the server without printining a work receipt. In this case the items won't pass the modules kitchen/bar and supplydesk.",
+ "Información: 'Tiques de trabajar y enviar a servidor': El camarero puede enviar las ordenes al servidor sin imprimir un tique de trabajo."];
var MAN_NO_ADMIN = ["Um Admin-Rechte zu bearbeiten, muss der Benutzer selbst Adminrechte besitzen.", "Modifying admin rights require that the changing user has also admin rights.", "Necesitas derecho de admin para modificar derecho de admin para otros usarios."];
var MAN_NO_ADMIN_CREATE = ["Nur Admin-Benutzer können andere Admin-Benutzer anlegen",
"Only admin users can create other admin users",
@@ -578,17 +582,27 @@ function createWorkflowConfigPart(workflow) {
html += '';
html += '';
html += '';
+ html += '';
} else if (workflow == 1) {
html += '';
html += '';
html += '';
- } else {
+ html += '';
+ } else if (workflow == 2){
html += '';
html += '';
html += '';
+ html += '';
+ } else {
+ html += '';
+ html += '';
+ html += '';
+ html += '';
}
html += '';
- return html;
+
+ html += "
" + MAN_WORKFLOW_WR_AND_TRANSFER_HLP[lang] + "
";
+ return html;
}
function createSMTPAuth(smtpauth) {
diff --git a/webapp/paydesk.html b/webapp/paydesk.html
index d2dd84f..b7d7c12 100644
--- a/webapp/paydesk.html
+++ b/webapp/paydesk.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/php/admin.php b/webapp/php/admin.php
index 1b3b810..4f17b66 100644
--- a/webapp/php/admin.php
+++ b/webapp/php/admin.php
@@ -350,7 +350,7 @@ class Admin {
} else {
$_SESSION['is_admin'] = ($zeile['is_admin'] == 1 ? true : false);
$_SESSION['right_waiter'] = ($zeile['right_waiter'] == 1 ? true : false);
- if ($workflow == 2) {
+ if (($workflow == 2) || ($workflow == 3)) {
$_SESSION['right_kitchen'] = false;
$_SESSION['right_bar'] = false;
$_SESSION['right_supply'] = false;
@@ -1108,19 +1108,19 @@ class Admin {
$right_rating = $_SESSION['right_rating'];
if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
- if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.13"); };
- if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.13"); };
- if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.13"); };
- if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.13"); };
+ if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.14"); };
+ if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.14"); };
+ if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.14"); };
+ if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.14"); };
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html"); };
- if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.13"); };
- if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.13"); };
- if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.13"); };
- if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.13"); };
- if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.13"); };
- if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.13"); };
- $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.13");
- $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.13");
+ if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.14"); };
+ if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.14"); };
+ if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.14"); };
+ if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.14"); };
+ if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.14"); };
+ if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.14"); };
+ $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.14");
+ $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.14");
}
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
@@ -1129,7 +1129,7 @@ class Admin {
$waiterMessage = $this->getMessage(null, "waitermessage");
}
// CAUTION: change version also in config.txt!!!
- $mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.13",
+ $mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.14",
"user" => $currentUser,
"menu" => $mainMenu,
"waitermessage" => $waiterMessage,
diff --git a/webapp/php/queuecontent.php b/webapp/php/queuecontent.php
index 3ddeead..ec7ae85 100644
--- a/webapp/php/queuecontent.php
+++ b/webapp/php/queuecontent.php
@@ -771,6 +771,9 @@ class QueueContent {
$stmt->execute(array('tax'));
$row = $stmt->fetchObject();
$normaltax = $row->setting;
+ $stmt->execute(array('workflowconfig'));
+ $row = $stmt->fetchObject();
+ $workflowconfig = $row->setting;
// get current pricelevel
$currentPriceLevel = $this->commonUtils->getCurrentPriceLevel($pdo);
@@ -856,8 +859,8 @@ class QueueContent {
VALUES (
NULL , ?,?,?,?,?,?,?,?,?,?,?, '0000-00-00 00:00:00', '0000-00-00 00:00:00', NULL,NULL,'0',NULL,'0');";
- $stmt = $pdo->prepare(DbUtils::substTableAlias($insertSql));
- $stmt->execute(array($theTableid,$productid,$currentPriceLevelId,$price,$tax,$productname,$ordertime,$_SESSION['userid'],$theOption,($theChangedPrice == "NO" ? 0 : 1),$togo));
+ $stmt = $pdo->prepare(DbUtils::substTableAlias($insertSql));
+ $stmt->execute(array($theTableid,$productid,$currentPriceLevelId,$price,$tax,$productname,$ordertime,$_SESSION['userid'],$theOption,($theChangedPrice == "NO" ? 0 : 1),$togo));
$queueid = $pdo->lastInsertId();
if (!is_null($extras) && ($extras != "")) {
@@ -870,18 +873,23 @@ class QueueContent {
$stmt->execute(array($queueid,$extraid,$extraname));
}
}
-
- if ($useConditions["usekitchen"] == 0) {
- // no - can bypass the kitchen
- $this->reallyDeclareAsCooked($pdo,$queueid);
- // then also look for supplydesk, since kitchen action won't do this!
- if ($useConditions["usesupply"] == 0) {
- // can bypass the supplydesk
- $this->declareProductBeDeliveredWithGivenPdo($pdo,$queueid);
- // THIS autop declares as "prepared" (cooked)!!!
- }
+
+ if (($workflowconfig == 3) && ($doPrint == 0)) {
+ $this->reallyDeclareAsCooked($pdo,$queueid);
+ $this->declareProductBeDeliveredWithGivenPdo($pdo,$queueid);
} else {
- $insertedQueueIds[] = $queueid;
+ if ($useConditions["usekitchen"] == 0) {
+ // no - can bypass the kitchen
+ $this->reallyDeclareAsCooked($pdo,$queueid);
+ // then also look for supplydesk, since kitchen action won't do this!
+ if ($useConditions["usesupply"] == 0) {
+ // can bypass the supplydesk
+ $this->declareProductBeDeliveredWithGivenPdo($pdo,$queueid);
+ // THIS autop declares as "prepared" (cooked)!!!
+ }
+ } else {
+ $insertedQueueIds[] = $queueid;
+ }
}
}
}
diff --git a/webapp/preferences.html b/webapp/preferences.html
index b532020..4cc8ff3 100644
--- a/webapp/preferences.html
+++ b/webapp/preferences.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/products.html b/webapp/products.html
index c521416..8126502 100644
--- a/webapp/products.html
+++ b/webapp/products.html
@@ -7,7 +7,7 @@
-
+
diff --git a/webapp/rating.html b/webapp/rating.html
index 01d10c9..385bdfa 100644
--- a/webapp/rating.html
+++ b/webapp/rating.html
@@ -7,7 +7,7 @@
-
+
diff --git a/webapp/reports.html b/webapp/reports.html
index 2792b2c..9f73e38 100644
--- a/webapp/reports.html
+++ b/webapp/reports.html
@@ -7,7 +7,7 @@
-
+
diff --git a/webapp/reservation.html b/webapp/reservation.html
index b591699..faf909a 100644
--- a/webapp/reservation.html
+++ b/webapp/reservation.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html
index c9adc25..fcb3b94 100644
--- a/webapp/supplydesk.html
+++ b/webapp/supplydesk.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/waiter.html b/webapp/waiter.html
index 106d685..78611cc 100644
--- a/webapp/waiter.html
+++ b/webapp/waiter.html
@@ -4,7 +4,7 @@
-
+
@@ -30,2488 +30,8 @@
-var W_TABLES = ["Tische","Tables","Mesas"];
-var W_ROOMS = ["Räume","Rooms","Espacios"];
-var W_SELECTION = ["Auswahl","Selection","Selección"];
-var W_LAST_SELECTED = ["zuletzt","last","seleccionado"];
-var W_FAVS = ["Favoriten","Favorites","Favoritos"];
-var W_NEW_ORDER = ["Neue Order","New Orders","Ordenes nuevas"];
-var W_KIT_BAR = ["nicht serviert/unbezahlt","unserved/unpaid","no servido/impagado"];
-var W_OTHER_PROD = ["Auswahl Produktkategorie","Select product categroy","Categoría diferente"];
-var W_WORK_TICKET = ["Arbeitsbon","Work ticket","Tique de trabajar"];
-var W_NOTE = ["Bemerkung","Comment","Comentario"];
-var W_SEND_ORDERS = ["Bestellung senden","Send orders","Enviar Ordenes"];
-var W_TO_PAYDESK = ["-> Kasse","-> Paydesk","-> Caja"];
-var W_TABLECHANGE = ["Tischwechsel","Change table","Cambiar mesa"];
-var W_ROOMTABLE = ["Raum-Tisch","Room-Table","Espacio-Mesa"];
-var W_TABLE_SEL = ["Tischauswahl","Select table","Qué mesa?"];
-var W_UNDELIV_INFO = ["Liste enthält die Produkte die noch in der Küchen-/Baransicht sind, sowie unbezahlte Produkte, die die Bereitstellungsansicht nicht durchlaufen.",
- "List contains the products which are still in kitchen or bar view, as well as unpaid products that do not pass the supplydesk view.",
- "La lista contiene los productos que estan todavía en modulo de cocina/bar, también productos impagados que no pasan vista de productos preparados."];
-var W_REMOVE_ERROR = ["Ansicht nicht mehr aktuell - Liste wird neu geladen.","View is obsolete - List will be reloaded.","Vista no esta actual - vamos a actualisar la lista."];
-var W_FOOD_FOR = ["Speisen für","Food for","Comidas para"];
-var W_DRINKS_FOR = ["Getränke für","Beverage for","Bebidas para"];
-var W_ACT_NEW_ORD_EL = ["Aktion auswählen","Select action","Que acción?"];
-var W_ACT_CHANGE = ["Ändern","Modify","Modificar"];
-var W_ACT_CHANGE_ALL = ["Alle Ändern","Modify all","Modificar todo"];
-var W_ACT_CHANGE_ONE = ["Einen Artikel ändern","Modify one item","Modificar un artículo"];
-var W_APPLY = ["Anwenden","Apply","Aplicar"];
-var W_CANCEL = ["Abbrechen","Cancel","Cancelar"];
-var W_STILL_UNSENT_ORDERS = ["Es sind noch ungesendete Orders vorhanden!","There are unsent orders in the list","Hay elementos in la liste que no han enviados"];
-var W_EXTRAS = ["Extras/Optionen","Add-ons/Options","Opciones"];
-var W_OPEN_PANEL = ["Extras-Auswahl noch offen","Add-ons selection still open","Selección de opciones todavía abierta"];
-var W_DEL = ["Löschen","Delete","Removar"];
-var W_MSG = ["Nachricht","Message","Mensaje"];
-var W_CHANGE_PRICE = ["Neuer Preis: ","New price: ","Cambiar precio: "];
-var W_PRICE = ["Preis","Price","Precio"];
-var W_WRONG_FORMAT = ["Falsches Zahlenformat","Wrong number format","Formato de precio incorecto"];
-var W_TOGO = ["Außer-Haus-Verkauf","Sale with Tax No 2","Venta IVA 2"];
-var W_YES = ["Ja","Yes","Si"];
-var W_NO = ["Nein","No","No"];
-var W_DISCARD_NO_ASK = ["Es sind noch ungesendete Orders vorhanden! Sollen diese verworfen werden?",
- "There are still unsent orders. Do you want to discard them?",
- "Hay todavía ordenes non-enviados. Removarlos?"];
-var W_DISCARD_HEADER = ["Neue Orders verwerfen?", "Discard new orders?", "Removar ordenes nuevos?"];
-var W_SEARCH = ["Produktsuche","Product search","Buscar producto"];
-var W_SEARCHRESULTS = ["Suchergebnis","Search Result","Encontrado"];
-var W_WRONG_PIN = ["Falscher Stornocode","Wrong cancel code","Codigo falso"];
-var W_NO_ORDERS = ["Keine gebuchten Orders vorhanden!","No orders available!","No hay ningún orden!"];
-var W_TO_PAY = ["offen","to pay","a pagar"];
-var W_UNPAID = ["unbezahlt","unpaid","no pagado"];
-var W_UNDELIVERED = ["nicht serviert (+ unbezahlt)","not served (and unpaid)","no servidos (y non-pagado)"];
-var W_MOVE_PRODS = ["Produkte verschieben","Move products","Productos a otra mesa"];
-var W_NO_PRODS_SELECTED = ["Es wurden keine Produkte ausgewählt!","You have not chosen any products!","No ha seleccionado ningún producto!"];
-
-var CHANGE_ALL = 0;
-var CHANGE_ONE = 1
-
-function Grouping(set,hashFct) {
- // initialization during construction of class
- this.set = set;
-
- // setting by group()
- this.sortedset = [];
-
- this.group = function() {
- this.sortedset = [];
- for (var i=0;i/g, ">"));
-}
-
-function setLanguage(language) {
- lang = language;
-
- $("#roomtableheader2").html(W_ROOMTABLE[lang]);
- $("#tableselection").html(W_TABLE_SEL[lang]);
- $("#actiontxt").html(W_ACT_NEW_ORD_EL[lang]);
- $("#actdeltxt").html(W_DEL[lang]);
-
- $("#discard_new_orders_yes").html(W_YES[lang]);
- $("#discard_new_orders_no").html(W_NO[lang]);
- $("#discardnewordersask").html(W_DISCARD_NO_ASK[lang]);
- $("#discardnoheader").html(W_DISCARD_HEADER[lang]);
-
- $("#change_unpaid_txt").html(W_UNPAID[lang]);
- $("#change_undelivered_txt").html(W_UNDELIVERED[lang]);
- $("#moveprods").html(W_MOVE_PRODS[lang]);
-
- var searchField = '';
- if (prominentsearch == 0) {
- searchField += '
';
- } else {
- searchField += '
';
- }
- searchField += '
';
-
- var commentField = '
\
- \
- \
-
';
-
- if (prominentsearch == 0) {
- $("#searchposition-normal").html(searchField);
- } else {
- $("#searchposition-prominent").html(searchField);
- }
-
- var html = commentField;
-
- if ((workflowconfig == 0) || (workflowconfig == 1)) {
- html += '' + W_SEND_ORDERS[lang] + '';
- }
-
- if ((workflowconfig == 0) || (workflowconfig == 2)) {
- html += '' + W_WORK_TICKET[lang] + '';
- }
-
- html += '' + W_TO_PAYDESK[lang] + ''
- + '';
-
- $("#commandbuttons").html(html);
-
- $("#waiterui").trigger("create");
-
- // for new orders dialog
- var actCommentField = '
\
- \
- \
-
';
- $("#actremark").html(actCommentField);
-
- if (rightchangeprice == 1) {
- var txt = '';
- $("#actchangepricesection").html(txt);
-
- var discounttxt = '
';
- txt += '
';
- txt += '
