OrderSprinter 1.5.6
This commit is contained in:
parent
7e5e012638
commit
72da923ecd
|
|
@ -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.5" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.5" />
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.6" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.6" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
<div data-role="footer" data-theme="b" id="thefooter1">
|
||||
<div class="ui-grid-a">
|
||||
<div class="ui-block-a"> OrderSprinter</div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">1.5.5 </div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">1.5.6 </div>
|
||||
</div><!-- /grid-a -->
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -90,10 +90,10 @@ if (isset($_POST['code'])) {
|
|||
} else {
|
||||
echo "<html>";
|
||||
echo "<head><title>Installation Gastsystem</title>";
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.5">';
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.6">';
|
||||
echo "</head>";
|
||||
echo "<body><div class=surround>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.5</span><br><br>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.6</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.
Binary file not shown.
|
|
@ -85,7 +85,7 @@ class Installer {
|
|||
}
|
||||
Database::dropTables($pdo);
|
||||
Database::createEmptyTables($pdo, $prefix);
|
||||
Database::setVersion($pdo,$prefix,"1.5.5");
|
||||
Database::setVersion($pdo,$prefix,"1.5.6");
|
||||
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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
|
||||
<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.5"></script>
|
||||
<script src="kitchenbar.js?v=1.5.5"></script>
|
||||
<script src="utilities.js?v=1.5.6"></script>
|
||||
<script src="kitchenbar.js?v=1.5.6"></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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
|
||||
<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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
|
||||
<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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.6">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -229,7 +229,7 @@ function handleResultOfInstallCheck(is_installed) {
|
|||
if (is_installed == "Yes") {
|
||||
useInstallation();
|
||||
} else {
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.5.5"},500);
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.5.6"},500);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -727,7 +727,7 @@ $(document).ready(function() {
|
|||
<tr id=updateline>
|
||||
<td> </td>
|
||||
<td align=center>
|
||||
<button id="updatebtn">Update -> 1.5.5</button>
|
||||
<button id="updatebtn">Update -> 1.5.6</button>
|
||||
<span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span>
|
||||
</td>
|
||||
<td> </td>
|
||||
|
|
|
|||
|
|
@ -414,7 +414,7 @@ $zones[] = $timezone_identifiers[$i];
|
|||
echo json_encode($zones);
|
||||
} else if ($command == 'update') {
|
||||
set_time_limit(60*30);
|
||||
$installerVersion = "1.5.5";
|
||||
$installerVersion = "1.5.6";
|
||||
|
||||
$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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
|
||||
<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.5"></script>
|
||||
<script src="kitchenbar.js?v=1.5.5"></script>
|
||||
<script src="utilities.js?v=1.5.6"></script>
|
||||
<script src="kitchenbar.js?v=1.5.6"></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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
|
||||
<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.5"></script>
|
||||
<script src="elements/tablemap.js?v=1.5.5"></script>
|
||||
<script src="elements/roommap.js?v=1.5.5"></script>
|
||||
<script src="elements/groundplan.js?v=1.5.5"></script>
|
||||
<script src="utilities.js?v=1.5.6"></script>
|
||||
<script src="elements/tablemap.js?v=1.5.6"></script>
|
||||
<script src="elements/roommap.js?v=1.5.6"></script>
|
||||
<script src="elements/groundplan.js?v=1.5.6"></script>
|
||||
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
|
|
@ -296,6 +296,14 @@ var MAN_DISCOUNTNAME2 = ["Bezeichnung Rabatt 2","Name of discount 2","Nombre del
|
|||
var MAN_DISCOUNTNAME3 = ["Bezeichnung Rabatt 3","Name of discount 3","Nombre del descuento 3"];
|
||||
var MAN_TIMETRACKING = ["Zeiterfassung:","Time tracking:","Tiempos de los empleados:"];
|
||||
var MAN_MEMORYLIMIT = ["PHP Memory Limit (MB)","PHP Memory Limit (MB)","PHP Memory Limit (MB)"];
|
||||
var MAN_POLL_SECTION_TXT = ["Abfrageintervalle des Druckservers;","Poll intervall of the printserver","Intervalo de consulta del print server"];
|
||||
var MAN_POLLBILLS = ["Rechnungsbons (Sek.)","Bills (sec.)","Facturas"];
|
||||
var MAN_POLLWORKSF = ["Speisearbeitsbons (Sek.)","Food work receipts (sec.)","Tiquets de trabajo de comidas"];
|
||||
var MAN_POLLWORKSD = ["Getränkearbeitsbons (Sek.)","Drinks work receipts (sec.)","tiquets de trabajo de bebidas"];
|
||||
var MAN_POLLCLOSINGS = ["Tageserfassungen (Sek.)","closings (sec.)","Resumen del dia"];
|
||||
var MAN_POLL_HINT = ["Einstellungen der Abfrageintervalle wirken erst ab Printserverversion 1.5.6. Der Printserver muss neu gestartet werden, damit Änderungen appliziert werden. Erlaubter Bereich: 2 bis 30 Sekunden.",
|
||||
"The settings of the poll interval only work for print server version 1.5.6 and higher. The settings will be applied after a restart of the print server. Valid range: 2-30 seconds",
|
||||
"Los datos de los intervalos son para printserver 1.5.6 y despues."];
|
||||
var MAN_MINBEFORECOME = ["'Kommen' stempelt Minuten früher","'Come' counts additional minutes earlier","'Venir' añade minutos más temprano"];
|
||||
var MAN_MINAFTERGO = ["'Gehen' stempelt Minuten später","'Go' counts additional minutes later","'Irse' añade minutos despues"];
|
||||
var MAN_UPDATEURL = ["Update-Server","Update server","Servidor de actualizar"];
|
||||
|
|
@ -560,7 +568,12 @@ var generalValuesSettings = [
|
|||
["taskownerempty",MAN_TASK_OWNEREMPTY[lang],"s",51],
|
||||
["taskifempty",MAN_TASK_IF_EMPTY[lang],"s",52],
|
||||
["showtogo",MAN_SHOWTOGO[lang],"s",53],
|
||||
["showprepinwaiter",MAN_SHOWPREPINWAITER[lang],"s",54]
|
||||
["showprepinwaiter",MAN_SHOWPREPINWAITER[lang],"s",54],
|
||||
|
||||
["pollbills",MAN_POLLBILLS[lang],"i",0,""],
|
||||
["pollworksf",MAN_POLLWORKSF[lang],"i",0,""],
|
||||
["pollworksd",MAN_POLLWORKSD[lang],"i",0,""],
|
||||
["pollclosings",MAN_POLLCLOSINGS[lang],"i",0,""]
|
||||
];
|
||||
|
||||
var predef = "";
|
||||
|
|
@ -726,6 +739,13 @@ function setLanguage(l) {
|
|||
|
||||
$("#guesttimeouthint").html(MAN_GUESTTIMEOUT_HINT[l]);
|
||||
$("#printextrashint").html(MAN_PRINT_EXTRAS_HINT[l]);
|
||||
|
||||
$("#pollssectiontxt").html(MAN_POLL_SECTION_TXT[l]);
|
||||
$("#pollhint").html(MAN_POLL_HINT[l]);
|
||||
$("#pollbillstxt").html(MAN_POLLBILLS[l]);
|
||||
$("#pollworksftxt").html(MAN_POLLWORKSF[l]);
|
||||
$("#pollworksdtxt").html(MAN_POLLWORKSD[l]);
|
||||
$("#pollclosingstxt").html(MAN_POLLCLOSINGS[l]);
|
||||
}
|
||||
|
||||
function createMonthSelection(label) {
|
||||
|
|
@ -993,6 +1013,11 @@ function insertGeneralConfigItems(configResult) {
|
|||
$("#certificatesn").val(values.certificatesn);
|
||||
$("#rksvserver").val(values.rksvserver);
|
||||
|
||||
$("#pollbills").val(values.pollbills);
|
||||
$("#pollworksf").val(values.pollworksf);
|
||||
$("#pollworksd").val(values.pollworksd);
|
||||
$("#pollclosings").val(values.pollclosings);
|
||||
|
||||
$("#partOfHotelInterface").html(createHotelInterfacePart(values.hotelinterface));
|
||||
|
||||
$("#configpart").trigger("create");
|
||||
|
|
@ -1364,7 +1389,7 @@ function initRestoreFileUpload() {
|
|||
} else {
|
||||
alert("Import war erfolgreich.");
|
||||
setTimeout(function(){
|
||||
document.location.href = "index.html?v=1.5.5";
|
||||
document.location.href = "index.html?v=1.5.6";
|
||||
},250);
|
||||
}
|
||||
},
|
||||
|
|
@ -1911,9 +1936,9 @@ function handleUpdateCheckResult(answer) {
|
|||
|
||||
var millis=getMillis();
|
||||
setTimeout(function(){
|
||||
document.location.href = "install.html?v=1.5.5&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=1.5.6&mode=onlyupdate&n=" + millis;
|
||||
},250);
|
||||
document.location.href = "install.html?v=1.5.5&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=1.5.6&mode=onlyupdate&n=" + millis;
|
||||
}
|
||||
|
||||
function handleUpdateReplace(answer) {
|
||||
|
|
@ -3736,6 +3761,25 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<div id="partOfShowprepinwaiter"></div>
|
||||
<div id="partOfDblog"></div>
|
||||
|
||||
<br><b><u><span id="pollssectiontxt">Druckabfrageintervalle</span></u></b><br><br>
|
||||
<i id=pollhint style="padding-left: 50px;padding-right: 50px;">Hinweis: Printserverversion 1.5.6+</i>
|
||||
<div data-role="fieldcontain">
|
||||
<label for="pollbills"><span id="pollbillstxt">Abfrageintervall Rechnungen:</span></label>
|
||||
<input type="text" value="" data-mini="true" placeholder="2" id="pollbills" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
<div data-role="fieldcontain">
|
||||
<label for="pollworksf"><span id="pollworksftxt">Abfrageintervall A.bons F</span></label>
|
||||
<input type="text" value="" data-mini="true" placeholder="2" id="pollworksf" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
<div data-role="fieldcontain">
|
||||
<label for="pollworksd"><span id="pollworksdtxt">Abfrageintervall A.bons D</span></label>
|
||||
<input type="text" value="" data-mini="true" placeholder="2" id="pollworksd" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
<div data-role="fieldcontain">
|
||||
<label for="pollclosings"><span id="pollclosingstxt">Abfrageintervall TE</span></label>
|
||||
<input type="text" value="" data-mini="true" placeholder="2" id="pollclosings" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
|
||||
<p>
|
||||
|
||||
<button type="submit" data-theme="f" data-icon="check" id="changeConfig">Ändern</button>
|
||||
|
|
|
|||
|
|
@ -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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -414,7 +414,7 @@ class Admin {
|
|||
$tasksForMe = Tasks::areThereTasksForMe($pdo);
|
||||
|
||||
|
||||
$TIMEOUT = 20;
|
||||
$TIMEOUT = 40;
|
||||
$active = json_encode(array("status" => "OK","msg" => 1, "tasksforme" => $tasksForMe));
|
||||
$notActive = json_encode(array("status" => "OK","msg" => 0, "tasksforme" => $tasksForMe));
|
||||
// check printmode
|
||||
|
|
@ -1163,7 +1163,12 @@ class Admin {
|
|||
array("certificatesn","",false),
|
||||
array("rksvserver","",false),
|
||||
array("webimpressum","",false),
|
||||
array("showprepinwaiter",1,false)
|
||||
array("showprepinwaiter",1,false),
|
||||
|
||||
array("pollbills",2,false),
|
||||
array("pollworksf",2,false),
|
||||
array("pollworksd",2,false),
|
||||
array("pollclosings",2,false)
|
||||
);
|
||||
|
||||
if (is_null($pdo)) {
|
||||
|
|
@ -1357,7 +1362,7 @@ class Admin {
|
|||
$view = "preferences.html";
|
||||
}
|
||||
|
||||
echo json_encode($view . "?v=1.5.5");
|
||||
echo json_encode($view . "?v=1.5.6");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1572,30 +1577,30 @@ 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.5"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.6"); }
|
||||
} else {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.5"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.6"); }
|
||||
}
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.5"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.5"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.5"); }
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.6"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.6"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.6"); }
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.5"); }
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.6"); }
|
||||
}
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.5"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.5"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.5"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.5"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.5"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.5"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.5"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.5"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.5"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.5");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.5"); }
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.6"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.6"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.6"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.6"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.6"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.6"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.6"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.6"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.6"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.6");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.6"); }
|
||||
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.5");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.5");
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.6");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.6");
|
||||
}
|
||||
|
||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||
|
|
@ -2033,6 +2038,20 @@ class Admin {
|
|||
exit;
|
||||
}
|
||||
|
||||
private static function returnInRange($aVal,$min,$max, $default) {
|
||||
$aVal = trim($aVal);
|
||||
|
||||
if (!ctype_digit($aVal)) {
|
||||
$aVal = $default;
|
||||
}
|
||||
$aVal = intval($aVal);
|
||||
if (($aVal < $min) || ($aVal > $max)) {
|
||||
$aVal = $default;
|
||||
}
|
||||
|
||||
return $aVal;
|
||||
}
|
||||
|
||||
function changeConfig($changedValues) {
|
||||
$pdo = $this->dbutils->openDbAndReturnPdo();
|
||||
$assoc_vals = array(
|
||||
|
|
@ -2144,6 +2163,11 @@ class Admin {
|
|||
"ftppass" => array("dbcol" => "ftppass","checknum" => 0),
|
||||
"hs3refresh" => array("dbcol" => "hs3refresh","checknum" => 0),
|
||||
|
||||
"pollbills" => array("dbcol" => "pollbills","checknum" => 0),
|
||||
"pollworksf" => array("dbcol" => "pollworksf","checknum" => 0),
|
||||
"pollworksd" => array("dbcol" => "pollworksd","checknum" => 0),
|
||||
"pollclosings" => array("dbcol" => "pollclosings","checknum" => 0),
|
||||
|
||||
"paydeskid" => array("dbcol" => "paydeskid","checknum" => 0),
|
||||
"aeskey" => array("dbcol" => "aeskey","checknum" => 0),
|
||||
"certificatesn" => array("dbcol" => "certificatesn","checksum" => 0),
|
||||
|
|
@ -2198,6 +2222,12 @@ class Admin {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (($name == "pollbills") || ($name == "pollworksf") || ($name == "pollworksd") || ($name == "pollclosings")) {
|
||||
$aVal = self::returnInRange($aVal, 1, 30, 2);
|
||||
}
|
||||
|
||||
if ($name == "minbeforecome") {
|
||||
$aVal = trim($aVal);
|
||||
if ($aVal != "-1") {
|
||||
|
|
|
|||
|
|
@ -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.5">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.6">';
|
||||
$txt .= "</head>";
|
||||
return $txt;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
|
|||
if (strlen($status) > 150) {
|
||||
$status = substr($status, 0,149);
|
||||
}
|
||||
$version = "1.5.5";
|
||||
$version = "1.5.6";
|
||||
|
||||
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ class PrintQueue {
|
|||
function handleCommand($command) {
|
||||
$fl = null;
|
||||
if (isset($_GET['fl'])) {
|
||||
$fl = $_GET['fl'];
|
||||
$fl = intval($_GET['fl']);
|
||||
}
|
||||
if (isset($_GET['instance'])) {
|
||||
$this->instance = $_GET['instance'];
|
||||
|
|
@ -90,7 +90,7 @@ class PrintQueue {
|
|||
} else if ($command == 'testConnection') {
|
||||
$this->testConnection($pass);
|
||||
} else if ($command == 'getReceiptConfig') {
|
||||
$this->getReceiptConfig();
|
||||
$this->getReceiptConfig($fl);
|
||||
} else if ($command == 'getLogoAsPng') {
|
||||
$this->getLogoAsPng();
|
||||
} else if ($command == 'getLogoAsWbmp') {
|
||||
|
|
@ -489,17 +489,29 @@ class PrintQueue {
|
|||
imagedestroy($php_img);
|
||||
}
|
||||
|
||||
function getReceiptConfig() {
|
||||
$pdo = $this->dbutils->openDbAndReturnPdo();
|
||||
$genInfo = $this->admin->getGeneralConfigItems(false,$pdo);
|
||||
function getReceiptConfig($fl = null) {
|
||||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
|
||||
$retArray = array("decpoint" => $genInfo["decpoint"],
|
||||
"billlanguage" => $genInfo["billlanguage"],
|
||||
"version" => $genInfo["version"],
|
||||
"currency" => $genInfo["currency"],
|
||||
"companyinfo" => $genInfo["companyinfo"]
|
||||
$decpoint = CommonUtils::getConfigValue($pdo, "decpoint", ",");
|
||||
$billlanguage = CommonUtils::getConfigValue($pdo, "billlanguage", 0);
|
||||
$version = CommonUtils::getConfigValue($pdo, "version", "0");
|
||||
$currency = CommonUtils::getConfigValue($pdo, "currency", "Euro");
|
||||
$companyinfo = CommonUtils::getConfigValue($pdo, "companyinfo", "");
|
||||
|
||||
$retArray = array("decpoint" => $decpoint,
|
||||
"billlanguage" => $billlanguage,
|
||||
"version" => $version,
|
||||
"currency" => $currency,
|
||||
"companyinfo" => $companyinfo
|
||||
);
|
||||
|
||||
if (!is_null($fl) && ($fl >= 12)) {
|
||||
$retArray["pollbills"] = CommonUtils::getConfigValue($pdo, "pollbills", 2);
|
||||
$retArray["pollworksf"] = CommonUtils::getConfigValue($pdo, "pollworksf", 2);
|
||||
$retArray["pollworksd"] = CommonUtils::getConfigValue($pdo, "pollworksd", 2);
|
||||
$retArray["pollclosings"] = CommonUtils::getConfigValue($pdo, "pollclosings", 2);
|
||||
}
|
||||
|
||||
echo json_encode($retArray);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -149,6 +149,7 @@ class TypeAndProductFileManager {
|
|||
} else {
|
||||
$previousDepth = $depth;
|
||||
}
|
||||
$textline = trim($textline);
|
||||
$newLineItem = new LineItem($depth,$index,$textline);
|
||||
if (is_null($newLineItem)) {
|
||||
return array("status" => "ERROR","code" => PARSE_ERROR,"msg" => PARSE_ERROR_MSG,"line" => $textline);
|
||||
|
|
|
|||
|
|
@ -962,6 +962,18 @@ class Version {
|
|||
}
|
||||
}
|
||||
|
||||
public static function upd_1505_1506($pdo, $prefix, $dbname) {
|
||||
try {
|
||||
self::insertOrUpdateConfigItem($pdo, 'pollbills', '2');
|
||||
self::insertOrUpdateConfigItem($pdo, 'pollworksf', '2');
|
||||
self::insertOrUpdateConfigItem($pdo, 'pollworksd', '2');
|
||||
self::insertOrUpdateConfigItem($pdo, 'pollclosings', '2');
|
||||
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"),
|
||||
|
|
@ -1014,7 +1026,8 @@ class Version {
|
|||
"1.5.1" => array("upd_1501_1502","1.5.2"),
|
||||
"1.5.2" => array("upd_1502_1503","1.5.3"),
|
||||
"1.5.3" => array("upd_1503_1504","1.5.4"),
|
||||
"1.5.4" => array("upd_1504_1505","1.5.5")
|
||||
"1.5.4" => array("upd_1504_1505","1.5.5"),
|
||||
"1.5.5" => array("upd_1505_1506","1.5.6")
|
||||
);
|
||||
|
||||
// RE;* also for install process no check is required
|
||||
|
|
|
|||
|
|
@ -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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
|
||||
<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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
<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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
<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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
<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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
<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 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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
|
||||
<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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
<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.5"></script>
|
||||
<script src="utilities.js?v=1.5.6"></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.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.6">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.6">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue