| |
-
+
Update... bitte warten.
|
|
diff --git a/webapp/install/installer.php b/webapp/install/installer.php
index 611aa0d..5c4b7e6 100644
--- a/webapp/install/installer.php
+++ b/webapp/install/installer.php
@@ -2677,6 +2677,28 @@ return false;
}
}
+function updateUserTable1325_1326($prefix, $version, $dbname) {
+$pdo = $this->pdo;
+try {
+if ($version != "1.3.25") {
+$ret = $this->updateUserTable1324_1325($prefix, $version, $dbname);
+if (!$ret) {
+echo "Version update v1.3.24 to 1.3.25 not successful.";
+return false;
+}
+}
+
+DbUtils::overrulePrefix($prefix);
+
+$this->updateVersion($pdo, '1.3.26');
+
+return true;
+} catch (PDOException $e) {
+echo "Error in v1.3.25 to 1.3.26: $e";
+return false;
+}
+}
+
function insertIntRow($pdo,$table,$rowToInsert,$afterRow) {
$sql = "SHOW COLUMNS FROM $table LIKE '$rowToInsert'";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
@@ -2832,7 +2854,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.25')");
+$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.3.26')");
$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')");
@@ -3061,7 +3083,7 @@ echo json_encode("ERROR");
}
function writeConfigFile($host,$db,$user,$password,$prefix) {
-$errorlevel = "openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
@@ -3307,7 +3329,7 @@ $supportedVersions = array("1.0.22","1.0.23","1.0.24","1.0.25","1.0.26","1.0.27"
"1.1.18","1.1.19","1.1.20","1.1.21","1.1.22","1.1.23","1.1.24","1.1.25","1.1.26","1.1.27","1.1.28","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.3.10","1.3.11","1.3.12",
-"1.3.13","1.3.14","1.3.15","1.3.16","1.3.17","1.3.18","1.3.19","1.3.20","1.3.21","1.3.22","1.3.23","1.3.24"
+"1.3.13","1.3.14","1.3.15","1.3.16","1.3.17","1.3.18","1.3.19","1.3.20","1.3.21","1.3.22","1.3.23","1.3.24","1.3.25"
);
if (!in_array($version, $supportedVersions)) {
@@ -3315,7 +3337,7 @@ echo json_encode("Quellversion nicht unterstützt");
return;
}
-$ret = $admin->updateUserTable1324_1325($_POST['prefix'], $version, $_POST['db']);
+$ret = $admin->updateUserTable1325_1326($_POST['prefix'], $version, $_POST['db']);
if(session_id() == '') {
session_start();
diff --git a/webapp/kitchen.html b/webapp/kitchen.html
index 7bb7d17..b79808d 100644
--- a/webapp/kitchen.html
+++ b/webapp/kitchen.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/manager.html b/webapp/manager.html
index 1926cb7..0111173 100644
--- a/webapp/manager.html
+++ b/webapp/manager.html
@@ -5,7 +5,7 @@
-
+
@@ -1231,7 +1231,7 @@ function initRestoreFileUpload() {
} else {
alert("Import war erfolgreich.");
setTimeout(function(){
- document.location.href = "index.html?v=1.3.25";
+ document.location.href = "index.html?v=1.3.26";
},250);
}
},
@@ -1790,9 +1790,9 @@ function handleUpdateCheckResult(answer) {
var millis=getMillis();
setTimeout(function(){
- document.location.href = "install.html?v=1.3.25&mode=onlyupdate&n=" + millis;
+ document.location.href = "install.html?v=1.3.26&mode=onlyupdate&n=" + millis;
},250);
- document.location.href = "install.html?v=1.3.25&mode=onlyupdate&n=" + millis;
+ document.location.href = "install.html?v=1.3.26&mode=onlyupdate&n=" + millis;
}
function handleUpdateReplace(answer) {
@@ -2730,12 +2730,11 @@ function invokeCmd(theCommand) {
doAjax("GET","php/contenthandler.php?module=admin&command=" + theCommand,null,handleResultOfDbAction,"Problemkommando " . theCommand);
}
-
function createClosingPart (aText,id,totalsum,cashsum,usersums,taxessums,cashops) {
var decpoint = $("#admin-page").data("decpoint");
var currency = $("#admin-page").data("currency");
var closingPart = '';
- closingPart += '
' + aText + '
';
+ closingPart += '' + toHtml(aText) + '
';
var decpoint = $("#admin-page").data("decpoint");
if (usersums.length > 0) {
diff --git a/webapp/paydesk.html b/webapp/paydesk.html
index 558557e..3371145 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 634d814..5382f0d 100644
--- a/webapp/php/admin.php
+++ b/webapp/php/admin.php
@@ -1215,7 +1215,7 @@ class Admin {
$view = "preferences.html";
}
- echo json_encode($view . "?v=1.3.25");
+ echo json_encode($view . "?v=1.3.26");
}
}
@@ -1422,27 +1422,27 @@ 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.25"); };
+ if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.3.26"); };
} else {
- if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.3.25"); };
+ if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.3.26"); };
}
- if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.3.25"); };
- if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.3.25"); };
- if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.3.25"); };
+ if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.3.26"); };
+ if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.3.26"); };
+ if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.3.26"); };
if ($_SESSION['modus'] == 0) {
- if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.3.25"); };
+ if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.3.26"); };
}
- if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.3.25"); };
- if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.3.25"); };
- if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.3.25"); };
- if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.3.25"); };
- if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.3.25"); };
- if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.3.25"); };
- if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.3.25"); };
- if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.3.25"); };
- $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.3.25");
- $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.3.25");
- $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.3.25");
+ if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.3.26"); };
+ if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.3.26"); };
+ if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.3.26"); };
+ if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.3.26"); };
+ if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.3.26"); };
+ if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.3.26"); };
+ if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.3.26"); };
+ if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.3.26"); };
+ $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.3.26");
+ $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.3.26");
+ $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.3.26");
}
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
@@ -1450,7 +1450,7 @@ class Admin {
$waiterMessage = $this->getMessage(null, "waitermessage");
}
- $mainMenuAndVersion = array ("version" => "OrderSprinter 1.3.25",
+ $mainMenuAndVersion = array ("version" => "OrderSprinter 1.3.26",
"user" => $currentUser,
"menu" => $mainMenu,
"waitermessage" => $waiterMessage,
diff --git a/webapp/php/closing.php b/webapp/php/closing.php
index 7cf04a4..e763f2c 100644
--- a/webapp/php/closing.php
+++ b/webapp/php/closing.php
@@ -356,6 +356,7 @@ return ($row->cashsum);
*/
private function getClosings($month, $year) {
$pdo = DbUtils::openDbAndReturnPdoStatic();
+date_default_timezone_set(DbUtils::getTimeZone());
$monthText=$month;
if ($month < 10) {
$monthText = "0" . $month;
diff --git a/webapp/php/debug.php b/webapp/php/debug.php
index f104440..1421f20 100644
--- a/webapp/php/debug.php
+++ b/webapp/php/debug.php
@@ -10,12 +10,13 @@ if (isset($_POST["cmd"])) {
$xhr = $_POST["xhr"];
$errormsg = $_POST["errormsg"];
$status = $_POST["status"];
+ $phpversion = phpversion();
if (strlen($cmd) > 150) {
$cmd = substr($cmd, 0,149);
}
- if (strlen($xhr) > 500) {
- $xhr = substr($xhr, 0,499);
+ if (strlen($xhr) > 700) {
+ $xhr = substr($xhr, 0,699);
}
if (strlen($fct) > 100) {
$fct = substr($fct, 0,99);
@@ -26,9 +27,9 @@ if (isset($_POST["cmd"])) {
if (strlen($status) > 150) {
$status = substr($status, 0,149);
}
- $version = "1.3.25";
+ $version = "1.3.26";
- $arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version);
+ $arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
} else {
return;
}
diff --git a/webapp/php/remoteaccess.php b/webapp/php/remoteaccess.php
index 56e91f0..083e840 100644
--- a/webapp/php/remoteaccess.php
+++ b/webapp/php/remoteaccess.php
@@ -1,5 +1,4 @@
-
+
diff --git a/webapp/products.html b/webapp/products.html
index 3f6fc89..48c0a02 100644
--- a/webapp/products.html
+++ b/webapp/products.html
@@ -7,7 +7,7 @@
-
+
diff --git a/webapp/rating.html b/webapp/rating.html
index 9a6a991..f4d2871 100644
--- a/webapp/rating.html
+++ b/webapp/rating.html
@@ -7,7 +7,7 @@
-
+
diff --git a/webapp/reports.html b/webapp/reports.html
index 9138903..fa13e93 100644
--- a/webapp/reports.html
+++ b/webapp/reports.html
@@ -7,7 +7,7 @@
-
+
diff --git a/webapp/reservation.html b/webapp/reservation.html
index 7841b0f..0255834 100644
--- a/webapp/reservation.html
+++ b/webapp/reservation.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html
index b45f32f..a4a4310 100644
--- a/webapp/supplydesk.html
+++ b/webapp/supplydesk.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/waiter.html b/webapp/waiter.html
index 464d793..9ed62a0 100644
--- a/webapp/waiter.html
+++ b/webapp/waiter.html
@@ -4,8 +4,8 @@
-
-
+
+