diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe
index 70b988f..5e0b4b9 100644
Binary files a/printserver/OrderSprinterPrintserver.exe and b/printserver/OrderSprinterPrintserver.exe differ
diff --git a/spider/install/installer.php b/spider/install/installer.php
index 6bca0f3..0064a7e 100644
--- a/spider/install/installer.php
+++ b/spider/install/installer.php
@@ -85,7 +85,7 @@ class Installer {
}
Database::dropTables($pdo);
Database::createEmptyTables($pdo, $prefix);
- Database::setVersion($pdo,$prefix,"1.2.20");
+ Database::setVersion($pdo,$prefix,"1.2.21");
Database::setAccessPassword($pdo,$prefix,$adminpass);
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
return array("status" => "OK","msg" => "Installation successful");
diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe
index 70b988f..5e0b4b9 100644
Binary files a/webapp/OrderSprinterPrintserver.exe and b/webapp/OrderSprinterPrintserver.exe differ
diff --git a/webapp/bar.html b/webapp/bar.html
index c21a141..0c3cd18 100644
--- a/webapp/bar.html
+++ b/webapp/bar.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/bill.html b/webapp/bill.html
index 17e586a..02d74a8 100644
--- a/webapp/bill.html
+++ b/webapp/bill.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/feedback.html b/webapp/feedback.html
index ab70df9..b7ab48b 100644
--- a/webapp/feedback.html
+++ b/webapp/feedback.html
@@ -4,7 +4,7 @@
-
+
diff --git a/webapp/index.html b/webapp/index.html
index 43cd934..809ddb0 100644
--- a/webapp/index.html
+++ b/webapp/index.html
@@ -9,8 +9,8 @@
-
-
+
+
@@ -203,7 +203,7 @@ function handleResultOfInstallCheck(is_installed) {
if (is_installed == "Yes") {
useInstallation();
} else {
- setTimeout(function(){document.location.href = "install.html?v=1.2.20"},500);
+ setTimeout(function(){document.location.href = "install.html?v=1.2.21"},500);
}
}
diff --git a/webapp/install.html b/webapp/install.html
index 1b7f2f2..71ea960 100644
--- a/webapp/install.html
+++ b/webapp/install.html
@@ -679,7 +679,7 @@ $(document).ready(function() {
| |
-
+
|
|
diff --git a/webapp/install/installer.php b/webapp/install/installer.php
index e67a08c..4894699 100644
--- a/webapp/install/installer.php
+++ b/webapp/install/installer.php
@@ -1658,7 +1658,6 @@ return false;
DbUtils::overrulePrefix($prefix);
-
$this->updateVersion($pdo, '1.2.20');
return true;
} catch (PDOException $e) {
@@ -1667,6 +1666,31 @@ return false;
}
}
+function updateUserTable1220_1221($prefix, $version, $dbname) {
+$pdo = $this->pdo;
+try {
+if ($version != "1.2.20") {
+$ret = $this->updateUserTable1219_1220($prefix, $version, $dbname);
+if (!$ret) {
+echo "Version update v1.2.19 to 1.2.20 not successful.";
+return false;
+}
+}
+
+DbUtils::overrulePrefix($prefix);
+
+$sql = "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL,?,?)";
+$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
+$stmt->execute(array('hs3refresh','60'));
+
+$this->updateVersion($pdo, '1.2.21');
+return true;
+} catch (PDOException $e) {
+echo "Error in v1.2.20 to 1.2.21: $e";
+return false;
+}
+}
+
function setVersion($prefix,$theVersion) {
$pdo = $this->pdo;
try {
@@ -1786,7 +1810,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.2.20')");
+$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.2.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')");
@@ -1827,6 +1851,7 @@ $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VAL
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'hsinfile', '')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'hsoutfile', '')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'hscurrency', 'EUR')");
+$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'hs3refresh', '60')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'memorylimit', '256')");
// prepare for later inconsistency check if version is obsolete
@@ -2165,7 +2190,7 @@ $zones[] = $timezone_identifiers[$i];
}
echo json_encode($zones);
} else if ($command == 'update') {
-$installerVersion = "1.2.20";
+$installerVersion = "1.2.21";
$admin = new InstallAdmin();
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
@@ -2196,7 +2221,7 @@ $supportedVersions = array("1.0.22","1.0.23","1.0.24","1.0.25","1.0.26","1.0.27"
"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.28","1.1.29","1.1.30",
"1.2.0","1.2.1","1.2.2", "1.2.3", "1.2.4","1.2.5","1.2.6","1.2.7","1.2.8","1.2.9","1.2.10","1.2.11","1.2.12","1.2.13","1.2.14","1.2.15","1.2.16","1.2.17",
-"1.2.18","1.2.19"
+"1.2.18","1.2.19","1.2.20"
);
if (!in_array($version, $supportedVersions)) {
@@ -2204,7 +2229,7 @@ echo json_encode("Quellversion nicht unterstützt");
return;
}
-$ret = $admin->updateUserTable1219_1220($_POST['prefix'], $version, $_POST['db']);
+$ret = $admin->updateUserTable1220_1221($_POST['prefix'], $version, $_POST['db']);
if(session_id() == '') {
session_start();
diff --git a/webapp/kitchen.html b/webapp/kitchen.html
index 0af9461..197d5a3 100644
--- a/webapp/kitchen.html
+++ b/webapp/kitchen.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/manager.html b/webapp/manager.html
index 18238fe..f0a7c63 100644
--- a/webapp/manager.html
+++ b/webapp/manager.html
@@ -5,7 +5,7 @@
-
+
@@ -257,6 +257,7 @@ var MAN_SMTPPASS = ["SMTP-Passwort","SMTP password","SMTP contraseña"];
var MAN_SMTPSECURE = ["SMTP-Protokoll","SMTP Protocol","SMTP Seguridad"];
var MAN_SMTPPORT = ["SMTP-Port","SMTP Port","SMTP Port"];
var MAN_MEMORYLIMIT = ["PHP Memory Limit (MB)","PHP Memory Limit (MB)","PHP Memory Limit (MB)"];
+var MAN_HS3REFRESH = ["HS/3 Updateinterval (Sek.)","HS/3 Update interval (sec.)","HS/3 Update Interval (sec)"];
var MAN_WEBIMPRESSUM = ["Webimpressum","Web company info","www café info"];
var MAN_TAX_ASSIGN = ["Umsatzsteuer-Zuweisung","Taxes assigment","Asignar impuestos"];
var MAN_TAX_ASS_DESC = ["An dieser Stelle können pauschal zwei unterschiedliche Steuersätze den Speisen und den Getränken zugewiesen werden. Das ist für die Nutzung der Software in Österreich interessant. Die Zuweisungen wirken sich nur im Betriebsmodus 'Österreich' aus!",
@@ -384,7 +385,8 @@ var generalValuesSettings = [
["hsoutfile",MAN_HSOUTFILE[lang],"i",0],
["hscurrency",MAN_HSCURRENCY[lang],"i",0],
- ["memorylimit",MAN_MEMORYLIMIT[lang],"i",0,""]
+ ["memorylimit",MAN_MEMORYLIMIT[lang],"i",0,""],
+ ["hs3refresh",MAN_HS3REFRESH[lang],"i",0,""]
];
var predef = "";
@@ -438,6 +440,7 @@ function setLanguage(l) {
$("#smtpporttxt").html(MAN_SMTPPORT[l]);
$("#memorylimittxt").html(MAN_MEMORYLIMIT[l]);
+ $("#hs3refreshtxt").html(MAN_HS3REFRESH[l]);
$("#paydeskidtxt").html(MAN_PAYDESKID[l]);
$("#austriahint").html(MAN_AUSTRIA_INCOMPLETE[l]);
@@ -660,6 +663,7 @@ function insertGeneralConfigItems(configResult) {
$("#smtpport").val(values.smtpport);
$("#memorylimit").val(values.memorylimit);
+ $("#hs3refresh").val(values.hs3refresh);
$("#paydeskid").val(values.paydeskid);
$("#aeskey").val(values.aeskey);
@@ -2596,18 +2600,22 @@ $(document).on("pageinit", "#admin-page", function () {
-
+
-
+
+
+
+
+
-
+
diff --git a/webapp/paydesk.html b/webapp/paydesk.html
index eb39bb5..04ff5b3 100644
--- a/webapp/paydesk.html
+++ b/webapp/paydesk.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/php/admin.php b/webapp/php/admin.php
index 83f0bd4..7f22f09 100644
--- a/webapp/php/admin.php
+++ b/webapp/php/admin.php
@@ -829,6 +829,7 @@ class Admin {
}
$memorylimit = CommonUtils::getConfigValue($pdo,"memorylimit",256);
+ $hs3refresh = CommonUtils::getConfigValue($pdo, "hs3refresh", 60);
$paydeskid = CommonUtils::getConfigValue($pdo,"paydeskid","");
$aeskey = CommonUtils::getConfigValue($pdo,"aeskey","");
@@ -861,7 +862,7 @@ class Admin {
"smtphost" => $smtphost,"smtpauth" => $smtpauth,"smtpuser" => $smtpuser,"smtppass" => $smtppass,"smtpsecure" => $smtpsecure,"smtpport" => $smtpport,
"webimpressum" => $webimpressum, "cancelunpaidcode" => $cancelunpaidcode, "discount1" => $discount1,"discount2" => $discount2,"discount3" => $discount3,
"austria" => $austria, "digigopaysetready" => $digigopaysetready, "waitergopayprint" => $waitergopayprint, "oneprodworkreceipts" => $oneprodworkreceipts,
- "digiprintwork" => $digiprintwork, "memorylimit" => $memorylimit,
+ "digiprintwork" => $digiprintwork, "memorylimit" => $memorylimit, "hs3refresh" => $hs3refresh,
"paydeskid" => $paydeskid, "aeskey" => $aeskey, "certificatesn" => $certificatesn, "addreceipttoprinter" => $addreceipttoprinter,
"printandqueuejobs" => $printandqueuejobs, "cashenabled" => $cashenabled, "beepcooked" => $beepcooked
);
@@ -955,7 +956,7 @@ class Admin {
$view = "preferences.html";
}
- echo json_encode($view . "?v=1.2.20");
+ echo json_encode($view . "?v=1.2.21");
}
}
@@ -1161,24 +1162,24 @@ 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.2.20"); };
+ if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.2.21"); };
} else {
- if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.2.20"); };
+ if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.2.21"); };
}
- if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.2.20"); };
- if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.2.20"); };
- if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.2.20"); };
+ if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.2.21"); };
+ if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.2.21"); };
+ if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.2.21"); };
if ($_SESSION['modus'] == 0) {
- if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.2.20"); };
+ if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.2.21"); };
}
- if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.2.20"); };
- if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.2.20"); };
- if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.2.20"); };
- if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.2.20"); };
- if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.2.20"); };
- if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.2.20"); };
- $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.2.20");
- $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.2.20");
+ if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.2.21"); };
+ if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.2.21"); };
+ if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.2.21"); };
+ if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.2.21"); };
+ if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.2.21"); };
+ if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.2.21"); };
+ $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.2.21");
+ $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.2.21");
}
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
@@ -1187,7 +1188,7 @@ class Admin {
$waiterMessage = $this->getMessage(null, "waitermessage");
}
// CAUTION: change version also in config.txt!!!
- $mainMenuAndVersion = array ("version" => "OrderSprinter 1.2.20",
+ $mainMenuAndVersion = array ("version" => "OrderSprinter 1.2.21",
"user" => $currentUser,
"menu" => $mainMenu,
"waitermessage" => $waiterMessage,
@@ -1462,6 +1463,7 @@ class Admin {
"smtpport" => array("dbcol" => "smtpport","checknum" => 0),
"memorylimit" => array("dbcol" => "memorylimit","checknum" => 0),
+ "hs3refresh" => array("dbcol" => "hs3refresh","checknum" => 0),
"paydeskid" => array("dbcol" => "paydeskid","checknum" => 0),
"aeskey" => array("dbcol" => "aeskey","checknum" => 0),
@@ -1512,6 +1514,17 @@ class Admin {
}
}
+ if ($name == "hs3refresh") {
+ $aVal = trim($aVal);
+ if (!ctype_digit($aVal)) {
+ $aVal = "60";
+ }
+ $aVal = intval($aVal);
+ if ($aVal < 5) {
+ $aVal = 60;
+ }
+ }
+
$association = $assoc_vals[$name];
$dbcol = $association["dbcol"];
$check = $association["checknum"];
diff --git a/webapp/php/hotelinterface.php b/webapp/php/hotelinterface.php
index 52de58e..24e3126 100644
--- a/webapp/php/hotelinterface.php
+++ b/webapp/php/hotelinterface.php
@@ -4,7 +4,6 @@ require_once ('dbutils.php');
require_once ('commonutils.php');
class Hotelinterface {
- private static $SYNC_INTERVAL = 300; // 5 * 60;
public static function hs3sync($pdo) {
$hotelinterface = CommonUtils::getConfigValue($pdo, "hotelinterface", 0);
@@ -13,6 +12,8 @@ class Hotelinterface {
return array("status" => "OK");
}
+ $syncInterval = intval(CommonUtils::getConfigValue($pdo, "hs3refresh", 60));
+
date_default_timezone_set(DbUtils::getTimeZone());
$currentTime = date('Y-m-d H:i:s');
@@ -25,7 +26,7 @@ class Hotelinterface {
$sql = "SELECT TIMESTAMPDIFF(SECOND,value,NOW()) as synctimediff FROM %work% WHERE item=?";
$row = CommonUtils::getRowSqlObject($pdo, $sql, array($itemNameForLastSync));
$lastdone = $row->synctimediff;
- if ($lastdone < self::$SYNC_INTERVAL) {
+ if ($lastdone < $syncInterval) {
return array("status" => "OK");
}
} else {
@@ -117,7 +118,7 @@ class Hotelinterface {
$entryArr[] = '"' . $anEntry["currency"] . '"';
$entryArr[] = '"' . $anEntry["waiterid"] . '"';
$entryArr[] = '"' . $anEntry["waitername"] . '"';
- $entryTxt = join(',',$entryArr);
+ $entryTxt = join(';',$entryArr);
$lines[] = $entryTxt;
}
$fullFileContent = implode("\r\n",$lines);
diff --git a/webapp/preferences.html b/webapp/preferences.html
index cfc0d07..5741d82 100644
--- a/webapp/preferences.html
+++ b/webapp/preferences.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/products.html b/webapp/products.html
index 51b4600..3208b5f 100644
--- a/webapp/products.html
+++ b/webapp/products.html
@@ -7,7 +7,7 @@
-
+
diff --git a/webapp/rating.html b/webapp/rating.html
index 95941cd..88c3e03 100644
--- a/webapp/rating.html
+++ b/webapp/rating.html
@@ -7,7 +7,7 @@
-
+
diff --git a/webapp/reports.html b/webapp/reports.html
index a89d6ca..a32e5f6 100644
--- a/webapp/reports.html
+++ b/webapp/reports.html
@@ -7,7 +7,7 @@
-
+
diff --git a/webapp/reservation.html b/webapp/reservation.html
index 5390a20..b601e71 100644
--- a/webapp/reservation.html
+++ b/webapp/reservation.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html
index 2397b2f..664b575 100644
--- a/webapp/supplydesk.html
+++ b/webapp/supplydesk.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/waiter.html b/webapp/waiter.html
index 18e701b..7ea1de0 100644
--- a/webapp/waiter.html
+++ b/webapp/waiter.html
@@ -4,7 +4,7 @@
-
+