From cdf9b3c72b4873c9fd6929b34448d1cb754e387d Mon Sep 17 00:00:00 2001 From: Geno Date: Thu, 19 Nov 2020 23:10:33 +0100 Subject: [PATCH] OrderSprinter 1.4.11 --- gastsystem/index.php | 6 ++-- gastsystem/install.php | 4 +-- printserver/OrderSprinterPrintserver.exe | Bin 265728 -> 265728 bytes spider/install/installer.php | 2 +- webapp/OrderSprinterPrintserver.exe | Bin 265728 -> 265728 bytes webapp/bar.html | 2 +- webapp/bill.html | 2 +- webapp/feedback.html | 2 +- webapp/index.html | 6 ++-- webapp/install.html | 2 +- webapp/install/installer.php | 2 +- webapp/kitchen.html | 2 +- webapp/manager.html | 8 ++--- webapp/paydesk.html | 2 +- webapp/php/admin.php | 36 +++++++++++------------ webapp/php/debug.php | 2 +- webapp/php/queuecontent.php | 2 +- webapp/php/utilities/version.php | 7 ++++- 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 | 4 +-- 25 files changed, 54 insertions(+), 49 deletions(-) diff --git a/gastsystem/index.php b/gastsystem/index.php index 6bd4b64..5b01760 100644 --- a/gastsystem/index.php +++ b/gastsystem/index.php @@ -9,8 +9,8 @@ - - + + @@ -105,7 +105,7 @@
  OrderSprinter
