OrderSprinter 1.1.21
This commit is contained in:
parent
8f08f66e2c
commit
58cc7c15b2
Binary file not shown.
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.1.20">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.21">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.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 name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.20">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.21">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.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 http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.20">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.21">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.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 name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.20">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.20">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.21">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.21">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
|
|||
|
|
@ -679,7 +679,7 @@ $(document).ready(function() {
|
|||
<tr id=updateline>
|
||||
<td> </td>
|
||||
<td align=center>
|
||||
<button id="updatebtn">Update -> 1.1.20</button>
|
||||
<button id="updatebtn">Update -> 1.1.21</button>
|
||||
</td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -916,6 +916,33 @@ $ret &= $this->setVersion($prefix, '1.1.20');
|
|||
return $ret;
|
||||
}
|
||||
|
||||
function updateUserTable1120_1121($prefix,$version) {
|
||||
$pdo = $this->pdo;
|
||||
try {
|
||||
if ($version != "1.1.20") {
|
||||
$ret = $this->updateUserTable1119_1120($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('discount1','50'));
|
||||
$stmt->execute(array('discount2','20'));
|
||||
$stmt->execute(array('discount3','10'));
|
||||
$stmt->execute(array('austria','0'));
|
||||
|
||||
$this->updateVersion($pdo, '1.1.21');
|
||||
return true;
|
||||
} catch (PDOException $e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
function setVersion($prefix,$theVersion) {
|
||||
$pdo = $this->pdo;
|
||||
try {
|
||||
|
|
@ -987,7 +1014,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 , '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 , 'version', '1.1.20')");
|
||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.21')");
|
||||
$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 , 'decpoint', '$decpoint')");
|
||||
|
|
@ -1005,6 +1032,12 @@ $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VAL
|
|||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'smtpsecure', '1')");
|
||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'smtpport', '587')");
|
||||
|
||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'discount1', '50')");
|
||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'discount2', '20')");
|
||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'discount3', '10')");
|
||||
|
||||
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'austria', '0')");
|
||||
|
||||
// prepare for later inconsistency check if version is obsolete
|
||||
date_default_timezone_set($timezone);
|
||||
$installDate = date('Y-m-d H:i:s');
|
||||
|
|
@ -1339,6 +1372,8 @@ $zones[] = $timezone_identifiers[$i];
|
|||
}
|
||||
echo json_encode($zones);
|
||||
} else if ($command == 'update') {
|
||||
$installerVersion = "1.1.21";
|
||||
|
||||
$admin = new InstallAdmin();
|
||||
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
|
||||
$admin->setPdo($pdo);
|
||||
|
|
@ -1351,6 +1386,11 @@ return;
|
|||
}
|
||||
|
||||
$version = $admin->getCurrentVersion();
|
||||
if ($version == $installerVersion) {
|
||||
echo json_encode("Version bereits installiert");
|
||||
return;
|
||||
}
|
||||
|
||||
if (is_null($version)) {
|
||||
echo json_encode("Version nicht bestimmbar");
|
||||
return;
|
||||
|
|
@ -1361,7 +1401,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.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.18","1.1.19"
|
||||
"1.1.18","1.1.19","1.1.20"
|
||||
);
|
||||
|
||||
if (!in_array($version, $supportedVersions)) {
|
||||
|
|
@ -1369,7 +1409,7 @@ echo json_encode("Quellversion nicht unterstützt");
|
|||
return;
|
||||
}
|
||||
|
||||
$ret = $admin->updateUserTable1119_1120($_POST['prefix'], $version);
|
||||
$ret = $admin->updateUserTable1120_1121($_POST['prefix'], $version);
|
||||
|
||||
if(session_id() == '') {
|
||||
session_start();
|
||||
|
|
|
|||
|
|
@ -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.1.20">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.21">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.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 name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.20">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.21">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -132,6 +132,10 @@ var MAN_PRINT_CONCEPT = ["Druckkonzept","Print concept","Concepto de impresión"
|
|||
var MAN_PAYMENT_CONFIG = ["Menü Zahlungsweg","Menu Payment Type","Selección tipo de pagar"];
|
||||
var MAN_WORKFONT_CONFIG = ["Arbeitsbon Schriftgröße","Font size work receipt","Tamaño de letras en tiques de trabajo"];
|
||||
var MAN_PROMINENT_SEARCH = ["Prominente Produktsuche","Prominent Product search","Buscar de productos ariba"];
|
||||
var MAN_DISCOUNT1 = ["Rabatt 1 (%)","Discount 1 (%)","Descuento 1 (%)"];
|
||||
var MAN_DISCOUNT2 = ["Rabatt 2 (%)","Discount 2 (%)","Descuento 2 (%)"];
|
||||
var MAN_DISCOUNT3 = ["Rabatt 3 (%)","Discount 3 (%)","Descuento 3 (%)"];
|
||||
var MAN_AUSTRIA = ["Österreich","Austria","Austria"];
|
||||
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_CHANGE_CONFIG_HEAD = ["Konfiguration ändern?","Change configuration?","Modificar configuración?"];
|
||||
|
|
@ -251,7 +255,7 @@ var MAN_UNPAID2 = ["Soll die Tageserfassung vorgenommen werden? In diesem Fall w
|
|||
"Quieres continuar y removar estos productos?"];
|
||||
|
||||
var lang = 0;
|
||||
var generalVals = [12,2,0,3,0,1,1,0,0,1];
|
||||
var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10];
|
||||
|
||||
var numberOfClosings = 0;
|
||||
|
||||
|
|
@ -273,6 +277,10 @@ var generalValuesSettings = [
|
|||
["bigfontworkreceipt",MAN_WORKFONT_CONFIG[lang],"s",7],
|
||||
["prominentsearch",MAN_PROMINENT_SEARCH[lang],"s",8],
|
||||
["groupworkitems",MAN_GROUP_WORK_ITEMS[lang],"s",9],
|
||||
["discount1",MAN_DISCOUNT1[lang],"s",11],
|
||||
["discount2",MAN_DISCOUNT2[lang],"s",12],
|
||||
["discount3",MAN_DISCOUNT3[lang],"s",13],
|
||||
["austria",MAN_AUSTRIA[lang],"s",10],
|
||||
["workflowconfig",MAN_WORKFLOW[lang],"s",4],
|
||||
["receiptfontsize",MAN_RECEIPT_FONTSIZE[lang],"s",0],
|
||||
["billlanguage",MAN_LANG_OF_RECEIPT[lang],"s",2],
|
||||
|
|
@ -453,6 +461,9 @@ function insertGeneralConfigItems(configResult) {
|
|||
$("#partOfBigFontWorkReceipt").html(createBigFontWorkReceiptPart(values.bigfontworkreceipt));
|
||||
$("#partOfProminentSearch").html(createProminentSearchPart(values.prominentsearch));
|
||||
$("#partOfGroupWorkItems").html(createGroupWorkItemsPart(values.groupworkitems));
|
||||
|
||||
$("#partOfAustria").html(createAustriaPart(values.austria));
|
||||
|
||||
var language = values.billlanguage;
|
||||
generalVals[2] = language;
|
||||
$("#partOfBillLanguage").html(createBillLanguagePart(language));
|
||||
|
|
@ -479,6 +490,14 @@ function insertGeneralConfigItems(configResult) {
|
|||
generalVals[8] = values.prominentsearch;
|
||||
generalVals[9] = values.groupworkitems;
|
||||
|
||||
generalVals[11] = parseInt(values.discount1);
|
||||
generalVals[12] = parseInt(values.discount2);
|
||||
generalVals[13] = parseInt(values.discount3);
|
||||
$("#partOfDiscount1").html(createDiscount1Part());
|
||||
$("#partOfDiscount2").html(createDiscount2Part());
|
||||
$("#partOfDiscount3").html(createDiscount3Part());
|
||||
generalVals[10] = values.austria;
|
||||
|
||||
$("#smtphost").val(values.smtphost);
|
||||
$("#partOfSmtpauth").html(createSMTPAuth(values.smtpauth));
|
||||
$("#smtpuser").val(values.smtpuser);
|
||||
|
|
@ -553,24 +572,41 @@ function createBigFontWorkReceiptPart(theValue) {
|
|||
}
|
||||
|
||||
function createProminentSearchPart(theValue) {
|
||||
return createYesNo("prominentsearch", MAN_PROMINENT_SEARCH, theValue);
|
||||
}
|
||||
|
||||
function createDiscountPart(label,nameOnGui,generalValIndex) {
|
||||
var html = '<div class="ui-field-contain">';
|
||||
html += '<label for="prominentsearch">' + MAN_PROMINENT_SEARCH[lang] + ':</label>';
|
||||
html += '<select name="prominentsearch" id="prominentsearch" data-theme="e">';
|
||||
if (theValue == 0) {
|
||||
html += '<option value="0" selected>' + MAN_NO[lang] + '</option>';
|
||||
html += '<option value="1">' + MAN_YES[lang] + '</option>';
|
||||
} else {
|
||||
html += '<option value="0">' + MAN_NO[lang] + '</option>';
|
||||
html += '<option value="1" selected>' + MAN_YES[lang] + '</option>';
|
||||
html += '<label for="' + label + '">' + nameOnGui[lang] + ':</label>';
|
||||
html += '<select name="' + label + '" id="' + label + '" data-theme="e">';
|
||||
for($i=10;$i<=100;$i+=10) {
|
||||
html += '<option value="' + $i + '"' + isSelectedOption($i,generalVals[generalValIndex]) + '>' + $i + '</option>';
|
||||
}
|
||||
html += '</select></div>';
|
||||
return html;
|
||||
}
|
||||
|
||||
function createDiscount1Part() {
|
||||
return createDiscountPart("discount1", MAN_DISCOUNT1, 11);
|
||||
}
|
||||
function createDiscount2Part() {
|
||||
return createDiscountPart("discount2", MAN_DISCOUNT2, 12);
|
||||
}
|
||||
function createDiscount3Part() {
|
||||
return createDiscountPart("discount3", MAN_DISCOUNT3, 13);
|
||||
}
|
||||
function createAustriaPart(theValue) {
|
||||
return createYesNo("austria", MAN_AUSTRIA, theValue);
|
||||
}
|
||||
|
||||
function createGroupWorkItemsPart(theValue) {
|
||||
return createYesNo("groupworkitems", MAN_GROUP_WORK_ITEMS, theValue);
|
||||
}
|
||||
|
||||
function createYesNo(label,nameOnGui,theValue) {
|
||||
var html = '<div class="ui-field-contain">';
|
||||
html += '<label for="groupworkitems">' + MAN_GROUP_WORK_ITEMS[lang] + ':</label>';
|
||||
html += '<select name="groupworkitems" id="groupworkitems" data-theme="e">';
|
||||
html += '<label for="' + label + '">' + nameOnGui[lang] + ':</label>';
|
||||
html += '<select name="' + label + '" id="' + label + '" data-theme="e">';
|
||||
if (theValue == 0) {
|
||||
html += '<option value="0" selected>' + MAN_NO[lang] + '</option>';
|
||||
html += '<option value="1">' + MAN_YES[lang] + '</option>';
|
||||
|
|
@ -2100,6 +2136,11 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<div id="partOfBigFontWorkReceipt"></div>
|
||||
<div id="partOfProminentSearch"></div>
|
||||
<div id="partOfGroupWorkItems"></div>
|
||||
|
||||
<div id="partOfDiscount1"></div>
|
||||
<div id="partOfDiscount2"></div>
|
||||
<div id="partOfDiscount3"></div>
|
||||
<div id="partOfAustria"></div>
|
||||
|
||||
<button type="submit" data-theme="f" data-icon="check" id="changeConfig">Ändern</button>
|
||||
</form><!-- Konfiguration -->
|
||||
|
|
|
|||
1217
webapp/paydesk.html
1217
webapp/paydesk.html
File diff suppressed because one or more lines are too long
|
|
@ -601,7 +601,7 @@ class Admin {
|
|||
return;
|
||||
}
|
||||
|
||||
$configItems = join(",",array("'decpoint'","'version'","'cancelunpaidcode'","'tax'","'togotax'","'currency'","'workflowconfig'","'prominentsearch'"));
|
||||
$configItems = join(",",array("'decpoint'","'version'","'cancelunpaidcode'","'tax'","'togotax'","'currency'","'workflowconfig'","'prominentsearch'","'discount1'","'discount2'","'discount3'"));
|
||||
$sql = "select name,setting FROM %config% WHERE name in ($configItems)";
|
||||
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
|
||||
$stmt->execute();
|
||||
|
|
@ -694,6 +694,19 @@ class Admin {
|
|||
$row = $stmt->fetchObject();
|
||||
$prominentsearch = $row->setting;
|
||||
|
||||
$stmt->execute(array("discount1"));
|
||||
$row = $stmt->fetchObject();
|
||||
$discount1 = $row->setting;
|
||||
$stmt->execute(array("discount2"));
|
||||
$row = $stmt->fetchObject();
|
||||
$discount2 = $row->setting;
|
||||
$stmt->execute(array("discount3"));
|
||||
$row = $stmt->fetchObject();
|
||||
$discount3 = $row->setting;
|
||||
$stmt->execute(array("austria"));
|
||||
$row = $stmt->fetchObject();
|
||||
$austria = $row->setting;
|
||||
|
||||
$stmt->execute(array("groupworkitems"));
|
||||
$row = $stmt->fetchObject();
|
||||
$groupworkitems = $row->setting;
|
||||
|
|
@ -796,7 +809,9 @@ class Admin {
|
|||
"rightchangeprice" => $right_changeprice, "bigfontworkreceipt" => $bigfontworkreceipt, "prominentsearch" => $prominentsearch,"groupworkitems" => $groupworkitems,
|
||||
"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,
|
||||
"webimpressum" => $webimpressum, "cancelunpaidcode" => $cancelunpaidcode);
|
||||
"webimpressum" => $webimpressum, "cancelunpaidcode" => $cancelunpaidcode, "discount1" => $discount1,"discount2" => $discount2,"discount3" => $discount3,
|
||||
"austria" => $austria
|
||||
);
|
||||
|
||||
if ($forHtml) {
|
||||
echo json_encode(array("status" => "OK", "msg" => $retVal));
|
||||
|
|
@ -1108,19 +1123,19 @@ class Admin {
|
|||
$right_rating = $_SESSION['right_rating'];
|
||||
|
||||
if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.20"); };
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.20"); };
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.20"); };
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.20"); };
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.21"); };
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.21"); };
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.21"); };
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.21"); };
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html"); };
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.20"); };
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.20"); };
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.20"); };
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.20"); };
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.20"); };
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.20"); };
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.20");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.20");
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.21"); };
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.21"); };
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.21"); };
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.21"); };
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.21"); };
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.21"); };
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.21");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.21");
|
||||
}
|
||||
|
||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||
|
|
@ -1129,7 +1144,7 @@ class Admin {
|
|||
$waiterMessage = $this->getMessage(null, "waitermessage");
|
||||
}
|
||||
// CAUTION: change version also in config.txt!!!
|
||||
$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.20",
|
||||
$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.21",
|
||||
"user" => $currentUser,
|
||||
"menu" => $mainMenu,
|
||||
"waitermessage" => $waiterMessage,
|
||||
|
|
@ -1326,6 +1341,10 @@ class Admin {
|
|||
"paymentconfig" => array("dbcol" => "paymentconfig","checknum" => 0),
|
||||
"bigfontworkreceipt" => array("dbcol" => "bigfontworkreceipt","checknum" => 0),
|
||||
"prominentsearch" => array("dbcol" => "prominentsearch","checknum" => 0),
|
||||
"discount1" => array("dbcol" => "discount1","checknum" => 0),
|
||||
"discount2" => array("dbcol" => "discount2","checknum" => 0),
|
||||
"discount3" => array("dbcol" => "discount3","checknum" => 0),
|
||||
"austria" => array("dbcol" => "austria","checknum" => 0),
|
||||
"groupworkitems" => array("dbcol" => "groupworkitems","checknum" => 0),
|
||||
"workflowconfig" => array("dbcol" => "workflowconfig","checknum" => 0),
|
||||
"receiptfontsize" => array("dbcol" => "receiptfontsize","checknum" => 0),
|
||||
|
|
|
|||
|
|
@ -369,7 +369,7 @@ class PdfExport extends FPDF {
|
|||
$bSum = 0;
|
||||
$nSum = 0;
|
||||
|
||||
$sql = "SELECT DISTINCT %closing%.id as id, DATE(closingdate) as datewotime,TIME(closingdate) as thetime FROM %bill%,%closing% WHERE closingid=%closing%.id AND DATE(closingdate) >= ? AND DATE(closingdate) <= ? ";
|
||||
$sql = "SELECT DISTINCT %closing%.id as id, DATE(closingdate) as datewotime,TIME(closingdate) as thetime FROM %closing% WHERE DATE(closingdate) >= ? AND DATE(closingdate) <= ? ";
|
||||
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
|
||||
$stmt->execute(array($startDate,$endDate));
|
||||
$allClosings = $stmt->fetchAll();
|
||||
|
|
|
|||
|
|
@ -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.1.20">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.21">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.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 name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.20">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.21">
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.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 name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.20">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.21">
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.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 name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.20">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.21">
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.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 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.1.20">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.21">
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.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 name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.20">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.21">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.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