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

OrderSprinter 1.5.10

This commit is contained in:
Geno 2020-11-19 23:11:57 +01:00
parent 5797c2c2b4
commit 42de3120a4
33 changed files with 153 additions and 160 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 name="author" content="Stefan Pichel">
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.9" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.9" />
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.10" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.10" />
<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" />
<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 class="ui-grid-a">
<div class="ui-block-a">&nbsp;&nbsp;OrderSprinter</div>
<div class="ui-block-b grid_right" id="versioninfo">1.5.9&nbsp;&nbsp;</div>
<div class="ui-block-b grid_right" id="versioninfo">1.5.10&nbsp;&nbsp;</div>
</div><!-- /grid-a -->
</div>
</div>

4
gastsystem/install.php
View File

@ -90,10 +90,10 @@ if (isset($_POST['code'])) {
} else {
echo "<html>";
echo "<head><title>Installation Gastsystem</title>";
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.9">';
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.10">';
echo "</head>";
echo "<body><div class=surround>";
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.9</span><br><br>";
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.10</span><br><br>";
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 "</form></div></html>";

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::createEmptyTables($pdo, $prefix);
Database::setVersion($pdo,$prefix,"1.5.9");
Database::setVersion($pdo,$prefix,"1.5.10");
Database::setAccessPassword($pdo,$prefix,$adminpass);
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
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 name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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" />
<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="utilities.js?v=1.5.9"></script>
<script src="kitchenbar.js?v=1.5.9"></script>
<script src="utilities.js?v=1.5.10"></script>
<script src="kitchenbar.js?v=1.5.10"></script>
<style>
#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 name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

44
webapp/elements/groundplan.js
View File

@ -13,10 +13,12 @@ var MAN_SAMPLEROOMNAME = ["Raum","Room","Habitación"];
function Groundplan() {
this.rooms = [];
this.togoworkprinter = 0;
this.insertRoomFieldDataFromServer = function(roomfield_json) {
var roomfield = roomfield_json.roomfield;
this.togoworkprinter = roomfield_json.togoworkprinter;
this.rooms = [];
for (var room_index = 0; room_index < roomfield.length; room_index++) {
var aRoom = roomfield[room_index];
@ -123,8 +125,13 @@ function Groundplan() {
instance.rooms.forEach(function(aRoom,i) {
roomdata[roomdata.length] = aRoom.exportObject();
});
// togoreceipt_printer
var selectedtogoworkprinter = $("#togoreceipt_printer").val();
var d = JSON.stringify(roomdata);
var data = { rooms:d};
var data = { rooms:d, togoworkprinter:selectedtogoworkprinter};
doAjax("POST","php/contenthandler.php?module=roomtables&command=setRoomInfo",data,instance.responseFromServer.bind(instance),"Raumplan nicht änderbar",true);
});
@ -138,12 +145,29 @@ function Groundplan() {
this.bindRoomChanges();
};
this.getTogoEntry = function() {
var txt = '<div data-role="collapsible" data-content-theme="f" data-collapsed="true" data-theme="e" >';
txt += '<h2>' + MAN_TOGO[lang]+ '</h2>';
txt += '<p>' + MAN_ROOM_PRINTER_TXT[lang] + ": ";
var printerOptions = [
{ name: MAN_ROOM_PRINTER_NO[lang], value: 0},
{ name: MAN_ROOM_PRINTER_1[lang], value: 1},
{ name: MAN_ROOM_PRINTER_2[lang], value: 2}
];
txt += createGenericSelectBox("togoreceipt_printer",printerOptions,this.togoworkprinter,"togoworkreceiptprinter","c");
txt += '</div>';
return txt;
}
this.render = function() {
var txt = "<form>";
for (var i=0;i<this.rooms.length;i++) {
var aRoom = this.rooms[i];
txt += "<p>" + aRoom.render();
};
txt += this.getTogoEntry();
txt += this.renderCancelApplyBtn();
txt += "</form>";
@ -339,7 +363,7 @@ function Room(jsonRoom) {
{ name: MAN_ROOM_PRINTER_1[lang], value: 1},
{ name: MAN_ROOM_PRINTER_2[lang], value: 2}
];
txt += "<td>" + createGenericSelectBox(htmlId + "_printer",printerOptions,this.printer,"roomvalue_" + this.roomid + "_printer");
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;color:red;'><img id='" + htmlId + "_delete' class='roomvalue_" + this.roomid + "_delete' src='img/delete.png' />";
@ -569,10 +593,10 @@ function Resttable(json,roomid,theClassname) {
var txt = "";
txt += "<tr><td>" + createGenericInputField(htmlId + "_tablename",this.tablename,"tablevalue_" + roomid);
txt += "<td>" + createGenericInputField(htmlId + "_name",this.name,"tablevalue_" + roomid);
txt += "<td>" + createGenericSelectBox(htmlId + "_active",[{name: "Ja",value: 1},{name: "Nein", value: 0}],this.active,"tablevalue_" + roomid);
txt += "<td>" + createGenericSelectBox(htmlId + "_area",this.createAreaValueArr(),this.area,"tablevalue_" + roomid);
txt += "<td>" + createGenericSelectBox(htmlId + "_active",[{name: "Ja",value: 1},{name: "Nein", value: 0}],this.active,"tablevalue_" + roomid,"f");
txt += "<td>" + createGenericSelectBox(htmlId + "_area",this.createAreaValueArr(),this.area,"tablevalue_" + roomid,"f");
txt += "<td>" + createGenericInputField(htmlId + "_code",this.code,"tablevalue_" + roomid);
txt += "<td>" + createGenericSelectBox(htmlId + "_allowoutorder",[{name: "Ja",value: 1},{name: "Nein", value: 0}],this.allowoutorder,"tablevalue_" + roomid);
txt += "<td>" + createGenericSelectBox(htmlId + "_allowoutorder",[{name: "Ja",value: 1},{name: "Nein", value: 0}],this.allowoutorder,"tablevalue_" + roomid,"f");
txt += "<td style='text-align:center;'><img id='" + htmlId + "_up' class='" + this.classname + "_up' src='img/higher.png' />";
txt += "<td style='text-align:center;color:red;'><img id='" + htmlId + "_delete' class='" + this.classname + "_delete' src='img/delete.png' />";
txt += "</tr>";
@ -598,10 +622,10 @@ function Resttable(json,roomid,theClassname) {
var txt = "<tr>";
txt += "<td>" + createGenericInputField("newtablename_" + id,"");
txt += "<td>" + createGenericInputField("newname_" + id,"");
txt += "<td>" + createGenericSelectBox("newactive_" + id,[{name: "Ja",value: 1},{name: "Nein", value: 0}],1);
txt += "<td>" + createGenericSelectBox("newarea_" + id,this.createAreaValueArr(),0);
txt += "<td>" + createGenericSelectBox("newactive_" + id,[{name: "Ja",value: 1},{name: "Nein", value: 0}],1,"","f");
txt += "<td>" + createGenericSelectBox("newarea_" + id,this.createAreaValueArr(),0,"","f");
txt += "<td>" + createGenericInputField("newcode_" + id,"");
txt += "<td>" + createGenericSelectBox("newallowoutorder_" + id,[{name: "Ja",value: 1},{name: "Nein", value: 0}],0);
txt += "<td>" + createGenericSelectBox("newallowoutorder_" + id,[{name: "Ja",value: 1},{name: "Nein", value: 0}],0,"","f");
txt += "<td>&nbsp;";
txt += "<td style='text-align:center;'><img class='createnewtable_" + id + "' src='img/add.png' style='height:50px;' />";
return txt;
@ -623,8 +647,8 @@ function Resttable(json,roomid,theClassname) {
}
function createGenericSelectBox(id,options,value,theclass) {
var txt = "<select id='" + id + "' class='" + theclass + "'>";
function createGenericSelectBox(id,options,value,theclass,datatheme) {
var txt = "<select id='" + id + "' class='" + theclass + "' data-theme='" + datatheme + "'>";
for (var i=0;i<options.length;i++) {
var anOption = options[i];
if (anOption.value == value) {

2
webapp/feedback.html
View File

@ -4,7 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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 name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.9">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.10">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.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") {
useInstallation();
} else {
setTimeout(function(){document.location.href = "install.html?v=1.5.9"},500);
setTimeout(function(){document.location.href = "install.html?v=1.5.10"},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>
<td>&nbsp;</td>
<td align=center>
<button id="updatebtn">Update -> 1.5.9</button>
<button id="updatebtn">Update -> 1.5.10</button>
<span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span>
</td>
<td>&nbsp;</td>

2
webapp/install/installer.php
View File

@ -414,7 +414,7 @@ $zones[] = $timezone_identifiers[$i];
echo json_encode($zones);
} else if ($command == 'update') {
set_time_limit(60*30);
$installerVersion = "1.5.9";
$installerVersion = "1.5.10";
$admin = new InstallAdmin();
$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 name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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" />
<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="utilities.js?v=1.5.9"></script>
<script src="kitchenbar.js?v=1.5.9"></script>
<script src="utilities.js?v=1.5.10"></script>
<script src="kitchenbar.js?v=1.5.10"></script>
<style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

70
webapp/manager.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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" />
<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="utilities.js?v=1.5.9"></script>
<script src="elements/tablemap.js?v=1.5.9"></script>
<script src="elements/roommap.js?v=1.5.9"></script>
<script src="elements/groundplan.js?v=1.5.9"></script>
<script src="utilities.js?v=1.5.10"></script>
<script src="elements/tablemap.js?v=1.5.10"></script>
<script src="elements/roommap.js?v=1.5.10"></script>
<script src="elements/groundplan.js?v=1.5.10"></script>
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
@ -1446,7 +1446,7 @@ function initRestoreFileUpload() {
} else {
alert("Import war erfolgreich.");
setTimeout(function(){
document.location.href = "index.html?v=1.5.9";
document.location.href = "index.html?v=1.5.10";
},250);
}
},
@ -2000,9 +2000,9 @@ function handleUpdateCheckResult(answer) {
var millis=getMillis();
setTimeout(function(){
document.location.href = "install.html?v=1.5.9&mode=onlyupdate&n=" + millis;
document.location.href = "install.html?v=1.5.10&mode=onlyupdate&n=" + millis;
},250);
document.location.href = "install.html?v=1.5.9&mode=onlyupdate&n=" + millis;
document.location.href = "install.html?v=1.5.10&mode=onlyupdate&n=" + millis;
}
function handleUpdateReplace(answer) {
@ -3162,60 +3162,6 @@ function fillDbStat(answer) {
$("#dbtablearea").html(txt);
}
function askForCurrentRoomField() {
doAjax("GET","php/contenthandler.php?module=roomtables&command=getRoomfield",null,initroomfield,"Raumplan",true);
}
function resizeRoomField() {
var n = $("#maxrooms_val").val();
var m = $("#maxtables_val").val();
try {
n = parseInt(n);
m = parseInt(m);
if ((n>0) && (n<30) && (m>0) && (m<30)) {
createEmptyRoomField(n,m);
} else {
alert("Größe außerhalb des zulässigen Bereichs");
}
} catch(e) {
alert ("Falsches Zahlenformat");
}
}
function createRoomPrinterSelection(roomid,selectedPrinter) {
var txt = '<select data-theme="e" name="roomprinter_' + roomid + '" id="roomprinter_' + roomid + '">';
if (selectedPrinter == 0) {
txt += '<option value=0 selected>' + MAN_ROOM_PRINTER_NO[lang] + '</option>';
txt += '<option value=1>' + MAN_ROOM_PRINTER_1[lang] + '</option>';
txt += '<option value=2>' + MAN_ROOM_PRINTER_2[lang] + '</option>';
} else if (selectedPrinter == 1) {
txt += '<option value=0>' + MAN_ROOM_PRINTER_NO[lang] + '</option>';
txt += '<option value=1 selected>' + MAN_ROOM_PRINTER_1[lang] + '</option>';
txt += '<option value=2>' + MAN_ROOM_PRINTER_2[lang] + '</option>';
} else {
txt += '<option value=0>' + MAN_ROOM_PRINTER_NO[lang] + '</option>';
txt += '<option value=1>' + MAN_ROOM_PRINTER_1[lang] + '</option>';
txt += '<option value=2 selected>' + MAN_ROOM_PRINTER_2[lang] + '</option>';
}
txt += '</select>';
return txt;
}
function createEmptyRoomField(n,m) {
var i=0;
var text = "<table>";
text += '<tr><th>' + MAN_ROOM_LABEL[lang] + '<th>' + MAN_ROOM_ABBR_TXT[lang] + '<th>' + MAN_ROOM_PRINTER_TXT[lang] + '<th colspan=' + m + '>' + MAN_TABLE_LABEL[lang] + '</tr>';
for (i=0;i<n;i++) {
text += '<tr><td><input style="background:white;" type="text" id="r_' + i.toString() + '"' + ' size="10" />';
text += '<td><input style="background:white;" type="text" id="rabbr_' + i.toString() + '"' + ' size="10" />';
text += '<td id=roomprintercol_' + i + '>' + createRoomPrinterSelection(i,0);
text += tablelist(m,i);
}
text += "</table>";
$("#roomfield").html(text);
$("#roomfield").trigger("create");
}
function golive() {
alert(MAN_GOLIVE_WAIT_HINT[lang]);
doAjax("POST","php/contenthandler.php?module=admin&command=golive",null,handleGoLive,"Produktivbetriebsstart");

2
webapp/paydesk.html
View File

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

47
webapp/php/admin.php
View File

@ -593,6 +593,11 @@ class Admin {
$_SESSION['right_tasksmanagement'] = false;
$_SESSION['keeptypelevel'] = false;
} else {
$extendedPickupPermission = false;
if (($zeile['right_pickups'] == 1) && ( ($zeile['right_kitchen'] == 1) || ($zeile['right_bar'] == 1))) {
$extendedPickupPermission = true;
}
$_SESSION['right_extendedpickup'] = $extendedPickupPermission;
$_SESSION['is_admin'] = ($zeile['is_admin'] == 1 ? true : false);
$_SESSION['right_waiter'] = ($zeile['right_waiter'] == 1 ? true : false);
if (($workflow == 2) || ($workflow == 3)) {
@ -1370,7 +1375,7 @@ class Admin {
$view = "preferences.html";
}
echo json_encode($view . "?v=1.5.9");
echo json_encode($view . "?v=1.5.10");
}
}
@ -1586,31 +1591,31 @@ class Admin {
if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.9"); }
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.10"); }
} else {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.9"); }
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.10"); }
}
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.9"); }
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.9"); }
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.9"); }
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.10"); }
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.10"); }
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.10"); }
if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.9"); }
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.10"); }
}
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.9"); }
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.9"); }
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.9"); }
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.9"); }
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.9"); }
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.9"); }
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.9"); }
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.9"); }
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.9"); }
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.9"); }
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.9");
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.9"); }
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.10"); }
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.10"); }
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.10"); }
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.10"); }
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.10"); }
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.10"); }
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.10"); }
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.10"); }
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.10"); }
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.10"); }
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.10");
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.10"); }
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.9");
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.9");
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.10");
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.10");
}
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");

2
webapp/php/customers.php
View File

@ -853,7 +853,7 @@ class Customers {
$txt = "<head>";
$txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>";
$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.9">';
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.10">';
$txt .= "</head>";
return $txt;
}

2
webapp/php/debug.php
View File

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

2
webapp/php/pickup.php
View File

@ -32,7 +32,7 @@ class Pickup {
if (!isset($_SESSION['angemeldet']) || !$_SESSION['angemeldet']) {
return false;
} else {
return ($_SESSION['right_pickups'] && ($_SESSION['right_kitchen'] || $_SESSION['right_bar']));
return $_SESSION['right_extendedpickup'];
}
}
private static function hasRightToRequestCompleteJobs() {

48
webapp/php/products.php
View File

@ -1309,32 +1309,30 @@ class Products {
private static function scaleImg($fn,$maxDim) {
list($width, $height, $type, $attr) = getimagesize($_FILES['imagefile']['tmp_name']);
if ($width > $maxDim || $height > $maxDim) {
$size = getimagesize($fn);
$ratio = $size[0] / $size[1]; // width/height
if ($ratio > 1) {
$width = $maxDim;
$height = $maxDim / $ratio;
} else {
$width = $maxDim * $ratio;
$height = $maxDim;
}
$src = imagecreatefromstring(file_get_contents($fn));
$dst = imagecreatetruecolor($width, $height);
imagealphablending($dst, false);
imagesavealpha($dst, true);
$transparent = imagecolorallocatealpha($dst, 255, 255, 255, 127);
imagefilledrectangle($dst, 0, 0, $width, $height, $transparent);
imagecopyresampled($dst, $src, 0, 0, 0, 0, $width, $height, $size[0], $size[1]);
imagedestroy($src);
ob_start();
imagepng($dst); // adjust format as needed
$imagedata = ob_get_contents();
ob_end_clean();
imagedestroy($dst);
return $imagedata;
$size = getimagesize($fn);
$ratio = $size[0] / $size[1]; // width/height
if ($ratio > 1) {
$width = $maxDim;
$height = $maxDim / $ratio;
} else {
$width = $maxDim * $ratio;
$height = $maxDim;
}
$src = imagecreatefromstring(file_get_contents($fn));
$dst = imagecreatetruecolor($width, $height);
imagealphablending($dst, false);
imagesavealpha($dst, true);
$transparent = imagecolorallocatealpha($dst, 255, 255, 255, 127);
imagefilledrectangle($dst, 0, 0, $width, $height, $transparent);
imagecopyresampled($dst, $src, 0, 0, 0, 0, $width, $height, $size[0], $size[1]);
imagedestroy($src);
ob_start();
imagepng($dst); // adjust format as needed
$imagedata = ob_get_contents();
ob_end_clean();
imagedestroy($dst);
return $imagedata;
}
private function deleteImageProdAssignment($prodid) {

5
webapp/php/queuecontent.php
View File

@ -422,6 +422,11 @@ class QueueContent {
if (!is_null($roomPrinter)) {
$thePrinter = $roomPrinter;
}
} else {
$roomPrinter = CommonUtils::getConfigValue($pdo, "togoworkprinter", 0);
if ($roomPrinter != 0) {
$thePrinter = $roomPrinter;
}
}
if ($thePrinter == $printer) {

15
webapp/php/roomtables.php
View File

@ -38,7 +38,7 @@ class Roomtables {
$this->getRoomfieldAlsoInactive();
} else if ($command == 'setRoomInfo') {
if ($this->hasCurrentUserAdminRights()) {
$this->setRoomInfo($_POST['rooms']);
$this->setRoomInfo($_POST['rooms'],$_POST['togoworkprinter']);
}
}
}
@ -310,7 +310,7 @@ class Roomtables {
}
function setRoomInfo($roomsAsJson) {
function setRoomInfo($roomsAsJson,$togoworkprinter) {
$rooms = json_decode($roomsAsJson, true);
$pdo = DbUtils::openDbAndReturnPdoStatic();
@ -387,6 +387,9 @@ class Roomtables {
CommonUtils::execSql($pdo, $sql, array($r["posid"]));
}
$hist = new HistFiller();
$hist->updateConfigInHist($pdo, "togoworkprinter", $togoworkprinter);
$pdo->commit();
} catch (Exception $ex) {
echo json_encode(array("status" => "ERROR","msg" => $ex->getMessage()));
@ -405,7 +408,7 @@ class Roomtables {
function getRoomfield($pdo = null) {
if (is_null($pdo)) {
$pdo = $this->dbutils->openDbAndReturnPdo();
$pdo = DbUtils::openDbAndReturnPdoStatic();
}
$this->getRoomfieldCore($pdo, false);
}
@ -446,8 +449,10 @@ class Roomtables {
}
$roomArr[] = array("roomid" => $roomid, "roomname" => $roomname, "abbreviation" => $abbreviation, "printer" => $printer, "sorting" => $roomsorting, "tables" => $tableArr, "noOfTables" => $numberOfTables);
}
echo json_encode(array("status" => "OK", "noOfRooms" => $numberOfRooms, "maxTables" => $maxTables, "roomfield" => $roomArr));
$togoworkprinter = CommonUtils::getConfigValue($pdo, "togoworkprinter", 0);
echo json_encode(array("status" => "OK", "noOfRooms" => $numberOfRooms, "maxTables" => $maxTables, "roomfield" => $roomArr, "togoworkprinter" => $togoworkprinter));
}
public static function getTablesForGuestsystem($pdo) {

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

@ -1033,6 +1033,15 @@ class Version {
}
}
public static function upd_1509_1510($pdo, $prefix, $dbname) {
try {
self::insertOrUpdateConfigItem($pdo, 'togoworkprinter', 0);
return array(true);
} catch (PDOException $e) {
return array(false,$e);
}
}
public static $updateOrder = array(
"1.3.0" => array("upd_1300_1301","1.3.1"),
"1.3.1" => array("upd_1301_1302","1.3.2"),
@ -1089,7 +1098,8 @@ class Version {
"1.5.5" => array("upd_1505_1506","1.5.6"),
"1.5.6" => array("upd_1506_1507","1.5.7"),
"1.5.7" => array("upd_1507_1508","1.5.8"),
"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")
);
// 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 http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.5.9"></script>
<script src="utilities.js?v=1.5.10"></script>
<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>

2
webapp/preferences.html
View File

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

2
webapp/products.html
View File

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

2
webapp/rating.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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 name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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 http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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 name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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 http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.5.9"></script>
<script src="utilities.js?v=1.5.10"></script>
<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>

2
webapp/timetracking.html
View File

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