-
1.4.10  
+
1.4.11  
diff --git a/gastsystem/install.php b/gastsystem/install.php index 08e08d5..7ac71fc 100644 --- a/gastsystem/install.php +++ b/gastsystem/install.php @@ -90,10 +90,10 @@ if (isset($_POST['code'])) { } else { echo ""; echo "Installation Gastsystem"; - echo ''; + echo ''; echo ""; echo "
"; - echo "Installation OrderSprinter-Gastsystem 1.4.10

"; + echo "Installation OrderSprinter-Gastsystem 1.4.11

"; echo "
"; echo "
"; echo "
"; diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe index 33fce8955765858d7ebe188032922eaa3205364a..4bdcabb9e603bf0eaf64658259eedda24f2a1aa6 100644 GIT binary patch delta 162 zcmZpeBhWBMU_uA;>oY8k-L2h>t=&vpyO}q4GjeaY?_pl2qhe%XVqos#=%(vvVQ8Ui zVrFTn>*(y{1mrq7x;j}H8XG$qZWr9i9Ba&IxIO<3Gbfk8`dSAKi4`;5*6d!f>vf~? z#_b*7nAh_Ir7hT4!k9R@8CVz?85kJ2w@>F_iDv|gf9GUb4Wy?p=4LTxHDu6ZFqmw} MsI;Athvh#b0IU@-EC2ui delta 162 zcmZpeBhWBMU_uA;mrBOQ?$&O`)^4V)-OQW28M(IG_b{*1QE@VGa&|U0bkQ|%b8*x) zaWys4b#!wy(lv8)F*9{>b~3ZHFxxJ;lR4Iy(O`T28)i-}0olWQHr(P5@>{ "OK","msg" => "Installation successful"); diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe index 33fce8955765858d7ebe188032922eaa3205364a..4bdcabb9e603bf0eaf64658259eedda24f2a1aa6 100644 GIT binary patch delta 162 zcmZpeBhWBMU_uA;>oY8k-L2h>t=&vpyO}q4GjeaY?_pl2qhe%XVqos#=%(vvVQ8Ui zVrFTn>*(y{1mrq7x;j}H8XG$qZWr9i9Ba&IxIO<3Gbfk8`dSAKi4`;5*6d!f>vf~? z#_b*7nAh_Ir7hT4!k9R@8CVz?85kJ2w@>F_iDv|gf9GUb4Wy?p=4LTxHDu6ZFqmw} MsI;Athvh#b0IU@-EC2ui delta 162 zcmZpeBhWBMU_uA;mrBOQ?$&O`)^4V)-OQW28M(IG_b{*1QE@VGa&|U0bkQ|%b8*x) zaWys4b#!wy(lv8)F*9{>b~3ZHFxxJ;lR4Iy(O`T28)i-}0olWQHr(P5@>{ - + diff --git a/webapp/bill.html b/webapp/bill.html index 86f50e7..13b363f 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/feedback.html b/webapp/feedback.html index fc7d3c6..7118dc8 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index 49f879f..aa1621a 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,8 +9,8 @@ - - + + @@ -215,7 +215,7 @@ function handleResultOfInstallCheck(is_installed) { if (is_installed == "Yes") { useInstallation(); } else { - setTimeout(function(){document.location.href = "install.html?v=1.4.10"},500); + setTimeout(function(){document.location.href = "install.html?v=1.4.11"},500); } } diff --git a/webapp/install.html b/webapp/install.html index d3550ad..810aa68 100644 --- a/webapp/install.html +++ b/webapp/install.html @@ -727,7 +727,7 @@ $(document).ready(function() {   - +   diff --git a/webapp/install/installer.php b/webapp/install/installer.php index 8021146..0085d8d 100644 --- a/webapp/install/installer.php +++ b/webapp/install/installer.php @@ -413,7 +413,7 @@ $zones[] = $timezone_identifiers[$i]; echo json_encode($zones); } else if ($command == 'update') { set_time_limit(60*30); -$installerVersion = "1.4.10"; +$installerVersion = "1.4.11"; $admin = new InstallAdmin(); $pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']); diff --git a/webapp/kitchen.html b/webapp/kitchen.html index 053f079..e49423f 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index dd3d38d..f472ac7 100644 --- a/webapp/manager.html +++ b/webapp/manager.html @@ -5,7 +5,7 @@ - + @@ -1253,7 +1253,7 @@ function initRestoreFileUpload() { } else { alert("Import war erfolgreich."); setTimeout(function(){ - document.location.href = "index.html?v=1.4.10"; + document.location.href = "index.html?v=1.4.11"; },250); } }, @@ -1791,9 +1791,9 @@ function handleUpdateCheckResult(answer) { var millis=getMillis(); setTimeout(function(){ - document.location.href = "install.html?v=1.4.10&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.4.11&mode=onlyupdate&n=" + millis; },250); - document.location.href = "install.html?v=1.4.10&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.4.11&mode=onlyupdate&n=" + millis; } function handleUpdateReplace(answer) { diff --git a/webapp/paydesk.html b/webapp/paydesk.html index 545741c..1d4b06d 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 dfadaac..ccffece 100644 --- a/webapp/php/admin.php +++ b/webapp/php/admin.php @@ -1273,7 +1273,7 @@ class Admin { $view = "preferences.html"; } - echo json_encode($view . "?v=1.4.10"); + echo json_encode($view . "?v=1.4.11"); } } @@ -1484,27 +1484,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.4.10"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.4.11"); }; } else { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.10"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.11"); }; } - if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.4.10"); }; - if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.4.10"); }; - if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.4.10"); }; + if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.4.11"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.4.11"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.4.11"); }; if ($_SESSION['modus'] == 0) { - if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.10"); }; + if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.11"); }; } - if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.4.10"); }; - if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.4.10"); }; - if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.4.10"); }; - if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.4.10"); }; - if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.4.10"); }; - if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.4.10"); }; - if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.4.10"); }; - if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.4.10"); }; - $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.4.10"); - $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.4.10"); - $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.4.10"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.4.11"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.4.11"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.4.11"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.4.11"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.4.11"); }; + if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.4.11"); }; + if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.4.11"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.4.11"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.4.11"); + $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.4.11"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.4.11"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); diff --git a/webapp/php/debug.php b/webapp/php/debug.php index 257e543..d080fa9 100644 --- a/webapp/php/debug.php +++ b/webapp/php/debug.php @@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) { if (strlen($status) > 150) { $status = substr($status, 0,149); } - $version = "1.4.10"; + $version = "1.4.11"; $arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion); } else { diff --git a/webapp/php/queuecontent.php b/webapp/php/queuecontent.php index fe4d52f..b6e7578 100644 --- a/webapp/php/queuecontent.php +++ b/webapp/php/queuecontent.php @@ -1908,7 +1908,7 @@ class QueueContent { if (!$calledInternally) { $sql = "INSERT INTO %records% (date,userid,tableid,action) VALUES(?,?,?,?)"; - CommonUtils::execSql($pdo, $sql, array($currentTime,$userid,$tableid,T_BILL)); + CommonUtils::execSql($pdo, $sql, array($currentTime,$userid,($tableid == 0 ? null : $tableid),T_BILL)); $recordid = $pdo->lastInsertId(); } diff --git a/webapp/php/utilities/version.php b/webapp/php/utilities/version.php index aceb136..408611d 100644 --- a/webapp/php/utilities/version.php +++ b/webapp/php/utilities/version.php @@ -814,6 +814,10 @@ class Version { public static function upd_1409_1410($pdo, $prefix, $dbname) { return array(true); + } + public static function upd_1410_1411($pdo, $prefix, $dbname) { + return array(true); + } public static $updateOrder = array( @@ -854,7 +858,8 @@ class Version { "1.4.6" => array("upd_1406_1407","1.4.7"), "1.4.7" => array("upd_1407_1408","1.4.8"), "1.4.8" => array("upd_1408_1409","1.4.9"), - "1.4.9" => array("upd_1409_1410","1.4.10") + "1.4.9" => array("upd_1409_1410","1.4.10"), + "1.4.10" => array("upd_1410_1411","1.4.11") ); // RE;* also for install process no check is required diff --git a/webapp/preferences.html b/webapp/preferences.html index 22fbc97..d4e4b93 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index 5e2b047..97bcfcc 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/rating.html b/webapp/rating.html index f651c3f..9da4c36 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index 3db7475..5f2d627 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index dfc9ff2..2dd8dc0 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index 2b13239..2c4c390 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index c2bf118..6d351b7 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,8 +4,8 @@ - - + +