OrderSprinter 1.6.2
This commit is contained in:
parent
14c0ebc7df
commit
023ea7dc39
|
|
@ -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.6.1" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.6.1" />
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=1.6.2" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.6.2" />
|
||||
<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>
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
<div data-role="footer" data-theme="b" id="thefooter1">
|
||||
<div class="ui-grid-a">
|
||||
<div class="ui-block-a"> OrderSprinter</div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">1.6.1 </div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">1.6.2 </div>
|
||||
</div><!-- /grid-a -->
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -114,10 +114,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.6.1">';
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.6.2">';
|
||||
echo "</head>";
|
||||
echo "<body><div class=surround>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.6.1</span><br><br>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.6.2</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>";
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -85,7 +85,7 @@ class Installer {
|
|||
}
|
||||
Database::dropTables($pdo);
|
||||
Database::createEmptyTables($pdo, $prefix);
|
||||
Database::setVersion($pdo,$prefix,"1.6.1");
|
||||
Database::setVersion($pdo,$prefix,"1.6.2");
|
||||
Database::setAccessPassword($pdo,$prefix,$adminpass);
|
||||
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
|
||||
return array("status" => "OK","msg" => "Installation successful");
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
|
||||
<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.6.1"></script>
|
||||
<script src="kitchenbar.js?v=1.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
<script src="kitchenbar.js?v=1.6.2"></script>
|
||||
<style>
|
||||
|
||||
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
|
||||
|
|
|
|||
|
|
@ -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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
<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-i18n.min.js"></script>
|
||||
<script src="utilities.js?v=1.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
<script src="receiptutils.js"></script>
|
||||
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
<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-i18n.min.js"></script>
|
||||
<script src="utilities.js?v=1.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
<script src="elements/customers.js"></script>
|
||||
</head>
|
||||
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
|
||||
<link rel="stylesheet" href="css/ospage.css" />
|
||||
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
<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.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
<script src="receiptutils.js"></script>
|
||||
<script src="elements/dash.js"></script>
|
||||
<script src="php/3rdparty/Chart.bundle.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ function Groundplan() {
|
|||
$("#createtableqrcodesbtn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=1.6.1",'_blank');
|
||||
window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=1.6.2",'_blank');
|
||||
});
|
||||
|
||||
this.bindRoomChanges();
|
||||
|
|
|
|||
|
|
@ -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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
<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.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
<script src="kitchenbar.js"></script>
|
||||
<style>
|
||||
|
||||
|
|
|
|||
|
|
@ -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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.2">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
<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.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.2">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
<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.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -231,7 +231,7 @@ function handleResultOfInstallCheck(is_installed) {
|
|||
if (is_installed == "Yes") {
|
||||
useInstallation();
|
||||
} else {
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.6.1"},500);
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.6.2"},500);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -285,11 +285,11 @@ $(document).on("pageinit", "#index-page", function () {
|
|||
|
||||
<div data-role="content">
|
||||
|
||||
<p><div id="toplogolocation" style="text-align: center;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.6.1&style=always" style="max-height:150px;"/></div>
|
||||
<p><div id="toplogolocation" style="text-align: center;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.6.2&style=always" style="max-height:150px;"/></div>
|
||||
<div data-role="collapsible" data-content-theme="c" data-collapsed="false" data-theme="e" id="loginmask">
|
||||
<H2>Anmelden</H2>
|
||||
|
||||
<p><div id="middlelogolocation" style="text-align: left;padding-left: 80px;padding-right:80px;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.6.1&style=always" style="max-height:150px;"/></div>
|
||||
<p><div id="middlelogolocation" style="text-align: left;padding-left: 80px;padding-right:80px;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.6.2&style=always" style="max-height:150px;"/></div>
|
||||
|
||||
<form method="post">
|
||||
<table border=0>
|
||||
|
|
|
|||
|
|
@ -202,17 +202,15 @@ function testdb() {
|
|||
pass:dbpass
|
||||
};
|
||||
|
||||
doAjaxSuppressError("POST",
|
||||
"install/installer.php?command=testDbConnection",
|
||||
data,answerOfTestDb,
|
||||
"Kommunikation zum Server fehlerhaft");
|
||||
doAjaxSuppressError("POST","install/installer.php?command=testDbConnection",data,answerOfTestDb,"Kommunikation zum Server fehlerhaft");
|
||||
|
||||
}
|
||||
|
||||
function getDbVals() {
|
||||
doAjax("GET",
|
||||
"install/installer.php?command=getConfig",
|
||||
null,fillDbVals,
|
||||
"Kommunikation zum Server fehlerhaft", true);
|
||||
"Kommunikation zum Server fehlerhaft", false);
|
||||
}
|
||||
|
||||
function fillDbVals(dbVals) {
|
||||
|
|
@ -639,6 +637,9 @@ $(document).ready(function() {
|
|||
$("#cancelcode").val("123");
|
||||
$("#restmodeselection").val(1);
|
||||
$("#defaultmodeselection").val(0);
|
||||
|
||||
doOnlyUpdate = checkDoOnlyUpdate();
|
||||
|
||||
setLanguage(0);
|
||||
binding();
|
||||
getDbVals();
|
||||
|
|
@ -646,8 +647,6 @@ $(document).ready(function() {
|
|||
|
||||
getTimeZones();
|
||||
|
||||
doOnlyUpdate = checkDoOnlyUpdate();
|
||||
|
||||
if (doOnlyUpdate) {
|
||||
$("#languagesettings").hide();
|
||||
$("#timezones").hide();
|
||||
|
|
@ -916,7 +915,7 @@ El servicio web OrderSprinter no requiere una conexión a Internet. Sin embargo,
|
|||
<tr id=updateline>
|
||||
<td> </td>
|
||||
<td align=center>
|
||||
<button id="updatebtn">Update -> 1.6.1</button>
|
||||
<button id="updatebtn">Update -> 1.6.2</button>
|
||||
<span id="updateinprogresstxt" style="display:none;"><img id="installprogressindicator" src="php/3rdparty/images/ajax-loader.gif" alt="Progress indication" style="display:none;"/> Update... bitte warten.</span>
|
||||
</td>
|
||||
<td> </td>
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@ return;
|
|||
}
|
||||
|
||||
set_time_limit(60*30);
|
||||
$installerVersion = "1.6.1";
|
||||
$installerVersion = "1.6.2";
|
||||
|
||||
$admin = new InstallAdmin();
|
||||
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
|
||||
|
|
|
|||
|
|
@ -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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
|
||||
<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.6.1"></script>
|
||||
<script src="kitchenbar.js?v=1.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
<script src="kitchenbar.js?v=1.6.2"></script>
|
||||
<style>
|
||||
|
||||
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
|
||||
|
|
|
|||
|
|
@ -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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
|
||||
<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.6.1"></script>
|
||||
<script src="elements/tablemap.js?v=1.6.1"></script>
|
||||
<script src="elements/roommap.js?v=1.6.1"></script>
|
||||
<script src="elements/groundplan.js?v=1.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
<script src="elements/tablemap.js?v=1.6.2"></script>
|
||||
<script src="elements/roommap.js?v=1.6.2"></script>
|
||||
<script src="elements/groundplan.js?v=1.6.2"></script>
|
||||
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
|
|
@ -170,9 +170,9 @@ var MAN_DIGI_PRINTWORK_HINT = ["Sollen Arbeitsbon erstellt werden, wenn in der K
|
|||
var MAN_PRINT_AND_QUEUE_HINT = ["Wird dieser Wert auf 'ja' gesetzt, so werden die Druckaufträge im digitalen Workflow zusätzlich auf Arbeitsbons ausgedruckt.",
|
||||
"If this setting is set to 'yes' in the digital workflow the orders are additionally printed.",
|
||||
"Si el valor esta 'si', orders van a ser imprimidos también en el modo digital."];
|
||||
var MAN_CASH_HINT = ["Die Kassen kann mit dieser Einstellung übergangen werden (Einstellung: nein). Jede Bestellung wird dann sofort mit der Übermittlung an den Server als als bar bezahlt deklariert.",
|
||||
"The cash function can be skipped ('no'). In this case every order will be declared as paid by cash automatically.",
|
||||
"Si configurado a 'no', cada ordern va a ser declarada pagada."];
|
||||
var MAN_CASH_HINT = ["Ist Schnellkasse aktiviert, werden alle Bestellungen mit der Übermittlung an den Server als bar bezahlt deklariert.",
|
||||
"If quick cash is activated every order will be declared as paid by cash automatically.",
|
||||
"Si configurado Factura rapida cada order va a ser declarada pagada."];
|
||||
var MAN_RETURN_TO_ORDER_HINT = ["Wird der Wert auf 'ja' gesetzt, so wechselt die Desktopansicht automatisch wieder in den Bestellmodus über, nachdem ein ausgewählter Tisch komplett abgerechnet oder im Kassenmodus auf einen leeren Tisch geklickt wurde.",
|
||||
"If this value is set to 'true' the mode of the desktop view automatically returns to the ordering after all products of the selected table are marked paid or an empty table was selected.",
|
||||
"Si es 'si' el modus vuelve a ordenar despues de declarar todos los productos de la mesa estado pagado o si el usario ha seleccionado una mesa vacia."];
|
||||
|
|
@ -383,7 +383,7 @@ var MAN_GENSECTION_TXT = ["Allgemeine Einstellungen:","General settings:","Confi
|
|||
var MAN_MOBILSECTION_TXT = ["Einstellungen für die Mobilansicht:","Settings for the mobil view:","Configuración para la vista mobil:"];
|
||||
var MAN_DESKTOP_SECTION_TXT = ["Einstellungen für die Desktop-Ansicht:","Settings for the desktop view","Configuración para la vista de PC"];
|
||||
var MAN_PRINT_AND_QUEUE = ["Drucke Jobs und zeige sie auch in der Küchen-/Baransicht an","Print jobs and show them also in the kitchen/bar view","Imprimir orders y también inserta en la vista de cocina/bar"];
|
||||
var MAN_CASH = ["Kassenfunktion aktiviert","Enabled cash function","Caja activada"];
|
||||
var MAN_CASH = ["Schnellkasse","Quick cash","Factura rapida"];
|
||||
var MAN_RETURNTOORDER = ["Rücksprung Bestellung","Go back to order","Volver a ordenar"];
|
||||
var MAN_BEEP_COOKED = ["Signalton, wenn neues Produkt serviert werden kann","Audio signal if new product can be served","Señal audio si un producto nuevo esta cocinado"];
|
||||
var MAN_BEEP_ORDERED = ["Signalton in Küchen-/Baransicht","Audio signal in kitchen and bar view","Señal audio si un producto nuevo tiene que ser preparado"];
|
||||
|
|
@ -1710,7 +1710,7 @@ function initRestoreFileUpload() {
|
|||
} else {
|
||||
alert("Import war erfolgreich.");
|
||||
setTimeout(function(){
|
||||
document.location.href = "index.html?v=1.6.1";
|
||||
document.location.href = "index.html?v=1.6.2";
|
||||
},250);
|
||||
}
|
||||
},
|
||||
|
|
@ -2194,38 +2194,38 @@ function binding() {
|
|||
$("#backup_btn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=1.6.1";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=1.6.2";
|
||||
});
|
||||
|
||||
$("#backup_btnall").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=1.6.1";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=1.6.2";
|
||||
});
|
||||
|
||||
$("#backup_btnalllogs").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=1.6.1";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=1.6.2";
|
||||
});
|
||||
|
||||
$("#backup_btnftpall").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
showProgressPopup();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=1.6.1",null,handleFtpResult,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=1.6.2",null,handleFtpResult,null);
|
||||
});
|
||||
|
||||
$("#backup_debugdata").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=1.6.1",'_blank');
|
||||
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=1.6.2",'_blank');
|
||||
});
|
||||
|
||||
$("#backupguests_btn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=1.6.1";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=1.6.2";
|
||||
});
|
||||
|
||||
$("#golive").off("click").on("click", function (e) {
|
||||
|
|
@ -2406,7 +2406,7 @@ function updateOneSingleFile() {
|
|||
setTimeout(function(){
|
||||
$("#sliderarea").hide();
|
||||
var millis=getMillis();
|
||||
document.location.href = "install.html?v=1.6.1&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=1.6.2&mode=onlyupdate&n=" + millis;
|
||||
},250);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -50,6 +50,7 @@ class Admin {
|
|||
|
||||
"setUserLanguage" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"setUserReceiptPrinter" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"setUserQuickcash" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"setBtnSize" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"getGeneralConfigItems" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"getGeneralConfigItemsAndUsers" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
|
|
@ -219,6 +220,8 @@ class Admin {
|
|||
$this->setUserLanguage($_POST['language']);
|
||||
} else if ($command == 'setUserReceiptPrinter') {
|
||||
$this->setUserReceiptPrinter($_POST['printer']);
|
||||
} else if ($command == 'setUserQuickcash') {
|
||||
$this->setUserQuickcash($_POST['value']);
|
||||
} else if ($command == 'setBtnSize') {
|
||||
$this->setBtnSize($_POST['btn'],$_POST['size']);
|
||||
} else if ($command == 'changeConfig') {
|
||||
|
|
@ -669,6 +672,12 @@ class Admin {
|
|||
}
|
||||
$_SESSION['receiptprinter'] = intval($receiptprinter);
|
||||
|
||||
$quickcash = $zeile['quickcash'];
|
||||
if (is_null($quickcash)) {
|
||||
$quickcash = 0;
|
||||
}
|
||||
$_SESSION['quickcash'] = intval($quickcash);
|
||||
|
||||
$preferTm = $zeile['prefertablemap'];
|
||||
if (is_null($preferTm)) {
|
||||
$preferTm = 1;
|
||||
|
|
@ -1046,11 +1055,8 @@ class Admin {
|
|||
$configresult[$item["name"]] = $item["setting"];
|
||||
}
|
||||
|
||||
$userlang = 0;
|
||||
$right_changeprice = 0;
|
||||
$supplyRight = 0;
|
||||
if ($userLoggedIn) {
|
||||
$sql = "SELECT language,right_supply,right_changeprice,keeptypelevel,extrasapplybtnpos,right_paydesk,IFNULL(preferimgdesk,0) as preferimgdesk,IFNULL(preferimgmobile,0) as preferimgmobile,IFNULL(showplusminus,0) as showplusminus,IFNULL(preferfixbtns,0) as preferfixbtns,IFNULL(tablesaftersend,1) as tablesaftersend FROM %user%,%roles% WHERE %user%.id=? AND %user%.roleid=%roles%.id";
|
||||
$sql = "SELECT language,right_supply,right_changeprice,keeptypelevel,extrasapplybtnpos,right_paydesk,IFNULL(preferimgdesk,0) as preferimgdesk,IFNULL(preferimgmobile,0) as preferimgmobile,IFNULL(showplusminus,0) as showplusminus,IFNULL(preferfixbtns,0) as preferfixbtns,IFNULL(tablesaftersend,1) as tablesaftersend,IFNULL(quickcash,0) as quickcash FROM %user%,%roles% WHERE %user%.id=? AND %user%.roleid=%roles%.id";
|
||||
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
|
||||
$stmt->execute(array($_SESSION['userid']));
|
||||
$row = $stmt->fetchObject();
|
||||
|
|
@ -1074,7 +1080,8 @@ class Admin {
|
|||
"preferimgdesk" => $row->preferimgdesk,
|
||||
"preferimgmobile" => $row->preferimgmobile,
|
||||
"showplusminus" => $row->showplusminus,
|
||||
"preferfixbtns" => $row->preferfixbtns
|
||||
"preferfixbtns" => $row->preferfixbtns,
|
||||
"quickcash" => $row->quickcash
|
||||
);
|
||||
echo json_encode($retVal);
|
||||
}
|
||||
|
|
@ -1277,9 +1284,11 @@ class Admin {
|
|||
$userlang = 0; // of no interest, if not called from web
|
||||
$receiptprinter = 1; // of no interest, if not called from web
|
||||
$right_changeprice = 0;
|
||||
$quickcash = 0;
|
||||
if ($userLoggedIn) {
|
||||
$userlang = $_SESSION["language"];
|
||||
$receiptprinter = $_SESSION['receiptprinter'];
|
||||
$quickcash = $_SESSION['quickcash'];
|
||||
$right_changeprice = ($_SESSION['right_changeprice'] ? 1 : 0);
|
||||
}
|
||||
|
||||
|
|
@ -1290,6 +1299,7 @@ class Admin {
|
|||
|
||||
$retVal["userlanguage"] = $userlang;
|
||||
$retVal["receiptprinter"] = $receiptprinter;
|
||||
$retVal["quickcash"] = $quickcash;
|
||||
$retVal["rightchangeprice"] = $right_changeprice;
|
||||
|
||||
$retVal["sday"] = $now["mday"];
|
||||
|
|
@ -1427,7 +1437,7 @@ class Admin {
|
|||
$view = "preferences.html";
|
||||
}
|
||||
|
||||
echo json_encode($view . "?v=1.6.1");
|
||||
echo json_encode($view . "?v=1.6.2");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1648,31 +1658,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.6.1"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.6.2"); }
|
||||
} else {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.6.1"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.6.2"); }
|
||||
}
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.6.1"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.6.1"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.6.1"); }
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.6.2"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.6.2"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.6.2"); }
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.6.1"); }
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.6.2"); }
|
||||
}
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.6.1"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.6.1"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.6.1"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.6.1"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.6.1"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.6.1"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.6.1"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.6.1"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.6.1"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.6.1"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.6.1");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.6.1"); }
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.6.2"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.6.2"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.6.2"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.6.2"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.6.2"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.6.2"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.6.2"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.6.2"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.6.2"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.6.2"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.6.2");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.6.2"); }
|
||||
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.6.1");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.6.1");
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.6.2");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.6.2");
|
||||
}
|
||||
|
||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||
|
|
@ -2564,16 +2574,24 @@ class Admin {
|
|||
}
|
||||
|
||||
function setUserReceiptPrinter($printer) {
|
||||
self::setUserIntProperty("receiptprinter", $printer, false);
|
||||
}
|
||||
function setUserQuickcash($value) {
|
||||
self::setUserIntProperty("quickcash", $value, true);
|
||||
}
|
||||
|
||||
private static function setUserIntProperty($item,$value,$doHist) {
|
||||
if(session_id() == '') {
|
||||
session_start();
|
||||
}
|
||||
$currentuserid = $_SESSION['userid'];
|
||||
$_SESSION['receiptprinter'] = intval($printer);
|
||||
|
||||
$_SESSION[$item] = intval($value);
|
||||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
$sql = "UPDATE %user% set receiptprinter=? WHERE active='1' AND id=?";
|
||||
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
|
||||
$stmt->execute(array($printer,$currentuserid));
|
||||
$sql = "UPDATE %user% set " . $item . "=? WHERE active='1' AND id=?";
|
||||
CommonUtils::execSql($pdo, $sql, array($value,$currentuserid));
|
||||
if ($doHist) {
|
||||
HistFiller::updateUserInHist($pdo,$currentuserid);
|
||||
}
|
||||
echo json_encode("OK");
|
||||
}
|
||||
|
||||
|
|
@ -2685,12 +2703,13 @@ class Admin {
|
|||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
$this->writeCsvHeader("datenexport-benutzer.csv");
|
||||
|
||||
echo("Eintragsid; Datum ; Benutzerid; Benutzername; Adminrechte; Kellnerrechte;Kuechenrechte; Barrechte; Bereitstellungsrechte; Kassenrechte; Reportrechte; Kassenbonrechte; Angebotsrechte; Beurteilungsrechte; Preisänderungsrechte; Gästerechte; Abholanzeige; Tageserfassungsrecht; Dashboardrechte; Zeiterfassung; Zeitmanagement; Aufgaben; Aufgabenmanagement; Managerrechte; Tischbereich; Aktiviert\n");
|
||||
echo("Eintragsid; Datum ; Benutzerid; Benutzername; Adminrechte; Kellnerrechte;Kuechenrechte; Barrechte; Bereitstellungsrechte; Kassenrechte; Reportrechte; Kassenbonrechte; Angebotsrechte; Beurteilungsrechte; Preisänderungsrechte; Gästerechte; Abholanzeige; Tageserfassungsrecht; Dashboardrechte; Zeiterfassung; Zeitmanagement; Aufgaben; Aufgabenmanagement; Managerrechte; Tischbereich; Schnellkasse; Aktiviert\n");
|
||||
|
||||
$sql = "SELECT DISTINCT %hist%.id as id,date,";
|
||||
$sql .= "IFNULL(userid,'') as userid,IFNULL(username,'') as username,is_admin,right_waiter,right_kitchen,right_bar,right_supply,";
|
||||
$sql .= "right_paydesk,right_statistics,right_bill,right_products,right_rating,right_changeprice,right_customers,right_pickups,right_closing,right_dash,right_timetracking,right_timemanager,right_tasks,right_tasksmanagement,right_manager,active,";
|
||||
$sql .= "IFNULL(area,'-') as area,";
|
||||
$sql .= "IFNULL(quickcash,'-') as quickcash,";
|
||||
$sql .= "description ";
|
||||
$sql .= " FROM %hist%, %histuser%, %histactions% ";
|
||||
$sql .= " WHERE (refid=%histuser%.id) ";
|
||||
|
|
@ -2734,6 +2753,7 @@ class Admin {
|
|||
}
|
||||
|
||||
$vals[] = $character;
|
||||
$vals[] = ($zeile["quickcash"] == '1' ? "Ja" : "Nein");
|
||||
$vals[] = ($zeile['active'] == '1' ? "Ja" : "Nein");
|
||||
$vals[] = $zeile['description'];
|
||||
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ if (is_null($code) || ($code == '')) {
|
|||
echo json_encode("Remote access code was not configured!");
|
||||
} else {
|
||||
if (md5($remoteaccesscode) == $code) {
|
||||
$this->createClosing($remark,0);
|
||||
echo json_encode($this->createClosing($remark,0));
|
||||
} else {
|
||||
echo json_encode("Remote access code not correct!");
|
||||
}
|
||||
|
|
@ -142,7 +142,8 @@ private function createClosing ($remark,$doPrint = 1) {
|
|||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
date_default_timezone_set(DbUtils::getTimeZone());
|
||||
if (!$this->isClosingAllowed($pdo)) {
|
||||
return(array("status" => "ERROR", "msg" => "Time between closings too short", "code" => ERROR_CLOSING_TIME_LIMIT));
|
||||
echo json_encode(array("status" => "ERROR", "msg" => "Time between closings too short", "code" => ERROR_CLOSING_TIME_LIMIT));
|
||||
return;
|
||||
}
|
||||
$closingTime = date('Y-m-d H:i:s');
|
||||
$result = $this->createClosingCore($pdo,$remark,$doPrint,$closingTime,true);
|
||||
|
|
|
|||
|
|
@ -878,7 +878,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.6.1">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.6.2">';
|
||||
$txt .= "</head>";
|
||||
return $txt;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,11 @@ class DbUtils {
|
|||
private static $prefix = null;
|
||||
private static $dbname = null;
|
||||
|
||||
public static $WORKFLOW_DIGITAL_AND_WORK = 0;
|
||||
public static $WORKFLOW_ONLY_DIGITAL = 1;
|
||||
public static $WORKFLOW_ONLY_WORK = 2;
|
||||
public static $WORKFLOW_WORK_WITH_SERVER = 3;
|
||||
|
||||
public static function overruleTimeZone($timezone) {
|
||||
self::$timezone = $timezone;
|
||||
}
|
||||
|
|
@ -192,6 +197,7 @@ class DbUtils {
|
|||
array("col" => 'right_timemanager', "hist" => 1, "new" => 'rTimemanager', "update" => 'rTimemanager'),
|
||||
array("col" => 'right_tasks', "hist" => 1, "new" => 'rTasks', "update" => 'rTasks'),
|
||||
array("col" => 'right_tasksmanagement',"hist" => 1,"new" => 'rTasksmanagement', "update" => 'rTasksmanagement'),
|
||||
array("col" => 'quickcash', "hist" => 1, "new" => null, "update" => null),
|
||||
array("col" => 'active', "hist" => 1, "new" => null ,"default" => 1, "update" => null),
|
||||
array("col" => 'area', "hist" => 1, "new" => null ,"default" => null, "update" => null),
|
||||
array("col" => 'lastmodule', "hist" => 0, "new" => null ,"default" => null, "update" => null),
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
|
|||
if (strlen($status) > 150) {
|
||||
$status = substr($status, 0,149);
|
||||
}
|
||||
$version = "1.6.1";
|
||||
$version = "1.6.2";
|
||||
|
||||
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1110,8 +1110,9 @@ class QueueContent {
|
|||
if(session_id() == '') {
|
||||
session_start();
|
||||
}
|
||||
$quickcash = $_SESSION['quickcash'];
|
||||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
$ret = $this->addProductListToQueueCore($pdo, $ordertime, $theTableid, $prods, $doPrint, $payprinttype,$_SESSION['userid']);
|
||||
$ret = $this->addProductListToQueueCore($pdo, $ordertime, $theTableid, $prods, $doPrint, $payprinttype,$_SESSION['userid'],$quickcash);
|
||||
echo json_encode($ret);
|
||||
}
|
||||
/*
|
||||
|
|
@ -1121,18 +1122,18 @@ class QueueContent {
|
|||
* If product shall not be run over kitchen or supplydesk this is
|
||||
* managed here as well
|
||||
*/
|
||||
public function addProductListToQueueCore($pdo,$ordertime,$theTableid,$prods,$doPrint,$payprinttype,$userid) {
|
||||
public function addProductListToQueueCore($pdo,$ordertime,$theTableid,$prods,$doPrint,$payprinttype,$userid,$quickcash) {
|
||||
|
||||
if (intval($theTableid) == 0) {
|
||||
$theTableid = null; // togo room
|
||||
}
|
||||
|
||||
|
||||
$printAndQueueJobs = CommonUtils::getConfigValue($pdo, "printandqueuejobs", 0);
|
||||
if ($printAndQueueJobs == 1) {
|
||||
$doPrint = 1;
|
||||
}
|
||||
|
||||
|
||||
$pdo->beginTransaction();
|
||||
|
||||
$togotax = CommonUtils::getExistingConfigValue($pdo, 'togotax');
|
||||
|
|
@ -1144,7 +1145,8 @@ class QueueContent {
|
|||
$currentPriceLevel = $commUtils->getCurrentPriceLevel($pdo);
|
||||
$currentPriceLevelId = $currentPriceLevel["id"];
|
||||
|
||||
$insertedQueueIds = array();
|
||||
$insertedQueueIdsForPrint = array();
|
||||
$insertedQueueIdsTotal = array();
|
||||
|
||||
$sql = "INSERT INTO %records% (date,userid,tableid,action) VALUES(?,?,?,?)";
|
||||
CommonUtils::execSql($pdo, $sql, array($ordertime,$userid,$theTableid,T_ORDER));
|
||||
|
|
@ -1284,17 +1286,18 @@ class QueueContent {
|
|||
}
|
||||
}
|
||||
|
||||
if (($workflowconfig == 3) && ($doPrint == 0)) {
|
||||
if (($workflowconfig == DbUtils::$WORKFLOW_WORK_WITH_SERVER) && ($doPrint == DbUtils::$WORKFLOW_DIGITAL_AND_WORK)) {
|
||||
self::reallyDeclareAsCooked($pdo,$queueid);
|
||||
self::declareProductBeDeliveredWithGivenPdo($pdo,$queueid);
|
||||
} else {
|
||||
$insertedQueueIdsTotal[] = $queueid;
|
||||
if ($useConditions["usekitchen"] == 0) {
|
||||
self::reallyDeclareAsCooked($pdo,$queueid);
|
||||
if ($useConditions["usesupply"] == 0) {
|
||||
self::declareProductBeDeliveredWithGivenPdo($pdo,$queueid);
|
||||
}
|
||||
} else {
|
||||
$insertedQueueIds[] = $queueid;
|
||||
$insertedQueueIdsForPrint[] = $queueid;
|
||||
|
||||
if (($printAndQueueJobs == 0) && ($doPrint == 0)) {
|
||||
self::setFlagForCooking($pdo,$productid);
|
||||
|
|
@ -1304,25 +1307,25 @@ class QueueContent {
|
|||
}
|
||||
}
|
||||
|
||||
$cashenabled = CommonUtils::getConfigValue($pdo, "cashenabled", 1);
|
||||
if ($cashenabled == 0) {
|
||||
$idStr = join(',',$insertedQueueIds);
|
||||
$generalQuickcash = CommonUtils::getConfigValue($pdo, "cashenabled", 1);
|
||||
if (($generalQuickcash == 1) || ($quickcash == 1)) {
|
||||
$idStr = join(',',$insertedQueueIdsTotal);
|
||||
$this->declarePaidCreateBillReturnBillId($pdo,$idStr, $theTableid, 1, 0, 0, true,'','','',null);
|
||||
}
|
||||
|
||||
if ($doPrint == 1) {
|
||||
if ($payprinttype == "s") {
|
||||
$this->doWorkPrint($pdo,$theTableid,$insertedQueueIds,$_SESSION['currentuser'],$payprinttype, $_SESSION['language']);
|
||||
$this->doWorkPrint($pdo,$theTableid,$insertedQueueIdsForPrint,$_SESSION['currentuser'],$payprinttype, $_SESSION['language']);
|
||||
$pdo->commit();
|
||||
return(array("status" => "OK"));
|
||||
} else {
|
||||
$result = $this->doWorkPrint($pdo,$theTableid,$insertedQueueIds,$_SESSION['currentuser'],$payprinttype, $_SESSION['language']);
|
||||
$result = $this->doWorkPrint($pdo,$theTableid,$insertedQueueIdsForPrint,$_SESSION['currentuser'],$payprinttype, $_SESSION['language']);
|
||||
$pdo->commit();
|
||||
return(array("status" => "OK", "msg" => $result));
|
||||
}
|
||||
}
|
||||
$pdo->commit();
|
||||
return(array("status" => "OK","queueids" => $insertedQueueIds));
|
||||
return(array("status" => "OK","queueids" => $insertedQueueIdsTotal));
|
||||
}
|
||||
|
||||
public static function setFlagForCooking($pdo,$productid) {
|
||||
|
|
@ -1417,7 +1420,7 @@ class QueueContent {
|
|||
CommonUtils::execSql($pdo, $sql, array($recordid,$queueid));
|
||||
|
||||
|
||||
if (($workflowconfig == 3) && ($doPrint == 0)) {
|
||||
if (($workflowconfig == DbUtils::$WORKFLOW_DIGITAL_AND_WORK) && ($doPrint == DbUtils::$WORKFLOW_WORK_WITH_SERVER)) {
|
||||
self::reallyDeclareAsCooked($pdo,$queueid);
|
||||
self::declareProductBeDeliveredWithGivenPdo($pdo,$queueid);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -47,6 +47,17 @@ class Reservation {
|
|||
date_default_timezone_set(DbUtils::getTimeZone());
|
||||
$currentTime = date('Y-m-d H:i:s');
|
||||
$scheduledDate = "$year-$month-$day 00:00:00";
|
||||
|
||||
// REM* check if date is in the past
|
||||
$resdate = new DateTime($year . '-' . $month . '-' . $day);
|
||||
$curDate = new DateTime(date('Y-m-d'));
|
||||
$interval = $curDate->diff($resdate);
|
||||
$daysDiff = intval($interval->format('%R%a'));
|
||||
if ($daysDiff < 0) {
|
||||
echo json_encode(array("status" => "ERROR", "msg" => "Reservierungsdatum liegt in der Vergangenheit"));
|
||||
return;
|
||||
}
|
||||
|
||||
if ($tableid <= 0) {
|
||||
$tableid = null;
|
||||
}
|
||||
|
|
@ -144,7 +155,7 @@ class Reservation {
|
|||
$txt = "<html><head>";
|
||||
$txt .= "<title>Reservierungsübersicht</title>";
|
||||
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=1.6.1">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=1.6.2">';
|
||||
$txt .= "</head>";
|
||||
$txt .= "<body>";
|
||||
$txt .= "<h1>Reservierungsübersicht für $day.$month.$year</h1><p>";
|
||||
|
|
|
|||
|
|
@ -594,7 +594,7 @@ class Roomtables {
|
|||
$txt = "<html><head>";
|
||||
$txt .= "<title>Tisch QR-Codes für die Gastbestellung</title>";
|
||||
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=1.6.1">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=1.6.2">';
|
||||
$txt .= "</head>";
|
||||
$txt .= "<body>";
|
||||
$txt .= "<h1>Tisch QR-Codes für die Gastbestellung</h1><p>";
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ class Demodata {
|
|||
"unitamount" => 1);
|
||||
|
||||
$userid = $users[0]["id"];
|
||||
$ret = $queue->addProductListToQueueCore($pdo, $dateTime, null, $prodArr, 0, 's', $userid);
|
||||
$ret = $queue->addProductListToQueueCore($pdo, $dateTime, null, $prodArr, 0, 's', $userid,0);
|
||||
return $ret['queueids'];
|
||||
} else {
|
||||
$ret = null;
|
||||
|
|
@ -171,7 +171,7 @@ class Demodata {
|
|||
"unitamount" => 1);
|
||||
}
|
||||
$userid = $users[0]["id"];
|
||||
$ret = $queue->addProductListToQueueCore($pdo, $dateTime, null, $prodArr, 0, 's', $userid);
|
||||
$ret = $queue->addProductListToQueueCore($pdo, $dateTime, null, $prodArr, 0, 's', $userid,0);
|
||||
return $ret['queueids'];
|
||||
}
|
||||
private static function createDemoForADate($pdo,$dateStr,$users,$prods,$tables,$queue) {
|
||||
|
|
@ -196,7 +196,7 @@ class Demodata {
|
|||
$userid = $users[$userindex]["id"];
|
||||
$time = $dateStr . " " . self::leadingzeronumber($hour) . ":05:20";
|
||||
|
||||
$ret = $queue->addProductListToQueueCore($pdo, $time, $tableid, $prodArr, 0, 's', $userid);
|
||||
$ret = $queue->addProductListToQueueCore($pdo, $time, $tableid, $prodArr, 0, 's', $userid,0);
|
||||
if ($ret["status"] != "OK") {
|
||||
echo json_encode($ret);
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -1307,6 +1307,20 @@ class Version {
|
|||
return array(true);
|
||||
}
|
||||
|
||||
public static function upd_1601_1602($pdo, $prefix, $dbname) {
|
||||
try {
|
||||
self::execSql($pdo, "ALTER TABLE %user% ADD quickcash INT(2) NULL DEFAULT '0' AFTER area");
|
||||
self::execSql($pdo, "ALTER TABLE %histuser% ADD quickcash INT(2) NULL DEFAULT '0' AFTER area");
|
||||
self::execSql($pdo, "UPDATE %user% SET quickcash='0'");
|
||||
self::execSql($pdo, "UPDATE %histuser% SET quickcash='0'");
|
||||
self::execSql($pdo, "UPDATE %config% SET setting=(1-setting) WHERE name='cashenabled'");
|
||||
self::execSql($pdo, "UPDATE %histconfig% SET setting=(1-setting) WHERE configid=(SELECT id from %config% WHERE name='cashenabled')");
|
||||
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"),
|
||||
|
|
@ -1389,7 +1403,8 @@ class Version {
|
|||
"1.5.31" => array("upd_1531_1532","1.5.32"),
|
||||
"1.5.32" => array("upd_1532_1533","1.5.33"),
|
||||
"1.5.33" => array("upd_1533_1600","1.6.0"),
|
||||
"1.6.0" => array("upd_1600_1601","1.6.1")
|
||||
"1.6.0" => array("upd_1600_1601","1.6.1"),
|
||||
"1.6.1" => array("upd_1601_1602","1.6.2")
|
||||
);
|
||||
|
||||
public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) {
|
||||
|
|
|
|||
|
|
@ -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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
<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.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></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>
|
||||
|
|
|
|||
|
|
@ -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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
|
||||
<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 @@
|
|||
<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.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
|
||||
</head>
|
||||
|
||||
|
|
@ -35,9 +35,10 @@ var PREF_WRONG_OLDASS = ["Das Passwort konnte nicht geändert werden. Bitte prü
|
|||
var PREF_PASS_CHANGED = ["Das Passwort wurde geändert.","Password changed.","La contraseña esta cambiado."];
|
||||
var PREF_VOL = ["Lautstärke:", "Volume:", "Volumen:"];
|
||||
var PREF_RECEIPT_PRINTER = ["Bondrucker","Receipt printer","Impresora de tique"];
|
||||
var PREF_PRINTER_HEAD = ["Kassendrucker","Paydesk printer","Impresora de tique"];
|
||||
var PREF_PRINTER_DETAILS = ["Die Auswahl des Bondruckers wirkt sich nur bei Server-Print aus.","The selection of the receipt printers is only relevant for server print.","La selección de la impresora solo sirve para 'server print'"];
|
||||
|
||||
var PREF_PRINTER_HEAD = ["Kasse","Paydesk","Facturas"];
|
||||
var PREF_PRINTER_SEL = ["Kassenbondrucker","Printer for receipts","Impresora para facturas"];
|
||||
var PREF_QUICKCASH = ["Schnellkasse","Quick cash","Factura rápida"];
|
||||
var PREF_QUICKCASH_HINT = ["<b>Schnellkasse</b> bedeutet, dass die Bestellung mit der Übermittlung an den Server als barbezahlt deklariert wird. Der Kassen-Button wird in diesem Fall nicht eingeblendet. Ist die Schnellkasse in der allgemeinen Konfiguration abgeschaltet, so kann ein Benutzer diese in diesen Einstellungen für sich dennoch aktivieren.","<b>Quick cash</b> means that thre ordert will be declared paid with cash by sending it to the server. The paydesk button will not be displayed in this case. If the quick cash is not activated imn the general settings each user can activate it here user-specifically.","<b>Factura rápida</b> significa que el pedido se declara con la transmisión al servidor como pago en efectivo. En este caso, el botón de pago no se muestra. Si la salida rápida está desactivada en la configuración general, el usuario puede activarla por sí mismo en estos ajustes."];
|
||||
var PREF_SIZE_SMALL = ["klein","small","pequeño"];
|
||||
var PREF_SIZE_MIDDLE = ["mittel","middle","medio"];
|
||||
var PREF_SIZE_BIG = ["groß","big","grande"];
|
||||
|
|
@ -105,6 +106,7 @@ function insertGeneralConfigItems(configResult) {
|
|||
var values = configResult.msg;
|
||||
|
||||
$("#pref-page").data("receiptprinter",values.receiptprinter);
|
||||
$("#pref-page").data("quickcash",values.quickcash);
|
||||
|
||||
$("#pref-page").data("userlanguage",values.userlanguage);
|
||||
setLanguage(values.userlanguage);
|
||||
|
|
@ -148,8 +150,9 @@ function isSelected(currentIndex,searchIndex) {
|
|||
|
||||
function createReceiptPrinterPart(language) {
|
||||
var printer = $("#pref-page").data("receiptprinter");
|
||||
var html = PREF_PRINTER_DETAILS[language] + '<br><div class="ui-field-contain">';
|
||||
html += '<label for="receiptprinter">' + PREF_PRINTER_HEAD[language] + ':</label>';
|
||||
var quickcash = $("#pref-page").data("quickcash");
|
||||
var html = '<div class="ui-field-contain">';
|
||||
html += '<label for="receiptprinter">' + PREF_PRINTER_SEL[language] + ':</label>';
|
||||
html += '<select name="receiptprinter" id="receiptprinter" data-theme="e">';
|
||||
|
||||
html += '<option value="1"' + isSelected(1,printer) + '>' + PREF_RECEIPT_PRINTER[language] + ' #1</option>';
|
||||
|
|
@ -160,6 +163,15 @@ function createReceiptPrinterPart(language) {
|
|||
html += '<option value="6"' + isSelected(6,printer) + '>' + PREF_RECEIPT_PRINTER[language] + ' #6</option>';
|
||||
|
||||
html += '</select></div>';
|
||||
|
||||
html += '<div class="ui-field-contain">';
|
||||
html += '<label for="quickcash">' + PREF_QUICKCASH[language] + ':</label>';
|
||||
html += '<select name="quickcash" id="quickcash" data-theme="e">';
|
||||
html += '<option value="0"' + isSelected(0,quickcash) + '>' + PREF_NO[language] + '</option>';
|
||||
html += '<option value="1"' + isSelected(1,quickcash) + '>' + PREF_YES[language] + '</option>';
|
||||
html += '</select></div>';
|
||||
html += "<br><i>" + PREF_QUICKCASH_HINT[language] + "</i>";
|
||||
|
||||
return html;
|
||||
}
|
||||
|
||||
|
|
@ -472,6 +484,20 @@ function binding() {
|
|||
binding();
|
||||
});
|
||||
|
||||
$("#quickcash").off('change').on('change', function(e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
|
||||
var newQuickcash = $("#quickcash").find(":selected").val();
|
||||
$("#pref-page").data("quickcash",newQuickcash);
|
||||
|
||||
$("#receiptprinterpart").html(createReceiptPrinterPart($("#pref-page").data("userlanguage")));
|
||||
$("#receiptprinterpartbox").trigger("create");
|
||||
|
||||
doAjax("POST","php/contenthandler.php?module=admin&command=setUserQuickcash",{value:newQuickcash},null,"Schnellkasse");
|
||||
binding();
|
||||
});
|
||||
|
||||
$("#roombtnsize").off('change').on('change', function(e) {
|
||||
var newSize = $("#roombtnsize").find(":selected").val();
|
||||
$("#roombtnpart").html(createBtnSizePart(newSize, "roombtnsize", PREF_ROOM_BTN_SIZE[l]));
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
<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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
<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/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.6.1"></script>
|
||||
<script src="elements/product.js?v=1.6.1"></script>
|
||||
<script src="elements/extra.js?v=1.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
<script src="elements/product.js?v=1.6.2"></script>
|
||||
<script src="elements/extra.js?v=1.6.2"></script>
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
|
||||
<link rel="stylesheet" href="css/ospage.css" />
|
||||
<link rel="stylesheet" href="css/tablepanel.css" />
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
<script src="php/3rdparty/jquery-2.2.4.min.js"></script>
|
||||
<script src="php/3rdparty/jqueryui1-12-0/jquery-ui.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=1.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
|
||||
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
<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/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.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
<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/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.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
<script src="elements/rating.js"></script>
|
||||
</head>
|
||||
|
||||
|
|
|
|||
|
|
@ -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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -13,9 +13,9 @@
|
|||
<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="elements/tablemap.js"></script>
|
||||
<script src="elements/reservation.js?v=1.6.1"></script>
|
||||
<script src="elements/reservation.js?v=1.6.2"></script>
|
||||
|
||||
<script src="utilities.js?v=1.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></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>
|
||||
|
|
@ -562,7 +562,7 @@ function bindCancelButtn() {
|
|||
var year = date.getFullYear();
|
||||
var dateStr = year + "-" + month + "-" + day;
|
||||
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=1.6.1&date=" + dateStr;},500);
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=1.6.2&date=" + dateStr;},500);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<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.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -30,7 +30,7 @@ var SUM_REASON = ["Grund","Reason","Razón"];
|
|||
var SUM_CANCEL_ITEM = ["Stornierung","Cancellation","Revocación"];
|
||||
var SUM_CANCELLATION_OK = ["Die Zahlung wurde in OrderSprinter storniert.","The payment was cancelled in OrderSprinter.","El pago se canceló en OrderSprinter."];
|
||||
|
||||
var nextpage = "paydesk.html?version=1.6.1";
|
||||
var nextpage = "paydesk.html?version=1.6.2";
|
||||
|
||||
var lang;
|
||||
|
||||
|
|
@ -84,10 +84,10 @@ function setLanguage(language) {
|
|||
|
||||
if (nextPage == "p") {
|
||||
$("#nextpagebtntxt").html(SUM_TO_PAYMENT[lang]);
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=1.6.1";
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=1.6.2";
|
||||
} else {
|
||||
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
|
||||
nextpage = "waiter.html?version=1.6.1";
|
||||
nextpage = "waiter.html?version=1.6.2";
|
||||
}
|
||||
|
||||
var txt = "<table class='viewtable'>";
|
||||
|
|
|
|||
|
|
@ -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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
|
||||
<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 @@
|
|||
<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.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></script>
|
||||
<style>
|
||||
|
||||
#tableWithPreparedProds,#tableWithDeliveredEntries,#headertableToCook
|
||||
|
|
|
|||
|
|
@ -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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
<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.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></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>
|
||||
|
|
|
|||
|
|
@ -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.6.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.2">
|
||||
<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.6.1"></script>
|
||||
<script src="utilities.js?v=1.6.2"></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>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue