From 865972f4a8ed53163760a054e0b4640bcee8a33a Mon Sep 17 00:00:00 2001 From: Geno Date: Thu, 19 Nov 2020 23:00:49 +0100 Subject: [PATCH] OrderSprinter 1.2.16 --- printserver/OrderSprinterPrintserver.exe | Bin 258560 -> 258560 bytes webapp/OrderSprinterPrintserver.exe | Bin 258560 -> 258560 bytes webapp/bar.html | 2 +- webapp/bill.html | 2 +- webapp/feedback.html | 2 +- webapp/index.html | 4 +-- webapp/install.html | 2 +- webapp/install/installer.php | 29 +++++++++++++++++--- webapp/kitchen.html | 2 +- webapp/manager.html | 2 +- webapp/paydesk.html | 2 +- webapp/php/admin.php | 32 +++++++++++------------ webapp/php/config.php | 0 webapp/php/queuecontent.php | 4 +-- webapp/preferences.html | 2 +- webapp/products.html | 2 +- webapp/rating.html | 2 +- webapp/reports.html | 2 +- webapp/reservation.html | 2 +- webapp/supplydesk.html | 2 +- webapp/waiter.html | 2 +- 21 files changed, 59 insertions(+), 38 deletions(-) mode change 100644 => 100755 webapp/php/config.php diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe index c6c2dc7d4567d1a68431307bef1aa971a560c282..7d5ba35a73dbba9c8ed0a80292aa6abb8960601f 100644 GIT binary patch delta 177 zcmV;i08ama95VxOs z1B@ypK`}5xL^(q@Ei*SUFfBAQGBqtiGd4FZHZU|bH#IXwH8wdkw@;)4S1tiIx2Mtr z#R(9{*$kl&Hzh-}XJAEjK30^seB1+`4gof|8|wpe0SOQQ0ssL3000oTm+S*y0Rc9* f_w56#0Rc9bqwfPZ1vUUK05Fp=0VB5p@B{t954WFr z1B@ypHZesvML9G!Ej2PYLoGBoFh(soMMOa@MnpqIH8w>zH#bE>w@;)4S1tiHx2Mtr z#R(8b>E~gLQV&R;+WpN|=XdM3eB1+`4goc{8|wpe0SONP0ssL3000lSm+S*y0Rc6) f_w56#0Rc6aqwfPZ1vLOJ05Fp=0VB5p@B{t95VxOs z1B@ypK`}5xL^(q@Ei*SUFfBAQGBqtiGd4FZHZU|bH#IXwH8wdkw@;)4S1tiIx2Mtr z#R(9{*$kl&Hzh-}XJAEjK30^seB1+`4gof|8|wpe0SOQQ0ssL3000oTm+S*y0Rc9* f_w56#0Rc9bqwfPZ1vUUK05Fp=0VB5p@B{t954WFr z1B@ypHZesvML9G!Ej2PYLoGBoFh(soMMOa@MnpqIH8w>zH#bE>w@;)4S1tiHx2Mtr z#R(8b>E~gLQV&R;+WpN|=XdM3eB1+`4goc{8|wpe0SONP0ssL3000lSm+S*y0Rc6) f_w56#0Rc6aqwfPZ1vLOJ05Fp=0VB5p@B{t - + diff --git a/webapp/bill.html b/webapp/bill.html index be64817..8c7b1a4 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/feedback.html b/webapp/feedback.html index 898cb84..d952638 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index 0694fda..b7cc8d4 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -6,8 +6,8 @@ - - + + diff --git a/webapp/install.html b/webapp/install.html index 7ad1689..b543735 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 9437547..86712fd 100644 --- a/webapp/install/installer.php +++ b/webapp/install/installer.php @@ -1570,6 +1570,27 @@ return false; } } +function updateUserTable1215_1216($prefix, $version, $dbname) { +$pdo = $this->pdo; +try { +if ($version != "1.2.15") { +$ret = $this->updateUserTable1214_1215($prefix, $version, $dbname); +if (!$ret) { +echo "Version update v1.2.14 to 1.2.15 not successful."; +return false; +} +} + +DbUtils::overrulePrefix($prefix); + +$this->updateVersion($pdo, '1.2.16'); +return true; +} catch (PDOException $e) { +echo "Error in v1.2.15 to 1.2.16: $e"; +return false; +} +} + function setVersion($prefix,$theVersion) { $pdo = $this->pdo; try { @@ -1687,7 +1708,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.15')"); +$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.2.16')"); $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')"); @@ -2055,7 +2076,7 @@ $zones[] = $timezone_identifiers[$i]; } echo json_encode($zones); } else if ($command == 'update') { -$installerVersion = "1.2.15"; +$installerVersion = "1.2.16"; $admin = new InstallAdmin(); $pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']); @@ -2085,7 +2106,7 @@ $supportedVersions = array("1.0.22","1.0.23","1.0.24","1.0.25","1.0.26","1.0.27" "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.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.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" ); if (!in_array($version, $supportedVersions)) { @@ -2093,7 +2114,7 @@ echo json_encode("Quellversion nicht unterstützt"); return; } -$ret = $admin->updateUserTable1214_1215($_POST['prefix'], $version, $_POST['db']); +$ret = $admin->updateUserTable1215_1216($_POST['prefix'], $version, $_POST['db']); if(session_id() == '') { session_start(); diff --git a/webapp/kitchen.html b/webapp/kitchen.html index a74bd32..bceeb4b 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index 4a581f4..cce445e 100644 --- a/webapp/manager.html +++ b/webapp/manager.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/paydesk.html b/webapp/paydesk.html index 7a3b2b3..f1608f1 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 3e8b161..769d34b 100644 --- a/webapp/php/admin.php +++ b/webapp/php/admin.php @@ -936,7 +936,7 @@ class Admin { $view = "preferences.html"; } - echo json_encode($view . "?v=1.2.15"); + echo json_encode($view . "?v=1.2.16"); } } @@ -1142,24 +1142,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.15"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.2.16"); }; } else { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.2.15"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.2.16"); }; } - if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.2.15"); }; - if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.2.15"); }; - if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.2.15"); }; + if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.2.16"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.2.16"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.2.16"); }; if ($_SESSION['modus'] == 0) { - if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.2.15"); }; + if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.2.16"); }; } - if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.2.15"); }; - if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.2.15"); }; - if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.2.15"); }; - if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.2.15"); }; - if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.2.15"); }; - if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.2.15"); }; - $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.2.15"); - $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.2.15"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.2.16"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.2.16"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.2.16"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.2.16"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.2.16"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.2.16"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.2.16"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.2.16"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); @@ -1168,7 +1168,7 @@ class Admin { $waiterMessage = $this->getMessage(null, "waitermessage"); } // CAUTION: change version also in config.txt!!! - $mainMenuAndVersion = array ("version" => "OrderSprinter 1.2.15", + $mainMenuAndVersion = array ("version" => "OrderSprinter 1.2.16", "user" => $currentUser, "menu" => $mainMenu, "waitermessage" => $waiterMessage, diff --git a/webapp/php/config.php b/webapp/php/config.php old mode 100644 new mode 100755 diff --git a/webapp/php/queuecontent.php b/webapp/php/queuecontent.php index 569bf9c..6edba6c 100644 --- a/webapp/php/queuecontent.php +++ b/webapp/php/queuecontent.php @@ -1316,9 +1316,9 @@ class QueueContent { if (is_numeric($queueid)) { date_default_timezone_set(DbUtils::getTimeZone()); $delivertime = date('Y-m-d H:i:s'); - $updateSql = "UPDATE %queue% SET delivertime IS NULL WHERE id=?"; + $updateSql = "UPDATE %queue% SET delivertime=? WHERE id=?"; $stmt = $pdo->prepare(DbUtils::substTableAlias($updateSql)); - $stmt->execute(array($queueid)); + $stmt->execute(array(null,$queueid)); } } diff --git a/webapp/preferences.html b/webapp/preferences.html index 50d25e9..cdba006 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index 8e43a3c..39a1ed6 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/rating.html b/webapp/rating.html index 1f02384..7494883 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index cde5823..8eeffbd 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index f6a9024..145d058 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index 16a0c3b..9c465d9 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index e89a197..e8e6da7 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,7 +4,7 @@ - +