From 3e90fc8119f602a8f794fa32ecdab221ad579677 Mon Sep 17 00:00:00 2001 From: Geno Date: Thu, 19 Nov 2020 22:55:55 +0100 Subject: [PATCH] OrderSprinter 1.1.16 --- javaprinter/javaprinter.jar | Bin 42350 -> 42352 bytes printserver/OrderSprinterPrintserver.exe | Bin 260096 -> 260096 bytes webapp/OrderSprinterPrintserver.exe | Bin 260096 -> 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 | 35 +++++++++++++++++------ webapp/php/admin.php | 26 ++++++++--------- 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, 69 insertions(+), 40 deletions(-) diff --git a/javaprinter/javaprinter.jar b/javaprinter/javaprinter.jar index 865e6ff8cccc0be48bb5d654b50c81e05812c056..b5a4d1d2fb70d392ab7a3a349924009cbb3648d2 100644 GIT binary patch delta 10422 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 delta 10317 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 QW&kXnPmjo!{7?1&0X+g5U;qFB diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe index 1d15123d800a92c6714683e741cf98886dea22b3..91fd8a95d58e852622fe84c30e347797040e11f3 100644 GIT binary patch delta 162 zcmZqpz~AtJe?kZImG`$AyIZ>%Tf3RIb~B&vWfa&R-N*b$RmITQ(Ae0`!dTbD(ZxmA z#KqBB*U8nuOxMWL$;8mv#M#2Y)OCB}7G@i5Mzihn?laG06==2>7QXAX#&;i^<`x;B zhPdrMPno}P1En25GW#-e3NSDNAp?WJ_UWIP;~9bC-#;_22GY|Pe`PjjHDl0YFqmw} MsJxx&8}mO#0O|WRAOHXW delta 162 zcmZqpz~AtJe?kZIe)H>%-L2h>t=&vpyP41TGV*Va?qhzWs$yp0Y+-0%VWDejV(O@C z;${kDxjH-QIvP2 z?slK2%wM>H(vBaQeHl6V85n_(fq{Sf^iRz3j6m`4pP5$!>FJBVGMlrSGUzcFOg3ax L-p=%m`5z+y#zi%U diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe index 1d15123d800a92c6714683e741cf98886dea22b3..91fd8a95d58e852622fe84c30e347797040e11f3 100644 GIT binary patch delta 162 zcmZqpz~AtJe?kZImG`$AyIZ>%Tf3RIb~B&vWfa&R-N*b$RmITQ(Ae0`!dTbD(ZxmA z#KqBB*U8nuOxMWL$;8mv#M#2Y)OCB}7G@i5Mzihn?laG06==2>7QXAX#&;i^<`x;B zhPdrMPno}P1En25GW#-e3NSDNAp?WJ_UWIP;~9bC-#;_22GY|Pe`PjjHDl0YFqmw} MsJxx&8}mO#0O|WRAOHXW delta 162 zcmZqpz~AtJe?kZIe)H>%-L2h>t=&vpyP41TGV*Va?qhzWs$yp0Y+-0%VWDejV(O@C z;${kDxjH-QIvP2 z?slK2%wM>H(vBaQeHl6V85n_(fq{Sf^iRz3j6m`4pP5$!>FJBVGMlrSGUzcFOg3ax L-p=%m`5z+y#zi%U diff --git a/webapp/bar.html b/webapp/bar.html index f2c7544..9a1ff97 100644 --- a/webapp/bar.html +++ b/webapp/bar.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/bill.html b/webapp/bill.html index 636722c..731fc54 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/feedback.html b/webapp/feedback.html index 2d69439..e5e8444 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index bc27043..9e84972 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -7,8 +7,8 @@ - - + + diff --git a/webapp/install.html b/webapp/install.html index 3956a3f..a76e5b9 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 b7edf55..c19e26e 100644 --- a/webapp/install/installer.php +++ b/webapp/install/installer.php @@ -856,6 +856,18 @@ $ret &= $this->setVersion($prefix, '1.1.15'); return $ret; } +function updateUserTable1115_1116($prefix,$version) { +$ret = true; +if ($version != "1.1.15") { +$ret = $this->updateUserTable1114_1115($prefix,$version); +if (!$ret) { +return false; +} +} +$ret &= $this->setVersion($prefix, '1.1.16'); +return $ret; +} + function setVersion($prefix,$theVersion) { $pdo = $this->pdo; try { @@ -927,7 +939,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.15')"); +$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.16')"); $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')"); @@ -1300,7 +1312,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.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.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" ); if (!in_array($version, $supportedVersions)) { @@ -1308,7 +1320,7 @@ echo json_encode("Quellversion nicht unterstützt"); return; } -$ret = $admin->updateUserTable1114_1115($_POST['prefix'], $version); +$ret = $admin->updateUserTable1115_1116($_POST['prefix'], $version); if(session_id() == '') { session_start(); diff --git a/webapp/kitchen.html b/webapp/kitchen.html index b65cba0..c251b1f 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index 8b8bbc3..b293b8c 100644 --- a/webapp/manager.html +++ b/webapp/manager.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/paydesk.html b/webapp/paydesk.html index 02bdd89..970ee6f 100644 --- a/webapp/paydesk.html +++ b/webapp/paydesk.html @@ -5,7 +5,7 @@ - + @@ -62,8 +62,8 @@ var P_ALL = ["Alles","All","Todo"]; var P_CONTENT_RECEIPT = ["Inhalt Kassenbon","Content of receipt","Contenido del tique"]; var P_ONLY_PAY = ["Nur Zahlung","Only pay","Solo pagar"]; var P_PAY_PRINT = ["Bondruck","Pay+Print","Pagar+Imprimir"]; -var P_PAYWAY = ["Zahlungsart","Payment type","Modo de pago"]; -var P_CHOOSE_PAYWAY = ["Auswahl der Zahlungsart","Selection of method of payment","Selección del modo de pago"]; +var P_CHANGE_CALC = ["Wechselgeldrechner:","Change Calculator:","Calculadora de Cambio:"]; +var P_CHOOSE_PAYWAY = ["Auswahl der Zahlungsart:","Selection of method of payment:","Selección del modo de pago:"]; var P_CANCEL = ["Abbrechen","Cancel","Cancelar"]; var P_CASHTAKEOUT = ["Barentnahme aus der Kasse","Cash take-out","Sacar dinero"]; var P_CASHTAKIN = ["Bareinlage in die Kasse","Cash insert","Insertar dinero"]; @@ -90,6 +90,7 @@ var P_PAY_RETURN = ["Zurück: ", "Return: ","Torna: "]; var P_CALC_PAYBACK = ["Berechne","Calculate","Calcular"]; var P_HAS_PAID = ["Bezahlt: ","Paid: ","Pagado: "]; var P_TOGO = ["Außer-Haus-Verkauf","Sale with Tax No 2","Venta IVA 2"]; +var P_TIP = ["Trinkg.: ","Tip: ","Prop.: "]; var lang = 0; var receiptfontsize = 12; @@ -197,7 +198,7 @@ function setLanguage(language) { $("#OnlyPayTxt").html(P_ONLY_PAY[lang]); $("#payprinttxt").html(P_PAY_PRINT[lang]); - $("#payway").html(P_PAYWAY[lang]); + $("#payway").html(P_CHANGE_CALC[lang]); $("#choosepayway").html(P_CHOOSE_PAYWAY[lang]); $("#canceltxt").html(P_CANCEL[lang]); @@ -223,6 +224,7 @@ function setLanguage(language) { $("#calcreturn").html(P_CALC_PAYBACK[lang]); $("#haspaidtxt").html(P_HAS_PAID[lang]); $("#tableselimmaptxt").html(P_TABLE_SEL[lang]); + $("#tiptxt").html(P_TIP[lang]); } function getButtonSizes() { @@ -923,6 +925,9 @@ function selectPayment(tableid,tablename,printoption) { $("#haspaid").val(""); $("#topayback").html("0" + decpoint + "00"); + $("#tipfield").attr("placeholder", "0.00".replace(".",decpoint) + " " + currency); + $("#tipfield").val(""); + // start pay process by selection of payment types $.mobile.changePage("#paymentdialog"); bindCalcReturn(); @@ -947,7 +952,15 @@ function bindCalcReturn() { try { var hasPaid = parseFloat($("#haspaid").val().replace(decpoint,".")); var toPay = parseFloat($("#topayval").html().replace(decpoint,".")); - var toRet = hasPaid - toPay; + + var tip = $("#tipfield").val().trim(); + if (tip == "") { + tip = 0.0; + } else { + tip = parseFloat(tip.replace(decpoint,".")); + } + + var toRet = hasPaid - (toPay + tip); if ($.isNumeric(parseFloat(toRet))) { var toReturn = toRet.toFixed(2).replace(".",decpoint); $("#topayback").html(toReturn); @@ -1307,19 +1320,23 @@ $(document).on("pageinit", "#info-page", function () {

- +
- - + + +
Zahlen: 0,00  Bezahlt:
Zurück: 0,00  + Zurück: 0,00 Trinkg.: +
+

-

Auswahl der Zahlungsart

+

Auswahl der Zahlungsart

 diff --git a/webapp/php/admin.php b/webapp/php/admin.php index 6ac1b41..53989fe 100644 --- a/webapp/php/admin.php +++ b/webapp/php/admin.php @@ -1108,19 +1108,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.15"); }; - if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.15"); }; - if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.15"); }; - if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.15"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.16"); }; + if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.16"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.16"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.16"); }; 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.15"); }; - if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.15"); }; - if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.15"); }; - if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.15"); }; - if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.15"); }; - if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.15"); }; - $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.15"); - $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.15"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.16"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.16"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.16"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.16"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.16"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.16"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.16"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.16"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); @@ -1129,7 +1129,7 @@ class Admin { $waiterMessage = $this->getMessage(null, "waitermessage"); } // CAUTION: change version also in config.txt!!! - $mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.15", + $mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.16", "user" => $currentUser, "menu" => $mainMenu, "waitermessage" => $waiterMessage, diff --git a/webapp/preferences.html b/webapp/preferences.html index 9645abc..b463a9f 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index 547197e..e9e7db8 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/rating.html b/webapp/rating.html index 7bf2041..80312d1 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index 00a04b6..a4f0cd4 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index 95275ee..aa7ca7f 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index efe642e..2a1407f 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index b484e5b..d027fad 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,7 +4,7 @@ - +