From 80ed5af23ea3b9c7ac75d432e8efc34913b889d5 Mon Sep 17 00:00:00 2001 From: Geno Date: Thu, 19 Nov 2020 23:00:22 +0100 Subject: [PATCH] OrderSprinter 1.2.9 --- javaprinter/javaprinter.jar | Bin 59001 -> 59043 bytes printserver/OrderSprinterPrintserver.exe | Bin 271872 -> 271872 bytes webapp/OrderSprinterPrintserver.exe | Bin 271872 -> 271872 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 | 27 ++++++++++++++++--- webapp/kitchen.html | 2 +- webapp/manager.html | 2 +- webapp/paydesk.html | 2 +- webapp/php/admin.php | 32 +++++++++++------------ 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 +- 20 files changed, 55 insertions(+), 36 deletions(-) diff --git a/javaprinter/javaprinter.jar b/javaprinter/javaprinter.jar index 1de1f3e2eb6930ad0b7e9363a50de92353485df0..a085be6f8f02e826a693a3f951a39ae1ba823e92 100644 GIT binary patch delta 6881 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 Dq@ygo diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe index e60cd5ac11fda9391c907617c48b1330658b6732..8fcf82f81bfa7a5786787bcacb07a3843a45a497 100755 GIT binary patch delta 154 zcmZoTBhYY0U_uA;F3wGj-L2h>t=&vpyP3_`GjeV}yq?)rQ^my9(%9V4)j-$H!o^kB z#LUo1*U{9-MAy*J(cID4(ap%j$!xpMP38wWjF#JZ*;rZEJ#Y+|Tu zVq|Ep>u70apljx8S|$b=)7I$Ci4RwMvLvdY%H@m1zsynNOi0ccUqZ{r+e&O zyUg|-{4BnFKxsBPmJTLP4hAL$Mg|53j_uPGSYjE0;$Ib6mILYObCp?)f!vGAEc#3U Dq@ygo diff --git a/webapp/bar.html b/webapp/bar.html index 25cd243..3686c17 100644 --- a/webapp/bar.html +++ b/webapp/bar.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/bill.html b/webapp/bill.html index e258cf4..dc1b974 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/feedback.html b/webapp/feedback.html index 2923594..bd77812 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index d22bf10..013657c 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -6,8 +6,8 @@ - - + + diff --git a/webapp/install.html b/webapp/install.html index 0007511..63bdd09 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 8e40ec0..2711b2e 100644 --- a/webapp/install/installer.php +++ b/webapp/install/installer.php @@ -1405,6 +1405,25 @@ return true; } catch (PDOException $e) { return false; } +} + +function updateUserTable1208_1209($prefix, $version, $dbname) { +$pdo = $this->pdo; +try { +if ($version != "1.2.8") { +$ret = $this->updateUserTable1207_1208($prefix, $version, $dbname); +if (!$ret) { +return false; +} +} + +DbUtils::overrulePrefix($prefix); + +$this->updateVersion($pdo, '1.2.9'); +return true; +} catch (PDOException $e) { +return false; +} } function setVersion($prefix,$theVersion) { @@ -1520,7 +1539,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.8')"); +$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.2.9')"); $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')"); @@ -1889,7 +1908,7 @@ $zones[] = $timezone_identifiers[$i]; echo json_encode($zones); } else if ($command == 'update') { -$installerVersion = "1.2.8"; +$installerVersion = "1.2.9"; $admin = new InstallAdmin(); $pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']); @@ -1919,7 +1938,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.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" ); if (!in_array($version, $supportedVersions)) { @@ -1927,7 +1946,7 @@ echo json_encode("Quellversion nicht unterstützt"); return; } -$ret = $admin->updateUserTable1207_1208($_POST['prefix'], $version, $_POST['db']); +$ret = $admin->updateUserTable1208_1209($_POST['prefix'], $version, $_POST['db']); if(session_id() == '') { session_start(); diff --git a/webapp/kitchen.html b/webapp/kitchen.html index 6fa13a1..40ee195 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index 9f36bef..e0c3578 100644 --- a/webapp/manager.html +++ b/webapp/manager.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/paydesk.html b/webapp/paydesk.html index f5b4e7d..ee911cd 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 bf9f3d4..3ad528e 100644 --- a/webapp/php/admin.php +++ b/webapp/php/admin.php @@ -1074,7 +1074,7 @@ class Admin { $view = "preferences.html"; } - echo json_encode($view . "?v=1.2.8"); + echo json_encode($view . "?v=1.2.9"); } } @@ -1291,24 +1291,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.8"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.2.9"); }; } else { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.2.8"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.2.9"); }; } - if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.2.8"); }; - if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.2.8"); }; - if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.2.8"); }; + if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.2.9"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.2.9"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.2.9"); }; if ($_SESSION['modus'] == 0) { - if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.2.8"); }; + if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.2.9"); }; } - if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.2.8"); }; - if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.2.8"); }; - if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.2.8"); }; - if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.2.8"); }; - if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.2.8"); }; - if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.2.8"); }; - $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.2.8"); - $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.2.8"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.2.9"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.2.9"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.2.9"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.2.9"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.2.9"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.2.9"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.2.9"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.2.9"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); @@ -1317,7 +1317,7 @@ class Admin { $waiterMessage = $this->getMessage(null, "waitermessage"); } // CAUTION: change version also in config.txt!!! - $mainMenuAndVersion = array ("version" => "OrderSprinter 1.2.8", + $mainMenuAndVersion = array ("version" => "OrderSprinter 1.2.9", "user" => $currentUser, "menu" => $mainMenu, "waitermessage" => $waiterMessage, diff --git a/webapp/preferences.html b/webapp/preferences.html index 86bada3..1c75025 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index 779b197..cb287df 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/rating.html b/webapp/rating.html index 6f52279..c1f0253 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index 0fc86e3..75a176e 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index 78eb10f..d065977 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index 868d38c..75996b2 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index 9de44c5..1e01c3c 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,7 +4,7 @@ - +