diff --git a/gastsystem/index.php b/gastsystem/index.php index 2404167..d3befa0 100644 --- a/gastsystem/index.php +++ b/gastsystem/index.php @@ -9,8 +9,8 @@ - - + + @@ -105,7 +105,7 @@
  OrderSprinter
-
1.4.13  
+
1.4.14  
diff --git a/gastsystem/install.php b/gastsystem/install.php index b293762..9b4a600 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.13

"; + echo "Installation OrderSprinter-Gastsystem 1.4.14

"; echo "
"; echo "
"; echo "
"; diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe index 8577d20..8e4c42e 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 833eabe..cacc7f0 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.13"); + Database::setVersion($pdo,$prefix,"1.4.14"); 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 8577d20..8e4c42e 100644 Binary files a/webapp/OrderSprinterPrintserver.exe and b/webapp/OrderSprinterPrintserver.exe differ diff --git a/webapp/bar.html b/webapp/bar.html index 001df4d..096c54c 100644 --- a/webapp/bar.html +++ b/webapp/bar.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/bill.html b/webapp/bill.html index db36e15..d763929 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/feedback.html b/webapp/feedback.html index 7582868..c95fd52 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index a5df05f..0ac2c28 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.13"},500); + setTimeout(function(){document.location.href = "install.html?v=1.4.14"},500); } } diff --git a/webapp/install.html b/webapp/install.html index 6372074..b577ee9 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 7102fe2..ca4325e 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.13"; +$installerVersion = "1.4.14"; $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 4eafee5..cbcc122 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index 61d2c8f..f8a180c 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.13"; + document.location.href = "index.html?v=1.4.14"; },250); } }, @@ -1791,9 +1791,9 @@ function handleUpdateCheckResult(answer) { var millis=getMillis(); setTimeout(function(){ - document.location.href = "install.html?v=1.4.13&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.4.14&mode=onlyupdate&n=" + millis; },250); - document.location.href = "install.html?v=1.4.13&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.4.14&mode=onlyupdate&n=" + millis; } function handleUpdateReplace(answer) { diff --git a/webapp/paydesk.html b/webapp/paydesk.html index b18467f..b4a2d31 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 ea5db60..3754fbc 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.13"); + echo json_encode($view . "?v=1.4.14"); } } @@ -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.13"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.4.14"); }; } else { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.13"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.14"); }; } - 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['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.4.14"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.4.14"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.4.14"); }; if ($_SESSION['modus'] == 0) { - if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.13"); }; + if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.14"); }; } - 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"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.4.14"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.4.14"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.4.14"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.4.14"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.4.14"); }; + if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.4.14"); }; + if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.4.14"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.4.14"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.4.14"); + $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.4.14"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.4.14"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); diff --git a/webapp/php/debug.php b/webapp/php/debug.php index c0a754d..fdeadee 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.13"; + $version = "1.4.14"; $arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion); } else { diff --git a/webapp/php/utilities/version.php b/webapp/php/utilities/version.php index ef0c25b..2a3e01c 100644 --- a/webapp/php/utilities/version.php +++ b/webapp/php/utilities/version.php @@ -822,6 +822,9 @@ class Version { public static function upd_1412_1413($pdo, $prefix, $dbname) { return array(true); } + public static function upd_1413_1414($pdo, $prefix, $dbname) { + return array(true); + } public static $updateOrder = array( "1.3.0" => array("upd_1300_1301","1.3.1"), @@ -864,7 +867,8 @@ class Version { "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.12" => array("upd_1412_1413","1.4.13") + "1.4.12" => array("upd_1412_1413","1.4.13"), + "1.4.13" => array("upd_1413_1414","1.4.14") ); // RE;* also for install process no check is required diff --git a/webapp/php/workreceipts.php b/webapp/php/workreceipts.php index 22127da..3484c6b 100644 --- a/webapp/php/workreceipts.php +++ b/webapp/php/workreceipts.php @@ -49,7 +49,7 @@ class Workreceipts { $time = $origJob["time"]; $products = $origJob["products"]; - $sql = "SELECT productname,productid,price FROM pos_queue WHERE id=?"; + $sql = "SELECT productname,productid,price FROM %queue% WHERE id=?"; $res = CommonUtils::fetchSqlAll($pdo, $sql, array($queueid)); if (count($res) > 0) { $longname = $res[0]["productname"]; @@ -62,7 +62,7 @@ class Workreceipts { $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=?"; + $sql = "select kind,category from %products%,%prodtype% where %products%.category=%prodtype%.id AND %products%.id=?"; $reskind = CommonUtils::fetchSqlAll($pdo, $sql, array($prodid)); $kind = $reskind[0]["kind"]; diff --git a/webapp/preferences.html b/webapp/preferences.html index 1d1b351..985c50c 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index 27a0f8e..a3fa6c1 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/rating.html b/webapp/rating.html index b632b6b..a7e9592 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index 971433f..480898b 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index eea070e..047d682 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index fe5d4fd..b9935b2 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index 24705cd..c9e54eb 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,8 +4,8 @@ - - + +