diff --git a/javaprinter/javaprinter.jar b/javaprinter/javaprinter.jar index 865e6ff..b5a4d1d 100644 Binary files a/javaprinter/javaprinter.jar and b/javaprinter/javaprinter.jar differ diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe index 1d15123..91fd8a9 100644 Binary files a/printserver/OrderSprinterPrintserver.exe and b/printserver/OrderSprinterPrintserver.exe differ diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe index 1d15123..91fd8a9 100644 Binary files a/webapp/OrderSprinterPrintserver.exe and b/webapp/OrderSprinterPrintserver.exe differ 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

Ja
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 @@ - +