From b4dcc6662b94778c9d55fc3185f3e36ac04a02b4 Mon Sep 17 00:00:00 2001 From: Geno Date: Thu, 19 Nov 2020 23:10:11 +0100 Subject: [PATCH] OrderSprinter 1.4.2 --- 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 | 30 +++++++++++++--- webapp/kitchen.html | 2 +- webapp/manager.html | 8 ++--- webapp/paydesk.html | 2 +- webapp/php/admin.php | 42 +++++++++++------------ webapp/php/debug.php | 2 +- 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 +-- 23 files changed, 75 insertions(+), 53 deletions(-) diff --git a/gastsystem/index.php b/gastsystem/index.php index 2fc70d6..e970ff2 100644 --- a/gastsystem/index.php +++ b/gastsystem/index.php @@ -9,8 +9,8 @@ - - + + @@ -98,7 +98,7 @@
  OrderSprinter
-
1.4.1  
+
1.4.2  
diff --git a/gastsystem/install.php b/gastsystem/install.php index 0122c7a..0dbf0dd 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.1

"; + echo "Installation OrderSprinter-Gastsystem 1.4.2

"; echo "
"; echo "
"; echo "
"; diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe index 3d985ef527faec7d117a80535a2b49ab9b997c05..62ddef5b25ed3fa5177a9fe4c2f40165cc146269 100644 GIT binary patch delta 154 zcmZpeBhWBMU_uA8^p$Om-L2h>t=&vpyO}q4Gcs+r?_pl2qvC34=HhB;V5Dp2=xm^C zV(RFoYw2WWuIuP*V(w^UVPxRuWU*avCv&thqtW)akujr*b| z{vF#pzA>-k2TGf>v4k^mGBL0)FfuSOFm0dC!4k^|6#vS}vK&ZHpUcexGUXySi#`(o DAw@2L delta 154 zcmZpeBhWBMU_uA;pR1c1yIZ>%Tf3RIb~A78W@OxM-^094N5#O=!pPag+(OsF#KltA z#L3ZF*TUS~Mc2T^*vZMn*wxg@)nL2ePUdK1M#Js7Z&Z_MlXfzsw|Ea6O?j0`Lcj0_A6jN7Mku*5O~#lLd0EC "OK","msg" => "Installation successful"); diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe index 3d985ef527faec7d117a80535a2b49ab9b997c05..62ddef5b25ed3fa5177a9fe4c2f40165cc146269 100644 GIT binary patch delta 154 zcmZpeBhWBMU_uA8^p$Om-L2h>t=&vpyO}q4Gcs+r?_pl2qvC34=HhB;V5Dp2=xm^C zV(RFoYw2WWuIuP*V(w^UVPxRuWU*avCv&thqtW)akujr*b| z{vF#pzA>-k2TGf>v4k^mGBL0)FfuSOFm0dC!4k^|6#vS}vK&ZHpUcexGUXySi#`(o DAw@2L delta 154 zcmZpeBhWBMU_uA;pR1c1yIZ>%Tf3RIb~A78W@OxM-^094N5#O=!pPag+(OsF#KltA z#L3ZF*TUS~Mc2T^*vZMn*wxg@)nL2ePUdK1M#Js7Z&Z_MlXfzsw|Ea6O?j0`Lcj0_A6jN7Mku*5O~#lLd0EC - + diff --git a/webapp/bill.html b/webapp/bill.html index 9c88ca8..ad0d00d 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/feedback.html b/webapp/feedback.html index 8604e65..c081927 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index 50bc4e5..e741998 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.1"},500); + setTimeout(function(){document.location.href = "install.html?v=1.4.2"},500); } } diff --git a/webapp/install.html b/webapp/install.html index 954be77..d925776 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 78daf8c..d38d6fb 100644 --- a/webapp/install/installer.php +++ b/webapp/install/installer.php @@ -2792,6 +2792,28 @@ return false; } } +function updateUserTable1401_1402($prefix, $version, $dbname) { +$pdo = $this->pdo; +try { +if ($version != "1.4.1") { +$ret = $this->updateUserTable1400_1401($prefix, $version, $dbname); +if (!$ret) { +echo "Version update v1.4.0 to 1.4.1 not successful."; +return false; +} +} + +DbUtils::overrulePrefix($prefix); + +$this->updateVersion($pdo, '1.4.2'); + +return true; +} catch (PDOException $e) { +echo "Error in v1.4.1 to 1.4.2: $e"; +return false; +} +} + function insertIntRow($pdo,$table,$rowToInsert,$afterRow) { $this->insertTypeRow($pdo, $table, $rowToInsert, $afterRow, 'INT(1) NULL'); } @@ -2967,7 +2989,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.4.1')"); +$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.4.2')"); $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')"); @@ -3414,7 +3436,7 @@ $zones[] = $timezone_identifiers[$i]; } echo json_encode($zones); } else if ($command == 'update') { -$installerVersion = "1.4.1"; +$installerVersion = "1.4.2"; $admin = new InstallAdmin(); $pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']); @@ -3445,7 +3467,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.25","1.3.26","1.4.0" +"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","1.3.26","1.4.0","1.4.1" ); if (!in_array($version, $supportedVersions)) { @@ -3453,7 +3475,7 @@ echo json_encode("Quellversion nicht unterstützt"); return; } -$ret = $admin->updateUserTable1400_1401($_POST['prefix'], $version, $_POST['db']); +$ret = $admin->updateUserTable1401_1402($_POST['prefix'], $version, $_POST['db']); if(session_id() == '') { session_start(); diff --git a/webapp/kitchen.html b/webapp/kitchen.html index af96e5b..4001919 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index cc694f3..9610c85 100644 --- a/webapp/manager.html +++ b/webapp/manager.html @@ -5,7 +5,7 @@ - + @@ -1227,7 +1227,7 @@ function initRestoreFileUpload() { } else { alert("Import war erfolgreich."); setTimeout(function(){ - document.location.href = "index.html?v=1.4.1"; + document.location.href = "index.html?v=1.4.2"; },250); } }, @@ -1764,9 +1764,9 @@ function handleUpdateCheckResult(answer) { var millis=getMillis(); setTimeout(function(){ - document.location.href = "install.html?v=1.4.1&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.4.2&mode=onlyupdate&n=" + millis; },250); - document.location.href = "install.html?v=1.4.1&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.4.2&mode=onlyupdate&n=" + millis; } function handleUpdateReplace(answer) { diff --git a/webapp/paydesk.html b/webapp/paydesk.html index 370445c..cda4fc3 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 687a174..10deffc 100644 --- a/webapp/php/admin.php +++ b/webapp/php/admin.php @@ -1245,7 +1245,7 @@ class Admin { $view = "preferences.html"; } - echo json_encode($view . "?v=1.4.1"); + echo json_encode($view . "?v=1.4.2"); } } @@ -1452,27 +1452,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.1"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.4.2"); }; } else { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.1"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.2"); }; } - if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.4.1"); }; - if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.4.1"); }; - if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.4.1"); }; + if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.4.2"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.4.2"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.4.2"); }; if ($_SESSION['modus'] == 0) { - if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.1"); }; + if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.2"); }; } - if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.4.1"); }; - if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.4.1"); }; - if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.4.1"); }; - if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.4.1"); }; - if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.4.1"); }; - if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.4.1"); }; - if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.4.1"); }; - if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.4.1"); }; - $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.4.1"); - $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.4.1"); - $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.4.1"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.4.2"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.4.2"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.4.2"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.4.2"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.4.2"); }; + if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.4.2"); }; + if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.4.2"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.4.2"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.4.2"); + $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.4.2"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.4.2"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); @@ -1480,7 +1480,7 @@ class Admin { $waiterMessage = $this->getMessage(null, "waitermessage"); } - $mainMenuAndVersion = array ("version" => "OrderSprinter 1.4.1", + $mainMenuAndVersion = array ("version" => "OrderSprinter 1.4.2", "user" => $currentUser, "menu" => $mainMenu, "waitermessage" => $waiterMessage, @@ -2721,10 +2721,10 @@ class Admin { $dbContent = json_decode($content,true); foreach($dbContent as $table) { - if ($table['table'] == 'config') { + if ($table['t'] == 'config') { $foundConfigItem = null; - foreach($table['content'] as $aConfigItem) { + foreach($table['c'] as $aConfigItem) { foreach($aConfigItem as $aConfigDbPart) { if (($aConfigDbPart['f'] == 'name') && ($aConfigDbPart['v'] == 'version')) { $foundConfigItem = $aConfigItem; diff --git a/webapp/php/debug.php b/webapp/php/debug.php index d768109..a9744ad 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.1"; + $version = "1.4.2"; $arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion); } else { diff --git a/webapp/preferences.html b/webapp/preferences.html index 94917ee..0c92ccc 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index f80d62c..d877444 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/rating.html b/webapp/rating.html index bea2112..3171713 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index 241242d..02d0059 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index b279392..a830347 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index 21f5d9d..987dfc3 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index 499f9e7..3c65b34 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,8 +4,8 @@ - - + +