diff --git a/gastsystem/index.php b/gastsystem/index.php index 717b3ac..43cda97 100644 --- a/gastsystem/index.php +++ b/gastsystem/index.php @@ -9,8 +9,8 @@ - - + + @@ -105,7 +105,7 @@
  OrderSprinter
-
1.4.8  
+
1.4.9  
diff --git a/gastsystem/install.php b/gastsystem/install.php index a2534b0..049abee 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.8

"; + echo "Installation OrderSprinter-Gastsystem 1.4.9

"; echo "
"; echo "
"; echo "
"; diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe index b9c0386..a97ff77 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 3d30d8f..72a6660 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.8"); + Database::setVersion($pdo,$prefix,"1.4.9"); 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 b9c0386..a97ff77 100644 Binary files a/webapp/OrderSprinterPrintserver.exe and b/webapp/OrderSprinterPrintserver.exe differ diff --git a/webapp/bar.html b/webapp/bar.html index 630c921..b9ff078 100644 --- a/webapp/bar.html +++ b/webapp/bar.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/bill.html b/webapp/bill.html index 975ab06..e397486 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/feedback.html b/webapp/feedback.html index 99b5352..e53a288 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index 16d4cab..f91932d 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.8"},500); + setTimeout(function(){document.location.href = "install.html?v=1.4.9"},500); } } diff --git a/webapp/install.html b/webapp/install.html index c013519..a187b7e 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 1fb3f45..0d8302e 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.8"; +$installerVersion = "1.4.9"; $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 31e77cb..5d92688 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index 0392ae4..f438e53 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.8"; + document.location.href = "index.html?v=1.4.9"; },250); } }, @@ -1791,9 +1791,9 @@ function handleUpdateCheckResult(answer) { var millis=getMillis(); setTimeout(function(){ - document.location.href = "install.html?v=1.4.8&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.4.9&mode=onlyupdate&n=" + millis; },250); - document.location.href = "install.html?v=1.4.8&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.4.9&mode=onlyupdate&n=" + millis; } function handleUpdateReplace(answer) { diff --git a/webapp/paydesk.html b/webapp/paydesk.html index e96cce6..5339de7 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 ca515d9..3a3d02c 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.8"); + echo json_encode($view . "?v=1.4.9"); } } @@ -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.8"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.4.9"); }; } else { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.8"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.9"); }; } - if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.4.8"); }; - if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.4.8"); }; - if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.4.8"); }; + if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.4.9"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.4.9"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.4.9"); }; if ($_SESSION['modus'] == 0) { - if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.8"); }; + if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.9"); }; } - if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.4.8"); }; - if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.4.8"); }; - if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.4.8"); }; - if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.4.8"); }; - if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.4.8"); }; - if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.4.8"); }; - if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.4.8"); }; - if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.4.8"); }; - $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.4.8"); - $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.4.8"); - $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.4.8"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.4.9"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.4.9"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.4.9"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.4.9"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.4.9"); }; + if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.4.9"); }; + if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.4.9"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.4.9"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.4.9"); + $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.4.9"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.4.9"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); diff --git a/webapp/php/debug.php b/webapp/php/debug.php index 71ccc43..4bf3bd5 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.8"; + $version = "1.4.9"; $arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion); } else { diff --git a/webapp/php/utilities/TypeAndProducts/ProductEntry.php b/webapp/php/utilities/TypeAndProducts/ProductEntry.php index 6e95081..a1795a7 100644 --- a/webapp/php/utilities/TypeAndProducts/ProductEntry.php +++ b/webapp/php/utilities/TypeAndProducts/ProductEntry.php @@ -60,6 +60,12 @@ class ProductEntry { if (!is_numeric($this->priceC)) { $this->priceC = 0.00; } + if ($this->unit == 'null') { + $this->unit = null; + } + if ($this->taxaustria == 'null') { + $this->taxaustria = null; + } if (!is_numeric($this->unit)) { $this->unit = null; } else { diff --git a/webapp/php/utilities/version.php b/webapp/php/utilities/version.php index ac46003..9a564fe 100644 --- a/webapp/php/utilities/version.php +++ b/webapp/php/utilities/version.php @@ -651,11 +651,7 @@ class Version { } public static function upd_1325_1326($pdo, $prefix, $dbname) { - try { - return array(true); - } catch (PDOException $e) { - return array(false,$e); - } + return array(true); } public static function upd_1326_1400($pdo, $prefix, $dbname) { @@ -721,11 +717,7 @@ class Version { } public static function upd_1401_1402($pdo, $prefix, $dbname) { - try { - return array(true); - } catch (PDOException $e) { - return array(false,$e); - } + return array(true); } public static function upd_1402_1403($pdo, $prefix, $dbname) { @@ -759,12 +751,7 @@ class Version { } public static function upd_1404_1405($pdo, $prefix, $dbname) { - try { - - return array(true); - } catch (PDOException $e) { - return array(false,$e); - } + return array(true); } public static function upd_1405_1406($pdo, $prefix, $dbname) { @@ -819,6 +806,11 @@ class Version { } } + public static function upd_1408_1409($pdo, $prefix, $dbname) { + return array(true); + + } + public static $updateOrder = array( "1.3.0" => array("upd_1300_1301","1.3.1"), "1.3.1" => array("upd_1301_1302","1.3.2"), @@ -855,7 +847,8 @@ class Version { "1.4.4" => array("upd_1404_1405","1.4.5"), "1.4.5" => array("upd_1405_1406","1.4.6"), "1.4.6" => array("upd_1406_1407","1.4.7"), - "1.4.7" => array("upd_1407_1408","1.4.8") + "1.4.7" => array("upd_1407_1408","1.4.8"), + "1.4.8" => array("upd_1408_1409","1.4.9") ); // RE;* also for install process no check is required diff --git a/webapp/preferences.html b/webapp/preferences.html index 79df02d..7f5b624 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index 798e4d1..0387174 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + @@ -593,7 +593,7 @@ function setLanguage(language) { }; if (aProperty.isnum) { aVal = aVal.toString().replace(decpoint,"."); - if ((aVal != '') && (!$.isNumeric(aVal))) { + if ((aVal != '') && (aVal != 'null') && (!$.isNumeric(aVal))) { return { status:false }; }; } @@ -605,6 +605,10 @@ function setLanguage(language) { retValue["selectedAudioFile"] = ''; } + if (austria != 1) { + retValue["taxaustria"] = 'null'; + } + retValue["status"] = true; return retValue; } diff --git a/webapp/rating.html b/webapp/rating.html index 2c3d764..5fd8a6f 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index c08edcf..7e34a3b 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index d50e71b..fbe08e8 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index 0130896..b34e1b7 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index 91eec24..511c920 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,8 +4,8 @@ - - + +