OrderSprinter 1.1.7
This commit is contained in:
parent
d078a57b90
commit
a425e95056
Binary file not shown.
Binary file not shown.
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -22,10 +22,11 @@
|
||||||
#
|
#
|
||||||
# Ein Produkteintrag hat folgendes Format:
|
# Ein Produkteintrag hat folgendes Format:
|
||||||
# Kurzname (ID:123); NormalPreis (Stufe A); Langname # Preis (Stufe B); Preis (Stufe C); Steuersatz
|
# Kurzname (ID:123); NormalPreis (Stufe A); Langname # Preis (Stufe B); Preis (Stufe C); Steuersatz
|
||||||
# dabei ist der Kurzname nur in der Kellneransicht zu sehen
|
# dabei ist der Kurzname nur in der Kellneransicht bei der Produktauswahl zu sehen,
|
||||||
|
# anschließend wird stets der Langname angezeigt.
|
||||||
# Nur Kurzname und Preis (A) sind erforderlich, die anderen Teile werden bei
|
# Nur Kurzname und Preis (A) sind erforderlich, die anderen Teile werden bei
|
||||||
# Auslassung automatisch gefüllt (Preis B=C=A und Langname = Kurzname)
|
# Auslassung automatisch gefüllt (Preis B=C=A und Langname = Kurzname)
|
||||||
# Die ID ist muss nicht angegeben werden, in dem Fall wird das Produkt als
|
# Die ID muss nicht angegeben werden, in dem Fall wird das Produkt als
|
||||||
# neu anzulegendes Produkt behandelt.
|
# neu anzulegendes Produkt behandelt.
|
||||||
# Wird ein Steuersatz angegeben, der für das Produkt vorgegeben sein soll, so
|
# Wird ein Steuersatz angegeben, der für das Produkt vorgegeben sein soll, so
|
||||||
# müssen auch die Preise A und B angegeben werden.
|
# müssen auch die Preise A und B angegeben werden.
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
#
|
#
|
||||||
# Ein Produkteintrag hat folgendes Format:
|
# Ein Produkteintrag hat folgendes Format:
|
||||||
# Kurzname ; NormalPreis (Stufe A); Langname # Preis (Stufe B); Preis (Stufe C)
|
# Kurzname ; NormalPreis (Stufe A); Langname # Preis (Stufe B); Preis (Stufe C)
|
||||||
# dabei ist der Kurzname nur in der Kellneransicht zu sehen
|
# dabei ist der Kurzname nur in der Kellneransicht bei der Produktauswahl zu sehen,
|
||||||
|
# anschließend wird stets der Langname angezeigt.
|
||||||
# Nur Kurzname und Preis (A) sind erforderlich, die anderen Teile werden bei
|
# Nur Kurzname und Preis (A) sind erforderlich, die anderen Teile werden bei
|
||||||
# Auslassung automatisch gefüllt (Preis B=C=A und Langname = Kurzname)
|
# Auslassung automatisch gefüllt (Preis B=C=A und Langname = Kurzname)
|
||||||
# Wird ein Steuersatz angegeben, der für das Produkt vorgegeben sein soll, so
|
# Wird ein Steuersatz angegeben, der für das Produkt vorgegeben sein soll, so
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -7,8 +7,8 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
|
||||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.7">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -679,7 +679,7 @@ $(document).ready(function() {
|
||||||
<tr id=updateline>
|
<tr id=updateline>
|
||||||
<td> </td>
|
<td> </td>
|
||||||
<td align=center>
|
<td align=center>
|
||||||
<button id="updatebtn">Update -> 1.1.6</button>
|
<button id="updatebtn">Update -> 1.1.7</button>
|
||||||
</td>
|
</td>
|
||||||
<td> </td>
|
<td> </td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
|
@ -509,6 +509,11 @@ class Admin {
|
||||||
if ($view != "logout.php") {
|
if ($view != "logout.php") {
|
||||||
$userid = $_SESSION['userid'];
|
$userid = $_SESSION['userid'];
|
||||||
|
|
||||||
|
$questPos = strpos($view,'?');
|
||||||
|
if ($questPos != false) {
|
||||||
|
$view = substr($view,0,$questPos);
|
||||||
|
}
|
||||||
|
|
||||||
$sql = "UPDATE %user% SET lastmodule=? WHERE id=? AND active='1'";
|
$sql = "UPDATE %user% SET lastmodule=? WHERE id=? AND active='1'";
|
||||||
$pdo = $this->dbutils->openDbAndReturnPdo();
|
$pdo = $this->dbutils->openDbAndReturnPdo();
|
||||||
|
|
||||||
|
@ -842,7 +847,7 @@ class Admin {
|
||||||
);
|
);
|
||||||
|
|
||||||
$valid = false;
|
$valid = false;
|
||||||
if ($view == 'preferences.html') {
|
if (($view == 'preferences.html') || ($view == 'feedback.html')) {
|
||||||
// always ok
|
// always ok
|
||||||
$valid = true;
|
$valid = true;
|
||||||
} else if ($view == 'manager.html') {
|
} else if ($view == 'manager.html') {
|
||||||
|
@ -1074,19 +1079,19 @@ class Admin {
|
||||||
$right_rating = $_SESSION['right_rating'];
|
$right_rating = $_SESSION['right_rating'];
|
||||||
|
|
||||||
if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
|
if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
|
||||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.6"); };
|
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.7"); };
|
||||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.6"); };
|
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.7"); };
|
||||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.6"); };
|
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.7"); };
|
||||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.6"); };
|
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.7"); };
|
||||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html"); };
|
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html"); };
|
||||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.6"); };
|
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.7"); };
|
||||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.6"); };
|
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.7"); };
|
||||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.6"); };
|
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.7"); };
|
||||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.6"); };
|
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.7"); };
|
||||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.6"); };
|
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.7"); };
|
||||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.6"); };
|
if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.7"); };
|
||||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.6");
|
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.7");
|
||||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.6");
|
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.7");
|
||||||
}
|
}
|
||||||
|
|
||||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||||
|
@ -1095,7 +1100,7 @@ class Admin {
|
||||||
$waiterMessage = $this->getMessage(null, "waitermessage");
|
$waiterMessage = $this->getMessage(null, "waitermessage");
|
||||||
}
|
}
|
||||||
// CAUTION: change version also in config.txt!!!
|
// CAUTION: change version also in config.txt!!!
|
||||||
$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.6",
|
$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.7",
|
||||||
"user" => $currentUser,
|
"user" => $currentUser,
|
||||||
"menu" => $mainMenu,
|
"menu" => $mainMenu,
|
||||||
"waitermessage" => $waiterMessage,
|
"waitermessage" => $waiterMessage,
|
||||||
|
@ -1271,7 +1276,7 @@ class Admin {
|
||||||
$content = file_get_contents($_FILES['logofile']['tmp_name']);
|
$content = file_get_contents($_FILES['logofile']['tmp_name']);
|
||||||
|
|
||||||
if ($_FILES['logofile']['error'] != UPLOAD_ERR_OK //checks for errors
|
if ($_FILES['logofile']['error'] != UPLOAD_ERR_OK //checks for errors
|
||||||
&& is_uploaded_file($_FILES['userfile']['tmp_name'])) { //checks that file is uploaded
|
&& is_uploaded_file($_FILES['logofile']['tmp_name'])) { //checks that file is uploaded
|
||||||
header("Location: ../infopage.html?e=manager.html=Kann_Datei_nicht_laden.");
|
header("Location: ../infopage.html?e=manager.html=Kann_Datei_nicht_laden.");
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
@ -1566,30 +1566,30 @@ function fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToF
|
||||||
var isCooking = prodOfTable[this.id]["isCooking"];
|
var isCooking = prodOfTable[this.id]["isCooking"];
|
||||||
|
|
||||||
if ((isPaid == "1") && (isReady=="1")) {
|
if ((isPaid == "1") && (isReady=="1")) {
|
||||||
var dialogText = "Produkt wurde schon zubereitet und bezahlt";
|
var dialogText = "Entfernen?";
|
||||||
var this_elem = this;
|
var this_elem = this;
|
||||||
areYouSure("Entfernen?", dialogText, "Ja", function() {
|
areYouSure("Produkt wurde schon zubereitet und bezahlt", dialogText, "Ja", function() {
|
||||||
removeProductFromQueue(prodOfTable[this_elem.id]["queueid"],isPaid,isCooking,isReady);
|
removeProductFromQueue(prodOfTable[this_elem.id]["queueid"],isPaid,isCooking,isReady);
|
||||||
fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToFill);
|
fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToFill);
|
||||||
});
|
});
|
||||||
} else if (isReady=="1") {
|
} else if (isReady=="1") {
|
||||||
var dialogText = "Produkt wurde schon zubereitet.";
|
var dialogText = "Entfernen?";
|
||||||
var this_elem = this;
|
var this_elem = this;
|
||||||
areYouSure("Entfernen?", dialogText, "Ja", function() {
|
areYouSure("Produkt wurde schon zubereitet.", dialogText, "Ja", function() {
|
||||||
removeProductFromQueue(prodOfTable[this_elem.id]["queueid"],isPaid,isCooking,isReady);
|
removeProductFromQueue(prodOfTable[this_elem.id]["queueid"],isPaid,isCooking,isReady);
|
||||||
fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToFill);
|
fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToFill);
|
||||||
});
|
});
|
||||||
} else if (isPaid == "1") {
|
} else if (isPaid == "1") {
|
||||||
var dialogText = "Produkt wurde schon bezahlt.";
|
var dialogText = "Entfernen?";
|
||||||
var this_elem = this;
|
var this_elem = this;
|
||||||
areYouSure("Entfernen?", dialogText, "Ja", function() {
|
areYouSure("Produkt wurde schon bezahlt.", dialogText, "Ja", function() {
|
||||||
removeProductFromQueue(prodOfTable[this_elem.id]["queueid"],isPaid,isCooking,isReady);
|
removeProductFromQueue(prodOfTable[this_elem.id]["queueid"],isPaid,isCooking,isReady);
|
||||||
fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToFill);
|
fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToFill);
|
||||||
});
|
});
|
||||||
} else if (isCooking == "1") {
|
} else if (isCooking == "1") {
|
||||||
var dialogText = "Produkt wird soeben zubereitet.";
|
var dialogText = "Entfernen?";
|
||||||
var this_elem = this;
|
var this_elem = this;
|
||||||
areYouSure("Entfernen?", dialogText, "Ja", function() {
|
areYouSure("Produkt wird soeben zubereitet.", dialogText, "Ja", function() {
|
||||||
removeProductFromQueue(prodOfTable[this_elem.id]["queueid"],isPaid,isCooking,isReady);
|
removeProductFromQueue(prodOfTable[this_elem.id]["queueid"],isPaid,isCooking,isReady);
|
||||||
fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToFill);
|
fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToFill);
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue