genofire
/
ordersprinter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OrderSprinter 1.5.13

This commit is contained in:
Geno 2020-11-19 23:12:05 +01:00
parent 66d43f2b42
commit c076710ca5
35 changed files with 310 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gastsystem/index.php
View File

@ -9,8 +9,8 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.12" /> <link rel="stylesheet" href="css/gueststyle.css?v=1.5.13" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.12" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.13" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
@ -105,7 +105,7 @@
<div data-role="footer" data-theme="b" id="thefooter1"> <div data-role="footer" data-theme="b" id="thefooter1">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a">&nbsp;&nbsp;OrderSprinter</div> <div class="ui-block-a">&nbsp;&nbsp;OrderSprinter</div>
<div class="ui-block-b grid_right" id="versioninfo">1.5.12&nbsp;&nbsp;</div> <div class="ui-block-b grid_right" id="versioninfo">1.5.13&nbsp;&nbsp;</div>
</div><!-- /grid-a --> </div><!-- /grid-a -->
</div> </div>
</div> </div>

4
gastsystem/install.php
View File

@ -90,10 +90,10 @@ if (isset($_POST['code'])) {
} else { } else {
echo "<html>"; echo "<html>";
echo "<head><title>Installation Gastsystem</title>"; echo "<head><title>Installation Gastsystem</title>";
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.12">'; echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.13">';
echo "</head>"; echo "</head>";
echo "<body><div class=surround>"; echo "<body><div class=surround>";
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.12</span><br><br>"; echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.13</span><br><br>";
echo "<form action='install.php' method='post'><input class=installfield name=code id=code type=text placeholder='Installationscode' />"; echo "<form action='install.php' method='post'><input class=installfield name=code id=code type=text placeholder='Installationscode' />";
echo "<br><input type=submit value='Installation starten' class=installbtn />"; echo "<br><input type=submit value='Installation starten' class=installbtn />";
echo "</form></div></html>"; echo "</form></div></html>";

BIN
javaprinter/javaprinter.jar
View File

Binary file not shown.

BIN
printserver/OrderSprinterPrintserver.exe
View File

Binary file not shown.

2
spider/install/installer.php
View File

@ -85,7 +85,7 @@ class Installer {
} }
Database::dropTables($pdo); Database::dropTables($pdo);
Database::createEmptyTables($pdo, $prefix); Database::createEmptyTables($pdo, $prefix);
Database::setVersion($pdo,$prefix,"1.5.12"); Database::setVersion($pdo,$prefix,"1.5.13");
Database::setAccessPassword($pdo,$prefix,$adminpass); Database::setAccessPassword($pdo,$prefix,$adminpass);
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
return array("status" => "OK","msg" => "Installation successful"); return array("status" => "OK","msg" => "Installation successful");

BIN
webapp/OrderSprinterPrintserver.exe
View File

Binary file not shown.

6
webapp/bar.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,8 +13,8 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script> <script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.5.12"></script> <script src="utilities.js?v=1.5.13"></script>
<script src="kitchenbar.js?v=1.5.12"></script> <script src="kitchenbar.js?v=1.5.13"></script>
<style> <style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

2
webapp/bill.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

10
webapp/elements/groundplan.js
View File

