From a0a538eb7b7c411ed4abbb247f46f88e2cb04a9b Mon Sep 17 00:00:00 2001 From: Geno Date: Thu, 19 Nov 2020 23:00:01 +0100 Subject: [PATCH] OrderSprinter 1.2.4 --- javaprinter/javaprinter.jar | Bin 57780 -> 58199 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 | 30 +++++++++++++++--------------- 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 +- 18 files changed, 54 insertions(+), 35 deletions(-) diff --git a/javaprinter/javaprinter.jar b/javaprinter/javaprinter.jar index 1d1785218f17c7a76a0d5feb28cf5df8f64e5141..1220bf01f8196e3ea923beb1e96802b5588fa06c 100644 GIT binary patch delta 14398 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%0A&N|1rt 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 QG7Svfpo9|t6VM?44;3BHUH||9 delta 13955 zcmZX51yo$i5-slT9^BpCT@oa?ySrN^5S(FI1mU32oP|9^IBA5Na*;mGcXe*9dt$XS-mEt zF!8H^HIo$lkqi^S!D{Yc>h2z>ru42`9OE}0qh?7Sedikz;T(A4{PW;*ayv;VyEE7C z8v1w!>Rt-^5x?o!vXzBzp&!-y_a%Wup5RsAK(5QNqveMYrjLddsq*Xp`eK4-06rD z=|Rq+x|-zr6hlV~F9(Z~A)JpYfBUj7rEfMKC#19w$2WUCCnH zm_>|3C7bL3!fhI;*q1%O9%UA~DU%5}1w~yrDsaD|E}|thj41NTlzaI5>6pY? z096QLKQA)GR2_~kN_eCa+6yS#3vw+DV?)hYqao{1&t<`f>;*umD#0U+7L3vcLP9`% zgo1df|A)mt?ENK+2;k_At%>o$3Cj;$vw&q&3agX@I~9T@{k|ZA*YUf}lonB$>Y5X8 z^HB1!)5@y!z4PNH^1v3nYIpRm&*M?7`mR%QTw>8Ll6tyUZ|k4q!V@cLL&gBH2k0(K zeiDkXA(cri)PWk|eG6wrLn74EWPRO47O9l!6n;t+s$p7tBtUtxVU>g8>K1_+e`&!@ zol0{;5{s>`u3(cHx5cE3h^<06#T?ephFS`bA$Fqx)3;%;xbJL#5`}X5AXy$_avN#;;X$Hn$-j(T7wgk$ui~>sFaR@9j#7NhGw(t|hX7Dv zgt+r>bMOgs-%@{&C{AfXPkIPY78S zMMl(2_*bnPY+BkJb!Up|mNb;$A2-cY@6mV4D`uCK93S$26Qmw#X^Xv?BE7Ipl&0Ei z?a|zbB#rT~GNED-<-2Ao2J(RPXKEgF?Qd~Dt4#q)!xDjlB0Tlk8ZmBiJ#A}PUenQ= z$Z#yp#|nJ=Q>En!xSLF<#!?=Baq25LR%&`Y)h83l!DR%7xTN1i;~7y{S=yqX6fkSb zV%Zw9w@TDztCv*dQut7k$|ke&_k!Kz2QQMHmRMn#6sn!H1)2~>jkuIQ#lWeUn(4AE zQx^ej#az0pc27zO%WzBFGGR4ZsyyNgY>A6bA#378h}y0OFpHc~TocF&R&hi2AUF3% zsciNKe0Cr^LS1x*0%8Q8NU<8GZK@08TxL>Y&6v+F=qRrs@VOjGm_&N*znUL-ZH}5} z3a!bu#Y8(AIBgwYIe*XIB$4Xc>W0ZuDnSy)q+{^2F^Z=8>t5-Z12Xu`wZIl z1LbPq)Dw{T!#PKxkSnyZ-3_MbHHWpTbR>brpc&%GwsYu}Il_}vcsB{qJQJKeXAtr> zAUNYojV=vub0F_$Y+|f{McExdov-}f2bwXesYZpHkOg7lL0LElUe)Ccm9%`a8pIy< zGiO(9Z`+uzkWlBxFXq2Vr*@71EF5IJ{OG7K5D;<*|GRL+4v>P^DG32S?`Ls;J6q8@ zb6z4)aCFt6VQ>(`#K~a6V2MYB#9<*ou_{{`b(?THXTr)?dP?XgF*44k>a3IZyW}k5r1=WP-*b2t)6ePpyV=XF_FqfgLi`sp?zalf*;`>25X?ybQj~oY!jA86o!bBGSZ~kmtUzl^A-_cNH19%Ru3a}0gj;u-QuH^=Om*UdL=?}}&$89PWn#pggNtyf5o z65{QEk_3xP7{SNL;W4V>Cd18v$Z|5z!u-D4_ zY0;6A2WCy;P|2cn!$US-Ol_8Q-AWUUwUW;T$$ zige01B=v?=ZMe-Ff9tqJ#~00zvvWwW3 FaqiQwFq3Zamx)yWSG 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 diff --git a/webapp/bar.html b/webapp/bar.html index a6bc8ae..8171a22 100644 --- a/webapp/bar.html +++ b/webapp/bar.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/bill.html b/webapp/bill.html index 0dc2ffe..515213b 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/feedback.html b/webapp/feedback.html index 5c34c5d..1c2ba6c 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index ceeabf0..9e9bf3c 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -7,8 +7,8 @@ - - + + diff --git a/webapp/install.html b/webapp/install.html index cd82dc4..a4d82a4 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 02b9330..198b13e 100644 --- a/webapp/install/installer.php +++ b/webapp/install/installer.php @@ -1304,6 +1304,25 @@ return false; } } +function updateUserTable1203_1204($prefix, $version, $dbname) { +$pdo = $this->pdo; +try { +if ($version != "1.2.3") { +$ret = $this->updateUserTable1202_1203($prefix, $version, $dbname); +if (!$ret) { +return false; +} +} + +DbUtils::overrulePrefix($prefix); + +$this->updateVersion($pdo, '1.2.4'); +return true; +} catch (PDOException $e) { +return false; +} +} + function setVersion($prefix,$theVersion) { $pdo = $this->pdo; try { @@ -1416,7 +1435,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.3')"); +$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.2.4')"); $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')"); @@ -1781,7 +1800,7 @@ $zones[] = $timezone_identifiers[$i]; } echo json_encode($zones); } else if ($command == 'update') { -$installerVersion = "1.2.3"; +$installerVersion = "1.2.4"; $admin = new InstallAdmin(); $pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']); @@ -1811,7 +1830,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.0","1.2.1","1.2.2", "1.2.3" ); if (!in_array($version, $supportedVersions)) { @@ -1819,7 +1838,7 @@ echo json_encode("Quellversion nicht unterstützt"); return; } -$ret = $admin->updateUserTable1202_1203($_POST['prefix'], $version, $_POST['db']); +$ret = $admin->updateUserTable1203_1204($_POST['prefix'], $version, $_POST['db']); if(session_id() == '') { session_start(); diff --git a/webapp/kitchen.html b/webapp/kitchen.html index 7492322..baed5f7 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index 0a32683..e696a9e 100644 --- a/webapp/manager.html +++ b/webapp/manager.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/paydesk.html b/webapp/paydesk.html index f91b00a..ad00af4 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 e5208b6..723ec90 100644 --- a/webapp/php/admin.php +++ b/webapp/php/admin.php @@ -1037,7 +1037,7 @@ class Admin { $view = "preferences.html"; } - echo json_encode($view . "?v=1.2.3"); + echo json_encode($view . "?v=1.2.4"); } } @@ -1251,19 +1251,19 @@ class Admin { $right_rating = $_SESSION['right_rating']; if (!self::isOnlyRatingUser($rights, $right_rating, true)) { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.2.3"); }; - if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.2.3"); }; - if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.2.3"); }; - if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.2.3"); }; - if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.2.3"); }; - if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.2.3"); }; - if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.2.3"); }; - if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.2.3"); }; - if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.2.3"); }; - if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.2.3"); }; - if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.2.3"); }; - $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.2.3"); - $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.2.3"); + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.2.4"); }; + if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.2.4"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.2.4"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.2.4"); }; + if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.2.4"); }; + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.2.4"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.2.4"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.2.4"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.2.4"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.2.4"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.2.4"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.2.4"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.2.4"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); @@ -1272,7 +1272,7 @@ class Admin { $waiterMessage = $this->getMessage(null, "waitermessage"); } // CAUTION: change version also in config.txt!!! - $mainMenuAndVersion = array ("version" => "OrderSprinter 1.2.3", + $mainMenuAndVersion = array ("version" => "OrderSprinter 1.2.4", "user" => $currentUser, "menu" => $mainMenu, "waitermessage" => $waiterMessage, diff --git a/webapp/preferences.html b/webapp/preferences.html index 32f700b..c9a6c78 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index 630ea30..ceb9556 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/rating.html b/webapp/rating.html index 2947ef0..5a9ec61 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index 9ffd011..32e728f 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index 70b0deb..960fd5e 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index 2e0e3de..269bfaf 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index da7f7ba..267173a 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,7 +4,7 @@ - +