OrderSprinter 1.5.27
This commit is contained in:
parent
ea17d50f5e
commit
3abd7290f0
|
|
@ -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.26" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.26" />
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.27" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.27" />
|
||||
<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>
|
||||
|
|
@ -111,7 +111,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.5.26 </div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">1.5.27 </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.5.26">';
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.27">';
|
||||
echo "</head>";
|
||||
echo "<body><div class=surround>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.26</span><br><br>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.27</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.5.26");
|
||||
Database::setVersion($pdo,$prefix,"1.5.27");
|
||||
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.5.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
|
||||
<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.26"></script>
|
||||
<script src="kitchenbar.js?v=1.5.26"></script>
|
||||
<script src="utilities.js?v=1.5.27"></script>
|
||||
<script src="kitchenbar.js?v=1.5.27"></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.5.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
|
|||
|
|
@ -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.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
|
|||
|
|
@ -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.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.27">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -231,7 +231,7 @@ function handleResultOfInstallCheck(is_installed) {
|
|||
if (is_installed == "Yes") {
|
||||
useInstallation();
|
||||
} else {
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.5.26"},500);
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.5.27"},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.5.26&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.5.27&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.5.26&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.5.27&style=always" style="max-height:150px;"/></div>
|
||||
|
||||
<form method="post">
|
||||
<table border=0>
|
||||
|
|
|
|||
|
|
@ -912,7 +912,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.5.26</button>
|
||||
<button id="updatebtn">Update -> 1.5.27</button>
|
||||
<span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span>
|
||||
</td>
|
||||
<td> </td>
|
||||
|
|
|
|||
|
|
@ -448,8 +448,14 @@ $zones[] = $timezone_identifiers[$i];
|
|||
}
|
||||
echo json_encode($zones);
|
||||
} else if ($command == 'update') {
|
||||
$configFile = __DIR__ . "/../php/config.php";
|
||||
if (!is_writable($configFile)) {
|
||||
echo json_encode("Datei config.php im php-Verzeichnis ist nicht beschreibbar - Update nicht möglich");
|
||||
return;
|
||||
}
|
||||
|
||||
set_time_limit(60*30);
|
||||
$installerVersion = "1.5.26";
|
||||
$installerVersion = "1.5.27";
|
||||
|
||||
$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.5.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
|
||||
<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.26"></script>
|
||||
<script src="kitchenbar.js?v=1.5.26"></script>
|
||||
<script src="utilities.js?v=1.5.27"></script>
|
||||
<script src="kitchenbar.js?v=1.5.27"></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.5.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
|
||||
<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.26"></script>
|
||||
<script src="elements/tablemap.js?v=1.5.26"></script>
|
||||
<script src="elements/roommap.js?v=1.5.26"></script>
|
||||
<script src="elements/groundplan.js?v=1.5.26"></script>
|
||||
<script src="utilities.js?v=1.5.27"></script>
|
||||
<script src="elements/tablemap.js?v=1.5.27"></script>
|
||||
<script src="elements/roommap.js?v=1.5.27"></script>
|
||||
<script src="elements/groundplan.js?v=1.5.27"></script>
|
||||
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
|
|
@ -201,6 +201,7 @@ var MAN_BAK_GUEST_BTN = ["Sicherung (Konfiguration + Gäste)","Backup (Configura
|
|||
var MAN_BAK_BTN_ALL = ["Sicherung (Alles ohne Logs)","Backup (all without logs)","Exportar (todo sin protocolo)"];
|
||||
var MAN_BAK_BTN_ALL_LOGS = ["Sicherung (Alles mit Logs)","Backup (all with logs)","Exportar (todo y protocolo)"];
|
||||
var MAN_BAK_FTP_ALL = ["FTP-Sicherung (Alles ohne Logs)","Ftp backup (all without logs)","Ftp (todo sin protocolo)"];
|
||||
var MAN_BAK_DEBUGDATA = ["Export Debug-Daten","Export debug data","Exportar debug data"];
|
||||
var MAN_UPDATE_HEAD = ["Versionsupdate","Version update","Actualizar la versión"];
|
||||
var MAN_CHECK_UPDATE_BTN = ["Update starten","Start update","Empezar actualizar"];
|
||||
var MAN_UPDATE_HINT = ["Das Updaten über diesen Weg funktioniert nur, wenn die Dateien im Webverzeichnis beschreibbar sind und eine Verbindung zum OrderSprinter-Webserver besteht.",
|
||||
|
|
@ -304,6 +305,7 @@ var MAN_DISCOUNT_SECTION_TXT = ["Rabatteinstellungen in Bestellansicht:","Discou
|
|||
var MAN_TIMETRACKING = ["Zeiterfassung:","Time tracking:","Tiempos de los empleados:"];
|
||||
var MAN_SUMUPFORCARD = ["SumUp für Kartenzahlung","SumUp for card payment","SumUp para pago con tarjeta"];
|
||||
var MAN_PRINTCASH = ["Drucke Barein-/auslage","Print cash operation","Imprimir entradas"];
|
||||
var MAN_DOUBLERECEIPT = ["Doppeldruck bei Kartenzahlung","Double receipt for EC and credit cards","Imprimir una vez mas para pago por tarjeta"];
|
||||
var MAN_SHOW_ERRORLOG = ["Zugriff auf Webserver error.log","Access to webserver error.log","Leer webserver error.log"];
|
||||
var MAN_SUMUP = ["SumUp-Anbindung","Connection to SumUp","SumUp"];
|
||||
var MAN_SUMUPFAILURETEXT = ["Stornotext bei fehlgeschlagener Kartenzahlung","Text in report for failured card payment","Texto en el informe para el pago con tarjeta de crédito fallido"];
|
||||
|
|
@ -367,7 +369,7 @@ var MAN_AESKEY = ["AES256 Schlüssel","AES256 Key","AES256 LLave"];
|
|||
var MAN_AESKEY_WRONG_LENGTH = ["Ein AES256-Schlüssel muss in Hex-Darstellung 64 Zeichen haben.","An AES256 key requires to have 64 characters in a hex string.", "Una llave de AES256 tiene que contener 64 characteres en forma hex."];
|
||||
var MAN_AESKEY_NO_HEX = ["Der AES-Schlüssel muss als Hex-Zahl angegeben werden.","The AES key must be specified as hex number","La llava AES tiene que especificado en formato hex."];
|
||||
var MAN_CERTIFICATE_SN = ["Zertifikatsseriennummer", "Certificate Serial No","Certificado ID"];
|
||||
var MAN_CBIRD_FOLDER = ["cbird Importverzeichnis","cbird import folder","cbird fichero"];
|
||||
var MAN_CBIRD_FOLDER = ["cbird/QRK Importverzeichnis","cbird/QRK import folder","cbird/QRK fichero"];
|
||||
var MAN_RKSVSERVER = ["RKSV-Server-URL","RKSV server URL","RKSV-Server URL"];
|
||||
var MAN_TAX = ["Steuersatz (%)","Tax (%)","Impuesto (%)"];
|
||||
var MAN_CONFIRM_GO_LIVE = ["Die Umsatz- und Logdaten wurden gelöscht und nur die Konfiguration übernommen. Deswegen ist nun ein erneutes Einloggen erforderlich.",
|
||||
|
|
@ -393,8 +395,8 @@ var MAN_CLOSSHOWPAYTAXES = ["Individuelle Steuerbeträge pro Zahlungsweg auf Tag
|
|||
var MAN_CLOSSHOWPRODS = ["Produktstatistik auf Tagesabschlussbon","Product statistics on closung","Statistica de productos en el cerramiento"];
|
||||
var MAN_SHOWPAYMENTS = ["Zahldialog und Wechselgeldrechner (Mobil)","Payment way and calculator (mobil)","Modo de pagar y calculadora (movil)"];
|
||||
var MAN_SHOWPAYMENTS_HINT = ["Wird der Zahldialog deaktiviert, wird stets eine Barzahlung angenommen!","If the payment dialog is deactivated all payments are declared as cash payments!","Si el dialogo de modo de pagar esta deactivado cada pagamiento es de moneda"];
|
||||
var MAN_SHOWPAYMENT2 = ["Kartenzahlung","Card Payment","Pago con Tarjeta"];
|
||||
var MAN_SHOWPAYMENT3 = ["Kartenzahlung","Card Payment","Pago con Tarjeta"];
|
||||
var MAN_SHOWPAYMENT2 = ["EC-Karte","EC Card Payment","Tarjeta EC"];
|
||||
var MAN_SHOWPAYMENT3 = ["Kreditkarte","Credit Card","Tarjeta Credit"];
|
||||
var MAN_SHOWPAYMENT4 = ["Rechnung","Bill","Factura"];
|
||||
var MAN_SHOWPAYMENT5 = ["Überweisung","Transfer","transferencia"];
|
||||
var MAN_SHOWPAYMENT6 = ["Lastschrift","debitsCard","Débito"];
|
||||
|
|
@ -452,6 +454,8 @@ var MAN_TMPDIRHINT = ["Wird das PHP-Tmp-Verzeichnis angegeben, so können z.B. k
|
|||
var MAN_IMPORT_IN_PROGRESS = ["Der Importvorgang ist aktiv. Bitte warten...","The import process is activated. Please wait...","El proceso del importe esta activo. Por favor espere un poco...."];
|
||||
var MAN_LOGOLOCATION = ["Logo-Position auf Anmeldeseite","Position of logo on login page","Posición del logo"];
|
||||
var MAN_LOGOLOC = [["Unsichtbar","Invisible","No logo"],["Oben","Top","Arriba"],["Im Anmeldefeld","In login area","En area de registrar"]];
|
||||
var MAN_AUSTRIA_BIND = ["Anbindung","Binding","Coneción"];
|
||||
var MAN_AUSTRIABIND_OPTIONS = ["-","cbird","QRK R2B", "QRK Receipt"];
|
||||
|
||||
var MAN_DAYNAMES = [
|
||||
["Montag","Monday","Lunes"],
|
||||
|
|
@ -501,7 +505,7 @@ var MAN_LAST_CLOSING = ["Letzte Tageserfassung","Last closing","Cerrada última"
|
|||
var MAN_PDF_REPORT_HINT = ["Erste und letzte Tageserfassung des Reports nach Eingrenzung des Datumsbereich (oben) auswählen:","Choose first and last closing after limit the time frame (above):","Seleccione la cerrada primera y última después de delimitar el intervalo de fechas (arriba):"];
|
||||
|
||||
var lang = 0;
|
||||
var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1,0,0,0,1,0,1,0,0,1,1, 1,1,1,1,1,1,1,1,1,1, 1,2,3, 1,0, 1,0,1, 1,1,0,0, 0,0,0, 0,0,0,1,1, 0,1,0,1,1, 1,2,0, 0,0,1,1,1];
|
||||
var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1,0,0,0,1,0,1,0,0,1,1, 1,1,1,1,1,1,1,1,1,1, 1,2,3, 1,0, 1,0,1, 1,1,0,0, 0,0,0, 0,0,0,1,1, 0,1,0,1,1, 1,2,0, 0,0,1,1,1, 0,0];
|
||||
|
||||
var numberOfClosings = 0;
|
||||
|
||||
|
|
@ -654,7 +658,10 @@ var generalValuesSettings = [
|
|||
["printcash",MAN_PRINTCASH[lang],"s",64],
|
||||
["showerrorlog",MAN_SHOW_ERRORLOG[lang],"s",65],
|
||||
["showtransferbtns",MAN_SHOWTRANSFERBTNS[lang],"s",66],
|
||||
["logolocation",MAN_LOGOLOCATION[lang],"s",67]
|
||||
["logolocation",MAN_LOGOLOCATION[lang],"s",67],
|
||||
|
||||
["austriabind",MAN_AUSTRIA_BIND[lang],"s",68],
|
||||
["doublereceipt",MAN_DOUBLERECEIPT[lang],"s",69]
|
||||
];
|
||||
|
||||
var predef = "";
|
||||
|
|
@ -747,6 +754,7 @@ function setLanguage(l) {
|
|||
$("#backupbtntxtall").html(MAN_BAK_BTN_ALL[l]);
|
||||
$("#backupbtntxtalllogs").html(MAN_BAK_BTN_ALL_LOGS[l]);
|
||||
$("#backupbtnftptxtall").html(MAN_BAK_FTP_ALL[l]);
|
||||
$("#backupbtndebugdata").html(MAN_BAK_DEBUGDATA[l]);
|
||||
$("#golivetxt").html(MAN_GO_LIVE[l]);
|
||||
|
||||
$("#shutdownbtntxt").html(MAN_SHUTDOWN[l]);
|
||||
|
|
@ -973,6 +981,7 @@ function insertGeneralConfigItems(configResult) {
|
|||
$("#pickuptemplate").val(values.pickuptemplate);
|
||||
|
||||
$("#reservationnote").val(values.reservationnote);
|
||||
$("#cbirdfolder").val(values.cbirdfolder);
|
||||
|
||||
var payPrintType = values.payprinttype;
|
||||
if (payPrintType == "l") {
|
||||
|
|
@ -1055,7 +1064,9 @@ function insertGeneralConfigItems(configResult) {
|
|||
|
||||
$("#partOfSumupforcard").html(createYesNo("sumupforcard",MAN_SUMUPFORCARD, values.sumupforcard));
|
||||
$("#partOfPrintcash").html(createYesNo("printcash",MAN_PRINTCASH, values.printcash));
|
||||
$("#partOfDoublereceipt").html(createYesNo("doublereceipt",MAN_DOUBLERECEIPT, values.doublereceipt));
|
||||
$("#partOfShowerrorlog").html(createYesNo("showerrorlog",MAN_SHOW_ERRORLOG, values.showerrorlog));
|
||||
$("#partOfAustriabind").html(createAustriaBindPart(values.austriabind));
|
||||
|
||||
var language = values.billlanguage;
|
||||
generalVals[2] = language;
|
||||
|
|
@ -1156,6 +1167,8 @@ function insertGeneralConfigItems(configResult) {
|
|||
generalVals[65] = values.showerrorlog;
|
||||
generalVals[66] = values.showtransferbtns;
|
||||
generalVals[67] = values.logolocation;
|
||||
generalVals[68] = values.austriabind;
|
||||
generalVals[69] = values.doublereceipt;
|
||||
|
||||
defaulttmp = values.defaulttmp;
|
||||
|
||||
|
|
@ -1231,8 +1244,8 @@ function createReceiptFontPart() {
|
|||
html += '<label for="receiptfontsize">' + MAN_RECEIPT_FONTSIZE[lang] + ':</label>';
|
||||
html += '<select name="receiptfontsize" id="receiptfontsize" data-theme="e">';
|
||||
|
||||
for($i=7;$i<=18;$i++) {
|
||||
html += '<option value="' + $i + '"' + isSelectedOption($i,generalVals[0]) + '>' + $i + '</option>';
|
||||
for(var i=7;i<=18;i++) {
|
||||
html += '<option value="' + i + '"' + isSelectedOption(i,generalVals[0]) + '>' + i + '</option>';
|
||||
}
|
||||
|
||||
html += '</select></div>';
|
||||
|
|
@ -1240,6 +1253,18 @@ function createReceiptFontPart() {
|
|||
return html;
|
||||
}
|
||||
|
||||
function createAustriaBindPart(value) {
|
||||
var html = '<div class="ui-field-contain">';
|
||||
html += '<label for="austriabind">' + MAN_AUSTRIA_BIND[lang] + ':</label>';
|
||||
html += '<select name="austriabind" id="austriabind" data-theme="e">';
|
||||
for (var i=0;i<4;i++) {
|
||||
html += '<option value="' + i + '"' + isSelectedOption(i,value) + '>' + MAN_AUSTRIABIND_OPTIONS[i] + '</option>';
|
||||
}
|
||||
html += '</select></div>';
|
||||
|
||||
return html;
|
||||
}
|
||||
|
||||
function createPaymentConfigPart(payment) {
|
||||
var html = '<div class="ui-field-contain">';
|
||||
html += '<label for="paymentconfig">' + MAN_PAYMENT_CONFIG[lang] + ':</label>';
|
||||
|
|
@ -1633,7 +1658,7 @@ function initRestoreFileUpload() {
|
|||
} else {
|
||||
alert("Import war erfolgreich.");
|
||||
setTimeout(function(){
|
||||
document.location.href = "index.html?v=1.5.26";
|
||||
document.location.href = "index.html?v=1.5.27";
|
||||
},250);
|
||||
}
|
||||
},
|
||||
|
|
@ -2106,32 +2131,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";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=1.5.27";
|
||||
});
|
||||
|
||||
$("#backup_btnall").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=1.5.27";
|
||||
});
|
||||
|
||||
$("#backup_btnalllogs").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=1.5.27";
|
||||
});
|
||||
|
||||
$("#backup_btnftpall").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
showProgressPopup();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all",null,handleFtpResult,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=1.5.27",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.5.27",'_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";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=1.5.27";
|
||||
});
|
||||
|
||||
$("#golive").off("click").on("click", function (e) {
|
||||
|
|
@ -2304,7 +2335,7 @@ function updateOneSingleFile() {
|
|||
setTimeout(function(){
|
||||
$("#sliderarea").hide();
|
||||
var millis=getMillis();
|
||||
document.location.href = "install.html?v=1.5.26&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=1.5.27&mode=onlyupdate&n=" + millis;
|
||||
},250);
|
||||
}
|
||||
}
|
||||
|
|
@ -3698,7 +3729,6 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
</span>
|
||||
</p>
|
||||
|
||||
<form>
|
||||
<b>Startdatum Umsätze:</b>
|
||||
<div class="ui-field-contain" id="datexportstartmonthpart"></div>
|
||||
|
||||
|
|
@ -3749,7 +3779,6 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<div id="otherrundatadivheader" class="headertext">Verlaufsdaten</div>
|
||||
<button type="submit" data-theme="f" class="cancelButton exportbtn" data-icon="check" id="createtimesexport">Export Zeiterfassung</button>
|
||||
<button type="submit" data-theme="f" class="cancelButton exportbtn" data-icon="check" id="createlogexport">Export Log</button>
|
||||
</form>
|
||||
</div><!-- Datenexport -->
|
||||
|
||||
</div> <!-- collapsible Abrechnung und Datenexport -->
|
||||
|
|
@ -3828,10 +3857,10 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div id="partOfAustria"></div>
|
||||
|
||||
<div id="partOfLogolocation"></div>
|
||||
|
||||
<div id="partOfAustria"></div>
|
||||
|
||||
<div id="partIfAustriaEnabled">
|
||||
<i><b><span id=austriahint></span></b></i>
|
||||
<div data-role="fieldcontain" style="display:none;">
|
||||
|
|
@ -3871,8 +3900,10 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<input type="text" value="" data-mini="true" placeholder="7,0" id="taxaustriaspecialval" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
|
||||
<div id="partOfAustriabind"></div>
|
||||
|
||||
<div data-role="fieldcontain">
|
||||
<label for="cbirdfolder"><span id="cbirdfoldertxt">CBird Imporfolder:</span></label>
|
||||
<label for="cbirdfolder"><span id="cbirdfoldertxt">CBird Imporfolder</span>:</label>
|
||||
<input type="text" value="" data-mini="true" placeholder="" id="cbirdfolder" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
</div> <!-- partIfAustriaEnabled -->
|
||||
|
|
@ -3954,6 +3985,7 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<span id=addrecprinterhint></span>
|
||||
</div>
|
||||
<div id="partOfPrintcash"></div>
|
||||
<div id="partOfDoublereceipt"></div>
|
||||
</div> <!-- confprintsection -->
|
||||
|
||||
<p><a class="genconflink" href="" onclick="javascript:showconfsection('confworkrecsection'); return false">
|
||||
|
|
@ -4198,7 +4230,7 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<div id="partOfshowpayments"></div>
|
||||
<i id=showpaymentshint style="padding-left: 50px;padding-right: 50px;">Hinweis: alles Bar</i><br>
|
||||
<div id="partOfshowpayment2"></div>
|
||||
<div id="partOfshowpayment3" style="display:none;"></div>
|
||||
<div id="partOfshowpayment3"></div>
|
||||
<div id="partOfshowpayment4"></div>
|
||||
<div id="partOfshowpayment5"></div>
|
||||
<div id="partOfshowpayment6"></div>
|
||||
|
|
@ -4619,6 +4651,7 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<ul>
|
||||
<li><i>Alles ohne Logs:</i> Die Konfiguration und Gästeinformation werden gesichert. Die Protokolldaten (hauptsächlich Informationen über die Abarbeitung von Druckjobs) werden nicht abgespeichert. Dies ist die Sicherung, die man durchführen sollte, wenn man zu einem anderen Zeitpunkt eine komplette Wiederherstellung vornehmen möchte. Diese Sicherungsart wird auch standardmäßig verwendet, wenn man über ein Skript eine Sicherung veranlasst.
|
||||
<li><i>Alles mit Logs:</i> Diese Sicherung enthält alle Daten inklusive der Protokolle. Die Protokolle werden nur benötigt, wenn man bestimmte Fehler erkennen möchte, z.B. fehlgeschlagene Druckjobs. Dieser Export kann vom Entwickler angefragt werden, für den typischen Benutzer ist diese Sicherungsart nicht von Interesse.
|
||||
<li><i>Export Debug-Daten:</i> Dieser Datenexport kann dem Entwickler helfen, Fehler oder Supportanfragen zu beantworten.</li>
|
||||
</ul>
|
||||
|
||||
<p>Üblicherweise wird die Sicherungsdatei zum Download an den Browser übermittelt. Zusätzlich kann man jedoch auch über die Sicherungsart "Alles ohne Logs" auf einen ftp-Server hochladen, wenn der Zugang zum ftp-Server zuvor in der Konfiguration festgelegt wurde.
|
||||
|
|
@ -4680,21 +4713,14 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<p>Durante la importación, se puede volver a importar una copia de seguridad de cualquier tipo. Las acciones de importación se registran y pueden ser vistas por los auditores.
|
||||
</div>
|
||||
|
||||
<div id=backuparea1>
|
||||
<p><div id="backuparea">
|
||||
<form action='dummy'>
|
||||
<button type="submit" data-theme="f" id="backup_btnall"><span id="backupbtntxtall" style="font-size:larger;font-style:oblique;">Sicherung</span></button>
|
||||
<button type="submit" data-theme="f" id="backup_btn"><span id="backupbtntxt">Sicherung</span></button>
|
||||
</form>
|
||||
</div>
|
||||
<div id=backuparea2>
|
||||
<form action='dummy'>
|
||||
<button type="submit" data-theme="f" id="backupguests_btn"><span id="backupguestsbtntxt">Sicherung</span></button>
|
||||
</form>
|
||||
</div>
|
||||
<p><div id=backuparea3>
|
||||
<form action='dummy'>
|
||||
<button type="submit" data-theme="f" id="backup_btnall"><span id="backupbtntxtall">Sicherung</span></button>
|
||||
<button type="submit" data-theme="f" id="backup_btnalllogs"><span id="backupbtntxtalllogs">Sicherung</span></button>
|
||||
<button type="submit" data-theme="f" id="backup_btnftpall"><span id="backupbtnftptxtall">FTPSicherung</span></button>
|
||||
<button type="submit" data-theme="f" id="backup_debugdata"><span id="backupbtndebugdata">Debugdaten</span></button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1218,7 +1218,9 @@ class Admin {
|
|||
|
||||
array("printcash",0,false),
|
||||
array("showerrorlog",1,false),
|
||||
array("logolocation",1,false)
|
||||
array("logolocation",1,false),
|
||||
array("austriabind",0,false),
|
||||
array("doublereceipt",0,false)
|
||||
);
|
||||
|
||||
if (is_null($pdo)) {
|
||||
|
|
@ -1413,7 +1415,7 @@ class Admin {
|
|||
$view = "preferences.html";
|
||||
}
|
||||
|
||||
echo json_encode($view . "?v=1.5.26");
|
||||
echo json_encode($view . "?v=1.5.27");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1634,31 +1636,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.26"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.27"); }
|
||||
} else {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.26"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.27"); }
|
||||
}
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.26"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.26"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.26"); }
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.27"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.27"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.27"); }
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.26"); }
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.27"); }
|
||||
}
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.26"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.26"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.26"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.26"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.26"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.26"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.26"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.26"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.26"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.26"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.26");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.26"); }
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.27"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.27"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.27"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.27"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.27"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.27"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.27"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.27"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.27"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.27"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.27");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.27"); }
|
||||
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.26");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.26");
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.27");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.27");
|
||||
}
|
||||
|
||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||
|
|
@ -2261,7 +2263,9 @@ class Admin {
|
|||
|
||||
"printcash" => array("dbcol" => "printcash","checknum" => 0),
|
||||
"showerrorlog" => array("dbcol" => "showerrorlog","checknum" => 0),
|
||||
"logolocation" => array("dbcol" => "logolocation","checknum" => 1)
|
||||
"logolocation" => array("dbcol" => "logolocation","checknum" => 1),
|
||||
"austriabind" => array("dbcol" => "austriabind","checknum" => 0),
|
||||
"doublereceipt" => array("dbcol" => "doublereceipt","checknum" => 0)
|
||||
);
|
||||
$problem = false;
|
||||
foreach ($changedValues as $aChangeSet) {
|
||||
|
|
@ -2771,7 +2775,87 @@ class Admin {
|
|||
}
|
||||
}
|
||||
|
||||
private static function getKeysOfDataLine($dataline) {
|
||||
$html = "<tr>";
|
||||
$keys = array_keys($dataline);
|
||||
foreach ($keys as $k) {
|
||||
$html .= "<th>" . htmlspecialchars($k);
|
||||
}
|
||||
$html .= "</tr>";
|
||||
return $html;
|
||||
}
|
||||
private static function showDataLineAsHtml($dataline) {
|
||||
$html = "<tr>";
|
||||
$keys = array_keys($dataline);
|
||||
foreach ($keys as $k) {
|
||||
$val = $dataline[$k];
|
||||
if (!is_null($val)) {
|
||||
$html .= "<td>" . htmlspecialchars($dataline[$k]);
|
||||
} else {
|
||||
$html .= "<td><i>NULL</i>";
|
||||
}
|
||||
}
|
||||
$html .= "</tr>";
|
||||
return $html;
|
||||
}
|
||||
|
||||
private static function exportdebugdata() {
|
||||
$pdo = DButils::openDbAndReturnPdoStatic();
|
||||
$timeLimitedTables = array(
|
||||
array('config',null,array('printpass','cancelguestcode','cancelunpaidcode','dailycode','ftppass','guestcode','remoteaccesscode','smtppass','stornocode'),null),
|
||||
array('queue','ordertime',null,null),
|
||||
array('bill','billdate',null,null),
|
||||
array('closing','closingdate',null,null),
|
||||
array('extras',null,null,null),
|
||||
array('queueextras',null,null,100),
|
||||
array('printjobs',null,null,null),
|
||||
array('log','date',null,null));
|
||||
|
||||
$html = self::debugDataStyle();
|
||||
foreach($timeLimitedTables as $t) {
|
||||
$tablename = $t[0];
|
||||
$datecol = $t[1];
|
||||
$notins = $t[2];
|
||||
$maxLines = $t[3];
|
||||
$where = "";
|
||||
$limit = "";
|
||||
if (!is_null($datecol)) {
|
||||
$where = " WHERE DATE(`$datecol`) >= ( CURDATE() - INTERVAL 2 DAY )";
|
||||
}
|
||||
if (!is_null($maxLines)) {
|
||||
$limit = " ORDER BY id DESC LIMIT $maxLines";
|
||||
}
|
||||
$sql = "SELECT * from `%$tablename%` $where $limit";
|
||||
$result = CommonUtils::fetchSqlAll($pdo, $sql);
|
||||
|
||||
$html .= "<h2>Tabelle " . htmlspecialchars($tablename) . ":</h2>";
|
||||
if (count($result) > 0) {
|
||||
$html .= "<table class='viewtable'>";
|
||||
$html .= self::getKeysOfDataLine($result[0]);
|
||||
foreach($result as $aLine) {
|
||||
if (!is_null($notins)) {
|
||||
if (in_array($aLine["name"],$notins)) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
$html .= self::showDataLineAsHtml($aLine);
|
||||
}
|
||||
$html .= "</table><p>";
|
||||
}
|
||||
}
|
||||
echo $html;
|
||||
}
|
||||
|
||||
private static function debugDataStyle() {
|
||||
$css = "<style>" . file_get_contents(__DIR__ . "/../css/bestformat.css") . "</style>";
|
||||
return $css;
|
||||
}
|
||||
|
||||
public function backup($theType,$remoteaccesscode,$doFtp = false) {
|
||||
if ($theType == "debugdata") {
|
||||
self::exportdebugdata();
|
||||
return;
|
||||
}
|
||||
set_time_limit(60*60);
|
||||
date_default_timezone_set(DbUtils::getTimeZone());
|
||||
$nowtime = date('Y-m-d');
|
||||
|
|
|
|||
|
|
@ -209,6 +209,20 @@ class Bill {
|
|||
}
|
||||
}
|
||||
|
||||
public static function isBillPaidByCard($pdo,$billid) {
|
||||
$sql = "SELECT paymentid FROM %bill% WHERE id=?";
|
||||
$result = CommonUtils::fetchSqlAll($pdo, $sql, array($billid));
|
||||
if (count($result) > 0) {
|
||||
$paymentid = $result[0]["paymentid"];
|
||||
if (($paymentid == 2) || ($paymentid == 3)) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public function initCardPayment($pdo,$billid) {
|
||||
$randval = md5(rand(0, getrandmax()));
|
||||
$sql = "INSERT INTO %work% (item,value,signature) VALUES(?,?,?)";
|
||||
|
|
|
|||
|
|
@ -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.26">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.27">';
|
||||
$txt .= "</head>";
|
||||
return $txt;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
|
|||
if (strlen($status) > 150) {
|
||||
$status = substr($status, 0,149);
|
||||
}
|
||||
$version = "1.5.26";
|
||||
$version = "1.5.27";
|
||||
|
||||
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -401,9 +401,14 @@ class PrintQueue {
|
|||
$printer = $_SESSION['receiptprinter'];
|
||||
|
||||
// now get receipt info from bill table
|
||||
$pdo = $this->dbutils->openDbAndReturnPdo();
|
||||
|
||||
CommonUtils::log($pdo, "PRINTQUEUE", "Insert bill with id=$billid for printer=$printer into queue.");
|
||||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
$doubleReceipt = CommonUtils::getConfigValue($pdo, 'doublereceipt', 0);
|
||||
$isBillPaidByCard = Bill::isBillPaidByCard($pdo,$billid);
|
||||
$noOfInsert = 1;
|
||||
if ($isBillPaidByCard && ($doubleReceipt == 1)) {
|
||||
$noOfInsert = 2;
|
||||
}
|
||||
CommonUtils::log($pdo, "PRINTQUEUE", "Insert bill $noOfInsert x with id=$billid for printer=$printer into queue.");
|
||||
|
||||
$sql = "SELECT setting FROM %config% WHERE name=?";
|
||||
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
|
||||
|
|
@ -413,7 +418,9 @@ class PrintQueue {
|
|||
|
||||
$printInsertSql = "INSERT INTO `%printjobs%` (`id` , `content`,`type`,`printer`) VALUES ( NULL,?,?,?)";
|
||||
$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($printInsertSql));
|
||||
$stmt->execute(array((string)($billid),self::$RECEIPT,$printer));
|
||||
for ($times=0;$times < $noOfInsert; $times++) {
|
||||
$stmt->execute(array((string)($billid),self::$RECEIPT,$printer));
|
||||
}
|
||||
|
||||
if (!is_null($addprinter) && ($addprinter != "") && ($useaddrecprinter == 1)) {
|
||||
$stmt->execute(array((string)($billid),self::$RECEIPT,$addprinter));
|
||||
|
|
|
|||
|
|
@ -2210,36 +2210,71 @@ class QueueContent {
|
|||
// Rksv::signBill($pdo, $billid);
|
||||
|
||||
$austriaEnabled = CommonUtils::getConfigValue($pdo, "austria", 0);
|
||||
if ($austriaEnabled == 1) {
|
||||
$cbirdFolder = trim(CommonUtils::getConfigValue($pdo, 'cbirdfolder', ''));
|
||||
if (($austriaEnabled == 1) && ($cbirdFolder != "")) {
|
||||
$austriabind = CommonUtils::getConfigValue($pdo, 'austriabind', 0);
|
||||
|
||||
$idlist = join(",",$ids_array);
|
||||
$sql = "SELECT count(productname) as mycount,productname,tax,price FROM %queue% WHERE id in ($idlist) GROUP BY productname, price, tax";
|
||||
$cbirdEntries = CommonUtils::fetchSqlAll($pdo, $sql);
|
||||
if ($paymentId == 1) {
|
||||
$paymentText = "Bar";
|
||||
} else {
|
||||
$sql = "SELECT name from %payment% WHERE id=?";
|
||||
$r = CommonUtils::fetchSqlAll($pdo, $sql, array($paymentId));
|
||||
$paymentText = $r[0]["name"];
|
||||
}
|
||||
$positionen = array();
|
||||
foreach ($cbirdEntries as $aPosition) {
|
||||
$priceInCent = $aPosition["price"] * 100;
|
||||
$aPos = array("bezeichnung" => $aPosition["productname"],
|
||||
"menge" => intval($aPosition["mycount"]),
|
||||
"einzelpreis" => intval($priceInCent),
|
||||
"ust" => intval($aPosition["tax"]));
|
||||
$positionen[] = $aPos;
|
||||
}
|
||||
$cbirdEntry = array("zahlungsmittel" => $paymentText, "positionen" => $positionen);
|
||||
$cbirdEntryJson = json_encode($cbirdEntry);
|
||||
$currentTime = date('Y-m-d');
|
||||
$longid = str_pad($billid, 10, '0', STR_PAD_LEFT);
|
||||
$cbirdFolder = trim(CommonUtils::getConfigValue($pdo, 'cbirdfolder', ''));
|
||||
if ($austriabind == 1) {
|
||||
// 0=nothing, 1 = cbird, 2=QRK (R2B), 3=QRK(Receipt) - hier 1=cbird was chosen
|
||||
|
||||
|
||||
if ($paymentId == 1) {
|
||||
$paymentText = "Bar";
|
||||
} else {
|
||||
$sql = "SELECT name from %payment% WHERE id=?";
|
||||
$r = CommonUtils::fetchSqlAll($pdo, $sql, array($paymentId));
|
||||
$paymentText = $r[0]["name"];
|
||||
}
|
||||
$positionen = array();
|
||||
foreach ($cbirdEntries as $aPosition) {
|
||||
$priceInCent = $aPosition["price"] * 100;
|
||||
$aPos = array("bezeichnung" => $aPosition["productname"],
|
||||
"menge" => intval($aPosition["mycount"]),
|
||||
"einzelpreis" => intval($priceInCent),
|
||||
"ust" => intval($aPosition["tax"]));
|
||||
$positionen[] = $aPos;
|
||||
}
|
||||
$cbirdEntry = array("zahlungsmittel" => $paymentText, "positionen" => $positionen);
|
||||
$cbirdEntryJson = json_encode($cbirdEntry);
|
||||
$currentTime = date('Y-m-d');
|
||||
$longid = str_pad($billid, 10, '0', STR_PAD_LEFT);
|
||||
|
||||
if ($cbirdFolder != "") {
|
||||
$filename = $cbirdFolder . "/" . $currentTime . "-" . $longid . ".json";
|
||||
file_put_contents($filename, $cbirdEntryJson);
|
||||
|
||||
} else if (($austriabind == 2) && self::isPaymentSupportedByQRK($paymentId)) {
|
||||
$bruttoFormatted = number_format($brutto, 2, '.', '');
|
||||
$qrkPaidby = strval(self::getPayedByForQRK($paymentId));
|
||||
$qrkbill = array("receiptNum" => strval($billid),
|
||||
"gross" => "$bruttoFormatted",
|
||||
"payedBy" => "$qrkPaidby",
|
||||
"customerText" => "");
|
||||
$qrkcontainer = array("r2b" => array($qrkbill));
|
||||
$qrkfilecontent = json_encode($qrkcontainer);
|
||||
$filename = $cbirdFolder . "/QRK_R2B_" . $billid . ".json";
|
||||
file_put_contents($filename, $qrkfilecontent);
|
||||
} else if (($austriabind == 3) && self::isPaymentSupportedByQRK($paymentId)) {
|
||||
$qrkPaidby = strval(self::getPayedByForQRK($paymentId));
|
||||
$positionen = array();
|
||||
foreach ($cbirdEntries as $aPosition) {
|
||||
$thePrice = $aPosition["price"];
|
||||
$thePriceFormatted = number_format($thePrice, 2, '.', '');
|
||||
$theTax = $aPosition["tax"];
|
||||
$theTaxFormatted = number_format($theTax, 2, '.', '');
|
||||
$aPos = array("count" => strval($aPosition["mycount"]),
|
||||
"name" => $aPosition["productname"],
|
||||
"gross" => $thePriceFormatted,
|
||||
"tax" => $theTaxFormatted);
|
||||
$positionen[] = $aPos;
|
||||
}
|
||||
$qrkbill = array("customerText" => "","payedBy" => $qrkPaidby,"items" => $positionen);
|
||||
$qrkreceipt = array("receipt" => array($qrkbill));
|
||||
$qrkfilecontent = json_encode($qrkreceipt);
|
||||
$filename = $cbirdFolder . "/QRK_Receipt_" . $billid . ".json";
|
||||
file_put_contents($filename, $qrkfilecontent);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2254,6 +2289,23 @@ class QueueContent {
|
|||
}
|
||||
}
|
||||
|
||||
private static function isPaymentSupportedByQRK($paymentid) {
|
||||
if (($paymentid == 1) || ($paymentid == 2) || ($paymentid == 3)) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
private static function getPayedByForQRK($paymentid) {
|
||||
if ($paymentid == 1) {
|
||||
return 0;
|
||||
} else if ($paymentid == 2) {
|
||||
return 1;
|
||||
} else if ($paymentid == 3) {
|
||||
return 2;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
private function getUserId() {
|
||||
if(session_id() == '') {
|
||||
session_start();
|
||||
|
|
|
|||
|
|
@ -1231,6 +1231,21 @@ class Version {
|
|||
}
|
||||
}
|
||||
|
||||
public static function upd_1526_1527($pdo, $prefix, $dbname) {
|
||||
try {
|
||||
self::execSql($pdo, "UPDATE %queueextras% SET amount='1' where amount is null");
|
||||
|
||||
self::insertOrUpdateConfigItem($pdo, 'doublereceipt', '0');
|
||||
|
||||
$sql = "UPDATE `%payment%` SET name=?, name_en=?, name_esp=? WHERE id=?";
|
||||
self::execSqlWithParam($pdo, $sql, array('EC-Kartenzahlung','Electr. purse (EC)','Pago con tarjeta EC',2));
|
||||
self::insertOrUpdateConfigItem($pdo, 'austriabind', '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"),
|
||||
|
|
@ -1304,7 +1319,8 @@ class Version {
|
|||
"1.5.22" => array("upd_1522_1523","1.5.23"),
|
||||
"1.5.23" => array("upd_1523_1524","1.5.24"),
|
||||
"1.5.24" => array("upd_1524_1525","1.5.25"),
|
||||
"1.5.25" => array("upd_1525_1526","1.5.26")
|
||||
"1.5.25" => array("upd_1525_1526","1.5.26"),
|
||||
"1.5.26" => array("upd_1526_1527","1.5.27")
|
||||
);
|
||||
|
||||
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.5.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
<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.26"></script>
|
||||
<script src="utilities.js?v=1.5.27"></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.5.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
|
|||
|
|
@ -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.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -15,8 +15,8 @@
|
|||
<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"></script>
|
||||
<script src="elements/product.js?v=1.5.26"></script>
|
||||
<script src="elements/extra.js?v=1.5.26"></script>
|
||||
<script src="elements/product.js?v=1.5.27"></script>
|
||||
<script src="elements/extra.js?v=1.5.27"></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.5.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
|
||||
<link rel="stylesheet" href="css/ospage.css" />
|
||||
<link rel="stylesheet" href="css/tablepanel.css" />
|
||||
|
|
|
|||
|
|
@ -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.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -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.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -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.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -623,7 +623,7 @@ function bindCancelButtn() {
|
|||
var year = date.getFullYear();
|
||||
var dateStr = year + "-" + month + "-" + day;
|
||||
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=1.5.26&date=" + dateStr;},500);
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=1.5.27&date=" + dateStr;},500);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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.5.26";
|
||||
var nextpage = "paydesk.html?version=1.5.27";
|
||||
|
||||
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.5.26";
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=1.5.27";
|
||||
} else {
|
||||
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
|
||||
nextpage = "waiter.html?version=1.5.26";
|
||||
nextpage = "waiter.html?version=1.5.27";
|
||||
}
|
||||
|
||||
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.5.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
|
|||
|
|
@ -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.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
<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.26"></script>
|
||||
<script src="utilities.js?v=1.5.27"></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.5.26">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.27">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
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