@ -6,6 +6,8 @@ var GEN_DIRECTION = ["Verschieben","Move","Mover"];
var MAN_ROOM_PRINTER_NO = ["Kategorieeinstellung","Category setting","Configuración/categoria"]; var MAN_ROOM_PRINTER_NO = ["Kategorieeinstellung","Category setting","Configuración/categoria"];
var MAN_ROOM_PRINTER_1 = ["Drucker 1","Printer 1","Imprimadora 1"]; var MAN_ROOM_PRINTER_1 = ["Drucker 1","Printer 1","Imprimadora 1"];
var MAN_ROOM_PRINTER_2 = ["Drucker 2","Printer 2","Imprimadora 2"]; var MAN_ROOM_PRINTER_2 = ["Drucker 2","Printer 2","Imprimadora 2"];
var MAN_ROOM_PRINTER_3 = ["Drucker 3","Printer 3","Imprimadora 3"];
var MAN_ROOM_PRINTER_4 = ["Drucker 4","Printer 4","Imprimadora 4"];
var MAN_ROOM_PRINTER_TXT = ["Arbeitsdrucker","Work printer","Imprimadora de trabajo"]; var MAN_ROOM_PRINTER_TXT = ["Arbeitsdrucker","Work printer","Imprimadora de trabajo"];
var MAN_ROOM_ABBR_TXT = ["Kürzel","Abbr.","Abbr."]; var MAN_ROOM_ABBR_TXT = ["Kürzel","Abbr.","Abbr."];
var MAN_CREATENEWROOM = ["Neuer Raum","New Room","Nueva habitación"]; var MAN_CREATENEWROOM = ["Neuer Raum","New Room","Nueva habitación"];
@ -152,7 +154,9 @@ function Groundplan() {
var printerOptions = [ var printerOptions = [
{ name: MAN_ROOM_PRINTER_NO[lang], value: 0}, { name: MAN_ROOM_PRINTER_NO[lang], value: 0},
{ name: MAN_ROOM_PRINTER_1[lang], value: 1}, { name: MAN_ROOM_PRINTER_1[lang], value: 1},
{ name: MAN_ROOM_PRINTER_2[lang], value: 2} { name: MAN_ROOM_PRINTER_2[lang], value: 2},
{ name: MAN_ROOM_PRINTER_3[lang], value: 3},
{ name: MAN_ROOM_PRINTER_4[lang], value: 4}
]; ];
txt += createGenericSelectBox("togoreceipt_printer",printerOptions,this.togoworkprinter,"togoworkreceiptprinter","c"); txt += createGenericSelectBox("togoreceipt_printer",printerOptions,this.togoworkprinter,"togoworkreceiptprinter","c");
@ -361,7 +365,9 @@ function Room(jsonRoom) {
var printerOptions = [ var printerOptions = [
{ name: MAN_ROOM_PRINTER_NO[lang], value: 0}, { name: MAN_ROOM_PRINTER_NO[lang], value: 0},
{ name: MAN_ROOM_PRINTER_1[lang], value: 1}, { name: MAN_ROOM_PRINTER_1[lang], value: 1},
{ name: MAN_ROOM_PRINTER_2[lang], value: 2} { name: MAN_ROOM_PRINTER_2[lang], value: 2},
{ name: MAN_ROOM_PRINTER_3[lang], value: 3},
{ name: MAN_ROOM_PRINTER_4[lang], value: 4}
]; ];
txt += "<td>" + createGenericSelectBox(htmlId + "_printer",printerOptions,this.printer,"roomvalue_" + this.roomid + "_printer","f"); txt += "<td>" + createGenericSelectBox(htmlId + "_printer",printerOptions,this.printer,"roomvalue_" + this.roomid + "_printer","f");
txt += "<td style='text-align:center;'><img id='" + htmlId + "_up' class='roomvalue_" + this.roomid + "_up' src='img/higher.png' />"; txt += "<td style='text-align:center;'><img id='" + htmlId + "_up' class='roomvalue_" + this.roomid + "_up' src='img/higher.png' />";

74
webapp/elements/product.js
View File

@ -228,9 +228,20 @@ function newProduct(id, longname, shortname,priceA,priceB,priceC,unit,display,da
if (this.id.indexOf("n") == 0) { if (this.id.indexOf("n") == 0) {
theme="f"; theme="f";
} }
var line = '<div id="cont_' + this.id + '" data-role="collapsible" data-content-theme="a" data-theme="' + theme + '">' var line = '<div id="cont_' + this.id + '" data-role="collapsible" data-content-theme="a" data-theme="' + theme + '" class="prodcollapsible" >'
+'<h3><span id=prodheader_' + this.id + '>Test</span></h3>' +'<h3><span id=prodheader_' + this.id + '>Test</span></h3>'
+ '<p><input type="hidden" name="prodid" value="' + this.id + '"></input></p>' + '<p id="contprod_' + this.id + '"><img src="php/3rdparty/images/ajax-loader.gif" /></div>';
return line;
},
createProdContentStructure:function(audiofiles) {
var theme="e";
if (this.id.indexOf("n") == 0) {
theme="f";
}
var line = ""
+ '<input type="hidden" name="prodid" value="' + this.id + '"></input></p>'
+ createInputField("prodlong_" + this.id,"prodlong_input_" + this.id,"longname") + createInputField("prodlong_" + this.id,"prodlong_input_" + this.id,"longname")
+ createInputField("prodshort_" + this.id,"prodshort_input_" + this.id,"shortname") + createInputField("prodshort_" + this.id,"prodshort_input_" + this.id,"shortname")
@ -280,7 +291,7 @@ function newProduct(id, longname, shortname,priceA,priceB,priceC,unit,display,da
line += this.createApplyArea("prodnew_" + this.id) + '</div>'; line += this.createApplyArea("prodnew_" + this.id) + '</div>';
} }
return line; $("#contprod_" + this.id).html(line);
}, },
insertValuesIntoMenuList:function() { insertValuesIntoMenuList:function() {
@ -396,7 +407,7 @@ function createResetApplyArea(idApply,idCancel,idDel) {
return txt; return txt;
} }
function createProdType(id,name,kind,usekitchen,usesupplydesk,printer) { function createProdType(id,name,kind,usekitchen,usesupplydesk,printer,fixbind) {
var prodtype = { var prodtype = {
id:id, id:id,
name: name, name: name,
@ -404,14 +415,15 @@ function createProdType(id,name,kind,usekitchen,usesupplydesk,printer) {
usesupplydesk:usesupplydesk, usesupplydesk:usesupplydesk,
kind:kind, kind:kind,
printer:printer, printer:printer,
fixbind:fixbind,
createTableStructureLine: function (depth) { createTableStructureLine: function (depth) {
var depthstr = ident(depth); var depthstr = ident(depth);
var trline = "<tr class='prodtype' id='prodtype_" + this.id + "'>" var trline = "<tr class='prodtype' id='prodtype_" + this.id + "'>"
+ "<td>" + depthstr + "<input type='text' class='typename whiteinput'></input>" + "<td>" + depthstr + "<input type='text' class='typename whiteinput'></input>"
+ "<td class='type_kind'>" + this.createTwoValSelection(kind,PROD_FOOD,PROD_DRINKS) + "<td class='type_kind'>" + this.createValSelection(kind,[PROD_FOOD,PROD_DRINKS])
+ "<td class='type_usekitchen'>" + this.createTwoValSelection(usekitchen,PROD_NO,PROD_YES) + "<td class='type_usekitchen'>" + this.createValSelection(usekitchen,[PROD_NO,PROD_YES])
+ "<td class='type_usesupply'>" + this.createTwoValSelection(usesupplydesk,PROD_NO,PROD_YES) + "<td class='type_usesupply'>" + this.createValSelection(usesupplydesk,[PROD_NO,PROD_YES])
+ "<td class='type_printer'>" + this.createTwoValSelection(printer,PROD_PRINTER_1,PROD_PRINTER_2) + "<td class='type_printer'>" + this.createValSelection(printer,[PROD_PRINTER_1,PROD_PRINTER_2,PROD_PRINTER_3,PROD_PRINTER_4])
+ "<td colspan=6>" + "<td colspan=6>"
+ "</tr>"; + "</tr>";
return trline; return trline;
@ -419,12 +431,16 @@ function createProdType(id,name,kind,usekitchen,usesupplydesk,printer) {
insertValuesIntoMenuTable:function() { insertValuesIntoMenuTable:function() {
$("#prodtype_" + id + " input.typename").val(name); $("#prodtype_" + id + " input.typename").val(name);
}, },
createTwoValSelection:function(theVal,text0,text1) { createValSelection:function(theVal,valTextArray) {
if (theVal == 1) { var txt = "<select>";
return "<select><option val=0 class='no'>" + text0[lang] + "</option><option val=1 selected class='yes'>" + text1[lang] + "</option></selected>"; for (var i=0;i<valTextArray.length;i++) {
} else { if (theVal == i) {
return "<select><option val=0 selected>" + text0[lang] + "</option><option val=1>" + text1[lang] + "</option></selected>"; txt += "<option val='" + i + "' selected class='yes'>" + valTextArray[i][lang] + "</option>";
} } else {
txt += "<option val='" + i + "' class='no'>" + valTextArray[i][lang] + "</option>";
}
}
return txt + "</select>";
}, },
@ -439,6 +455,7 @@ function createProdType(id,name,kind,usekitchen,usesupplydesk,printer) {
+ "<div id=dtypeuk_" + this.id + " ></div>" + "<div id=dtypeuk_" + this.id + " ></div>"
+ "<div id=dtypeus_" + this.id + " ></div>" + "<div id=dtypeus_" + this.id + " ></div>"
+ "<div id=dtypeprinter_" + this.id + " ></div>" + "<div id=dtypeprinter_" + this.id + " ></div>"
+ "<div id=dtypefixbind_" + this.id + " ></div>"
+ createInputField("typename_" + this.id,"typename_input_" + this.id,"typename_input_" + this.id) + createInputField("typename_" + this.id,"typename_input_" + this.id,"typename_input_" + this.id)
@ -461,24 +478,29 @@ function createProdType(id,name,kind,usekitchen,usesupplydesk,printer) {
insertValuesIntoMenuList:function() { insertValuesIntoMenuList:function() {
$("#typename_" + this.id).html(PROD_NAME[lang]); $("#typename_" + this.id).html(PROD_NAME[lang]);
$("#typename_input_" + this.id).val(this.name); $("#typename_input_" + this.id).val(this.name);
$("#dtypekind_" + this.id).html(this.createMobileSel("kind_" + this.id,this.kind,PROD_TYPE,PROD_FOOD,PROD_DRINKS)); $("#dtypekind_" + this.id).html(this.createMobileSel("kind_" + this.id,this.kind,PROD_TYPE,[PROD_FOOD,PROD_DRINKS]));
$("#dtypeuk_" + this.id).html(this.createMobileSel("usekitchen_" + this.id,this.usekitchen,PROD_KITCHEN_BAR,PROD_NO_PASS_KITCHEN,PROD_PASS_KITCHEN)); $("#dtypeuk_" + this.id).html(this.createMobileSel("usekitchen_" + this.id,this.usekitchen,PROD_KITCHEN_BAR,[PROD_NO_PASS_KITCHEN,PROD_PASS_KITCHEN]));
$("#dtypeus_" + this.id).html(this.createMobileSel("usesupply_" + this.id,this.usesupplydesk,PROD_SUPPLY,PROD_NO_PASS_SUPPLY,PROD_PASS_SUPPLY)); $("#dtypeus_" + this.id).html(this.createMobileSel("usesupply_" + this.id,this.usesupplydesk,PROD_SUPPLY,[PROD_NO_PASS_SUPPLY,PROD_PASS_SUPPLY]));
$("#dtypeprinter_" + this.id).html(this.createMobileSel("printer_" + this.id,this.printer-1,PROD_PRINTER,PROD_PRINTER_1,PROD_PRINTER_2)); $("#dtypeprinter_" + this.id).html(this.createMobileSel("printer_" + this.id,this.printer-1,PROD_PRINTER,[PROD_PRINTER_1,PROD_PRINTER_2,PROD_PRINTER_3,PROD_PRINTER_4]));
$("#dtypefixbind_" + this.id).html(this.createMobileSel("fixbind_" + this.id,this.fixbind,PROD_PRINTER_PRIO,[PROD_PRINTER_FIXB0,PROD_PRINTER_FIXB1]));
}, },
createMobileSel:function(id,theVal,label,text0,text1) { createMobileSel:function(id,theVal,label,valTextArray) {
var txt = '<p><div data-role="fieldcontain">' var txt = '<p><div data-role="fieldcontain">'
+ '<label for="' + id + '">' + label[lang] + '</label>' + '<label for="' + id + '">' + label[lang] + '</label>'
+ this.createSelection(id,theVal,text0,text1) + this.createSelection(id,theVal,valTextArray)
+ '</div></p>'; + '</div></p>';
return txt; return txt;
}, },
createSelection:function(id,theVal,text0,text1) { createSelection:function(id,theVal,valTextArray) {
if (theVal == 1) { var txt = "<select id='" + id + "'>";
return "<select id=" + id + "><option value=0>" + text0[lang] + "</option><option value=1 selected>" + text1[lang] + "</option></select>"; for (var i=0;i<valTextArray.length;i++) {
} else { if (theVal == i) {
return "<select id=" + id + "><option value=0 selected>" + text0[lang] + "</option><option value=1>" + text1[lang] + "</option></select>"; txt += "<option value='" + i + "' selected>" + valTextArray[i][lang] + "</option>";
} } else {
txt += "<option value='" + i + "' >" + valTextArray[i][lang] + "</option>";
}
}
return txt + "</select>";
} }
}; };
return prodtype; return prodtype;

2
webapp/feedback.html
View File

@ -4,7 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

6
webapp/index.html
View File

@ -9,8 +9,8 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.13">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -229,7 +229,7 @@ function handleResultOfInstallCheck(is_installed) {
if (is_installed == "Yes") { if (is_installed == "Yes") {
useInstallation(); useInstallation();
} else { } else {
setTimeout(function(){document.location.href = "install.html?v=1.5.12"},500); setTimeout(function(){document.location.href = "install.html?v=1.5.13"},500);
} }
} }

2
webapp/install.html
View File

@ -794,7 +794,7 @@ El servicio web OrderSprinter no requiere una conexión a Internet. Sin embargo,
<tr id=updateline> <tr id=updateline>
<td>&nbsp;</td> <td>&nbsp;</td>
<td align=center> <td align=center>
<button id="updatebtn">Update -> 1.5.12</button> <button id="updatebtn">Update -> 1.5.13</button>
<span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span> <span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span>
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>

2
webapp/install/installer.php
View File

@ -414,7 +414,7 @@ $zones[] = $timezone_identifiers[$i];
echo json_encode($zones); echo json_encode($zones);
} else if ($command == 'update') { } else if ($command == 'update') {
set_time_limit(60*30); set_time_limit(60*30);
$installerVersion = "1.5.12"; $installerVersion = "1.5.13";
$admin = new InstallAdmin(); $admin = new InstallAdmin();
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']); $pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);

6
webapp/kitchen.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,8 +13,8 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script> <script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.5.12"></script> <script src="utilities.js?v=1.5.13"></script>
<script src="kitchenbar.js?v=1.5.12"></script> <script src="kitchenbar.js?v=1.5.13"></script>
<style> <style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

48
webapp/manager.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,10 +13,10 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.5.12"></script> <script src="utilities.js?v=1.5.13"></script>
<script src="elements/tablemap.js?v=1.5.12"></script> <script src="elements/tablemap.js?v=1.5.13"></script>
<script src="elements/roommap.js?v=1.5.12"></script> <script src="elements/roommap.js?v=1.5.13"></script>
<script src="elements/groundplan.js?v=1.5.12"></script> <script src="elements/groundplan.js?v=1.5.13"></script>
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet"> <link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script> <script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
@ -446,7 +446,7 @@ var MAN_RECEIPT_TXT = ["Kasse","Receipts","Recibos"];
var MAN_DRINKS_REC_TXT = ["Getränke","Drinks","Bebidas"]; var MAN_DRINKS_REC_TXT = ["Getränke","Drinks","Bebidas"];
var MAN_FOOD_REC_TXT = ["Speisen","Food","Comidas"]; var MAN_FOOD_REC_TXT = ["Speisen","Food","Comidas"];
var MAN_PICKUPQUEUE_TXT = ["Abholbons","Pickup receips","Tiquets de recogidos"]; var MAN_PICKUPQUEUE_TXT = ["Abholbons","Pickup receips","Tiquets de recogidos"];
var MAN_PRINSTANCE_HINT = ["Alle Zuordnungen wirken erst ab Printserverversion 1.5.8 oder höher!","All the assignments only work with print server versions 1.5.8 and higher!","Esta configuración sólo funciona con printservers de una version 1.5.8 o despues!"]; var MAN_PRINSTANCE_HINT = ["Alle Zuordnungen wirken erst ab Printserverversion 1.5.13 oder höher!","All the assignments only work with print server versions 1.5.13 and higher!","Esta configuración sólo funciona con printservers de una version 1.5.13 o despues!"];
var MAN_DASHSLOT1 = ["Dashboard Slot 1","Dashboard Slot 1","Dashboard Slot 1"]; var MAN_DASHSLOT1 = ["Dashboard Slot 1","Dashboard Slot 1","Dashboard Slot 1"];
var MAN_DASHSLOT2 = ["Dashboard Slot 2","Dashboard Slot 2","Dashboard Slot 2"]; var MAN_DASHSLOT2 = ["Dashboard Slot 2","Dashboard Slot 2","Dashboard Slot 2"];
var MAN_DASHSLOT3 = ["Dashboard Slot 3","Dashboard Slot 3","Dashboard Slot 3"]; var MAN_DASHSLOT3 = ["Dashboard Slot 3","Dashboard Slot 3","Dashboard Slot 3"];
@ -1501,7 +1501,7 @@ function initRestoreFileUpload() {
} else { } else {
alert("Import war erfolgreich."); alert("Import war erfolgreich.");
setTimeout(function(){ setTimeout(function(){
document.location.href = "index.html?v=1.5.12"; document.location.href = "index.html?v=1.5.13";
},250); },250);
} }
}, },
@ -2055,9 +2055,9 @@ function handleUpdateCheckResult(answer) {
var millis=getMillis(); var millis=getMillis();
setTimeout(function(){ setTimeout(function(){
document.location.href = "install.html?v=1.5.12&mode=onlyupdate&n=" + millis; document.location.href = "install.html?v=1.5.13&mode=onlyupdate&n=" + millis;
},250); },250);
document.location.href = "install.html?v=1.5.12&mode=onlyupdate&n=" + millis; document.location.href = "install.html?v=1.5.13&mode=onlyupdate&n=" + millis;
} }
function handleUpdateReplace(answer) { function handleUpdateReplace(answer) {
@ -2094,9 +2094,13 @@ function insertPrinterInstance(answer) {
setPrinterInstance("pia_f1",answer.msg.f1); setPrinterInstance("pia_f1",answer.msg.f1);
setPrinterInstance("pia_f2",answer.msg.f2); setPrinterInstance("pia_f2",answer.msg.f2);
setPrinterInstance("pia_f3",answer.msg.f3);
setPrinterInstance("pia_f4",answer.msg.f4);
setPrinterInstance("pia_d1",answer.msg.d1); setPrinterInstance("pia_d1",answer.msg.d1);
setPrinterInstance("pia_d2",answer.msg.d2); setPrinterInstance("pia_d2",answer.msg.d2);
setPrinterInstance("pia_d3",answer.msg.d3);
setPrinterInstance("pia_d4",answer.msg.d4);
setPrinterInstance("pia_p1",answer.msg.p1); setPrinterInstance("pia_p1",answer.msg.p1);
@ -2137,9 +2141,13 @@ function bindPrinterInstanceClick() {
var f1 = $("#pia_f1").data("instance"); var f1 = $("#pia_f1").data("instance");
var f2 = $("#pia_f2").data("instance"); var f2 = $("#pia_f2").data("instance");
var f3 = $("#pia_f3").data("instance");
var f4 = $("#pia_f4").data("instance");
var d1 = $("#pia_d1").data("instance"); var d1 = $("#pia_d1").data("instance");
var d2 = $("#pia_d2").data("instance"); var d2 = $("#pia_d2").data("instance");
var d3 = $("#pia_d3").data("instance");
var d4 = $("#pia_d4").data("instance");
var p1 = $("#pia_p1").data("instance"); var p1 = $("#pia_p1").data("instance");
@ -2153,9 +2161,13 @@ function bindPrinterInstanceClick() {
f1: f1, f1: f1,
f2: f2, f2: f2,
f3: f3,
f4: f4,
d1: d1, d1: d1,
d2: d2, d2: d2,
d3: d3,
d4: d4,
p1: p1 p1: p1
}; };
@ -2167,8 +2179,8 @@ function bindPrinterInstanceClick() {
function renderPrinterInstancesTable() { function renderPrinterInstancesTable() {
renderPrinterInstanceRow("k",6); renderPrinterInstanceRow("k",6);
renderPrinterInstanceRow("f",2); renderPrinterInstanceRow("f",4);
renderPrinterInstanceRow("d",2); renderPrinterInstanceRow("d",4);
renderPrinterInstanceRow("p",1); renderPrinterInstanceRow("p",1);
} }
@ -3584,7 +3596,7 @@ $(document).on("pageinit", "#admin-page", function () {
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="cbirdfolder"><span id="cbirdfoldertxt">CBird Imporfolder:</span></label> <label for="cbirdfolder"><span id="cbirdfoldertxt">CBird Imporfolder:</span></label>
<input type="text" value="" data-mini="true" placeholder="7,0" id="cbirdfolder" data-theme="c" class="genConfigEl"/> <input type="text" value="" data-mini="true" placeholder="" id="cbirdfolder" data-theme="c" class="genConfigEl"/>
</div> </div>
</div> </div>
@ -3971,8 +3983,13 @@ $(document).on("pageinit", "#admin-page", function () {
<tr id="pia_f1" class="prinstancerow"><td class="rowname"><span class="pia_f_txt">Speise</span> 1<td id="pia_f1_1"><td id="pia_f1_2"><td id="pia_f1_3"><td id="pia_f1_4"><td id="pia_f1_5"><td id="pia_f1_6"><td id="pia_f1_7"><td id="pia_f1_8"><td id="pia_f1_9"><td id="pia_f1_10"></tr> <tr id="pia_f1" class="prinstancerow"><td class="rowname"><span class="pia_f_txt">Speise</span> 1<td id="pia_f1_1"><td id="pia_f1_2"><td id="pia_f1_3"><td id="pia_f1_4"><td id="pia_f1_5"><td id="pia_f1_6"><td id="pia_f1_7"><td id="pia_f1_8"><td id="pia_f1_9"><td id="pia_f1_10"></tr>
<tr id="pia_f2" class="prinstancerow"><td class="rowname"><span class="pia_f_txt">Speise</span> 2<td id="pia_f2_1"><td id="pia_f2_2"><td id="pia_f2_3"><td id="pia_f2_4"><td id="pia_f2_5"><td id="pia_f2_6"><td id="pia_f2_7"><td id="pia_f2_8"><td id="pia_f2_9"><td id="pia_f2_10"></tr> <tr id="pia_f2" class="prinstancerow"><td class="rowname"><span class="pia_f_txt">Speise</span> 2<td id="pia_f2_1"><td id="pia_f2_2"><td id="pia_f2_3"><td id="pia_f2_4"><td id="pia_f2_5"><td id="pia_f2_6"><td id="pia_f2_7"><td id="pia_f2_8"><td id="pia_f2_9"><td id="pia_f2_10"></tr>
<tr id="pia_f3" class="prinstancerow"><td class="rowname"><span class="pia_f_txt">Speise</span> 3<td id="pia_f3_1"><td id="pia_f3_2"><td id="pia_f3_3"><td id="pia_f3_4"><td id="pia_f3_5"><td id="pia_f3_6"><td id="pia_f3_7"><td id="pia_f3_8"><td id="pia_f3_9"><td id="pia_f3_10"></tr>
<tr id="pia_f4" class="prinstancerow"><td class="rowname"><span class="pia_f_txt">Speise</span> 4<td id="pia_f4_1"><td id="pia_f4_2"><td id="pia_f4_3"><td id="pia_f4_4"><td id="pia_f4_5"><td id="pia_f4_6"><td id="pia_f4_7"><td id="pia_f4_8"><td id="pia_f4_9"><td id="pia_f4_10"></tr>
<tr id="pia_d1" class="prinstancerow"><td class="rowname"><span class="pia_d_txt">Getränke</span> 1<td id="pia_d1_1"><td id="pia_d1_2"><td id="pia_d1_3"><td id="pia_d1_4"><td id="pia_d1_5"><td id="pia_d1_6"><td id="pia_d1_7"><td id="pia_d1_8"><td id="pia_d1_9"><td id="pia_d1_10"></tr> <tr id="pia_d1" class="prinstancerow"><td class="rowname"><span class="pia_d_txt">Getränke</span> 1<td id="pia_d1_1"><td id="pia_d1_2"><td id="pia_d1_3"><td id="pia_d1_4"><td id="pia_d1_5"><td id="pia_d1_6"><td id="pia_d1_7"><td id="pia_d1_8"><td id="pia_d1_9"><td id="pia_d1_10"></tr>
<tr id="pia_d2" class="prinstancerow"><td class="rowname"><span class="pia_d_txt">Getränke</span> 2<td id="pia_d2_1"><td id="pia_d2_2"><td id="pia_d2_3"><td id="pia_d2_4"><td id="pia_d2_5"><td id="pia_d2_6"><td id="pia_d2_7"><td id="pia_d2_8"><td id="pia_d2_9"><td id="pia_d2_10"></tr> <tr id="pia_d2" class="prinstancerow"><td class="rowname"><span class="pia_d_txt">Getränke</span> 2<td id="pia_d2_1"><td id="pia_d2_2"><td id="pia_d2_3"><td id="pia_d2_4"><td id="pia_d2_5"><td id="pia_d2_6"><td id="pia_d2_7"><td id="pia_d2_8"><td id="pia_d2_9"><td id="pia_d2_10"></tr>
<tr id="pia_d3" class="prinstancerow"><td class="rowname"><span class="pia_d_txt">Getränke</span> 3<td id="pia_d3_1"><td id="pia_d3_2"><td id="pia_d3_3"><td id="pia_d3_4"><td id="pia_d3_5"><td id="pia_d3_6"><td id="pia_d3_7"><td id="pia_d3_8"><td id="pia_d3_9"><td id="pia_d3_10"></tr>
<tr id="pia_d4" class="prinstancerow"><td class="rowname"><span class="pia_d_txt">Getränke</span> 4<td id="pia_d4_1"><td id="pia_d4_2"><td id="pia_d4_3"><td id="pia_d4_4"><td id="pia_d4_5"><td id="pia_d4_6"><td id="pia_d4_7"><td id="pia_d4_8"><td id="pia_d4_9"><td id="pia_d4_10"></tr>
<tr id="pia_p1" class="prinstancerow"><td class="rowname"><span class="pia_p_txt">Abholung</span><td id="pia_p1_1"><td id="pia_p1_2"><td id="pia_p1_3"><td id="pia_p1_4"><td id="pia_p1_5"><td id="pia_p1_6"><td id="pia_p1_7"><td id="pia_p1_8"><td id="pia_p1_9"><td id="pia_p1_10"></tr> <tr id="pia_p1" class="prinstancerow"><td class="rowname"><span class="pia_p_txt">Abholung</span><td id="pia_p1_1"><td id="pia_p1_2"><td id="pia_p1_3"><td id="pia_p1_4"><td id="pia_p1_5"><td id="pia_p1_6"><td id="pia_p1_7"><td id="pia_p1_8"><td id="pia_p1_9"><td id="pia_p1_10"></tr>
</table> </table>
@ -4080,12 +4097,15 @@ $(document).on("pageinit", "#admin-page", function () {
Wird ein <i>K</i> und <i>B</i> mitgegeben, so werden diese Produkte über die Küchen/Bar (K) - Wird ein <i>K</i> und <i>B</i> mitgegeben, so werden diese Produkte über die Küchen/Bar (K) -
und Bereitstellungsansicht (B) geführt. Die Einstellung wird auf die Unterkategorien und Bereitstellungsansicht (B) geführt. Die Einstellung wird auf die Unterkategorien
vererbt, wenn die darunter liegenden Kategorien keine Angabe dazu enthalten. vererbt, wenn die darunter liegenden Kategorien keine Angabe dazu enthalten.
Hinter dem zweiten Gleichheitszeichen kann die Nummer eines Arbeitsbondruckers
des jeweiligen Typs (Speise/Getränk) angegeben werden.
<p>Wenn ein <i>D</i> angegeben ist, wird als Typ <b>Getränk</b> angenommen, bei einem <i>F</i> <b>Speise</b>. <p>Wenn ein <i>D</i> angegeben ist, wird als Typ <b>Getränk</b> angenommen, bei einem <i>F</i> <b>Speise</b>.
Wenn die Angabe fehlt, wird die Eigenschaft des übergeordneten Eintrags verwendet. Wenn die Angabe fehlt, wird die Eigenschaft des übergeordneten Eintrags verwendet.
<p>Hinter dem zweiten Gleichheitszeichen kann die Nummer eines Arbeitsbondruckers
des jeweiligen Typs (Speise/Getränk) angegeben werden.
<p>Nach dem dritten Gleichheitszeichen kann die Priorität der Druckerauswahl angegeben werden: RD bedeitet, dass der Raumdrucker höhere Priorität als der Kategoriedrucker besitzt (Default), anderenfalls der Kategoriedrucker (KD)
<h3>Extras</h3> <h3>Extras</h3>
<p>Extras werden mit einem Ausrufezeichen am Zeilenanfang deklariert. Nach dem Namen und der (vom OrderSprinter vergebenenen ID, die also <p>Extras werden mit einem Ausrufezeichen am Zeilenanfang deklariert. Nach dem Namen und der (vom OrderSprinter vergebenenen ID, die also
nicht vom Benutzer angegeben werden muss), können nach einem Semikolon die Produkte angegeben werden, die mit diesem Extra nicht vom Benutzer angegeben werden muss), können nach einem Semikolon die Produkte angegeben werden, die mit diesem Extra

2
webapp/paydesk.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

56
webapp/php/admin.php
View File

@ -387,7 +387,7 @@ class Admin {
} else if ($command == 'getprinterinstances') { } else if ($command == 'getprinterinstances') {
$this->getPrinterInstances(); $this->getPrinterInstances();
} else if ($command == 'setprinterinstances') { } else if ($command == 'setprinterinstances') {
$this->setprinterinstances($_POST["k1"],$_POST["k2"],$_POST["k3"],$_POST["k4"],$_POST["k5"],$_POST["k6"],$_POST["f1"],$_POST["f2"],$_POST["d1"],$_POST["d2"],$_POST["p1"]); $this->setprinterinstances($_POST["k1"],$_POST["k2"],$_POST["k3"],$_POST["k4"],$_POST["k5"],$_POST["k6"],$_POST["f1"],$_POST["f2"],$_POST["f3"],$_POST["f4"],$_POST["d1"],$_POST["d2"],$_POST["d3"],$_POST["d4"],$_POST["p1"]);
} else if ($command == 'getdashreports') { } else if ($command == 'getdashreports') {
$this->getdashreports(); $this->getdashreports();
} else if ($command == 'getDailycode') { } else if ($command == 'getDailycode') {
@ -1397,7 +1397,7 @@ class Admin {
$view = "preferences.html"; $view = "preferences.html";
} }
echo json_encode($view . "?v=1.5.12"); echo json_encode($view . "?v=1.5.13");
} }
} }
@ -1613,31 +1613,31 @@ class Admin {
if (!self::isOnlyRatingUser($rights, $right_rating, true)) { if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
if ($_SESSION['modus'] == 0) { if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.12"); } if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.13"); }
} else { } else {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.12"); } if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.13"); }
} }
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.12"); } if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.13"); }
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.12"); } if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.13"); }
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.12"); } if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.13"); }
if ($_SESSION['modus'] == 0) { if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.12"); } if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.13"); }
} }
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.12"); } if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.13"); }
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.12"); } if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.13"); }
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.12"); } if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.13"); }
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.12"); } if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.13"); }
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.12"); } if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.13"); }
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.12"); } if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.13"); }
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.12"); } if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.13"); }
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.12"); } if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.13"); }
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.12"); } if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.13"); }
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.12"); } if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.13"); }
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.12"); $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.13");
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.12"); } if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.13"); }
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.12"); $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.13");
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.12"); $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.13");
} }
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
@ -1667,11 +1667,15 @@ class Admin {
$k6 = CommonUtils::getConfigValue($pdo, 'k6prinstance', 1); $k6 = CommonUtils::getConfigValue($pdo, 'k6prinstance', 1);
$f1 = CommonUtils::getConfigValue($pdo, 'f1prinstance', 1); $f1 = CommonUtils::getConfigValue($pdo, 'f1prinstance', 1);
$f2 = CommonUtils::getConfigValue($pdo, 'f2prinstance', 1); $f2 = CommonUtils::getConfigValue($pdo, 'f2prinstance', 1);
$f3 = CommonUtils::getConfigValue($pdo, 'f3prinstance', 1);
$f4 = CommonUtils::getConfigValue($pdo, 'f4prinstance', 1);
$d1 = CommonUtils::getConfigValue($pdo, 'd1prinstance', 1); $d1 = CommonUtils::getConfigValue($pdo, 'd1prinstance', 1);
$d2 = CommonUtils::getConfigValue($pdo, 'd2prinstance', 1); $d2 = CommonUtils::getConfigValue($pdo, 'd2prinstance', 1);
$d3 = CommonUtils::getConfigValue($pdo, 'd3prinstance', 1);
$d4 = CommonUtils::getConfigValue($pdo, 'd4prinstance', 1);
$p1 = CommonUtils::getConfigValue($pdo, 'p1prinstance', 1); $p1 = CommonUtils::getConfigValue($pdo, 'p1prinstance', 1);
$ret = array("k1" => $k1,"k2" => $k2,"k3" => $k3, "k4" => $k4,"k5" => $k5,"k6" => $k6,"d1" => $d1,"d2" => $d2,"f1" => $f1,"f2" => $f2,"p1" => $p1); $ret = array("k1" => $k1,"k2" => $k2,"k3" => $k3, "k4" => $k4,"k5" => $k5,"k6" => $k6,"d1" => $d1,"d2" => $d2,"d3" => $d3,"d4" => $d4,"f1" => $f1,"f2" => $f2,"f3" => $f3,"f4" => $f4,"p1" => $p1);
echo json_encode(array("status" => "OK","msg" => $ret)); echo json_encode(array("status" => "OK","msg" => $ret));
} catch (Exception $ex) { } catch (Exception $ex) {
@ -1680,7 +1684,7 @@ class Admin {
} }
} }
private function setprinterinstances($k1,$k2,$k3,$k4,$k5,$k6,$f1,$f2,$d1,$d2,$p1) { private function setprinterinstances($k1,$k2,$k3,$k4,$k5,$k6,$f1,$f2,$f3,$f4,$d1,$d2,$d3,$d4,$p1) {
try { try {
$pdo = DbUtils::openDbAndReturnPdoStatic(); $pdo = DbUtils::openDbAndReturnPdoStatic();
$sql = "UPDATE %config% SET setting=? WHERE name=?"; $sql = "UPDATE %config% SET setting=? WHERE name=?";
@ -1694,9 +1698,13 @@ class Admin {
$stmt->execute(array($f1,"f1prinstance")); $stmt->execute(array($f1,"f1prinstance"));
$stmt->execute(array($f2,"f2prinstance")); $stmt->execute(array($f2,"f2prinstance"));
$stmt->execute(array($f3,"f3prinstance"));
$stmt->execute(array($f4,"f4prinstance"));
$stmt->execute(array($d1,"d1prinstance")); $stmt->execute(array($d1,"d1prinstance"));
$stmt->execute(array($d2,"d2prinstance")); $stmt->execute(array($d2,"d2prinstance"));
$stmt->execute(array($d3,"d3prinstance"));
$stmt->execute(array($d4,"d4prinstance"));
$stmt->execute(array($p1,"p1prinstance")); $stmt->execute(array($p1,"p1prinstance"));

2
webapp/php/customers.php
View File

@ -853,7 +853,7 @@ class Customers {
$txt = "<head>"; $txt = "<head>";
$txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>"; $txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>";
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">'; $txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.12">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.13">';
$txt .= "</head>"; $txt .= "</head>";
return $txt; return $txt;
} }

2
webapp/php/debug.php
View File

@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
if (strlen($status) > 150) { if (strlen($status) > 150) {
$status = substr($status, 0,149); $status = substr($status, 0,149);
} }
$version = "1.5.12"; $version = "1.5.13";
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion); $arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
} else { } else {

48
webapp/php/products.php
View File

@ -116,7 +116,7 @@ class Products {
} else if ($command == 'createProdType') { } else if ($command == 'createProdType') {
$this->createProdType($_POST['refid'],$_POST['name']); $this->createProdType($_POST['refid'],$_POST['name']);
} else if ($command == 'applyType') { } else if ($command == 'applyType') {
$this->applyType($_POST['id'],$_POST['name'],$_POST['kind'],$_POST['usekitchen'],$_POST['usesupply'],$_POST['printer']); $this->applyType($_POST['id'],$_POST['name'],$_POST['kind'],$_POST['usekitchen'],$_POST['usesupply'],$_POST['printer'],$_POST['fixbind']);
} else if ($command == 'delType') { } else if ($command == 'delType') {
$this->delType($_POST['id']); $this->delType($_POST['id']);
} else if ($command == 'getPriceLevelInfo') { } else if ($command == 'getPriceLevelInfo') {
@ -455,15 +455,11 @@ class Products {
* ["id" => 2, "name" => "Drinks"], ... * ["id" => 2, "name" => "Drinks"], ...
*/ */
private function getProdTypesWithReferenz($pdo,$ref) { private function getProdTypesWithReferenz($pdo,$ref) {
$sql = "SELECT id,name,kind,usekitchen,usesupplydesk,printer,'t' as type,sorting from %prodtype% where removed is null AND reference is null ORDER BY sorting"; $sql = "SELECT id,name,kind,usekitchen,usesupplydesk,printer,'t' as type,fixbind,sorting from %prodtype% where removed is null AND reference is null ORDER BY sorting";
if ($ref > 0) { if ($ref > 0) {
$sql = "SELECT id,name,kind,usekitchen,usesupplydesk,printer,'t' as type,sorting from %prodtype% where removed is null AND reference=$ref ORDER BY sorting"; $sql = "SELECT id,name,kind,usekitchen,usesupplydesk,printer,'t' as type,fixbind,sorting from %prodtype% where removed is null AND reference=$ref ORDER BY sorting";
} }
$types = CommonUtils::fetchSqlAll($pdo, $sql, null);
$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql));
$stmt->execute();
$types = $stmt->fetchAll();
return $types; return $types;
} }
@ -483,10 +479,10 @@ class Products {
} }
private function getMenu($ref,$pdo) { private function getMenu($ref,$pdo) {
if (is_null($pdo)) { if (is_null($pdo)) {
$pdo = $this->dbutils->openDbAndReturnPdo(); $pdo = DbUtils::openDbAndReturnPdoStatic();
} }
if (!is_null($ref) && ($ref>0)) { if (!is_null($ref) && ($ref>0)) {
$sql = "SELECT id,name,kind,usekitchen,usesupplydesk,printer,'t' as type from %prodtype% where removed is null AND id=?"; $sql = "SELECT id,name,kind,usekitchen,usesupplydesk,printer,'t' as type,fixbind from %prodtype% where removed is null AND id=?";
$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql)); $stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql));
$stmt->execute(array($ref)); $stmt->execute(array($ref));
$currentProdType =$stmt->fetchObject(); $currentProdType =$stmt->fetchObject();
@ -495,11 +491,11 @@ class Products {
} }
if (!is_null($ref) && ($ref>0)) { if (!is_null($ref) && ($ref>0)) {
$sql = "SELECT id,name,kind,usekitchen,usesupplydesk,printer,'t' as type from %prodtype% where removed is null AND reference=?"; $sql = "SELECT id,name,kind,usekitchen,usesupplydesk,printer,'t' as type,fixbind from %prodtype% where removed is null AND reference=?";
$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql)); $stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql));
$stmt->execute(array($ref)); $stmt->execute(array($ref));
} else { } else {
$sql = "SELECT id,name,kind,usekitchen,usesupplydesk,printer,'t' as type from %prodtype% where removed is null AND reference is null"; $sql = "SELECT id,name,kind,usekitchen,usesupplydesk,printer,'t' as type,fixbind from %prodtype% where removed is null AND reference is null";
$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql)); $stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql));
$stmt->execute(); $stmt->execute();
} }
@ -672,7 +668,7 @@ class Products {
function getSingleTypeData($id) { function getSingleTypeData($id) {
if (is_numeric($id)) { if (is_numeric($id)) {
$pdo = $this->dbutils->openDbAndReturnPdo(); $pdo = $this->dbutils->openDbAndReturnPdo();
$sql = "SELECT id,name,usekitchen,usesupplydesk,kind,reference FROM %prodtype% WHERE removed is NULL AND id=?"; $sql = "SELECT id,name,usekitchen,usesupplydesk,kind,reference,printer,fixbind FROM %prodtype% WHERE removed is NULL AND id=?";
$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql)); $stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql));
$stmt->execute(array($id)); $stmt->execute(array($id));
$affectedRows = $stmt->rowCount(); $affectedRows = $stmt->rowCount();
@ -1511,8 +1507,8 @@ class Products {
if (isset($_POST["kind"])) { if (isset($_POST["kind"])) {
$kind = $_POST["kind"]; $kind = $_POST["kind"];
} }
$sql = "INSERT INTO `%prodtype%` (`name`,`usekitchen`,`usesupplydesk`,`kind`,`printer`,`sorting`,`reference`) VALUES(?,1,1,?,1,?,?)"; $sql = "INSERT INTO `%prodtype%` (`name`,`usekitchen`,`usesupplydesk`,`kind`,`printer`,`fixbind`,`sorting`,`reference`) VALUES(?,1,1,?,1,?,?,?)";
CommonUtils::execSql($pdo, $sql, array($prodTypeName,$kind,$nextSort,null)); CommonUtils::execSql($pdo, $sql, array($prodTypeName,$kind,0,$nextSort,null));
$pdo->commit(); $pdo->commit();
echo json_encode(array("status" => "OK")); echo json_encode(array("status" => "OK"));
return; return;
@ -1535,8 +1531,8 @@ class Products {
} }
$kind = $row->kind; $kind = $row->kind;
$sql = "INSERT INTO `%prodtype%` (`name`,`usekitchen`,`usesupplydesk`,`kind`,`printer`,`sorting`,`reference`) VALUES(?,?,?,?,?,?,?)"; $sql = "INSERT INTO `%prodtype%` (`name`,`usekitchen`,`usesupplydesk`,`kind`,`printer`,`fixbind`,`sorting`,`reference`) VALUES(?,?,?,?,?,?,?,?)";
CommonUtils::execSql($pdo, $sql, array($prodTypeName,1,1,$kind,1,$nextSort,$id)); CommonUtils::execSql($pdo, $sql, array($prodTypeName,1,1,$kind,1,0,$nextSort,$id));
$pdo->commit(); $pdo->commit();
echo json_encode(array("status" => "OK")); echo json_encode(array("status" => "OK"));
@ -1570,14 +1566,13 @@ class Products {
/* /*
* Change the properties of a type of products * Change the properties of a type of products
*/ */
function applyType($id,$name,$kind,$usekitchen,$usesupply,$printer) { function applyType($id,$name,$kind,$usekitchen,$usesupply,$printer,$fixbind) {
if (!is_numeric($id) || !is_numeric($kind) || !is_numeric($usekitchen) || !is_numeric($usesupply) || !is_numeric($printer)) { if (!is_numeric($id) || !is_numeric($kind) || !is_numeric($usekitchen) || !is_numeric($usesupply) || !is_numeric($printer) || !is_numeric($fixbind)) {
return; return;
} }
$pdo = $this->dbutils->openDbAndReturnPdo(); $pdo = DbUtils::openDbAndReturnPdoStatic();
$updateSql = "UPDATE %prodtype% SET kind=?, name=?, usekitchen=?, usesupplydesk=?, printer=? WHERE id=?"; $updateSql = "UPDATE %prodtype% SET kind=?, name=?, usekitchen=?, usesupplydesk=?, printer=?, fixbind=? WHERE id=?";
$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($updateSql)); CommonUtils::execSql($pdo, $updateSql, array($kind,$name,$usekitchen,$usesupply,$printer,$fixbind,$id));
$stmt->execute(array($kind,$name,$usekitchen,$usesupply,$printer,$id));
echo json_encode("OK: $updateSql"); echo json_encode("OK: $updateSql");
} }
@ -1683,8 +1678,13 @@ class Products {
$usekitchen = ($aProdType['usekitchen'] == 1 ? "K" : ""); $usekitchen = ($aProdType['usekitchen'] == 1 ? "K" : "");
$usesupplydesk = ($aProdType['usesupplydesk'] == 1 ? "B" : ""); $usesupplydesk = ($aProdType['usesupplydesk'] == 1 ? "B" : "");
$printer = ($aProdType['printer']); $printer = ($aProdType['printer']);
$fixbind = ($aProdType['fixbind']);
$fixBindTxt = "RD";
if ($fixbind == 1) {
$fixBindTxt = "KD";
}
$text .= $indent . $prodTypeName . " = $usekitchen$usesupplydesk$kind = $printer\n"; $text .= $indent . $prodTypeName . " = $usekitchen$usesupplydesk$kind = $printer = $fixBindTxt\n";
$text .= $this->readDbProductsWithRef_json_version($pdo,$typeRef,$depth+1); $text .= $this->readDbProductsWithRef_json_version($pdo,$typeRef,$depth+1);
} }

50
webapp/php/queuecontent.php
View File

@ -403,29 +403,32 @@ class QueueContent {
$groupworkitems = 1; $groupworkitems = 1;
} }
$sql = "SELECT %queue%.id as id,%queue%.tablenr as tableid, %queue%.productid,%queue%.productname as longname,%queue%.price as price,%queue%.togo as togo,anoption,%prodtype%.kind as kind,%prodtype%.printer as printer FROM %queue%,%products%,%prodtype% WHERE %prodtype%.kind=? AND %queue%.id IN ($queueStr) AND productid=%products%.id AND %products%.category=%prodtype%.id ORDER BY longname"; $sql = "SELECT %queue%.id as id,%queue%.tablenr as tableid, %queue%.productid,%queue%.productname as longname,%queue%.price as price,%queue%.togo as togo,anoption,%prodtype%.kind as kind,%prodtype%.printer as printer,fixbind FROM %queue%,%products%,%prodtype% WHERE %prodtype%.kind=? AND %queue%.id IN ($queueStr) AND productid=%products%.id AND %products%.category=%prodtype%.id ORDER BY longname";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $queueItems = CommonUtils::fetchSqlAll($pdo, $sql, array($kind));
$stmt->execute(array($kind));
$queueItems = $stmt->fetchAll();
$jobs = array(); $jobs = array();
foreach($queueItems as $aQueueItem) { foreach($queueItems as $aQueueItem) {
$thePrinter = $aQueueItem["printer"]; $thePrinter = $aQueueItem["printer"];
$fixbind = $aQueueItem["fixbind"];
$queueid = $aQueueItem["id"]; $queueid = $aQueueItem["id"];
$tableid = $aQueueItem["tableid"]; $tableid = $aQueueItem["tableid"];
if (!is_null($tableid) && ($tableid != 0)) { if ($fixbind == 0) {
$sql = "SELECT DISTINCT %room%.printer as printer FROM %queue%,%resttables%,%room% WHERE %resttables%.id=? AND %resttables%.roomid=%room%.id LIMIT 1"; if (!is_null($tableid) && ($tableid != 0)) {
$row = CommonUtils::getRowSqlObject($pdo, $sql, array($tableid)); $sql = "SELECT printer FROM %resttables% T,%room% R WHERE T.id=? AND T.roomid=R.id";
$roomPrinter = $row->printer; $r = CommonUtils::fetchSqlAll($pdo, $sql, array($tableid));
if (!is_null($roomPrinter)) { if (count($r) > 0) {
$thePrinter = $roomPrinter; $roomPrinter = $r[0]["printer"];
} if (!is_null($roomPrinter)) {
} else { $thePrinter = $roomPrinter;
$roomPrinter = CommonUtils::getConfigValue($pdo, "togoworkprinter", 0); }
if ($roomPrinter != 0) { }
$thePrinter = $roomPrinter; } else {
$roomPrinter = CommonUtils::getConfigValue($pdo, "togoworkprinter", 0);
if ($roomPrinter != 0) {
$thePrinter = $roomPrinter;
}
} }
} }
@ -445,7 +448,7 @@ class QueueContent {
"printer" => $aQueueItem["printer"], "printer" => $aQueueItem["printer"],
"extras" => $extras "extras" => $extras
); );
if ($groupworkitems) { if ($groupworkitems == 1) {
$this->grouping($jobs, $theEntry); $this->grouping($jobs, $theEntry);
} else { } else {
$jobs[] = $theEntry; $jobs[] = $theEntry;
@ -454,11 +457,12 @@ class QueueContent {
} }
if ($groupworkitems == 1) { if ($groupworkitems == 1) {
$jobidsOfThisJob = array();
foreach($jobs as &$aJob) { foreach($jobs as &$aJob) {
$aJob["singleprod"] = $aJob["longname"]; $aJob["singleprod"] = $aJob["longname"];
$cnt = $aJob["count"]; $cnt = $aJob["count"];
$aJob["longname"] = $cnt . "x " . $aJob["longname"]; $aJob["longname"] = $cnt . "x " . $aJob["longname"];
$aJob["allqueueids"] = $queueIds; $aJob["allqueueids"] = $aJob["queueids"];
} }
} }
@ -473,6 +477,7 @@ class QueueContent {
if (($anEntry["longname"] == $entry["longname"]) && ($anEntry["price"] == $entry["price"]) && ($anEntry["togo"] == $entry["togo"]) && ($anEntry["anoption"] == $entry["anoption"]) && (join(",",$anEntry["extras"]) == $extrasTxt)) { if (($anEntry["longname"] == $entry["longname"]) && ($anEntry["price"] == $entry["price"]) && ($anEntry["togo"] == $entry["togo"]) && ($anEntry["anoption"] == $entry["anoption"]) && (join(",",$anEntry["extras"]) == $extrasTxt)) {
$found = true; $found = true;
$anEntry["count"] = $anEntry["count"] + 1; $anEntry["count"] = $anEntry["count"] + 1;
$anEntry["queueids"][] = $entry["id"];
} }
} }
if (!$found) { if (!$found) {
@ -486,7 +491,8 @@ class QueueContent {
"togo" => $entry["togo"], "togo" => $entry["togo"],
"kind" => $entry["kind"], "kind" => $entry["kind"],
"extras" => $entry["extras"], "extras" => $entry["extras"],
"count" => 1 "count" => 1,
"queueids" => array($entry["id"])
); );
} }
} }
@ -542,14 +548,22 @@ class QueueContent {
$foodJobsPrinter1 = $this->getJobsToPrint($pdo, 0, 1, $insertedQueueIds); $foodJobsPrinter1 = $this->getJobsToPrint($pdo, 0, 1, $insertedQueueIds);
$foodJobsPrinter2 = $this->getJobsToPrint($pdo, 0, 2, $insertedQueueIds); $foodJobsPrinter2 = $this->getJobsToPrint($pdo, 0, 2, $insertedQueueIds);
$foodJobsPrinter3 = $this->getJobsToPrint($pdo, 0, 3, $insertedQueueIds);
$foodJobsPrinter4 = $this->getJobsToPrint($pdo, 0, 4, $insertedQueueIds);
$drinkJobsPrinter1 = $this->getJobsToPrint($pdo, 1, 1, $insertedQueueIds); $drinkJobsPrinter1 = $this->getJobsToPrint($pdo, 1, 1, $insertedQueueIds);
$drinkJobsPrinter2 = $this->getJobsToPrint($pdo, 1, 2, $insertedQueueIds); $drinkJobsPrinter2 = $this->getJobsToPrint($pdo, 1, 2, $insertedQueueIds);
$drinkJobsPrinter3 = $this->getJobsToPrint($pdo, 1, 3, $insertedQueueIds);
$drinkJobsPrinter4 = $this->getJobsToPrint($pdo, 1, 4, $insertedQueueIds);
if ($payPrintType == "s") { if ($payPrintType == "s") {
$this->createAWorkReceiptAndQueueWorkPrint($pdo,$foodJobsPrinter1,$theTableid,0,1,$username,$lang); $this->createAWorkReceiptAndQueueWorkPrint($pdo,$foodJobsPrinter1,$theTableid,0,1,$username,$lang);
$this->createAWorkReceiptAndQueueWorkPrint($pdo,$foodJobsPrinter2,$theTableid,0,2,$username,$lang); $this->createAWorkReceiptAndQueueWorkPrint($pdo,$foodJobsPrinter2,$theTableid,0,2,$username,$lang);
$this->createAWorkReceiptAndQueueWorkPrint($pdo,$foodJobsPrinter3,$theTableid,0,3,$username,$lang);
$this->createAWorkReceiptAndQueueWorkPrint($pdo,$foodJobsPrinter4,$theTableid,0,4,$username,$lang);
$this->createAWorkReceiptAndQueueWorkPrint($pdo,$drinkJobsPrinter1,$theTableid,1,1,$username,$lang); $this->createAWorkReceiptAndQueueWorkPrint($pdo,$drinkJobsPrinter1,$theTableid,1,1,$username,$lang);
$this->createAWorkReceiptAndQueueWorkPrint($pdo,$drinkJobsPrinter2,$theTableid,1,2,$username,$lang); $this->createAWorkReceiptAndQueueWorkPrint($pdo,$drinkJobsPrinter2,$theTableid,1,2,$username,$lang);
$this->createAWorkReceiptAndQueueWorkPrint($pdo,$drinkJobsPrinter3,$theTableid,1,3,$username,$lang);
$this->createAWorkReceiptAndQueueWorkPrint($pdo,$drinkJobsPrinter4,$theTableid,1,4,$username,$lang);
} }
if ($declareReadyDelivered) { if ($declareReadyDelivered) {
$printAndQueueJobs = CommonUtils::getConfigValue($pdo, "printandqueuejobs", 0); $printAndQueueJobs = CommonUtils::getConfigValue($pdo, "printandqueuejobs", 0);

43
webapp/php/utilities/TypeAndProducts/LineItem.php
View File

@ -26,6 +26,7 @@ class LineItem {
private $usesupplydesk = -1; // default (not set) private $usesupplydesk = -1; // default (not set)
private $kind = KIND_UNDEFINED; // default private $kind = KIND_UNDEFINED; // default
private $printer = 1; private $printer = 1;
private $fixbind = 0;
/* /*
* Constructor * Constructor
@ -38,10 +39,11 @@ class LineItem {
$this->type = ENTRY_TYPE; $this->type = ENTRY_TYPE;
} else { } else {
$this->type = ENTRY_PRODUCT; $this->type = ENTRY_PRODUCT;
return;
} }
// this is only of interest for categories // this is only of interest for categories
// for products this content will be nonsens, but who cares... // for products this content will be nonsens, but who cares...
$parts = explode ("=",$aName,3); $parts = explode ("=",$aName,4);
if (count($parts) > 1) { if (count($parts) > 1) {
$this->name = $parts[0]; $this->name = $parts[0];
$theUsePart = $parts[1]; $theUsePart = $parts[1];
@ -67,18 +69,36 @@ class LineItem {
if (count($parts) > 2) { if (count($parts) > 2) {
try { try {
$this->printer = intval($parts[2]); $this->printer = intval($parts[2]);
if (($this->printer < 1) || ($this->printer > 2)) { // REM* 1..4 is allowed for work printers
if (($this->printer < 1) || ($this->printer > 4)) {
$this->printer = 1; $this->printer = 1;
} }
} catch (Exception $e) { } catch (Exception $e) {
$this->printer = 1; $this->printer = 1;
} }
} }
$this->fixbind = 0;
if (count($parts) > 3) {
$p = strtolower($parts[3]);
try {
if (stristr($p, 'rd') !== FALSE) {
$this->fixbind = 0;
} else if (stristr($p, 'kd') !== FALSE) {
$this->fixbind = 1;
}
} catch (Exception $ex) {
$this->fixbind = 0;
}
}
} }
function getPrinter() { function getPrinter() {
return $this->printer; return $this->printer;
} }
function getFixBind() {
return $this->fixbind;
}
function getId() { function getId() {
return $this->id; return $this->id;
@ -111,6 +131,9 @@ class LineItem {
function setPrinter($aPrinter) { function setPrinter($aPrinter) {
$this->printer = $aPrinter; $this->printer = $aPrinter;
} }
function setFixBind($fixbindval) {
$this->fixbind = $fixbindval;
}
function setDepth($aDepth) { function setDepth($aDepth) {
$this->depth = $aDepth; $this->depth = $aDepth;
} }
@ -138,12 +161,16 @@ class LineItem {
} }
private static function syntaxIsProductType($textline) { private static function syntaxIsProductType($textline) {
// REM* something like Speisen = KBF = 1 // REM* something like Speisen = KBF = 1 = RD
$pattern = '/^[.]=[KBkb]{0-2}[fFdD]{1}[ ]*=[ ]*[12]{1}/'; $pattern = '/^[^=]*[ ]*[=]{1,1}[ ]*';
$pattern = '/^[^=]*[ ]*[=]{1,1}[ ]*'; // REM* "KBF", "KD" usw
$pattern .= '[kbKB]{0,2}[fFdD]{1,1}[ ]*[=]{1,1}[ ]*'; $pattern .= '[kbKB]{0,2}[fFdD]{1,1}[ ]*';
$pattern .= '[12]{1,1}'; // REM* optional: " = 1 ", "=1" (allow up to 6 printers)
$pattern .= '$/'; $pattern .= '([=]{1,1}[ ]*[1-6]{1,1}){0,1}';
// REM* optional: " = RD", " = kd "
$pattern .= '[ ]*([=]{1,1}[ ]*[rRkK]{1,1}[dD]{1,1}){0,1}[ ]*';
$pattern .= '$/';
$treffer = ''; $treffer = '';
if (preg_match($pattern,$textline,$treffer)) { if (preg_match($pattern,$textline,$treffer)) {
return true; return true;

20
webapp/php/utilities/TypeAndProducts/TypeAndProductFileManager.php
View File

@ -213,7 +213,7 @@ class TypeAndProductFileManager {
* *
* This method sets the references, so that it has no return value. * This method sets the references, so that it has no return value.
*/ */
private function findAllSubItemsOfIndex($index,$useKitchen,$useSupplyDesk,$kind,$usePrinter) { private function findAllSubItemsOfIndex($index,$useKitchen,$useSupplyDesk,$kind,$usePrinter,$fixbind) {
$currentEntry = $this->entries->get($index); $currentEntry = $this->entries->get($index);
$currentId = $currentEntry->getId(); // maybe currentId = $index enough? $currentId = $currentEntry->getId(); // maybe currentId = $index enough?
$currentDepth = $currentEntry->getDepth(); $currentDepth = $currentEntry->getDepth();
@ -227,6 +227,7 @@ class TypeAndProductFileManager {
$useSupplyOfEntry = $currentEntry->getUseSupplyDesk(); $useSupplyOfEntry = $currentEntry->getUseSupplyDesk();
$kindOfEntry = $currentEntry->getKind(); $kindOfEntry = $currentEntry->getKind();
$printer = $currentEntry->getPrinter(); $printer = $currentEntry->getPrinter();
$fixbindOfEntry = $currentEntry->getFixBind();
if ($useKitOfEntry < 0) { if ($useKitOfEntry < 0) {
$this->entries->get($index)->setUseKitchen($useKitchen); $this->entries->get($index)->setUseKitchen($useKitchen);
@ -252,6 +253,11 @@ class TypeAndProductFileManager {
$usePrinter = 1; $usePrinter = 1;
} }
} }
if ($fixbindOfEntry < 0) {
$this->entries->get($index)->setFixBind($fixbind);
} else {
$fixbind = $fixbindOfEntry;
}
} }
// now look at all the subsequent items after this item // now look at all the subsequent items after this item
@ -263,7 +269,7 @@ class TypeAndProductFileManager {
if ($nextDepth == ($currentDepth + 1)) { if ($nextDepth == ($currentDepth + 1)) {
// directly under currentDepth // directly under currentDepth
$nextEntry->setReference($currentId); $nextEntry->setReference($currentId);
$this->findAllSubItemsOfIndex($nextIndex,$useKitchen,$useSupplyDesk,$kind,$usePrinter); // recursive! $this->findAllSubItemsOfIndex($nextIndex,$useKitchen,$useSupplyDesk,$kind,$usePrinter,$fixbind); // recursive!
} else if ($nextDepth <= $currentDepth) { } else if ($nextDepth <= $currentDepth) {
// same depth level or higher - is no sub-element // same depth level or higher - is no sub-element
break; break;
@ -301,6 +307,7 @@ class TypeAndProductFileManager {
$usekitchen = 1; // default $usekitchen = 1; // default
$usesupplydesk = 1; // default $usesupplydesk = 1; // default
$printer = 1; // default $printer = 1; // default
$fixbind = 0; // default: Raumdrucker
$theEntry = $this->entries->get($i); $theEntry = $this->entries->get($i);
$parts = explode(';', $theEntry->getName(), 2); $parts = explode(';', $theEntry->getName(), 2);
@ -310,18 +317,19 @@ class TypeAndProductFileManager {
$usesupplydesk = $theEntry->getUseSupplyDesk(); $usesupplydesk = $theEntry->getUseSupplyDesk();
$kind = $theEntry->getKind(); $kind = $theEntry->getKind();
$printer = $theEntry->getPrinter(); $printer = $theEntry->getPrinter();
$fixbind = $theEntry->getFixBind();
$theProdTypeName = trim($theNameEntry); $theProdTypeName = trim($theNameEntry);
$theRefId = $theEntry->getReference(); $theRefId = $theEntry->getReference();
$id = $theEntry->getId(); $id = $theEntry->getId();
$insertSql = "INSERT INTO `%prodtype%` (`id`, `name`, `reference`, `usekitchen`, `usesupplydesk`, `kind`,`printer`) VALUES (?,?,?,?,?,?,?)"; $insertSql = "INSERT INTO `%prodtype%` (`id`, `name`, `reference`, `usekitchen`, `usesupplydesk`, `kind`,`printer`,`fixbind`) VALUES (?,?,?,?,?,?,?,?)";
$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($insertSql)); $stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($insertSql));
try { try {
if ($theEntry->getDepth() > 0) { if ($theEntry->getDepth() > 0) {
$stmt->execute(array($id,$theProdTypeName,$theRefId,$usekitchen,$usesupplydesk,$kind,$printer)); $stmt->execute(array($id,$theProdTypeName,$theRefId,$usekitchen,$usesupplydesk,$kind,$printer,$fixbind));
} else { } else {
$stmt->execute(array($id,$theProdTypeName,null,$usekitchen,$usesupplydesk,$kind,$printer)); $stmt->execute(array($id,$theProdTypeName,null,$usekitchen,$usesupplydesk,$kind,$printer,$fixbind));
} }
} catch (Exception $e) { } catch (Exception $e) {
return array("status" => "ERROR","code" => PARSE_ERROR,"msg" => PARSE_ERROR_MSG,"line" => $theProdTypeName); return array("status" => "ERROR","code" => PARSE_ERROR,"msg" => PARSE_ERROR_MSG,"line" => $theProdTypeName);
@ -501,7 +509,7 @@ class TypeAndProductFileManager {
if ($anEntry->getDepth() == 0) { if ($anEntry->getDepth() == 0) {
// highest level // highest level
$this->findAllSubItemsOfIndex($i,1,1,FOOD,null); $this->findAllSubItemsOfIndex($i,1,1,FOOD,null,0);
} }
} }

19
webapp/php/utilities/version.php
View File

@ -1065,6 +1065,22 @@ class Version {
} }
} }
public static function upd_1512_1513($pdo, $prefix, $dbname) {
try {
self::execSql($pdo, "ALTER TABLE %prodtype% ADD fixbind INT(1) NULL AFTER printer");
self::execSql($pdo, "UPDATE %prodtype% SET fixbind='0'");
self::insertOrUpdateConfigItem($pdo, 'd3prinstance', '1');
self::insertOrUpdateConfigItem($pdo, 'd4prinstance', '1');
self::insertOrUpdateConfigItem($pdo, 'f3prinstance', '1');
self::insertOrUpdateConfigItem($pdo, 'f4prinstance', '1');
return array(true);
} catch (PDOException $e) {
return array(false,$e);
}
}
public static $updateOrder = array( public static $updateOrder = array(
"1.3.0" => array("upd_1300_1301","1.3.1"), "1.3.0" => array("upd_1300_1301","1.3.1"),
"1.3.1" => array("upd_1301_1302","1.3.2"), "1.3.1" => array("upd_1301_1302","1.3.2"),
@ -1124,7 +1140,8 @@ class Version {
"1.5.8" => array("upd_1508_1509","1.5.9"), "1.5.8" => array("upd_1508_1509","1.5.9"),
"1.5.9" => array("upd_1509_1510","1.5.10"), "1.5.9" => array("upd_1509_1510","1.5.10"),
"1.5.10" => array("upd_1510_1511","1.5.11"), "1.5.10" => array("upd_1510_1511","1.5.11"),
"1.5.11" => array("upd_1511_1512","1.5.12") "1.5.11" => array("upd_1511_1512","1.5.12"),
"1.5.12" => array("upd_1512_1513","1.5.13")
); );
// RE;* also for install process no check is required // RE;* also for install process no check is required

4
webapp/pickups.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,7 +13,7 @@
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.5.12"></script> <script src="utilities.js?v=1.5.13"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script> <script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>

2
webapp/preferences.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

32
webapp/products.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -73,6 +73,11 @@ var PROD_ASSIGN_EXTRAS_ALL = ["Extras allen Produkten dieser Kategorie zuweisen:
var PROD_PRINTER = ["Drucker","Printer","Imrpimadora"]; var PROD_PRINTER = ["Drucker","Printer","Imrpimadora"];
var PROD_PRINTER_1 = ["Drucker 1","Printer 1","Imprimadora 1"]; var PROD_PRINTER_1 = ["Drucker 1","Printer 1","Imprimadora 1"];
var PROD_PRINTER_2 = ["Drucker 2","Printer 2","Imprimadora 2"]; var PROD_PRINTER_2 = ["Drucker 2","Printer 2","Imprimadora 2"];
var PROD_PRINTER_3 = ["Drucker 3","Printer 3","Imprimadora 3"];
var PROD_PRINTER_4 = ["Drucker 4","Printer 4","Imprimadora 4"];
var PROD_PRINTER_PRIO = ["Druckerpriorität","Priority of printer","Prioridad de la impresora"];
var PROD_PRINTER_FIXB0 = ["Raumdrucker","Room printer","Impresora de la habitación"];
var PROD_PRINTER_FIXB1 = ["Kategoriedrucker","Category printer","Impresora de la categoría"];
var PROD_PLACEHOLDER_NEW_PRODTYPE = ["Name der neuen Kategorie", "Name of the new category","Nombre de la categoría nueva"]; var PROD_PLACEHOLDER_NEW_PRODTYPE = ["Name der neuen Kategorie", "Name of the new category","Nombre de la categoría nueva"];
var PROD_APPLIED = ["Aktion wurde durchgeführt.","Action was performed.","Acción completa."]; var PROD_APPLIED = ["Aktion wurde durchgeführt.","Action was performed.","Acción completa."];
var PROD_TYPEPROPS = ["Kategorieeigenschaften ein-/ausblenden","Show/hide properties of type","Mostrar o ocultar characterística de typo"]; var PROD_TYPEPROPS = ["Kategorieeigenschaften ein-/ausblenden","Show/hide properties of type","Mostrar o ocultar characterística de typo"];
@ -141,6 +146,7 @@ function setLanguage(language) {
$("#menulist").trigger("create"); $("#menulist").trigger("create");
cmdBinding(); cmdBinding();
getProdsForProdsImageArea(); getProdsForProdsImageArea();
bindExpandProdEntry();
} }
function getProdsForProdsImageArea() { function getProdsForProdsImageArea() {
@ -333,7 +339,7 @@ function setLanguage(language) {
$("#goupimg_0").show(); $("#goupimg_0").show();
p_currenttypeid = ct.id; p_currenttypeid = ct.id;
var prodtype = createProdType(ct.id,ct.name,ct.kind,ct.usekitchen,ct.usesupplydesk,ct.printer); var prodtype = createProdType(ct.id,ct.name,ct.kind,ct.usekitchen,ct.usesupplydesk,ct.printer,ct.fixbind);
prodtypes[prodtypes.length] = prodtype; prodtypes[prodtypes.length] = prodtype;
txt += prodtype.createUpperMenuTypeStructure(); txt += prodtype.createUpperMenuTypeStructure();
} else { } else {
@ -411,6 +417,22 @@ function setLanguage(language) {
return txt; return txt;
} }
function bindExpandProdEntry() {
$(".prodcollapsible").off("collapsibleexpand").on("collapsibleexpand", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
var id = (this.id.split("_"))[1];
for (var i=0;i<prodleafs.length;i++) {
var prod = prodleafs[i];
if (prod.id == id) {
prod.createProdContentStructure(audiofiles);
prodcancel(id);
cmdBinding();
}
}
});
}
function fillListTableWithContent() { function fillListTableWithContent() {
var i=0; var i=0;
for (i=0;i<prodtypes.length;i++) { for (i=0;i<prodtypes.length;i++) {
@ -824,6 +846,7 @@ function setLanguage(language) {
var useKit = $("#usekitchen_" + typeid + " option:selected").val(); var useKit = $("#usekitchen_" + typeid + " option:selected").val();
var useSupply = $("#usesupply_" + typeid + " option:selected").val(); var useSupply = $("#usesupply_" + typeid + " option:selected").val();
var printer = parseInt($("#printer_" + typeid + " option:selected").val()) + 1; var printer = parseInt($("#printer_" + typeid + " option:selected").val()) + 1;
var fixbind = parseInt($("#fixbind_" + typeid + " option:selected").val());
var data = { var data = {
id: typeid, id: typeid,
@ -831,7 +854,8 @@ function setLanguage(language) {
kind: kind, kind: kind,
usekitchen: useKit, usekitchen: useKit,
usesupply: useSupply, usesupply: useSupply,
printer: printer printer: printer,
fixbind: fixbind
}; };
doAjax("POST","php/contenthandler.php?module=products&command=applyType",data,null,"Fehler Kategorieänderung"); doAjax("POST","php/contenthandler.php?module=products&command=applyType",data,null,"Fehler Kategorieänderung");
} }
@ -847,7 +871,7 @@ function setLanguage(language) {
function handleTypeCancelAnswer(answer) { function handleTypeCancelAnswer(answer) {
if (answer.status == "OK") { if (answer.status == "OK") {
var theType = answer.msg; var theType = answer.msg;
var prodtype = createProdType(theType.id,theType.name,theType.kind,theType.usekitchen,theType.usesupplydesk); var prodtype = createProdType(theType.id,theType.name,theType.kind,theType.usekitchen,theType.usesupplydesk,theType.printer,theType.fixbind);
prodtype.insertValuesIntoMenuList(); prodtype.insertValuesIntoMenuList();
$("#menulist").trigger("create"); $("#menulist").trigger("create");
} else { } else {

2
webapp/rating.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

2
webapp/reports.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

2
webapp/reservation.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

2
webapp/supplydesk.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

4
webapp/tasks.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,7 +13,7 @@
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.5.12"></script> <script src="utilities.js?v=1.5.13"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script> <script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>

2
webapp/timetracking.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

4
webapp/waiter.html
View File

@ -4,8 +4,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.13">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.12"> <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.13">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />