From 3f65119d9a010a30b96e5c9a55bb9c7244775386 Mon Sep 17 00:00:00 2001 From: Geno Date: Thu, 19 Nov 2020 22:53:18 +0100 Subject: [PATCH] OrderSprinter 1.1.8 --- printserver/OrderSprinterPrintserver.exe | Bin 253440 -> 260096 bytes webapp/OrderSprinterPrintserver.exe | Bin 253440 -> 260096 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 | 18 +++++++++++++--- webapp/kitchen.html | 2 +- webapp/manager.html | 2 +- webapp/paydesk.html | 2 +- webapp/php/admin.php | 26 +++++++++++------------ webapp/php/printqueue.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 | 24 ++++++++++++++++++--- 20 files changed, 65 insertions(+), 35 deletions(-) diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe index 23ed35b38adeb0ce34f120db44b556211e9a6a84..c1383ab056a96f90cac03f43f10a85273d344713 100644 GIT binary patch delta 27636 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�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 SZ&f@j7h-$Q9p7#IQT`v7y5Qab diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe index 23ed35b38adeb0ce34f120db44b556211e9a6a84..c1383ab056a96f90cac03f43f10a85273d344713 100644 GIT binary patch delta 27636 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�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 SZ&f@j7h-$Q9p7#IQT`v7y5Qab diff --git a/webapp/bar.html b/webapp/bar.html index 0da15ee..2bdc979 100644 --- a/webapp/bar.html +++ b/webapp/bar.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/bill.html b/webapp/bill.html index 06f6eb8..17d0030 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/feedback.html b/webapp/feedback.html index 264e228..47442e6 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index 0df0466..5d0fea5 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -7,8 +7,8 @@ - - + + diff --git a/webapp/install.html b/webapp/install.html index 88ce49c..65b33e9 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 6a3d902..0c66a12 100644 --- a/webapp/install/installer.php +++ b/webapp/install/installer.php @@ -706,6 +706,18 @@ $ret &= $this->setVersion($prefix, '1.1.7'); return $ret; } +function updateUserTable1107_1108($prefix,$version) { +$ret = true; +if ($version != "1.1.7") { +$ret = $this->updateUserTable1106_1107($prefix,$version); +if (!$ret) { +return false; +} +} +$ret &= $this->setVersion($prefix, '1.1.8'); +return $ret; +} + function setVersion($prefix,$theVersion) { $pdo = $this->pdo; try { @@ -777,7 +789,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.1.7')"); +$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.8')"); $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')"); @@ -1149,7 +1161,7 @@ return; $supportedVersions = array("1.0.22","1.0.23","1.0.24","1.0.25","1.0.26","1.0.27","1.0.28","1.0.29", "1.0.30","1.0.31","1.0.32","1.0.33","1.0.34","1.0.35","1.0.36","1.0.37","1.0.38","1.0.39", "1.0.40", -"1.1.0","1.1.1","1.1.2","1.1.3","1.1.4","1.1.5","1.1.6" +"1.1.0","1.1.1","1.1.2","1.1.3","1.1.4","1.1.5","1.1.6","1.1.7" ); if (!in_array($version, $supportedVersions)) { @@ -1157,7 +1169,7 @@ echo json_encode("Quellversion nicht unterstützt"); return; } -$ret = $admin->updateUserTable1106_1107($_POST['prefix'], $version); +$ret = $admin->updateUserTable1107_1108($_POST['prefix'], $version); if(session_id() == '') { session_start(); diff --git a/webapp/kitchen.html b/webapp/kitchen.html index cf2151b..0ce4f15 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index 9d167b2..dd2bd42 100644 --- a/webapp/manager.html +++ b/webapp/manager.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/paydesk.html b/webapp/paydesk.html index c34dc81..b5e332c 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 8211a11..6ec1cfe 100644 --- a/webapp/php/admin.php +++ b/webapp/php/admin.php @@ -1079,19 +1079,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.1.7"); }; - if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.7"); }; - if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.7"); }; - if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.7"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.8"); }; + if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.8"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.8"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.8"); }; if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html"); }; - if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.7"); }; - if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.7"); }; - if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.7"); }; - if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.7"); }; - if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.7"); }; - if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.7"); }; - $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.7"); - $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.7"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.8"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.8"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.8"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.8"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.8"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.8"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.8"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.8"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); @@ -1100,7 +1100,7 @@ class Admin { $waiterMessage = $this->getMessage(null, "waitermessage"); } // CAUTION: change version also in config.txt!!! - $mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.7", + $mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.8", "user" => $currentUser, "menu" => $mainMenu, "waitermessage" => $waiterMessage, diff --git a/webapp/php/printqueue.php b/webapp/php/printqueue.php index 7a5f76d..1c25fc2 100644 --- a/webapp/php/printqueue.php +++ b/webapp/php/printqueue.php @@ -353,7 +353,7 @@ class PrintQueue { function getNextWorkPrintJobs($md5pass,$theType,$printer) { $isCorrect = $this->isPasswordCorrect($md5pass,false); - if ($isCorrect || true) { + if ($isCorrect) { $pdo = $this->dbutils->openDbAndReturnPdo(); $bigFontWorkReceipt = $this->getBigFontWorkReceiptSetting($pdo); diff --git a/webapp/preferences.html b/webapp/preferences.html index 83735a2..66a6f89 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index faaaa9e..01d469c 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/rating.html b/webapp/rating.html index c31e1c9..d9f2bfd 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index b000a63..acf91c4 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index ce40f72..965311c 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index b1b82fb..181d1d8 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index 32af0d9..1d390f0 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,7 +4,7 @@ - + @@ -34,6 +34,7 @@ var W_TABLES = ["Tische","Tables","Mesas"]; var W_ROOMS = ["Räume","Rooms","Espacios"]; var W_SELECTION = ["Auswahl","Selection","Selección"]; +var W_LAST_SELECTED = ["zuletzt","last","seleccionado"]; var W_FAVS = ["Favoriten","Favorites","Favoritos"]; var W_NEW_ORDER = ["Neue Order","New Orders","Ordenes nuevas"]; var W_KIT_BAR = ["nicht serviert/unbezahlt","unserved/unpaid","no servido/impagado"]; @@ -135,6 +136,8 @@ var tableListActive = false; var queueIdsOfTakeAway = []; +var lastSelectedProduct = ""; + function toHtml(text) { return (text.replace(/"/g, '"').replace(//g, ">")); } @@ -491,6 +494,8 @@ function addProductToQueue(productid,extras,changedPrice) { var prodprop = getProdProperties(productid); var prodname = prodprop.name; + lastSelectedProduct = prodname; + $("#lastselectedprod").html(lastSelectedProdToStr()); var prodprice = prodprop.price; var entry = { name: prodname, @@ -762,7 +767,7 @@ function insertTableList(roominfo) { } function initializeEverything() { - + lastSelectedProduct = ""; $(".modules").off("click").on("click", function (e) { $("#menuswitch").trigger("mouseout"); e.stopImmediatePropagation(); @@ -848,6 +853,7 @@ function handleClickInTablemap(data) { // Now we prepare the second page (tables) for display $(document).on("pagebeforeshow", "#tables-page", function () { + lastSelectedProduct = ""; tableListActive = true; if (nextPage == "") { reloadPage(); @@ -1171,8 +1177,16 @@ function bindExtrasSel() { }); } +function lastSelectedProdToStr() { + return " (" + W_LAST_SELECTED[lang] + ": " + lastSelectedProduct + ")"; +} + function listOfTypesProds(ref) { - var li = "
  • " + W_SELECTION[lang] + '
  • '; + var li = "
  • " + W_SELECTION[lang] + ""; + if (lastSelectedProduct != "") { + li += lastSelectedProdToStr(); + } + li += "
  • "; var prodtypes = $("#typprodpage").data("types_prods"); var size = getProdSizeClass(); @@ -1619,6 +1633,7 @@ function handleTestForLoggedIn(answer) { //Now we prepare the product page (level 0) for display $(document).on("pagebeforeshow", "#typprodpage", function () { + lastSelectedProduct = ""; tableListActive = false; if (nextPage == "") { reloadPage(); @@ -1671,6 +1686,7 @@ function bindSendNewOrdersButton() { $("#sendorder_btn").off("click").on("click", function (e) { e.stopImmediatePropagation(); e.preventDefault(); + lastSelectedProduct = ""; if (extrasMenuOpen) { alert(W_OPEN_PANEL[lang]); } else { @@ -1683,6 +1699,7 @@ function bindSendNewOrdersButton() { $("#workprint_btn").off("click").on("click", function(e) { e.stopImmediatePropagation(); e.preventDefault(); + lastSelectedProduct = ""; if (extrasMenuOpen) { alert(W_OPEN_PANEL[lang]); } else { @@ -1701,6 +1718,7 @@ function bindSendNewOrdersButton() { $("#gopaydesk_btn").off("click").on("click", function(e) { e.stopImmediatePropagation(); e.preventDefault(); + lastSelectedProduct = ""; if (neworders.length > 0) { sendNewOrders(false,"s",goToPayDesk);