diff --git a/gastsystem/index.php b/gastsystem/index.php index 5b01760..667f105 100644 --- a/gastsystem/index.php +++ b/gastsystem/index.php @@ -9,8 +9,8 @@ - - + + @@ -105,7 +105,7 @@
  OrderSprinter
-
1.4.11  
+
1.4.12  
diff --git a/gastsystem/install.php b/gastsystem/install.php index 7ac71fc..22ccede 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.11

"; + echo "Installation OrderSprinter-Gastsystem 1.4.12

"; echo "
"; echo "
"; echo "
"; diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe index 4bdcabb..996d2a6 100644 Binary files a/printserver/OrderSprinterPrintserver.exe and b/printserver/OrderSprinterPrintserver.exe differ diff --git a/spider/install/installer.php b/spider/install/installer.php index e306d9c..9d244e7 100644 --- a/spider/install/installer.php +++ b/spider/install/installer.php @@ -85,7 +85,7 @@ class Installer { } Database::dropTables($pdo); Database::createEmptyTables($pdo, $prefix); - Database::setVersion($pdo,$prefix,"1.4.11"); + Database::setVersion($pdo,$prefix,"1.4.12"); Database::setAccessPassword($pdo,$prefix,$adminpass); Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour return array("status" => "OK","msg" => "Installation successful"); diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe index 4bdcabb..996d2a6 100644 Binary files a/webapp/OrderSprinterPrintserver.exe and b/webapp/OrderSprinterPrintserver.exe differ diff --git a/webapp/bar.html b/webapp/bar.html index 021be91..c7664d9 100644 --- a/webapp/bar.html +++ b/webapp/bar.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/bill.html b/webapp/bill.html index 13b363f..c668d91 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/feedback.html b/webapp/feedback.html index 7118dc8..27d3aa8 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index aa1621a..0aaafe5 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.11"},500); + setTimeout(function(){document.location.href = "install.html?v=1.4.12"},500); } } diff --git a/webapp/install.html b/webapp/install.html index 810aa68..f7920e1 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 0085d8d..ac0ee8a 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.11"; +$installerVersion = "1.4.12"; $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 e49423f..b448997 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index f472ac7..22eaf0e 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.11"; + document.location.href = "index.html?v=1.4.12"; },250); } }, @@ -1791,9 +1791,9 @@ function handleUpdateCheckResult(answer) { var millis=getMillis(); setTimeout(function(){ - document.location.href = "install.html?v=1.4.11&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.4.12&mode=onlyupdate&n=" + millis; },250); - document.location.href = "install.html?v=1.4.11&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.4.12&mode=onlyupdate&n=" + millis; } function handleUpdateReplace(answer) { diff --git a/webapp/paydesk.html b/webapp/paydesk.html index 1d4b06d..65ba737 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 ccffece..bd5d6cf 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.11"); + echo json_encode($view . "?v=1.4.12"); } } @@ -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.11"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.4.12"); }; } else { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.11"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.12"); }; } - 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['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.4.12"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.4.12"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.4.12"); }; if ($_SESSION['modus'] == 0) { - if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.11"); }; + if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.12"); }; } - 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"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.4.12"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.4.12"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.4.12"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.4.12"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.4.12"); }; + if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.4.12"); }; + if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.4.12"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.4.12"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.4.12"); + $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.4.12"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.4.12"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); diff --git a/webapp/php/debug.php b/webapp/php/debug.php index d080fa9..27d3daf 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.11"; + $version = "1.4.12"; $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 b6e7578..c4c2652 100644 --- a/webapp/php/queuecontent.php +++ b/webapp/php/queuecontent.php @@ -404,6 +404,7 @@ class QueueContent { "id" => $queueid, "productid" => $aQueueItem["productid"], "longname" => $aQueueItem["longname"], + "singleprod" => $aQueueItem["longname"], "price" => $formattedPrice, "togo" => $aQueueItem["togo"], "anoption" => $aQueueItem["anoption"], @@ -421,6 +422,7 @@ class QueueContent { if ($groupworkitems) { foreach($jobs as &$aJob) { + $aJob["singleprod"] = $aJob["longname"]; $cnt = $aJob["count"]; $aJob["longname"] = $cnt . "x " . $aJob["longname"]; } @@ -443,6 +445,7 @@ class QueueContent { $collection[] = array("id" => $entry["id"], "productid" => $entry["productid"], "longname" => $entry["longname"], + "singleprod" => $entry["singleprod"], "printer" => $entry["printer"], "anoption" => $entry["anoption"], "price" => $entry["price"], @@ -554,6 +557,7 @@ class QueueContent { } $arr = array("id" => $queueId, "longname" => $aJob['longname'], + "singleprod" => $aJob['singleprod'], "price" => $aJob['price'], "togo" => $togo, "option" => $aJob['anoption'], diff --git a/webapp/php/utilities/version.php b/webapp/php/utilities/version.php index 408611d..060ecaf 100644 --- a/webapp/php/utilities/version.php +++ b/webapp/php/utilities/version.php @@ -808,16 +808,16 @@ class Version { public static function upd_1408_1409($pdo, $prefix, $dbname) { return array(true); - } public static function upd_1409_1410($pdo, $prefix, $dbname) { return array(true); - } public static function upd_1410_1411($pdo, $prefix, $dbname) { - return array(true); - + return array(true); + } + public static function upd_1411_1412($pdo, $prefix, $dbname) { + return array(true); } public static $updateOrder = array( @@ -859,7 +859,8 @@ class Version { "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.10" => array("upd_1410_1411","1.4.11") + "1.4.10" => array("upd_1410_1411","1.4.11"), + "1.4.11" => array("upd_1411_1412","1.4.12") ); // RE;* also for install process no check is required diff --git a/webapp/php/workreceipts.php b/webapp/php/workreceipts.php index 954c68e..2ab8fa6 100644 --- a/webapp/php/workreceipts.php +++ b/webapp/php/workreceipts.php @@ -54,6 +54,9 @@ class Workreceipts { if ($id == $queueid) { $kind = $prod["kind"]; $longname = $prod["longname"]; + if (isset($prod["singleprod"])) { + $longname = $prod["singleprod"]; + } $price = $prod["price"]; $extrasArr = $prod["extras"]; $extrasStr = implode(",", $extrasArr); diff --git a/webapp/preferences.html b/webapp/preferences.html index d4e4b93..0617394 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index 97bcfcc..445365b 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/rating.html b/webapp/rating.html index 9da4c36..cf65a78 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index 5f2d627..7fdac09 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index 2dd8dc0..d15a51f 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index 2c4c390..635e446 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index 6d351b7..10909a0 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,8 +4,8 @@ - - + +