OrderSprinter 1.1.29
This commit is contained in:
parent
ef2e38d223
commit
dd516ba2d3
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.28">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.29">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.28">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.29">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.28">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.29">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -7,8 +7,8 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.28">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.29">
|
||||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.28">
|
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.29">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -679,7 +679,7 @@ $(document).ready(function() {
|
||||||
<tr id=updateline>
|
<tr id=updateline>
|
||||||
<td> </td>
|
<td> </td>
|
||||||
<td align=center>
|
<td align=center>
|
||||||
<button id="updatebtn">Update -> 1.1.28</button>
|
<button id="updatebtn">Update -> 1.1.29</button>
|
||||||
</td>
|
</td>
|
||||||
<td> </td>
|
<td> </td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
@ -1115,6 +1115,30 @@ return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateUserTable1128_1129($prefix,$version) {
|
||||||
|
$pdo = $this->pdo;
|
||||||
|
try {
|
||||||
|
if ($version != "1.1.28") {
|
||||||
|
$ret = $this->updateUserTable1126_1127($prefix,$version);
|
||||||
|
if (!$ret) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$adminCl = new Admin();
|
||||||
|
DbUtils::overrulePrefix($prefix);
|
||||||
|
|
||||||
|
$sql = "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL,?,?)";
|
||||||
|
$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
|
||||||
|
$stmt->execute(array('waitergopayprint',0));
|
||||||
|
|
||||||
|
$this->updateVersion($pdo, '1.1.29');
|
||||||
|
return true;
|
||||||
|
} catch (PDOException $e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function setVersion($prefix,$theVersion) {
|
function setVersion($prefix,$theVersion) {
|
||||||
$pdo = $this->pdo;
|
$pdo = $this->pdo;
|
||||||
try {
|
try {
|
||||||
|
@ -1194,7 +1218,7 @@ $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VAL
|
||||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'billlanguage', $billlanguage)");
|
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'billlanguage', $billlanguage)");
|
||||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'currency', '$currency')");
|
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'currency', '$currency')");
|
||||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'receiptfontsize', '12')");
|
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'receiptfontsize', '12')");
|
||||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.28')");
|
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.29')");
|
||||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'paymentconfig', '0')");
|
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'paymentconfig', '0')");
|
||||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'remoteaccesscode', null)");
|
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'remoteaccesscode', null)");
|
||||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'decpoint', '$decpoint')");
|
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'decpoint', '$decpoint')");
|
||||||
|
@ -1222,6 +1246,7 @@ $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VAL
|
||||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'certificatesn', '1234567')");
|
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'certificatesn', '1234567')");
|
||||||
|
|
||||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'digigopaysetready', '1')");
|
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'digigopaysetready', '1')");
|
||||||
|
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'waitergopayprint', '0')");
|
||||||
|
|
||||||
// prepare for later inconsistency check if version is obsolete
|
// prepare for later inconsistency check if version is obsolete
|
||||||
date_default_timezone_set($timezone);
|
date_default_timezone_set($timezone);
|
||||||
|
@ -1557,7 +1582,7 @@ $zones[] = $timezone_identifiers[$i];
|
||||||
}
|
}
|
||||||
echo json_encode($zones);
|
echo json_encode($zones);
|
||||||
} else if ($command == 'update') {
|
} else if ($command == 'update') {
|
||||||
$installerVersion = "1.1.28";
|
$installerVersion = "1.1.29";
|
||||||
|
|
||||||
$admin = new InstallAdmin();
|
$admin = new InstallAdmin();
|
||||||
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
|
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
|
||||||
|
@ -1586,7 +1611,7 @@ $supportedVersions = array("1.0.22","1.0.23","1.0.24","1.0.25","1.0.26","1.0.27"
|
||||||
"1.0.30","1.0.31","1.0.32","1.0.33","1.0.34","1.0.35","1.0.36","1.0.37","1.0.38","1.0.39",
|
"1.0.30","1.0.31","1.0.32","1.0.33","1.0.34","1.0.35","1.0.36","1.0.37","1.0.38","1.0.39",
|
||||||
"1.0.40","1.0.41","1.0.42","1.0.43",
|
"1.0.40","1.0.41","1.0.42","1.0.43",
|
||||||
"1.1.0","1.1.1","1.1.2","1.1.3","1.1.4","1.1.5","1.1.6","1.1.7","1.1.8", "1.1.9","1.1.10","1.1.11","1.1.12","1.1.13","1.1.14","1.1.15","1.1.16","1.1.17",
|
"1.1.0","1.1.1","1.1.2","1.1.3","1.1.4","1.1.5","1.1.6","1.1.7","1.1.8", "1.1.9","1.1.10","1.1.11","1.1.12","1.1.13","1.1.14","1.1.15","1.1.16","1.1.17",
|
||||||
"1.1.18","1.1.19","1.1.20","1.1.21","1.1.22","1.1.23","1.1.24","1.1.25","1.1.26","1.1.27"
|
"1.1.18","1.1.19","1.1.20","1.1.21","1.1.22","1.1.23","1.1.24","1.1.25","1.1.26","1.1.27","1.1.28"
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!in_array($version, $supportedVersions)) {
|
if (!in_array($version, $supportedVersions)) {
|
||||||
|
@ -1594,7 +1619,7 @@ echo json_encode("Quellversion nicht unterstützt");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$ret = $admin->updateUserTable1127_1128($_POST['prefix'], $version);
|
$ret = $admin->updateUserTable1128_1129($_POST['prefix'], $version);
|
||||||
|
|
||||||
if(session_id() == '') {
|
if(session_id() == '') {
|
||||||
session_start();
|
session_start();
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.28">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.29">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.28">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.29">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
@ -136,10 +136,14 @@ var MAN_DISCOUNT1 = ["Rabatt 1 (%)","Discount 1 (%)","Descuento 1 (%)"];
|
||||||
var MAN_DISCOUNT2 = ["Rabatt 2 (%)","Discount 2 (%)","Descuento 2 (%)"];
|
var MAN_DISCOUNT2 = ["Rabatt 2 (%)","Discount 2 (%)","Descuento 2 (%)"];
|
||||||
var MAN_DISCOUNT3 = ["Rabatt 3 (%)","Discount 3 (%)","Descuento 3 (%)"];
|
var MAN_DISCOUNT3 = ["Rabatt 3 (%)","Discount 3 (%)","Descuento 3 (%)"];
|
||||||
var MAN_AUSTRIA = ["Österreich","Austria","Austria"];
|
var MAN_AUSTRIA = ["Österreich","Austria","Austria"];
|
||||||
var MAN_DIGI_GOPAY_SET_READY = ["Bestell-Kassenbutton deklariert Produkte 'fertig'","Waiter's paydesk button declares products be served","Boton caja en camarero view pone declara productos servidos"];
|
var MAN_DIGI_GOPAY_SET_READY = ["Bestell-Kassenbutton deklariert Produkte 'fertig'","Waiter's paydesk button declares products be served","Boton caja en vista de camarero pone declara productos servidos"];
|
||||||
var MAN_DIGI_GOPAY_DESCR = ["Im Arbeitsablauf 'nur digital' bestimmt diese Einstellung, ob bei Druck auf den Button 'Kasse' in der Bestellansicht mit anschließender Bezahlung die Produkte als serviert behandelt werden sollen.",
|
var MAN_DIGI_GOPAY_DESCR = ["Im Arbeitsablauf 'nur digital' bestimmt diese Einstellung, ob bei Druck auf den Button 'Kasse' in der Bestellansicht mit anschließender Bezahlung die Produkte als serviert behandelt werden sollen.",
|
||||||
"In the 'only digital' workflow this setting specifies if after pressing the 'paydesk' button in the waiter's view and paying the products shall be handled as served.",
|
"In the 'only digital' workflow this setting specifies if after pressing the 'paydesk' button in the waiter's view and paying the products shall be handled as served.",
|
||||||
"En el modus 'digital' este boton especifica si los productos deben declarados como servidos despues pagar por click en el boton 'caja' en la vista de camarero."];
|
"En el modus 'digital' este boton especifica si los productos deben declarados como servidos despues pagar por click en el boton 'caja' en la vista de camarero."];
|
||||||
|
var MAN_WAITER_GOPAY_PRINT = ["Bestell-Kassenbutton druckt Arbeitsbons","Waiter's paydesk button prints also work receipts","Boton caja en vista de camarero imprime también tiquets de trabajo"];
|
||||||
|
var MAN_WAITER_GOPAY_DESCR = ["Im Arbeitsablauf 'nur Arbeitsbons' bestimmt diese Einstellung, ob bei Druck auf den Button 'Kasse' Arbeitsbons gedruckt werden sollen.",
|
||||||
|
"In the 'only work receipts' workflow this setting specifies if after pressing the 'paydesk' button in the waiter's view work receipts shall be printed.",
|
||||||
|
"En el modus 'solo tiques de trabajar' este boton especifica se debe imprimido el tique de trabajar despues el click en el boton 'caja' en la vista de camarero."];
|
||||||
var MAN_GROUP_WORK_ITEMS = ["Artikelzusammenfassung Arbeitsbon","Summary articels on work receipt", "Agrupación articulos tique d. tr." ];
|
var MAN_GROUP_WORK_ITEMS = ["Artikelzusammenfassung Arbeitsbon","Summary articels on work receipt", "Agrupación articulos tique d. tr." ];
|
||||||
var MAN_RES_NOTE = ["Reservierungsbestätigung","Confirmation reservation","Text de email para reservación"];
|
var MAN_RES_NOTE = ["Reservierungsbestätigung","Confirmation reservation","Text de email para reservación"];
|
||||||
var MAN_CHANGE_CONFIG_HEAD = ["Konfiguration ändern?","Change configuration?","Modificar configuración?"];
|
var MAN_CHANGE_CONFIG_HEAD = ["Konfiguration ändern?","Change configuration?","Modificar configuración?"];
|
||||||
|
@ -270,7 +274,7 @@ var MAN_CERTIFICATE_SN = ["Zertifikatsseriennummer", "Certificate Serial No","Ce
|
||||||
var MAN_TAX = ["Steuersatz (%)","Tax (%)","Impuesto (%)"];
|
var MAN_TAX = ["Steuersatz (%)","Tax (%)","Impuesto (%)"];
|
||||||
|
|
||||||
var lang = 0;
|
var lang = 0;
|
||||||
var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1];
|
var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1,0];
|
||||||
|
|
||||||
var numberOfClosings = 0;
|
var numberOfClosings = 0;
|
||||||
|
|
||||||
|
@ -298,6 +302,7 @@ var generalValuesSettings = [
|
||||||
["discount3",MAN_DISCOUNT3[lang],"s",13],
|
["discount3",MAN_DISCOUNT3[lang],"s",13],
|
||||||
["austria",MAN_AUSTRIA[lang],"s",10],
|
["austria",MAN_AUSTRIA[lang],"s",10],
|
||||||
["digigopaysetready",MAN_DIGI_GOPAY_SET_READY[lang],"s",14],
|
["digigopaysetready",MAN_DIGI_GOPAY_SET_READY[lang],"s",14],
|
||||||
|
["waitergopayprint",MAN_WAITER_GOPAY_PRINT[lang],"s",15],
|
||||||
["workflowconfig",MAN_WORKFLOW[lang],"s",4],
|
["workflowconfig",MAN_WORKFLOW[lang],"s",4],
|
||||||
["receiptfontsize",MAN_RECEIPT_FONTSIZE[lang],"s",0],
|
["receiptfontsize",MAN_RECEIPT_FONTSIZE[lang],"s",0],
|
||||||
["billlanguage",MAN_LANG_OF_RECEIPT[lang],"s",2],
|
["billlanguage",MAN_LANG_OF_RECEIPT[lang],"s",2],
|
||||||
|
@ -372,6 +377,7 @@ function setLanguage(l) {
|
||||||
$("#paydeskidtxt").html(MAN_PAYDESKID[l]);
|
$("#paydeskidtxt").html(MAN_PAYDESKID[l]);
|
||||||
$("#austriahint").html(MAN_AUSTRIA_INCOMPLETE[l]);
|
$("#austriahint").html(MAN_AUSTRIA_INCOMPLETE[l]);
|
||||||
$("#digigopaysetreadyhint").html("<p style='padding-left: 50px;padding-right: 50px;'><i>" + MAN_DIGI_GOPAY_DESCR[l] + "</i></p>");
|
$("#digigopaysetreadyhint").html("<p style='padding-left: 50px;padding-right: 50px;'><i>" + MAN_DIGI_GOPAY_DESCR[l] + "</i></p>");
|
||||||
|
$("#waitergopayprinthint").html("<p style='padding-left: 50px;padding-right: 50px;'><i>" + MAN_WAITER_GOPAY_DESCR[l] + "</i></p>");
|
||||||
$("#aeskeytxt").html(MAN_AESKEY[l]);
|
$("#aeskeytxt").html(MAN_AESKEY[l]);
|
||||||
$("#certificatesntxt").html(MAN_CERTIFICATE_SN[l]);
|
$("#certificatesntxt").html(MAN_CERTIFICATE_SN[l]);
|
||||||
|
|
||||||
|
@ -494,6 +500,7 @@ function insertGeneralConfigItems(configResult) {
|
||||||
|
|
||||||
$("#partOfAustria").html(createAustriaPart(values.austria));
|
$("#partOfAustria").html(createAustriaPart(values.austria));
|
||||||
$("#partOfDigigopaysetready").html(createDigigopaysetready(values.digigopaysetready));
|
$("#partOfDigigopaysetready").html(createDigigopaysetready(values.digigopaysetready));
|
||||||
|
$("#partOfWaitergopayprint").html(createWaitergopayprint(values.waitergopayprint));
|
||||||
|
|
||||||
var language = values.billlanguage;
|
var language = values.billlanguage;
|
||||||
generalVals[2] = language;
|
generalVals[2] = language;
|
||||||
|
@ -529,6 +536,7 @@ function insertGeneralConfigItems(configResult) {
|
||||||
$("#partOfDiscount3").html(createDiscount3Part());
|
$("#partOfDiscount3").html(createDiscount3Part());
|
||||||
generalVals[10] = values.austria;
|
generalVals[10] = values.austria;
|
||||||
generalVals[14] = values.digigopaysetready;
|
generalVals[14] = values.digigopaysetready;
|
||||||
|
generalVals[15] = values.waitergopayprint;
|
||||||
|
|
||||||
$("#smtphost").val(values.smtphost);
|
$("#smtphost").val(values.smtphost);
|
||||||
$("#partOfSmtpauth").html(createSMTPAuth(values.smtpauth));
|
$("#partOfSmtpauth").html(createSMTPAuth(values.smtpauth));
|
||||||
|
@ -638,6 +646,9 @@ function createAustriaPart(theValue) {
|
||||||
function createDigigopaysetready(theValue) {
|
function createDigigopaysetready(theValue) {
|
||||||
return createYesNo("digigopaysetready",MAN_DIGI_GOPAY_SET_READY, theValue);
|
return createYesNo("digigopaysetready",MAN_DIGI_GOPAY_SET_READY, theValue);
|
||||||
}
|
}
|
||||||
|
function createWaitergopayprint(theValue) {
|
||||||
|
return createYesNo("waitergopayprint",MAN_WAITER_GOPAY_PRINT, theValue);
|
||||||
|
}
|
||||||
|
|
||||||
function createGroupWorkItemsPart(theValue) {
|
function createGroupWorkItemsPart(theValue) {
|
||||||
return createYesNo("groupworkitems", MAN_GROUP_WORK_ITEMS, theValue);
|
return createYesNo("groupworkitems", MAN_GROUP_WORK_ITEMS, theValue);
|
||||||
|
@ -1128,7 +1139,7 @@ function binding() {
|
||||||
e.stopImmediatePropagation();
|
e.stopImmediatePropagation();
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
setVisibilityOfAustriaButtons();
|
setVisibilityOfAustriaButtons();
|
||||||
setVisibilityOfDigiGoPayDeskPart();
|
setVisibilityDueToWorkflow();
|
||||||
});
|
});
|
||||||
|
|
||||||
bindSelectionsWithActions();
|
bindSelectionsWithActions();
|
||||||
|
@ -1150,7 +1161,7 @@ function bindSelectionsWithActions() {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
var newworkflowSel = $("#workflowconfig").find(":selected").val();
|
var newworkflowSel = $("#workflowconfig").find(":selected").val();
|
||||||
$("#partOfWorkflowConfig").html(createWorkflowConfigPart(newworkflowSel));
|
$("#partOfWorkflowConfig").html(createWorkflowConfigPart(newworkflowSel));
|
||||||
setVisibilityOfDigiGoPayDeskPart();
|
setVisibilityDueToWorkflow();
|
||||||
$("#configpart").trigger("create");
|
$("#configpart").trigger("create");
|
||||||
bindSelectionsWithActions();
|
bindSelectionsWithActions();
|
||||||
});
|
});
|
||||||
|
@ -1165,13 +1176,19 @@ function setVisibilityOfAustriaButtons() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function setVisibilityOfDigiGoPayDeskPart() {
|
function setVisibilityDueToWorkflow() {
|
||||||
var workflowBox = $("#workflowconfig").find(":selected").val();
|
var workflowBox = $("#workflowconfig").find(":selected").val();
|
||||||
if (workflowBox == 1) {
|
if (workflowBox == 1) {
|
||||||
$("#partIfDigiWorkflow").show();
|
$("#partIfDigiWorkflow").show();
|
||||||
} else {
|
} else {
|
||||||
$("#partIfDigiWorkflow").hide();
|
$("#partIfDigiWorkflow").hide();
|
||||||
}
|
}
|
||||||
|
// REM: 2: Only digital
|
||||||
|
if (workflowBox == 2) {
|
||||||
|
$("#partIfWorkReceiptsWorkflow").show();
|
||||||
|
} else {
|
||||||
|
$("#partIfWorkReceiptsWorkflow").hide();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function confirmMsg (result) {
|
function confirmMsg (result) {
|
||||||
|
@ -2267,6 +2284,10 @@ $(document).on("pageinit", "#admin-page", function () {
|
||||||
<div id="partOfDigigopaysetready"></div>
|
<div id="partOfDigigopaysetready"></div>
|
||||||
<span id=digigopaysetreadyhint></span>
|
<span id=digigopaysetreadyhint></span>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="partIfWorkReceiptsWorkflow">
|
||||||
|
<div id="partOfWaitergopayprint"></div>
|
||||||
|
<span id=waitergopayprinthint></span>
|
||||||
|
</div>
|
||||||
<div id="partOfBigFontWorkReceipt"></div>
|
<div id="partOfBigFontWorkReceipt"></div>
|
||||||
<div id="partOfProminentSearch"></div>
|
<div id="partOfProminentSearch"></div>
|
||||||
<div id="partOfGroupWorkItems"></div>
|
<div id="partOfGroupWorkItems"></div>
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -601,7 +601,7 @@ class Admin {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$configItems = join(",",array("'decpoint'","'version'","'cancelunpaidcode'","'tax'","'togotax'","'currency'","'workflowconfig'","'prominentsearch'","'discount1'","'discount2'","'discount3'"));
|
$configItems = join(",",array("'decpoint'","'version'","'cancelunpaidcode'","'tax'","'togotax'","'currency'","'workflowconfig'","'prominentsearch'","'discount1'","'discount2'","'discount3'","'waitergopayprint'"));
|
||||||
$sql = "select name,setting FROM %config% WHERE name in ($configItems)";
|
$sql = "select name,setting FROM %config% WHERE name in ($configItems)";
|
||||||
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
|
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
|
||||||
$stmt->execute();
|
$stmt->execute();
|
||||||
|
@ -716,6 +716,12 @@ class Admin {
|
||||||
if (is_null($digigopaysetready)) {
|
if (is_null($digigopaysetready)) {
|
||||||
$digigopaysetready = 1;
|
$digigopaysetready = 1;
|
||||||
}
|
}
|
||||||
|
$stmt->execute(array("waitergopayprint"));
|
||||||
|
$row = $stmt->fetchObject();
|
||||||
|
$waitergopayprint = $row->setting;
|
||||||
|
if (is_null($waitergopayprint)) {
|
||||||
|
$waitergopayprint = 0;
|
||||||
|
}
|
||||||
|
|
||||||
$stmt->execute(array("groupworkitems"));
|
$stmt->execute(array("groupworkitems"));
|
||||||
$row = $stmt->fetchObject();
|
$row = $stmt->fetchObject();
|
||||||
|
@ -824,7 +830,8 @@ class Admin {
|
||||||
"sday" => $now["mday"],"smonth" => $now["mon"], "syear" => $now["year"], "shour" => $now["hours"], "smin" => $now["minutes"],
|
"sday" => $now["mday"],"smonth" => $now["mon"], "syear" => $now["year"], "shour" => $now["hours"], "smin" => $now["minutes"],
|
||||||
"smtphost" => $smtphost,"smtpauth" => $smtpauth,"smtpuser" => $smtpuser,"smtppass" => $smtppass,"smtpsecure" => $smtpsecure,"smtpport" => $smtpport,
|
"smtphost" => $smtphost,"smtpauth" => $smtpauth,"smtpuser" => $smtpuser,"smtppass" => $smtppass,"smtpsecure" => $smtpsecure,"smtpport" => $smtpport,
|
||||||
"webimpressum" => $webimpressum, "cancelunpaidcode" => $cancelunpaidcode, "discount1" => $discount1,"discount2" => $discount2,"discount3" => $discount3,
|
"webimpressum" => $webimpressum, "cancelunpaidcode" => $cancelunpaidcode, "discount1" => $discount1,"discount2" => $discount2,"discount3" => $discount3,
|
||||||
"austria" => $austria, "digigopaysetready" => $digigopaysetready, "paydeskid" => $paydeskid, "aeskey" => $aeskey, "certificatesn" => $certificatesn
|
"austria" => $austria, "digigopaysetready" => $digigopaysetready, "waitergopayprint" => $waitergopayprint,
|
||||||
|
"paydeskid" => $paydeskid, "aeskey" => $aeskey, "certificatesn" => $certificatesn
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($forHtml) {
|
if ($forHtml) {
|
||||||
|
@ -1137,19 +1144,19 @@ class Admin {
|
||||||
$right_rating = $_SESSION['right_rating'];
|
$right_rating = $_SESSION['right_rating'];
|
||||||
|
|
||||||
if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
|
if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
|
||||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.28"); };
|
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.29"); };
|
||||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.28"); };
|
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.29"); };
|
||||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.28"); };
|
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.29"); };
|
||||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.28"); };
|
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.29"); };
|
||||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html"); };
|
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.1.29"); };
|
||||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.28"); };
|
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.29"); };
|
||||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.28"); };
|
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.29"); };
|
||||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.28"); };
|
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.29"); };
|
||||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.28"); };
|
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.29"); };
|
||||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.28"); };
|
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.29"); };
|
||||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.28"); };
|
if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.29"); };
|
||||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.28");
|
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.29");
|
||||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.28");
|
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.29");
|
||||||
}
|
}
|
||||||
|
|
||||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||||
|
@ -1158,7 +1165,7 @@ class Admin {
|
||||||
$waiterMessage = $this->getMessage(null, "waitermessage");
|
$waiterMessage = $this->getMessage(null, "waitermessage");
|
||||||
}
|
}
|
||||||
// CAUTION: change version also in config.txt!!!
|
// CAUTION: change version also in config.txt!!!
|
||||||
$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.28",
|
$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.29",
|
||||||
"user" => $currentUser,
|
"user" => $currentUser,
|
||||||
"menu" => $mainMenu,
|
"menu" => $mainMenu,
|
||||||
"waitermessage" => $waiterMessage,
|
"waitermessage" => $waiterMessage,
|
||||||
|
@ -1361,6 +1368,7 @@ class Admin {
|
||||||
"discount3" => array("dbcol" => "discount3","checknum" => 0),
|
"discount3" => array("dbcol" => "discount3","checknum" => 0),
|
||||||
"austria" => array("dbcol" => "austria","checknum" => 0),
|
"austria" => array("dbcol" => "austria","checknum" => 0),
|
||||||
"digigopaysetready" => array("dbcol" => "digigopaysetready","checknum" => 0),
|
"digigopaysetready" => array("dbcol" => "digigopaysetready","checknum" => 0),
|
||||||
|
"waitergopayprint" => array("dbcol" => "waitergopayprint","checknum" => 0),
|
||||||
"groupworkitems" => array("dbcol" => "groupworkitems","checknum" => 0),
|
"groupworkitems" => array("dbcol" => "groupworkitems","checknum" => 0),
|
||||||
"workflowconfig" => array("dbcol" => "workflowconfig","checknum" => 0),
|
"workflowconfig" => array("dbcol" => "workflowconfig","checknum" => 0),
|
||||||
"receiptfontsize" => array("dbcol" => "receiptfontsize","checknum" => 0),
|
"receiptfontsize" => array("dbcol" => "receiptfontsize","checknum" => 0),
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.28">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.29">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.28">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.29">
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.28">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.29">
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.28">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.29">
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.28">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.29">
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.28">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.29">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue