| |
-
+
Update... bitte warten.
|
|
diff --git a/webapp/install/installer.php b/webapp/install/installer.php
index c106981..92baa90 100644
--- a/webapp/install/installer.php
+++ b/webapp/install/installer.php
@@ -2104,6 +2104,33 @@ return false;
}
}
+function updateUserTable1310_1311($prefix, $version, $dbname) {
+$pdo = $this->pdo;
+try {
+if ($version != "1.3.10") {
+$ret = $this->updateUserTable1309_1310($prefix, $version, $dbname);
+if (!$ret) {
+echo "Version update v1.3.9 to 1.3.10 not successful.";
+return false;
+}
+}
+
+DbUtils::overrulePrefix($prefix);
+
+$sql = "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL,?,?)";
+$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
+$hosttext = self::genSampleHostText();
+$stmt->execute(array('hosttext',$hosttext));
+
+$this->updateVersion($pdo, '1.3.11');
+
+return true;
+} catch (PDOException $e) {
+echo "Error in v1.3.10 to 1.3.11: $e";
+return false;
+}
+}
+
function setVersion($prefix,$theVersion) {
$pdo = $this->pdo;
@@ -2230,7 +2257,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.3.10')");
+$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.3.11')");
$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')");
@@ -2294,6 +2321,9 @@ $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VAL
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'showpayment7', '1')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'showpayment8', '1')");
+$hosttext = self::genSampleHostText();
+$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'hosttext', '$hosttext')");
+
// prepare for later inconsistency check if version is obsolete
date_default_timezone_set($timezone);
$installDate = date('Y-m-d H:i:s');
@@ -2303,6 +2333,16 @@ $this->readConfigTableAndSendToHist($pdo);
return;
}
+public static function genSampleHostText() {
+$hosttext = "\n\nAngaben zum Nachweis der Höhe\nund der betrieblichen\nVeranlassung von\nBewirtungsaufwendungen\n(Par. 4 Abs. 5 Ziff. 2 EStG)\n\n";
+$hosttext .= "Tag der Bewirtung:\n\n\n";
+$hosttext .= "Ort der Bewirtung:\n\n\n";
+$hosttext .= "Bewirtete Person(en):\n\n\n\n\n\n";
+$hosttext .= "Anlass der Bewirtung:\n\n\n\n\n\n\n";
+$hosttext .= "Ort, Datum Unterschrift\n\n";
+return $hosttext;
+}
+
public function getCurrentVersion() {
try {
$pdo = $this->pdo;
@@ -2630,7 +2670,7 @@ $zones[] = $timezone_identifiers[$i];
}
echo json_encode($zones);
} else if ($command == 'update') {
-$installerVersion = "1.3.10";
+$installerVersion = "1.3.11";
$admin = new InstallAdmin();
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
@@ -2660,7 +2700,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.20","1.2.21","1.2.22","1.3.0","1.3.1","1.3.2","1.3.3","1.3.4","1.3.5","1.3.6","1.3.7","1.3.8","1.3.9"
+"1.2.18","1.2.19","1.2.20","1.2.21","1.2.22","1.3.0","1.3.1","1.3.2","1.3.3","1.3.4","1.3.5","1.3.6","1.3.7","1.3.8","1.3.9","1.3.10"
);
if (!in_array($version, $supportedVersions)) {
@@ -2668,7 +2708,7 @@ echo json_encode("Quellversion nicht unterstützt");
return;
}
-$ret = $admin->updateUserTable1309_1310($_POST['prefix'], $version, $_POST['db']);
+$ret = $admin->updateUserTable1310_1311($_POST['prefix'], $version, $_POST['db']);
if(session_id() == '') {
session_start();
diff --git a/webapp/kitchen.html b/webapp/kitchen.html
index 1eca438..1a28d9b 100644
--- a/webapp/kitchen.html
+++ b/webapp/kitchen.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/manager.html b/webapp/manager.html
index 8b6185a..264b3e2 100644
--- a/webapp/manager.html
+++ b/webapp/manager.html
@@ -5,7 +5,7 @@
-
+
@@ -174,6 +174,7 @@ var MAN_RECEIPT_FONTSIZE = ["Schriftgröße Bon (Bildschirm)","Font size receipt
var MAN_EMAIL_DATA = ["Email senden","Send email","Enviar email"];
var MAN_EMAIL_WRONG_FORMAT = ["Keine gültige Email-Adresse angegeben.","No valid email address.","Dirección de email invalida."];
var MAN_EMAIL_EMPTY = ["Keine Email-Adresse angegeben.","No email address given.","No hay ningún dirección de email."];
+var MAN_HOSTTEXT_TXT = ["Vorlage Bewirtungsbeleg","Template Host Area","Bewirtungsbeleg"];
var MAN_EMAIL_SENDER_TXT = ["Email-Absender:","Email sender:","Remitente de email:"];
var MAN_DEFAULT_EMAIL_TO = ["Standard-Email-Empfänger:","Standard email receiver","Destinario estandard de emails"];
var MAN_NEW_VERSION_AVAIL = ["Neue Version verfügbar", "New version available", "Hay una versión nueva"];
@@ -380,6 +381,7 @@ var generalValuesSettings = [
["stornocode","Stornocode","i",1,"Stornocode wurde nicht angegeben!"],
["printpass","Printcode","i",1,"Printcode wurde nicht angegeben"],
["companyinfo","Betriebsinfo","i",0],
+ ["hosttext","Bewirtungsbeleg","i",0],
["rectemplate","Bonvorlage ","i",0],
["foodtemplate","Arb.bonvorlage Speisen","i",0],
["drinktemplate","Arb.bonvorlage Getränke","i",0],
@@ -495,6 +497,7 @@ function setLanguage(l) {
$("#roomfield_prefill").html(MAN_DO_AUTO_NUM[l]);
$("#readspeisekarte").html(MAN_APPLY[l]);
+ $("#hosttexttxt").html(MAN_HOSTTEXT_TXT[l]);
$("#fromemailtxt").html(MAN_EMAIL_SENDER_TXT[l]);
$("#toemailtxt").html(MAN_DEFAULT_EMAIL_TO[l]);
@@ -658,6 +661,7 @@ function insertGeneralConfigItems(configResult) {
version = values.version;
$("#companyinfo").val(values.companyinfo);
+ $("#hosttext").val(values.hosttext);
$("#rectemplate").val(values.rectemplate);
$("#foodtemplate").val(values.foodtemplate);
$("#drinktemplate").val(values.drinktemplate);
@@ -796,6 +800,7 @@ function insertGeneralConfigItems(configResult) {
$("#configpart").trigger("create");
bindConfig();
+ continueInitialization();
} else {
setTimeout(function(){document.location.href = "index.html"},250); // not logged in
}
@@ -1582,9 +1587,9 @@ function handleUpdateCheckResult(answer) {
var millis=getMillis();
setTimeout(function(){
- document.location.href = "install.html?v=1.3.10&mode=onlyupdate&n=" + millis;
+ document.location.href = "install.html?v=1.3.11&mode=onlyupdate&n=" + millis;
},250);
- document.location.href = "install.html?v=1.3.10&mode=onlyupdate&n=" + millis;
+ document.location.href = "install.html?v=1.3.11&mode=onlyupdate&n=" + millis;
}
function handleUpdateReplace(answer) {
@@ -2634,9 +2639,7 @@ function insertPrintQueue(queue) {
}
}
-$(document).on("pageinit", "#admin-page", function () {
- initializeMainMenu("#modulemenu");
- getGeneralConfigItems();
+function continueInitialization() {
doAjax("GET","php/contenthandler.php?module=admin&command=isLoggedinUserAdminOrManagerOrTE",null,showPanelsDueToUserStatus,"Fehler");
askAndFillUserList();
@@ -2661,6 +2664,11 @@ $(document).on("pageinit", "#admin-page", function () {
getVersionInfoForUpdate();
binding();
+}
+
+$(document).on("pageinit", "#admin-page", function () {
+ initializeMainMenu("#modulemenu");
+ getGeneralConfigItems();
});
@@ -2822,6 +2830,10 @@ $(document).on("pageinit", "#admin-page", function () {
Hinweis: siehe Anleitung
+
+
+
+
diff --git a/webapp/paydesk.html b/webapp/paydesk.html
index c4658e6..6c0a3b3 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 3e1321d..4f760d1 100644
--- a/webapp/php/admin.php
+++ b/webapp/php/admin.php
@@ -867,6 +867,7 @@ class Admin {
}
$companyInfo = CommonUtils::getConfigValue($pdo,"companyinfo",null);
+ $hosttext = CommonUtils::getConfigValue($pdo,"hosttext",null);
$rectemplate = CommonUtils::getConfigValue($pdo,"rectemplate",null);
$foodtemplate = CommonUtils::getConfigValue($pdo,"foodtemplate",null);
$drinktemplate = CommonUtils::getConfigValue($pdo,"drinktemplate",null);
@@ -986,14 +987,14 @@ class Admin {
"paydeskid" => $paydeskid, "aeskey" => $aeskey, "certificatesn" => $certificatesn, "rksvserver" => $rksvserver, "addreceipttoprinter" => $addreceipttoprinter,
"printandqueuejobs" => $printandqueuejobs, "cashenabled" => $cashenabled, "returntoorder" => $returntoorder, "beepcooked" => $beepcooked,"restaurantmode" => $restaurantmode,
"discountname1" => $discountname1,"discountname2" => $discountname2,"discountname3" => $discountname3,
- "closshowci" => $closshowci, "closshowpaytaxes" => $closshowpaytaxes, "closshowprods" => $closshowprods,
+ "closshowci" => $closshowci, "closshowpaytaxes" => $closshowpaytaxes, "closshowprods" => $closshowprods,"hosttext" => $hosttext,
"showpayment2" => $showpayment2,
"showpayment3" => $showpayment3,
"showpayment4" => $showpayment4,
"showpayment5" => $showpayment5,
"showpayment6" => $showpayment6,
"showpayment7" => $showpayment7,
- "showpayment8" => $showpayment8
+ "showpayment8" => $showpayment8
);
@@ -1084,7 +1085,7 @@ class Admin {
$view = "preferences.html";
}
- echo json_encode($view . "?v=1.3.10");
+ echo json_encode($view . "?v=1.3.11");
}
}
@@ -1286,25 +1287,25 @@ 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.3.10"); };
+ if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.3.11"); };
} else {
- if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.3.10"); };
+ if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.3.11"); };
}
- if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.3.10"); };
- if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.3.10"); };
- if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.3.10"); };
+ if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.3.11"); };
+ if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.3.11"); };
+ if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.3.11"); };
if ($_SESSION['modus'] == 0) {
- if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.3.10"); };
+ if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.3.11"); };
}
- if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.3.10"); };
- if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.3.10"); };
- if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.3.10"); };
- if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.3.10"); };
- if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.3.10"); };
- if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.3.10"); };
- if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.3.10"); };
- $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.3.10");
- $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.3.10");
+ if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.3.11"); };
+ if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.3.11"); };
+ if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.3.11"); };
+ if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.3.11"); };
+ if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.3.11"); };
+ if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.3.11"); };
+ if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.3.11"); };
+ $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.3.11");
+ $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.3.11");
}
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
@@ -1312,7 +1313,7 @@ class Admin {
$waiterMessage = $this->getMessage(null, "waitermessage");
}
- $mainMenuAndVersion = array ("version" => "OrderSprinter 1.3.10",
+ $mainMenuAndVersion = array ("version" => "OrderSprinter 1.3.11",
"user" => $currentUser,
"menu" => $mainMenu,
"waitermessage" => $waiterMessage,
@@ -1348,7 +1349,13 @@ class Admin {
private function getGuestInfo($pdo) {
try {
- $sql = "SELECT %customers%.id as id,%customers%.id as object,CONCAT(IFNULL(name,''),' - ',IFNULL(room,'')) as guest FROM %customers%,%vacations% where %customers%.id=%vacations%.customerid AND ((checkin <= CURDATE()) AND (CURDATE() <= checkout)) GROUP BY id";
+ $sql = "SELECT %customers%.id as id,%customers%.id as object,CONCAT(IFNULL(name,''),' - ',IFNULL(room,'')) as guest ";
+ $sql .= " FROM %customers%,%vacations% ";
+ $sql .= " WHERE %customers%.id=%vacations%.customerid AND (";
+ $sql .= " ((checkin <= CURDATE()) AND (CURDATE() <= checkout)) ";
+ $sql .= " OR (checkin is null AND (CURDATE() <= checkout)) ";
+ $sql .= " OR ((checkin <= CURDATE()) AND checkout is null) ";
+ $sql .= ") GROUP BY id";
$guests = CommonUtils::fetchSqlAll($pdo, $sql, null);
return(array("status" => "OK","guests" => $guests));
} catch (Exception $ex) {
@@ -1551,6 +1558,7 @@ class Admin {
"stornocode" => array("dbcol" => "stornocode","checknum" => 0),
"printpass" => array("dbcol" => "printpass","checknum" => 0),
"companyinfo" => array("dbcol" => "companyinfo","checknum" => 0),
+ "hosttext" => array("dbcol" => "hosttext","checknum" => 0),
"rectemplate" => array("dbcol" => "rectemplate","checknum" => 0),
"foodtemplate" => array("dbcol" => "foodtemplate","checknum" => 0),
"drinktemplate" => array("dbcol" => "drinktemplate","checknum" => 0),
@@ -2082,6 +2090,7 @@ class Admin {
}
public function backup($theType,$remoteaccesscode) {
+ set_time_limit(60*60);
date_default_timezone_set(DbUtils::getTimeZone());
$nowtime = date('Y-m-d');
@@ -2183,7 +2192,7 @@ class Admin {
}
private function restore() {
- set_time_limit(60*20);
+ set_time_limit(60*60);
if ($_FILES['userfile']['error'] != UPLOAD_ERR_OK //checks for errors
&& is_uploaded_file($_FILES['userfile']['tmp_name'])) { //checks that file is uploaded
diff --git a/webapp/php/printqueue.php b/webapp/php/printqueue.php
index b362d55..e60c6b9 100644
--- a/webapp/php/printqueue.php
+++ b/webapp/php/printqueue.php
@@ -488,6 +488,9 @@ class PrintQueue {
if (in_array($printer, $printersArr)) {
if (is_null($fl)) {
$receiptJob = array("id" => $printJobId,"bill" => $bill->getBillWithId($pdo,$aBillId,$language,$printer));
+ } else if ($fl >= 9) {
+ $hosttext = CommonUtils::getConfigValue($pdo, 'hosttext', '');
+ $receiptJob = array("id" => $printJobId,"bill" => $bill->getBillWithId($pdo,$aBillId,$language,$printer,true,true), "template" => $template, "hosttext" => $hosttext);
} else if ($fl >= 6) {
$receiptJob = array("id" => $printJobId,"bill" => $bill->getBillWithId($pdo,$aBillId,$language,$printer,true,true), "template" => $template);
} else if ($fl >= 4) {
diff --git a/webapp/php/updater.php b/webapp/php/updater.php
index 6417376..45ad157 100644
--- a/webapp/php/updater.php
+++ b/webapp/php/updater.php
@@ -117,7 +117,7 @@ class Updater {
$infoFileLines = $infoFile["msg"];
if (count($infoFileLines) > 1) {
- $checkIfNewerVersion = self::isV2Newer('1.3.10',trim($infoFileLines[0]));
+ $checkIfNewerVersion = self::isV2Newer('1.3.11',trim($infoFileLines[0]));
return array("status" => "OK","msg" => $infoFileLines[0],"url" => $url,"neweravailable" => ($checkIfNewerVersion ? 1 : 0));
} else {
return array("status" => "ERROR","msg" => "Info file not valid","url" => $url);
diff --git a/webapp/preferences.html b/webapp/preferences.html
index c48b502..942dd8c 100644
--- a/webapp/preferences.html
+++ b/webapp/preferences.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/products.html b/webapp/products.html
index 614d552..c8e2332 100644
--- a/webapp/products.html
+++ b/webapp/products.html
@@ -7,7 +7,7 @@
-
+
diff --git a/webapp/rating.html b/webapp/rating.html
index 53e3f31..c125e1d 100644
--- a/webapp/rating.html
+++ b/webapp/rating.html
@@ -7,7 +7,7 @@
-
+
diff --git a/webapp/reports.html b/webapp/reports.html
index 7c12bab..1d95c6b 100644
--- a/webapp/reports.html
+++ b/webapp/reports.html
@@ -7,7 +7,7 @@
-
+
diff --git a/webapp/reservation.html b/webapp/reservation.html
index d12abed..6e0963e 100644
--- a/webapp/reservation.html
+++ b/webapp/reservation.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html
index 558dec0..6ca0a12 100644
--- a/webapp/supplydesk.html
+++ b/webapp/supplydesk.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/waiter.html b/webapp/waiter.html
index fb04b1d..f65f9f1 100644
--- a/webapp/waiter.html
+++ b/webapp/waiter.html
@@ -4,8 +4,8 @@
-
-
+
+