diff --git a/gastsystem/index.php b/gastsystem/index.php index 08c224b..e91fef4 100644 --- a/gastsystem/index.php +++ b/gastsystem/index.php @@ -9,8 +9,8 @@ - - + + @@ -105,7 +105,7 @@
diff --git a/gastsystem/install.php b/gastsystem/install.php index ad9de09..17d453c 100644 --- a/gastsystem/install.php +++ b/gastsystem/install.php @@ -90,10 +90,10 @@ if (isset($_POST['code'])) { } else { echo ""; echo "diff --git a/webapp/paydesk.html b/webapp/paydesk.html index a35d22e..cc8190c 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 2adaf56..584c24f 100644 --- a/webapp/php/admin.php +++ b/webapp/php/admin.php @@ -1083,6 +1083,7 @@ class Admin { $cashenabled = CommonUtils::getConfigValueStmt($pdo,$stmt,"cashenabled",1); $returntoorder = CommonUtils::getConfigValueStmt($pdo,$stmt,"returntoorder",1); $beepcooked = CommonUtils::getConfigValueStmt($pdo,$stmt,"beepcooked",0); + $beepordered = CommonUtils::getConfigValueStmt($pdo,$stmt,"beepordered",0); $closshowci = CommonUtils::getConfigValueStmt($pdo,$stmt,"closshowci",1); $closshowpaytaxes = CommonUtils::getConfigValueStmt($pdo,$stmt,"closshowpaytaxes",1); @@ -1169,7 +1170,7 @@ class Admin { "austria" => $austria, "digigopaysetready" => $digigopaysetready, "waitergopayprint" => $waitergopayprint, "oneprodworkrecf" => $oneprodworkrecf, "oneprodworkrecd" => $oneprodworkrecd, "digiprintwork" => $digiprintwork, "memorylimit" => $memorylimit, "updateurl" => $updateurl, "tmpdir" => $tmpdir, "hs3refresh" => $hs3refresh, "paydeskid" => $paydeskid, "aeskey" => $aeskey, "certificatesn" => $certificatesn, "rksvserver" => $rksvserver, "addreceipttoprinter" => $addreceipttoprinter, - "printandqueuejobs" => $printandqueuejobs, "cashenabled" => $cashenabled, "returntoorder" => $returntoorder, "beepcooked" => $beepcooked,"restaurantmode" => $restaurantmode, + "printandqueuejobs" => $printandqueuejobs, "cashenabled" => $cashenabled, "returntoorder" => $returntoorder, "beepcooked" => $beepcooked,"beepordered" => $beepordered, "restaurantmode" => $restaurantmode, "discountname1" => $discountname1,"discountname2" => $discountname2,"discountname3" => $discountname3, "dblog" => $dblog,"startprodsearch" => $startprodsearch, "closshowci" => $closshowci, "closshowpaytaxes" => $closshowpaytaxes, "closshowprods" => $closshowprods,"hosttext" => $hosttext, "forceprint" => $forceprint, "printextras" => $printextras, "showpayment2" => $showpayment2, @@ -1275,7 +1276,7 @@ class Admin { $view = "preferences.html"; } - echo json_encode($view . "?v=1.4.17"); + echo json_encode($view . "?v=1.4.18"); } } @@ -1486,27 +1487,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.17"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.4.18"); }; } else { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.17"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.18"); }; } - if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.4.17"); }; - if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.4.17"); }; - if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.4.17"); }; + if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.4.18"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.4.18"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.4.18"); }; if ($_SESSION['modus'] == 0) { - if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.17"); }; + if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.18"); }; } - if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.4.17"); }; - if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.4.17"); }; - if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.4.17"); }; - if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.4.17"); }; - if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.4.17"); }; - if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.4.17"); }; - if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.4.17"); }; - if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.4.17"); }; - $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.4.17"); - $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.4.17"); - $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.4.17"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.4.18"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.4.18"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.4.18"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.4.18"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.4.18"); }; + if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.4.18"); }; + if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.4.18"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.4.18"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.4.18"); + $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.4.18"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.4.18"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); @@ -2003,8 +2004,8 @@ class Admin { "cashenabled" => array("dbcol" => "cashenabled","checknum" => 0), "returntoorder" => array("dbcol" => "returntoorder","checknum" => 0), "beepcooked" => array("dbcol" => "beepcooked","checknum" => 0), - - + "beepordered" => array("dbcol" => "beepordered","checknum" => 0), + "closshowci" => array("dbcol" => "closshowci","checknum" => 0), "closshowpaytaxes" => array("dbcol" => "closshowpaytaxes","checknum" => 0), "closshowprods" => array("dbcol" => "closshowprods","checknum" => 0), diff --git a/webapp/php/closing.php b/webapp/php/closing.php index ffdbcac..674408f 100644 --- a/webapp/php/closing.php +++ b/webapp/php/closing.php @@ -191,9 +191,8 @@ return; } // declare not closed bills as closed -$declareClosedSql = "UPDATE %bill% SET closingid='$newClosingId' WHERE closingid is null AND (tableid >= '0' OR status='c') "; -$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($declareClosedSql)); -$stmt->execute(); +$sql = "UPDATE %bill% SET closingid='$newClosingId' WHERE closingid is null AND (tableid >= '0' OR status='c') "; +CommonUtils::execSql($pdo, $sql, null); $sql ="SELECT count(id) as billstotake FROM %bill% WHERE closingid=? AND (tableid >= '0' OR status='c')"; $stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql)); @@ -228,28 +227,25 @@ openssl_free_key($pkeyid); // now add values to closing table to prepare for electronic signature $sql = "UPDATE %closing% SET billcount=?, billsum=?,signature=? WHERE id=?"; -$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql)); -$stmt->execute(array($billsToTake,$pricesum,$signature,$newClosingId)); +CommonUtils::execSql($pdo, $sql, array($billsToTake,$pricesum,$signature,$newClosingId)); + +$sql = "DELETE FROM %queueextras% where queueid in (SELECT Q.id as quid FROM %queue% Q WHERE id not in (select distinct queueid FROM %billproducts% BP) AND billid is null)"; +CommonUtils::execSql($pdo, $sql, null); $sql = "DELETE FROM %queue% WHERE id not in (select distinct queueid FROM %billproducts%) AND billid is null"; -$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql)); -$stmt->execute(); +CommonUtils::execSql($pdo, $sql, null); $sql = "UPDATE %queue% set paidtime=?,delivertime=? WHERE billid is not null AND paidtime is null"; -$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql)); -$stmt->execute(array($closingTime,$closingTime)); +CommonUtils::execSql($pdo, $sql, array($closingTime,$closingTime)); $sql = "UPDATE %queue% set delivertime=?,workprinted=? WHERE billid is not null AND delivertime IS NULL"; -$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql)); -$stmt->execute(array($closingTime,1)); +CommonUtils::execSql($pdo, $sql, array($closingTime,1)); $sql = "DELETE FROM %printjobs%"; -$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql)); -$stmt->execute(); +CommonUtils::execSql($pdo, $sql, null); $sql = "UPDATE %queue% SET isclosed=?"; -$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql)); -$stmt->execute(array(1)); +CommonUtils::execSql($pdo, $sql, array(1)); $dblogging = CommonUtils::getConfigValue($pdo, 'dblog', 1); if ($dblogging == 0) { diff --git a/webapp/php/debug.php b/webapp/php/debug.php index 463fcf0..48b6c43 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.17"; + $version = "1.4.18"; $arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion); } else { diff --git a/webapp/php/products.php b/webapp/php/products.php index 250da8a..8af2183 100644 --- a/webapp/php/products.php +++ b/webapp/php/products.php @@ -10,8 +10,6 @@ require_once ('utilities/TypeAndProducts/ProductEntry.php'); - - class Products { var $dbutils; var $queue; @@ -38,7 +36,8 @@ class Products { } } - function handleCommand($command) { + function handleCommand($command) { + $cmdArray = array('showDbProducts', 'getMenuLevelUp', 'applySingleProdData', 'createExtra', 'applyExtra', 'upExtra', 'delExtra','sortup','sortdown', 'delproduct', 'reassign', 'applyType', 'delType', 'getSingleProdData', 'getSingleTypeData', 'getPriceLevelInfo','setPriceLevelInfo', 'createProduct','createProdType', @@ -164,6 +163,8 @@ class Products { } else { $this->getprodimage(null); } + } else if ($command == 'prodimghmlexport') { + self::exportImgHml(); } else { echo "Command not supported."; } @@ -189,6 +190,12 @@ class Products { array("id" => "display", "get" => "IF(display is not null, display, 'KG') as display","histid" => "display","histget" => "display","histexportname" => "Anzeige","isnumber" => "0") ); + public static function exportImgHml() { + $pdo = DbUtils::openDbAndReturnPdoStatic(); + $sql = "SELECT imgh,imgm,imgl from %prodimages% where id='24'"; + $result = CommonUtils::fetchSqlAll($pdo, $sql, null); + echo $result[0]['imgh'] . ";" . $result[0]['imgm'] . ";" . $result[0]['imgl']; + } function getDateValueAsBoolInterpretatedIcon($aValue) { if ($aValue != '0' ) { $imgFile = "ok.png"; diff --git a/webapp/php/queuecontent.php b/webapp/php/queuecontent.php index 0ceb02e..9ca50ed 100644 --- a/webapp/php/queuecontent.php +++ b/webapp/php/queuecontent.php @@ -111,25 +111,44 @@ class QueueContent { } private static function setNewProductsToServe($pdo,$val) { + self::setWorkItemFlag($pdo, "newproductstoserve", $val); + } + private static function getNewProductsToServe($pdo) { + return self::getWorkItemFlag($pdo, "newproductstoserve"); + } + private static function setNewFoodToCookFlag($pdo,$val) { + self::setWorkItemFlag($pdo, "newfoodtocook", $val); + } + private static function getNewFoodToCookFlag($pdo) { + return self::getWorkItemFlag($pdo, "newfoodtocook"); + } + private static function setNewDrinkToCookFlag($pdo,$val) { + self::setWorkItemFlag($pdo, "newdrinktocook", $val); + } + private static function getNewDrinkToCookFlag($pdo) { + return self::getWorkItemFlag($pdo, "newdrinktocook"); + } + + private static function setWorkItemFlag($pdo,$item,$val) { $sql = "SELECT count(id) as countid FROM %work% WHERE item=?"; - $row = CommonUtils::getRowSqlObject($pdo, $sql, array("newproductstoserve")); + $row = CommonUtils::getRowSqlObject($pdo, $sql, array($item)); if ($row->countid == 0) { $sql = "INSERT INTO %work% (item,value,signature) VALUES (?,?,?)"; - CommonUtils::execSql($pdo, $sql, array("newproductstoserve",$val,null)); + CommonUtils::execSql($pdo, $sql, array($item,$val,null)); } else { $sql = "UPDATE %work% SET value=? WHERE item=?"; - CommonUtils::execSql($pdo, $sql, array($val,"newproductstoserve")); + CommonUtils::execSql($pdo, $sql, array($val,$item)); } } - private static function getNewProductsToServe($pdo) { + private static function getWorkItemFlag($pdo,$item) { $sql = "SELECT count(id) as countid FROM %work% WHERE item=?"; - $row = CommonUtils::getRowSqlObject($pdo, $sql, array("newproductstoserve")); + $row = CommonUtils::getRowSqlObject($pdo, $sql, array($item)); if ($row->countid == 0) { return 0; } else { $sql = "SELECT value FROM %work% WHERE item=?"; - $row = CommonUtils::getRowSqlObject($pdo, $sql, array("newproductstoserve")); + $row = CommonUtils::getRowSqlObject($pdo, $sql, array($item)); return $row->value; } } @@ -180,7 +199,7 @@ class QueueContent { date_default_timezone_set(DbUtils::getTimeZone()); $currentTime = date('Y-m-d H:i:s'); - $pdo = $this->dbutils->openDbAndReturnPdo(); + $pdo = DbUtils::openDbAndReturnPdoStatic(); Guestsync::sync($pdo); @@ -320,7 +339,16 @@ class QueueContent { } } } - echo json_encode($tablearray); + + if ($kind == 0) { + $newProductsToMake = self::getNewFoodToCookFlag($pdo); + self::setNewFoodToCookFlag($pdo, 0); + } else { + $newProductsToMake = self::getNewDrinkToCookFlag($pdo); + self::setNewDrinkToCookFlag($pdo, 0); + } + $ret = array("status" => "OK","msg" => array("newproducts" => $newProductsToMake,"tocook" => $tablearray)); + echo json_encode($ret); } private function getExtrasOfQueueItem($pdo,$queueid) { @@ -1043,6 +1071,19 @@ class QueueContent { } } else { $insertedQueueIds[] = $queueid; + + if (($printAndQueueJobs == 0) && ($doPrint == 0)) { + $sql = "SELECT kind FROM %prodtype% T,%products% P where P.id=? AND P.category=T.id"; + $result = CommonUtils::fetchSqlAll($pdo, $sql, array($productid)); + if (count($result)>0) { + $kindOfNewProd = $result[0]['kind']; + if ($kindOfNewProd == 0) { + self::setNewFoodToCookFlag($pdo, 1); + } else { + self::setNewDrinkToCookFlag($pdo, 1); + } + } + } } } } diff --git a/webapp/php/utilities/version.php b/webapp/php/utilities/version.php index 330e245..117342a 100644 --- a/webapp/php/utilities/version.php +++ b/webapp/php/utilities/version.php @@ -849,6 +849,14 @@ class Version { return array(false,$e); } } + public static function upd_1417_1418($pdo, $prefix, $dbname) { + try { + self::insertOrUpdateConfigItem($pdo, 'beepordered', '0'); + return array(true); + } catch (PDOException $e) { + return array(false,$e); + } + } public static $updateOrder = array( "1.3.0" => array("upd_1300_1301","1.3.1"), @@ -895,7 +903,8 @@ class Version { "1.4.13" => array("upd_1413_1414","1.4.14"), "1.4.14" => array("upd_1414_1415","1.4.15"), "1.4.15" => array("upd_1415_1416","1.4.16"), - "1.4.16" => array("upd_1416_1417","1.4.17") + "1.4.16" => array("upd_1416_1417","1.4.17"), + "1.4.17" => array("upd_1417_1418","1.4.18") ); // RE;* also for install process no check is required diff --git a/webapp/preferences.html b/webapp/preferences.html index cd88c79..7d3f9b5 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index dcd2067..71e336b 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/rating.html b/webapp/rating.html index cc28dd2..a31a8d1 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index 371e06a..5d0be73 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index cbf9612..f7cb212 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index 405dd1a..4e12a95 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index 071d7f0..6d30977 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,8 +4,8 @@ - - + +