diff --git a/gastsystem/index.php b/gastsystem/index.php index 667f105..2404167 100644 --- a/gastsystem/index.php +++ b/gastsystem/index.php @@ -9,8 +9,8 @@ - - + + @@ -105,7 +105,7 @@
  OrderSprinter
-
1.4.12  
+
1.4.13  
diff --git a/gastsystem/install.php b/gastsystem/install.php index 22ccede..b293762 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.12

"; + echo "Installation OrderSprinter-Gastsystem 1.4.13

"; echo "
"; echo "
"; echo "
"; diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe index 996d2a6..8577d20 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 9d244e7..833eabe 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.12"); + Database::setVersion($pdo,$prefix,"1.4.13"); 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 996d2a6..8577d20 100644 Binary files a/webapp/OrderSprinterPrintserver.exe and b/webapp/OrderSprinterPrintserver.exe differ diff --git a/webapp/bar.html b/webapp/bar.html index c7664d9..001df4d 100644 --- a/webapp/bar.html +++ b/webapp/bar.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/bill.html b/webapp/bill.html index c668d91..db36e15 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/feedback.html b/webapp/feedback.html index 27d3aa8..7582868 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index 0aaafe5..a5df05f 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.12"},500); + setTimeout(function(){document.location.href = "install.html?v=1.4.13"},500); } } diff --git a/webapp/install.html b/webapp/install.html index f7920e1..6372074 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 ac0ee8a..7102fe2 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.12"; +$installerVersion = "1.4.13"; $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 b448997..4eafee5 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index 22eaf0e..61d2c8f 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.12"; + document.location.href = "index.html?v=1.4.13"; },250); } }, @@ -1791,9 +1791,9 @@ function handleUpdateCheckResult(answer) { var millis=getMillis(); setTimeout(function(){ - document.location.href = "install.html?v=1.4.12&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.4.13&mode=onlyupdate&n=" + millis; },250); - document.location.href = "install.html?v=1.4.12&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.4.13&mode=onlyupdate&n=" + millis; } function handleUpdateReplace(answer) { diff --git a/webapp/paydesk.html b/webapp/paydesk.html index 65ba737..b18467f 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 bd5d6cf..ea5db60 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.12"); + echo json_encode($view . "?v=1.4.13"); } } @@ -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.12"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.4.13"); }; } else { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.12"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.13"); }; } - 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['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.4.13"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.4.13"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.4.13"); }; if ($_SESSION['modus'] == 0) { - if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.12"); }; + if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.13"); }; } - 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"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.4.13"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.4.13"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.4.13"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.4.13"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.4.13"); }; + if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.4.13"); }; + if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.4.13"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.4.13"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.4.13"); + $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.4.13"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.4.13"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); diff --git a/webapp/php/debug.php b/webapp/php/debug.php index 27d3daf..c0a754d 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.12"; + $version = "1.4.13"; $arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion); } else { diff --git a/webapp/php/printqueue.php b/webapp/php/printqueue.php index 3de3d56..67b712a 100644 --- a/webapp/php/printqueue.php +++ b/webapp/php/printqueue.php @@ -19,6 +19,8 @@ class PrintQueue { private static $CLOSING = 4; public static $CANCELFOOD = 5; public static $CANCELDRINK = 6; + public static $FOOD_PRINTSERVER = 0; + public static $DRINK_PRINTSERVER = 1; function __construct() { $this->dbutils = new DbUtils(); @@ -178,8 +180,13 @@ class PrintQueue { $queueid = $aProd["id"]; $stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $stmt->execute(array($idOfWorkJob,$queueid)); + if (isset($aProd["allqueueids"])) { + foreach($aProd["allqueueids"] as $aQueueId) { + $stmt->execute(array($idOfWorkJob,$aQueueId)); + } + } } - + CommonUtils::log($pdo,"QUEUE","Create work job with id=$idOfWorkJob for tableid $table from user $username of kind $kind for printer=$printer"); } @@ -661,6 +668,16 @@ class PrintQueue { $workarray = array(); foreach($result as $aWorkJob) { $aWork = (array) json_decode($aWorkJob["content"]); // is in json format + $ps = (array) ($aWork["products"]); + foreach($ps as $p) { + if (isset($p->singleprod)) { + unset($p->singleprod); + } + if (isset($p->allqueueids)) { + unset($p->allqueueids); + } + } + CommonUtils::log($pdo,"PRINTQUEUE", "getNextWorkPrintJobs: collect work receipt with id=" . $aWorkJob["id"] . " for printer=$printer"); $workid = $aWork["workid"]; @@ -772,11 +789,15 @@ class PrintQueue { $workid = $aWork["workid"]; unset($aWork["workid"]); + $showType = self::$FOOD_PRINTSERVER; + if ($theType == self::$CANCELDRINK) { + $showType = self::$DRINK_PRINTSERVER; + } $workarray[] = array("workid" => $workid, "id" => $aWorkJob["id"], "refworkid" => $aWork["refworkid"], "longname" => $aWork["longname"], - "kind" => $theType, + "kind" => $showType, "table" => $aWork["table"], "time" => $aWork["time"], "price" => $aWork["price"], diff --git a/webapp/php/queuecontent.php b/webapp/php/queuecontent.php index c4c2652..31ce373 100644 --- a/webapp/php/queuecontent.php +++ b/webapp/php/queuecontent.php @@ -420,11 +420,12 @@ class QueueContent { } } - if ($groupworkitems) { + if ($groupworkitems == 1) { foreach($jobs as &$aJob) { $aJob["singleprod"] = $aJob["longname"]; $cnt = $aJob["count"]; $aJob["longname"] = $cnt . "x " . $aJob["longname"]; + $aJob["allqueueids"] = $queueIds; } } @@ -564,7 +565,8 @@ class QueueContent { "extras" => $extras, "ordertime" => $germanTime, "kind" => $kind, - "printer" => $printer + "printer" => $printer, + "allqueueids" => $aJob["allqueueids"] ); $resultarray[] = $arr; } diff --git a/webapp/php/utilities/version.php b/webapp/php/utilities/version.php index 060ecaf..ef0c25b 100644 --- a/webapp/php/utilities/version.php +++ b/webapp/php/utilities/version.php @@ -819,6 +819,9 @@ class Version { public static function upd_1411_1412($pdo, $prefix, $dbname) { return array(true); } + public static function upd_1412_1413($pdo, $prefix, $dbname) { + return array(true); + } public static $updateOrder = array( "1.3.0" => array("upd_1300_1301","1.3.1"), @@ -860,7 +863,8 @@ class Version { "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.11" => array("upd_1411_1412","1.4.12") + "1.4.11" => array("upd_1411_1412","1.4.12"), + "1.4.12" => array("upd_1412_1413","1.4.13") ); // RE;* also for install process no check is required diff --git a/webapp/php/workreceipts.php b/webapp/php/workreceipts.php index 2ab8fa6..22127da 100644 --- a/webapp/php/workreceipts.php +++ b/webapp/php/workreceipts.php @@ -49,42 +49,47 @@ class Workreceipts { $time = $origJob["time"]; $products = $origJob["products"]; - foreach ($products as $prod) { - $id = $prod["id"]; - 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); - - $cancelJob = array( - "workid" => $workid, - "refworkid" => $refworkid, - "table" => $table, - "time" => $time, - "longname" => $longname, - "kind" => $kind, - "price" => $price, - "extras" => $extrasStr); - - $cancelJobJson = json_encode($cancelJob); - - $printInsertSql = "INSERT INTO `%printjobs%` (`id` , `content`,`type`,`printer`) VALUES ( NULL,?,?,?)"; - $stmt = $pdo->prepare(DbUtils::substTableAlias($printInsertSql)); - $type = PrintQueue::$CANCELFOOD; - if ($kind == 1) { - $type = PrintQueue::$CANCELDRINK; - } - $stmt->execute(array($cancelJobJson,$type,$printer)); - - $idOfWorkJob = $pdo->lastInsertId(); - - CommonUtils::log($pdo,"QUEUE","Create cancel work job with id=$idOfWorkJob for tableid $table of kind $kind for printer=$printer"); + $sql = "SELECT productname,productid,price FROM pos_queue WHERE id=?"; + $res = CommonUtils::fetchSqlAll($pdo, $sql, array($queueid)); + if (count($res) > 0) { + $longname = $res[0]["productname"]; + $prodid = $res[0]["productid"]; + $price = $res[0]["price"]; + $sql = "select %extras%.name as name,%extras%.id FROM %queueextras%,%extras% WHERE extraid=%extras%.id AND queueid=?"; + $extrares = CommonUtils::fetchSqlAll($pdo, $sql, array($queueid)); + $extrasArr = array(); + foreach($extrares as $e) { + $extrasArr[] = $e["name"]; } + $extrasStr = implode(",",$extrasArr); + $sql = "select kind,category from pos_products,pos_prodtype where pos_products.category=pos_prodtype.id AND pos_products.id=?"; + $reskind = CommonUtils::fetchSqlAll($pdo, $sql, array($prodid)); + $kind = $reskind[0]["kind"]; + + $cancelJob = array( + "workid" => $workid, + "refworkid" => $refworkid, + "table" => $table, + "time" => $time, + "longname" => $longname, + "kind" => $kind, + "price" => $price, + "extras" => $extrasStr); + + $cancelJobJson = json_encode($cancelJob); + + $printInsertSql = "INSERT INTO `%printjobs%` (`id` , `content`,`type`,`printer`) VALUES ( NULL,?,?,?)"; + $stmt = $pdo->prepare(DbUtils::substTableAlias($printInsertSql)); + $type = PrintQueue::$CANCELFOOD; + if ($kind == 1) { + $type = PrintQueue::$CANCELDRINK; + } + $stmt->execute(array($cancelJobJson,$type,$printer)); + + $idOfWorkJob = $pdo->lastInsertId(); + + CommonUtils::log($pdo,"QUEUE","Create cancel work job with id=$idOfWorkJob for tableid $table of kind $kind for printer=$printer"); + } } } catch (Exception $ex) { diff --git a/webapp/preferences.html b/webapp/preferences.html index 0617394..1d1b351 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index 445365b..27a0f8e 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/rating.html b/webapp/rating.html index cf65a78..b632b6b 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index 7fdac09..971433f 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index d15a51f..eea070e 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index 635e446..fe5d4fd 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index 10909a0..24705cd 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,8 +4,8 @@ - - + +