genofire
/
ordersprinter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OrderSprinter 1.5.21

This commit is contained in:
Geno 2020-11-19 23:12:27 +01:00
parent a3233b7709
commit ee24c9e112
35 changed files with 172 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gastsystem/index.php
View File

@ -9,8 +9,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" href="css/gueststyle.css?v=1.5.20" /> <link rel="stylesheet" href="css/gueststyle.css?v=1.5.21" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.20" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.21" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
@ -105,7 +105,7 @@
<div data-role="footer" data-theme="b" id="thefooter1"> <div data-role="footer" data-theme="b" id="thefooter1">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a">&nbsp;&nbsp;OrderSprinter</div> <div class="ui-block-a">&nbsp;&nbsp;OrderSprinter</div>
<div class="ui-block-b grid_right" id="versioninfo">1.5.20&nbsp;&nbsp;</div> <div class="ui-block-b grid_right" id="versioninfo">1.5.21&nbsp;&nbsp;</div>
</div><!-- /grid-a --> </div><!-- /grid-a -->
</div> </div>
</div> </div>

4
gastsystem/install.php
View File

@ -90,10 +90,10 @@ if (isset($_POST['code'])) {
} else { } else {
echo "<html>"; echo "<html>";
echo "<head><title>Installation Gastsystem</title>"; echo "<head><title>Installation Gastsystem</title>";
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.20">'; echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.21">';
echo "</head>"; echo "</head>";
echo "<body><div class=surround>"; echo "<body><div class=surround>";
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.20</span><br><br>"; echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.21</span><br><br>";
echo "<form action='install.php' method='post'><input class=installfield name=code id=code type=text placeholder='Installationscode' />"; echo "<form action='install.php' method='post'><input class=installfield name=code id=code type=text placeholder='Installationscode' />";
echo "<br><input type=submit value='Installation starten' class=installbtn />"; echo "<br><input type=submit value='Installation starten' class=installbtn />";
echo "</form></div></html>"; echo "</form></div></html>";

BIN
printserver/OrderSprinterPrintserver.exe
View File

Binary file not shown.

2
spider/install/installer.php
View File

@ -85,7 +85,7 @@ class Installer {
} }
Database::dropTables($pdo); Database::dropTables($pdo);
Database::createEmptyTables($pdo, $prefix); Database::createEmptyTables($pdo, $prefix);
Database::setVersion($pdo,$prefix,"1.5.20"); Database::setVersion($pdo,$prefix,"1.5.21");
Database::setAccessPassword($pdo,$prefix,$adminpass); Database::setAccessPassword($pdo,$prefix,$adminpass);
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
return array("status" => "OK","msg" => "Installation successful"); return array("status" => "OK","msg" => "Installation successful");

BIN
webapp/OrderSprinterPrintserver.exe
View File

Binary file not shown.

6
webapp/bar.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,8 +13,8 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script> <script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.5.20"></script> <script src="utilities.js?v=1.5.21"></script>
<script src="kitchenbar.js?v=1.5.20"></script> <script src="kitchenbar.js?v=1.5.21"></script>
<style> <style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

2
webapp/bill.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

2
webapp/feedback.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

6
webapp/index.html
View File

@ -9,8 +9,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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.20"> <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.21">
<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" />
@ -229,7 +229,7 @@ function handleResultOfInstallCheck(is_installed) {
if (is_installed == "Yes") { if (is_installed == "Yes") {
useInstallation(); useInstallation();
} else { } else {
setTimeout(function(){document.location.href = "install.html?v=1.5.20"},500); setTimeout(function(){document.location.href = "install.html?v=1.5.21"},500);
} }
} }

2
webapp/install.html
View File

@ -909,7 +909,7 @@ El servicio web OrderSprinter no requiere una conexión a Internet. Sin embargo,
<tr id=updateline> <tr id=updateline>
<td>&nbsp;</td> <td>&nbsp;</td>
<td align=center> <td align=center>
<button id="updatebtn">Update -> 1.5.20</button> <button id="updatebtn">Update -> 1.5.21</button>
<span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span> <span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span>
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>

2
webapp/install/installer.php
View File

@ -389,7 +389,7 @@ $zones[] = $timezone_identifiers[$i];
echo json_encode($zones); echo json_encode($zones);
} else if ($command == 'update') { } else if ($command == 'update') {
set_time_limit(60*30); set_time_limit(60*30);
$installerVersion = "1.5.20"; $installerVersion = "1.5.21";
$admin = new InstallAdmin(); $admin = new InstallAdmin();
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']); $pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);

6
webapp/kitchen.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,8 +13,8 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script> <script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.5.20"></script> <script src="utilities.js?v=1.5.21"></script>
<script src="kitchenbar.js?v=1.5.20"></script> <script src="kitchenbar.js?v=1.5.21"></script>
<style> <style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

14
webapp/manager.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,10 +13,10 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.5.20"></script> <script src="utilities.js?v=1.5.21"></script>
<script src="elements/tablemap.js?v=1.5.20"></script> <script src="elements/tablemap.js?v=1.5.21"></script>
<script src="elements/roommap.js?v=1.5.20"></script> <script src="elements/roommap.js?v=1.5.21"></script>
<script src="elements/groundplan.js?v=1.5.20"></script> <script src="elements/groundplan.js?v=1.5.21"></script>
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet"> <link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script> <script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
@ -1562,7 +1562,7 @@ function initRestoreFileUpload() {
} else { } else {
alert("Import war erfolgreich."); alert("Import war erfolgreich.");
setTimeout(function(){ setTimeout(function(){
document.location.href = "index.html?v=1.5.20"; document.location.href = "index.html?v=1.5.21";
},250); },250);
} }
}, },
@ -2130,7 +2130,7 @@ function updateOneSingleFile() {
setTimeout(function(){ setTimeout(function(){
$("#sliderarea").hide(); $("#sliderarea").hide();
var millis=getMillis(); var millis=getMillis();
document.location.href = "install.html?v=1.5.20&mode=onlyupdate&n=" + millis; document.location.href = "install.html?v=1.5.21&mode=onlyupdate&n=" + millis;
},250); },250);
} }
} }

2
webapp/paydesk.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

42
webapp/php/admin.php
View File

@ -1407,7 +1407,7 @@ class Admin {
$view = "preferences.html"; $view = "preferences.html";
} }
echo json_encode($view . "?v=1.5.20"); echo json_encode($view . "?v=1.5.21");
} }
} }
@ -1623,31 +1623,31 @@ class Admin {
if (!self::isOnlyRatingUser($rights, $right_rating, true)) { if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
if ($_SESSION['modus'] == 0) { if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.20"); } if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.21"); }
} else { } else {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.20"); } if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.21"); }
} }
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.20"); } if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.21"); }
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.20"); } if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.21"); }
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.20"); } if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.21"); }
if ($_SESSION['modus'] == 0) { if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.20"); } if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.21"); }
} }
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.20"); } if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.21"); }
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.20"); } if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.21"); }
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.20"); } if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.21"); }
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.20"); } if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.21"); }
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.20"); } if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.21"); }
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.20"); } if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.21"); }
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.20"); } if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.21"); }
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.20"); } if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.21"); }
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.20"); } if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.21"); }
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.20"); } if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.21"); }
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.20"); $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.21");
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.20"); } if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.21"); }
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.20"); $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.21");
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.20"); $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.21");
} }
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");

74
webapp/php/bill.php
View File

@ -992,7 +992,7 @@ class Bill {
if ($removeproducts == 0) { if ($removeproducts == 0) {
$sql = "UPDATE %queue% SET paidtime=null,billid=null WHERE billid=?"; $sql = "UPDATE %queue% SET paidtime=null,billid=null WHERE billid=?";
} else { } else {
$sql = "UPDATE %queue% SET ordertime=null,paidtime=null,billid=null WHERE billid=?"; $sql = "UPDATE %queue% SET toremove='1',paidtime=null,billid=null WHERE billid=?";
} }
CommonUtils::execSql($pdo, $sql, array($billid)); CommonUtils::execSql($pdo, $sql, array($billid));
@ -1149,9 +1149,11 @@ class Bill {
$allcells = array(); $allcells = array();
$firstRow = array( $firstRow = array(
$this->t['Date'][$l], 'Bestellzeitpunkt',
'Abrechnungszeitpunkt',
$this->t['ID'][$l], $this->t['ID'][$l],
$this->t['Tablename'][$l], $this->t['Tablename'][$l],
'Produktpreis' . " ($currency)",
$this->t['Brutto'][$l] ."($currency)", $this->t['Brutto'][$l] ."($currency)",
$this->t['Netto'][$l] . "($currency)", $this->t['Netto'][$l] . "($currency)",
'Umsatzsteuer (%)', 'Umsatzsteuer (%)',
@ -1162,8 +1164,8 @@ class Bill {
'Produkt-ID', 'Produkt-ID',
$this->t['PayWay'][$l], $this->t['PayWay'][$l],
$this->t['reason'][$l], $this->t['reason'][$l],
$this->t['User'][$l], 'Abrechnungsbenutzer',
$this->t['Userid'][$l], 'Abrechnungsbenutzer-ID',
$this->t['ClosId'][$l], $this->t['ClosId'][$l],
$this->t['ClosDate'][$l], $this->t['ClosDate'][$l],
$this->t['ClosRemark'][$l] $this->t['ClosRemark'][$l]
@ -1178,28 +1180,63 @@ class Bill {
$sql = " $sql = "
SELECT B.billdate as billdate,B.id as billid, SELECT B.billdate as billdate,B.id as billid,
ordertime,
IF(tableid > '0',(SELECT tableno FROM %resttables% WHERE id=tableid),'') as tablename, IF(tableid > '0',(SELECT tableno FROM %resttables% WHERE id=tableid),'') as tablename,
price as productprice,
(IF(B.status='s',-1,1) * price) as brutto, (IF(B.status='s',-1,1) * price) as brutto,
(IF(B.status='s',-1,1) * Q.price / (1 + Q.tax * 0.01)) as netto, (IF(B.status='s',-1,1) * Q.price / (1 + Q.tax * 0.01)) as netto,
Q.tax as tax, Q.tax as tax,
(IF(B.host = '1','x','-')) as host, (IF(B.host = '1','x','-')) as host,
IFNULL(B.ref,'') as reference,B.status as status,productname,productid,P.$payment_col as payment, IFNULL(B.ref,'') as reference,
B.status as status,
productname,
productid,
P.$payment_col as payment,
IFNULL(B.reason,'') as reason, IFNULL(B.reason,'') as reason,
U.username,U.id as userid,closingid,C.closingdate as closingdate, IFNULL(C.remark,'') as remark U.username,U.id as userid,closingid,C.closingdate as closingdate, IFNULL(C.remark,'') as remark
from %billproducts% BP,%queue% Q,%bill% B,%payment% P,%user% U,%closing% C from %billproducts% BP,%queue% Q,%bill% B,%payment% P,%user% U,%closing% C
WHERE BP.queueid=Q.id AND BP.billid=B.id AND B.closingid is not null AND B.paymentid=P.id WHERE BP.queueid=Q.id AND BP.billid=B.id AND B.closingid is not null AND B.paymentid=P.id
AND U.id=B.userid AND B.closingid=C.id AND U.id=B.userid AND B.closingid=C.id
AND Q.toremove = '0'
AND B.billdate >= ? AND B.billdate <= ? AND B.billdate >= ? AND B.billdate <= ?
UNION ALL UNION ALL
SELECT B.billdate as billdate,B.id as billid,'' as tablename, B.brutto as brutto,B.netto as netto,'' as tax,'' as host,'' as reference,status,'Einlage' as productname, SELECT '' as billdate, '' as billid,
ordertime,
IF(tablenr > '0',(SELECT tableno FROM %resttables% WHERE id=tablenr),'') as tablename,
price as productprice,
'0.00' as brutto,
'0.00' as netto,
Q.tax as tax,
'-' as host,
'' as reference,
'd' as status,
productname,
productid,
'' as payment,
'' as reason,
'' as username,'' as userid,
'' as closingid, '' as closingdate, '' as remark
FROM %queue% Q
WHERE Q.toremove = '1'
AND ordertime >= ? AND ordertime <= ?
UNION ALL
SELECT B.billdate as billdate,B.id as billid,B.billdate as ordertime,
'' as tablename,
'' as productprice,
B.brutto as brutto,B.netto as netto,
'' as tax,
'' as host,
'' as reference,
status,
'Einlage' as productname,
'' as productid,'Barzahlung' as payment, IFNULL(B.reason,'') as reason, U.username, U.id as userid,closingid,C.closingdate as closingdate,IFNULL(C.remark,'') as remark '' as productid,'Barzahlung' as payment, IFNULL(B.reason,'') as reason, U.username, U.id as userid,closingid,C.closingdate as closingdate,IFNULL(C.remark,'') as remark
FROM %bill% B,%user% U,%closing% C WHERE B.status='c' AND B.closingid is not null AND B.userid=U.id AND B.closingid=C.id FROM %bill% B,%user% U,%closing% C WHERE B.status='c' AND B.closingid is not null AND B.userid=U.id AND B.closingid=C.id
AND B.billdate >= ? AND B.billdate <= ? AND B.billdate >= ? AND B.billdate <= ?
ORDER BY ORDER BY
billid ordertime,billid
"; ";
$result = CommonUtils::fetchSqlAll($pdo, $sql, array($startDate,$endDate,$startDate,$endDate)); $result = CommonUtils::fetchSqlAll($pdo, $sql, array($startDate,$endDate,$startDate,$endDate,$startDate,$endDate));
foreach($result as $z) { foreach($result as $z) {
set_time_limit(60*5); set_time_limit(60*5);
@ -1223,13 +1260,16 @@ class Bill {
} else if ($status == 's') { } else if ($status == 's') {
$cat = $this->t["storno"][$l]; $cat = $this->t["storno"][$l];
} else if ($status == 'c') { } else if ($status == 'c') {
$status = $this->t["cashact"][$l]; $cat = $this->t["cashact"][$l];
} else if ($status == 'd') {
$cat = 'Storno vor Abrechnung';
} }
$line = array( $line = array(
$z['ordertime'],
$z['billdate'], $z['billdate'],
$z['billid'],$z['tablename'], $z['billid'],$z['tablename'],
$brutto,$netto, $z['productprice'],$brutto,$netto,
$tax, $tax,
$z['host'], $z['host'],
$z['reference'], $z['reference'],
@ -1265,13 +1305,17 @@ class Bill {
$formatCodeBrutto = "0.00"; $formatCodeBrutto = "0.00";
$formatCodeNetto = "0.0000"; $formatCodeNetto = "0.0000";
for ($i=1;$i<count($allcells);$i++) { for ($i=1;$i<count($allcells);$i++) {
$aVal = $objWorksheet->getCell('D' . ($i+1)) ->getValue();
$objWorksheet->getCell('D' . ($i+1)) ->setValueExplicit($aVal,PHPExcel_Cell_DataType::TYPE_NUMERIC);
$objWorksheet->getStyle('D' . ($i+1))->getNumberFormat()->setFormatCode($formatCodeBrutto);
$aVal = $objWorksheet->getCell('E' . ($i+1)) ->getValue(); $aVal = $objWorksheet->getCell('E' . ($i+1)) ->getValue();
$objWorksheet->getCell('E' . ($i+1)) ->setValueExplicit($aVal,PHPExcel_Cell_DataType::TYPE_NUMERIC); $objWorksheet->getCell('E' . ($i+1)) ->setValueExplicit($aVal,PHPExcel_Cell_DataType::TYPE_NUMERIC);
$objWorksheet->getStyle('E' . ($i+1))->getNumberFormat()->setFormatCode($formatCodeNetto); $objWorksheet->getStyle('E' . ($i+1))->getNumberFormat()->setFormatCode($formatCodeBrutto);
$aVal = $objWorksheet->getCell('F' . ($i+1)) ->getValue();
$objWorksheet->getCell('F' . ($i+1)) ->setValueExplicit($aVal,PHPExcel_Cell_DataType::TYPE_NUMERIC);
$objWorksheet->getStyle('F' . ($i+1))->getNumberFormat()->setFormatCode($formatCodeBrutto);
$aVal = $objWorksheet->getCell('G' . ($i+1)) ->getValue();
$objWorksheet->getCell('G' . ($i+1)) ->setValueExplicit($aVal,PHPExcel_Cell_DataType::TYPE_NUMERIC);
$objWorksheet->getStyle('G' . ($i+1))->getNumberFormat()->setFormatCode($formatCodeNetto);
} }
} }

11
webapp/php/closing.php
View File

@ -171,7 +171,6 @@ $closingEntrySql = "INSERT INTO `%closing%` (`closingdate`,`remark`,`billcount`,
CommonUtils::execSql($pdo, $closingEntrySql, array($closingTime,$remark,0,0.0,null)); CommonUtils::execSql($pdo, $closingEntrySql, array($closingTime,$remark,0,0.0,null));
$newClosingId = $pdo->lastInsertId(); $newClosingId = $pdo->lastInsertId();
// test for consistency of bills
$sql = "SELECT id FROM %bill% WHERE closingid is null AND (tableid >= '0' OR status='c') "; $sql = "SELECT id FROM %bill% WHERE closingid is null AND (tableid >= '0' OR status='c') ";
$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql)); $stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql));
$stmt->execute(); $stmt->execute();
@ -191,7 +190,6 @@ echo json_encode(array("status" => "ERROR", "code" => ERROR_INCONSISTENT_DB, "ms
return; return;
} }
// declare not closed bills as closed
$sql = "UPDATE %bill% SET closingid='$newClosingId' WHERE closingid is null AND (tableid >= '0' OR status='c') "; $sql = "UPDATE %bill% SET closingid='$newClosingId' WHERE closingid is null AND (tableid >= '0' OR status='c') ";
CommonUtils::execSql($pdo, $sql, null); CommonUtils::execSql($pdo, $sql, null);
@ -219,21 +217,18 @@ $prevClosingDate = self::getDateOfPreviousClosing($pdo,$newClosingId);
if (is_null($prevClosingDate)) { if (is_null($prevClosingDate)) {
$prevClosingDate = ""; $prevClosingDate = "";
} }
// sign the date
$pricesumstr = number_format($pricesum, 2, ".", ''); $pricesumstr = number_format($pricesum, 2, ".", '');
$data = "I($newClosingId)-S($prevClosingDate)-E($closingTime)-D($billsToTake)-S($pricesumstr)"; $data = "I($newClosingId)-S($prevClosingDate)-E($closingTime)-D($billsToTake)-S($pricesumstr)";
$signature = md5($data); $signature = md5($data);
// now add values to closing table to prepare for electronic signature
$sql = "UPDATE %closing% SET billcount=?, billsum=?,signature=? WHERE id=?"; $sql = "UPDATE %closing% SET billcount=?, billsum=?,signature=? WHERE id=?";
CommonUtils::execSql($pdo, $sql, 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";
$sql = "UPDATE %queue% SET toremove='1' WHERE id not in (select distinct queueid FROM %billproducts%) AND billid is null";
CommonUtils::execSql($pdo, $sql, null); CommonUtils::execSql($pdo, $sql, null);
CommonUtils::execSql($pdo, "OPTIMIZE TABLE %queue%", null);
$sql = "UPDATE %queue% set paidtime=?,delivertime=? WHERE billid is not null AND paidtime is null"; $sql = "UPDATE %queue% set paidtime=?,delivertime=? WHERE billid is not null AND paidtime is null";
CommonUtils::execSql($pdo, $sql, array($closingTime,$closingTime)); CommonUtils::execSql($pdo, $sql, array($closingTime,$closingTime));

2
webapp/php/customers.php
View File

@ -853,7 +853,7 @@ class Customers {
$txt = "<head>"; $txt = "<head>";
$txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>"; $txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>";
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">'; $txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.20">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.21">';
$txt .= "</head>"; $txt .= "</head>";
return $txt; return $txt;
} }

2
webapp/php/debug.php
View File

@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
if (strlen($status) > 150) { if (strlen($status) > 150) {
$status = substr($status, 0,149); $status = substr($status, 0,149);
} }
$version = "1.5.20"; $version = "1.5.21";
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion); $arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
} else { } else {

48
webapp/php/queuecontent.php
View File

@ -219,7 +219,7 @@ class QueueContent {
$sql = "SELECT DISTINCT %queue%.id as id,%resttables%.id as tableid,tablenr,longname,anoption,tableno,date_format(ordertime,'%Y-%m-%d %H:%i:00') as ordertime,cooking,TIMESTAMPDIFF(MINUTE,ordertime,?) AS waittime FROM %queue%,%products%,%prodtype%,%resttables% "; $sql = "SELECT DISTINCT %queue%.id as id,%resttables%.id as tableid,tablenr,longname,anoption,tableno,date_format(ordertime,'%Y-%m-%d %H:%i:00') as ordertime,cooking,TIMESTAMPDIFF(MINUTE,ordertime,?) AS waittime FROM %queue%,%products%,%prodtype%,%resttables% ";
} }
$sql .= "WHERE (readytime IS NULL AND "; $sql .= "WHERE (readytime IS NULL AND ";
$sql .= " ordertime is not null AND "; $sql .= "%queue%.toremove='0' AND ";
$sql .= "%queue%.productid=%products%.id AND "; $sql .= "%queue%.productid=%products%.id AND ";
$sql .= "%queue%.tablenr = %resttables%.id AND "; $sql .= "%queue%.tablenr = %resttables%.id AND ";
$sql .= "%products%.category=%prodtype%.id AND "; $sql .= "%products%.category=%prodtype%.id AND ";
@ -242,7 +242,7 @@ class QueueContent {
$sql = "SELECT DISTINCT q.id as id,'-' as tableid,'-' as tablenr,longname,anoption,'-' as tableno,date_format(ordertime,'%Y-%m-%d %H:%i:00') as ordertime,cooking,TIMESTAMPDIFF(MINUTE,ordertime,?) AS waittime FROM %products%,%prodtype%,%queue% q LEFT OUTER JOIN %bill% b "; $sql = "SELECT DISTINCT q.id as id,'-' as tableid,'-' as tablenr,longname,anoption,'-' as tableno,date_format(ordertime,'%Y-%m-%d %H:%i:00') as ordertime,cooking,TIMESTAMPDIFF(MINUTE,ordertime,?) AS waittime FROM %products%,%prodtype%,%queue% q LEFT OUTER JOIN %bill% b ";
$sql .= " ON q.billid=b.id "; $sql .= " ON q.billid=b.id ";
$sql .= "WHERE (readytime IS NULL AND "; $sql .= "WHERE (readytime IS NULL AND ";
$sql .= " ordertime is not null AND "; $sql .= "q.toremove='0' AND ";
$sql .= "q.productid=%products%.id AND "; $sql .= "q.productid=%products%.id AND ";
$sql .= "q.tablenr is null AND "; $sql .= "q.tablenr is null AND ";
$sql .= "%products%.category=%prodtype%.id AND "; $sql .= "%products%.category=%prodtype%.id AND ";
@ -659,7 +659,7 @@ class QueueContent {
} }
$sql .= "WHERE (readytime IS NOT NULL AND "; $sql .= "WHERE (readytime IS NOT NULL AND ";
$sql .= "delivertime IS NULL AND "; $sql .= "delivertime IS NULL AND ";
$sql .= "ordertime is not null AND "; $sql .= "%queue%.toremove = '0' AND ";
$sql .= "%queue%.productid=%products%.id AND "; $sql .= "%queue%.productid=%products%.id AND ";
$sql .= "%queue%.tablenr = %resttables%.id AND "; $sql .= "%queue%.tablenr = %resttables%.id AND ";
$sql .= "%products%.category=%prodtype%.id AND "; $sql .= "%products%.category=%prodtype%.id AND ";
@ -685,7 +685,7 @@ class QueueContent {
$sql .= "WHERE (readytime IS NOT NULL AND "; $sql .= "WHERE (readytime IS NOT NULL AND ";
$sql .= "delivertime IS NULL AND "; $sql .= "delivertime IS NULL AND ";
$sql .= "ordertime is not null AND "; $sql .= "%queue%.toremove = '0' AND ";
$sql .= "%queue%.productid=%products%.id AND "; $sql .= "%queue%.productid=%products%.id AND ";
$sql .= "%queue%.tablenr is null AND "; $sql .= "%queue%.tablenr is null AND ";
$sql .= "%products%.category=%prodtype%.id AND "; $sql .= "%products%.category=%prodtype%.id AND ";
@ -736,7 +736,7 @@ class QueueContent {
$sql .= "INNER JOIN %products% p ON q.productid=p.id "; $sql .= "INNER JOIN %products% p ON q.productid=p.id ";
$sql .= "INNER JOIN %prodtype% t ON p.category=t.id AND t.kind=? AND t.usesupplydesk='0' AND t.usekitchen='1' "; $sql .= "INNER JOIN %prodtype% t ON p.category=t.id AND t.kind=? AND t.usesupplydesk='0' AND t.usekitchen='1' ";
$sql .= "LEFT JOIN %resttables% r ON q.tablenr=r.id "; $sql .= "LEFT JOIN %resttables% r ON q.tablenr=r.id ";
$sql .= "WHERE q.workprinted='0' AND toremove <> '1' AND q.readytime IS NOT NULL AND ordertime is not null "; $sql .= "WHERE q.workprinted='0' AND toremove <> '1' AND q.readytime IS NOT NULL AND q.toremove='0' ";
$sql .= " AND (q.billid is null OR (q.billid=b.id AND b.closingid is null)) "; $sql .= " AND (q.billid is null OR (q.billid=b.id AND b.closingid is null)) ";
$sql .= "ORDER BY q.delivertime DESC LIMIT 50"; $sql .= "ORDER BY q.delivertime DESC LIMIT 50";
@ -1379,7 +1379,7 @@ class QueueContent {
/* /*
* Do as if the product would have been removed from queue - but don't do it exactly, * Do as if the product would have been removed from queue - but don't do it exactly,
* because then it would not appear in the reports any more. Instead declare the * because then it would not appear in the reports any more. Instead declare the
* ordertime = null (was never ordered...) * toremove = 1 (was never ordered...)
*/ */
function removeProductFromQueue($queueid,$isPaid,$isCooking,$isReady) { function removeProductFromQueue($queueid,$isPaid,$isCooking,$isReady) {
if (is_numeric($queueid)) { if (is_numeric($queueid)) {
@ -1405,7 +1405,7 @@ class QueueContent {
} else { } else {
$sql = "UPDATE %queue% "; $sql = "UPDATE %queue% ";
} }
$sql .= "SET ordertime=null WHERE %queue%.id=? AND ordertime IS NOT NULL "; $sql .= "SET %queue%.toremove='1' WHERE %queue%.id=? AND %queue%.toremove='0' ";
if ($isPaid == '1') { if ($isPaid == '1') {
$sql .= " AND paidtime IS NOT NULL "; $sql .= " AND paidtime IS NOT NULL ";
} else { } else {
@ -1447,13 +1447,13 @@ class QueueContent {
function getUnpaidTables() { function getUnpaidTables() {
$pdo = DbUtils::openDbAndReturnPdoStatic(); $pdo = DbUtils::openDbAndReturnPdoStatic();
$sql = "SELECT DISTINCT %resttables%.tableno as tablename FROM %queue%,%resttables% WHERE paidtime is null AND ordertime is not null and tablenr=%resttables%.id AND isclosed is null"; $sql = "SELECT DISTINCT %resttables%.tableno as tablename FROM %queue%,%resttables% WHERE paidtime is null AND %queue%.toremove='0' and tablenr=%resttables%.id AND isclosed is null";
$result = CommonUtils::fetchSqlAll($pdo, $sql, null); $result = CommonUtils::fetchSqlAll($pdo, $sql, null);
$unpaidTables = array(); $unpaidTables = array();
foreach ($result as $anUnpaidTable) { foreach ($result as $anUnpaidTable) {
$unpaidTables[] = $anUnpaidTable["tablename"]; $unpaidTables[] = $anUnpaidTable["tablename"];
} }
$sql = "SELECT COUNT(id) as takeawayitems FROM %queue% WHERE tablenr is null AND paidtime is null AND ordertime is not null AND isclosed is null"; $sql = "SELECT COUNT(id) as takeawayitems FROM %queue% WHERE tablenr is null AND paidtime is null AND %queue%.toremove='0' AND isclosed is null";
$result = CommonUtils::fetchSqlAll($pdo, $sql, null); $result = CommonUtils::fetchSqlAll($pdo, $sql, null);
$cnt = $result[0]["takeawayitems"]; $cnt = $result[0]["takeawayitems"];
$takeawayHasOpenBills = 0; $takeawayHasOpenBills = 0;
@ -1468,7 +1468,7 @@ class QueueContent {
* Return as JSON structure all products that are assigned to a specified table, with the * Return as JSON structure all products that are assigned to a specified table, with the
* specification that they are not delivered yet. * specification that they are not delivered yet.
* *
* ordertime must not be null, because =null means that is is paid but was cancelled later * toremove must not be 1, because = 1 means that is is paid but was cancelled later
* by the waiter! (in a previous version such entries were deleted from queue, but then * by the waiter! (in a previous version such entries were deleted from queue, but then
* they won't appear in reports any more) * they won't appear in reports any more)
* *
@ -1489,9 +1489,9 @@ class QueueContent {
$row = CommonUtils::getRowSqlObject($pdo, $sql, null); $row = CommonUtils::getRowSqlObject($pdo, $sql, null);
if ($row->countid == 0) { if ($row->countid == 0) {
$sql = "SELECT DISTINCT %queue%.id as quid, ordertime FROM %queue% WHERE ordertime is not null AND isclosed is null AND "; $sql = "SELECT DISTINCT %queue%.id as quid, ordertime FROM %queue% WHERE %queue%.toremove='0' AND isclosed is null AND ";
} else { } else {
$sql = "SELECT DISTINCT %queue%.id as quid, ordertime FROM %queue%,%bill% WHERE ordertime is not null AND isclosed is null AND ((%queue%.billid is null AND %queue%.paidtime is null) OR (%queue%.billid=%bill%.id AND %bill%.closingid is null)) AND "; $sql = "SELECT DISTINCT %queue%.id as quid, ordertime FROM %queue%,%bill% WHERE %queue%.toremove='0' AND isclosed is null AND ((%queue%.billid is null AND %queue%.paidtime is null) OR (%queue%.billid=%bill%.id AND %bill%.closingid is null)) AND ";
} }
if ($tableid == 0) { if ($tableid == 0) {
@ -1573,14 +1573,14 @@ class QueueContent {
$sql = "SELECT %queue%.id as queueid,productname FROM "; $sql = "SELECT %queue%.id as queueid,productname FROM ";
$sql .= "%queue% WHERE "; $sql .= "%queue% WHERE ";
$sql .= "(tablenr=? OR (tablenr IS NULL AND ? IS NULL)) AND ordertime is not null AND isclosed is null AND billid is null "; $sql .= "(tablenr=? OR (tablenr IS NULL AND ? IS NULL)) AND %queue%.toremove='0' AND isclosed is null AND billid is null ";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
$stmt->execute(array($tableid,$tableid)); $stmt->execute(array($tableid,$tableid));
$unpaidresultungrouped = $stmt->fetchAll(); $unpaidresultungrouped = $stmt->fetchAll();
$sql = "SELECT %queue%.id as queueid,productname FROM "; $sql = "SELECT %queue%.id as queueid,productname FROM ";
$sql .= "%queue% LEFT OUTER JOIN %bill% ON %queue%.billid=%bill%.id WHERE "; $sql .= "%queue% LEFT OUTER JOIN %bill% ON %queue%.billid=%bill%.id WHERE ";
$sql .= "(tablenr=? OR (tablenr IS NULL AND ? IS NULL)) AND ordertime is not null AND isclosed is null AND billid is null AND ("; $sql .= "(tablenr=? OR (tablenr IS NULL AND ? IS NULL)) AND %queue%.toremove='0' AND isclosed is null AND billid is null AND (";
$sql .= "%queue%.delivertime IS NULL OR "; $sql .= "%queue%.delivertime IS NULL OR ";
$sql .= "(%queue%.delivertime IS NOT NULL AND workprinted='1')) "; $sql .= "(%queue%.delivertime IS NOT NULL AND workprinted='1')) ";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
@ -1659,7 +1659,7 @@ class QueueContent {
} else { } else {
$sql .= "WHERE tablenr = $tableid "; $sql .= "WHERE tablenr = $tableid ";
} }
$sql .= "AND paidtime is null AND toremove <> '1' AND ordertime is not null AND isclosed is null ORDER BY kind,ordertime, id;"; $sql .= "AND paidtime is null AND %queue%.toremove='0' AND isclosed is null ORDER BY kind,ordertime, id;";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
$stmt->execute(); $stmt->execute();
@ -1777,8 +1777,7 @@ class QueueContent {
$sql .= "AND %queue%.productid=%products%.id "; $sql .= "AND %queue%.productid=%products%.id ";
$sql .= "AND %queue%.isclosed is null "; $sql .= "AND %queue%.isclosed is null ";
$sql .= "AND ordertime is not null "; $sql .= "AND toremove = '0') ";
$sql .= "AND toremove <> '1') ";
if ($this->areBillExisting($pdo)) { if ($this->areBillExisting($pdo)) {
$sql .= "AND (%queue%.billid is null OR ("; $sql .= "AND (%queue%.billid is null OR (";
$sql .= "%queue%.billid=%bill%.id AND %bill%.closingid is null)) "; $sql .= "%queue%.billid=%bill%.id AND %bill%.closingid is null)) ";
@ -1814,10 +1813,9 @@ class QueueContent {
$sql .= "FROM %queue% "; $sql .= "FROM %queue% ";
} }
$sql .= "WHERE delivertime IS NULL "; $sql .= "WHERE delivertime IS NULL ";
$sql .= "AND ordertime is not null ";
$sql .= "AND %queue%.isclosed is null "; $sql .= "AND %queue%.isclosed is null ";
$sql .= "AND workprinted='0' "; $sql .= "AND workprinted='0' ";
$sql .= "AND toremove <> '1' "; $sql .= "AND toremove = '0' ";
if (!is_null($tableid)) { if (!is_null($tableid)) {
$sql .= "AND %queue%.tablenr=%resttables%.id "; $sql .= "AND %queue%.tablenr=%resttables%.id ";
$sql .= "AND %resttables%.id=" . $tableid; $sql .= "AND %resttables%.id=" . $tableid;
@ -1843,9 +1841,8 @@ class QueueContent {
$sql .= "FROM %queue%,%resttables% "; $sql .= "FROM %queue%,%resttables% ";
} }
$sql .= "WHERE (readytime IS NOT NULL and delivertime IS NULL "; $sql .= "WHERE (readytime IS NOT NULL and delivertime IS NULL ";
$sql .= "AND toremove <> '1' "; $sql .= "AND toremove = '0' ";
$sql .= "AND %queue%.tablenr=%resttables%.id AND "; $sql .= "AND %queue%.tablenr=%resttables%.id AND ";
$sql .= "ordertime is not null AND ";
$sql .= "%queue%.isclosed is null AND "; $sql .= "%queue%.isclosed is null AND ";
$sql .= "%queue%.workprinted='0') "; $sql .= "%queue%.workprinted='0') ";
@ -1867,9 +1864,8 @@ class QueueContent {
$sql .= "FROM %queue% "; $sql .= "FROM %queue% ";
} }
$sql .= "WHERE (readytime IS NOT NULL and delivertime IS NULL "; $sql .= "WHERE (readytime IS NOT NULL and delivertime IS NULL ";
$sql .= "AND toremove <> '1' "; $sql .= "AND toremove = '0' ";
$sql .= "AND %queue%.tablenr is null AND "; $sql .= "AND %queue%.tablenr is null AND ";
$sql .= "ordertime is not null AND ";
$sql .= "%queue%.isclosed is null AND "; $sql .= "%queue%.isclosed is null AND ";
$sql .= "%queue%.workprinted='0') "; $sql .= "%queue%.workprinted='0') ";
if ($this->areBillExisting($pdo)) { if ($this->areBillExisting($pdo)) {
@ -1943,8 +1939,7 @@ class QueueContent {
$sql .= "WHERE (delivertime IS NOT NULL "; $sql .= "WHERE (delivertime IS NOT NULL ";
$sql .= "AND %queue%.productid=%products%.id "; $sql .= "AND %queue%.productid=%products%.id ";
$sql .= "AND %queue%.tablenr=%resttables%.id "; $sql .= "AND %queue%.tablenr=%resttables%.id ";
$sql .= "AND toremove <> '1' AND "; $sql .= "AND toremove = '0' AND ";
$sql .= "ordertime is not null AND ";
$sql .= "%queue%.isclosed is null AND "; $sql .= "%queue%.isclosed is null AND ";
$sql .= "%queue%.workprinted='0') "; $sql .= "%queue%.workprinted='0') ";
@ -1968,8 +1963,7 @@ class QueueContent {
$sql .= "WHERE (delivertime IS NOT NULL "; $sql .= "WHERE (delivertime IS NOT NULL ";
$sql .= "AND %queue%.productid=%products%.id "; $sql .= "AND %queue%.productid=%products%.id ";
$sql .= "AND %queue%.tablenr is null "; $sql .= "AND %queue%.tablenr is null ";
$sql .= "AND toremove <> '1' AND "; $sql .= "AND toremove = '0' AND ";
$sql .= "ordertime is not null AND ";
$sql .= "%queue%.isclosed is null AND "; $sql .= "%queue%.isclosed is null AND ";
$sql .= "%queue%.workprinted='0') "; $sql .= "%queue%.workprinted='0') ";
if ($this->areBillExisting($pdo)) { if ($this->areBillExisting($pdo)) {

4
webapp/php/reports.php
View File

@ -431,7 +431,7 @@ class Reports {
$howManyTables = CommonUtils::getRowSqlObject($pdo, $sql, array($roomId)); $howManyTables = CommonUtils::getRowSqlObject($pdo, $sql, array($roomId));
$tableCountTotal += $howManyTables->countid; $tableCountTotal += $howManyTables->countid;
$sql = "SELECT %resttables%.id as id,%resttables%.tableno as name,IFNULL(SUM(IF(%queue%.ordertime is not null AND %queue%.paidtime is null AND %queue%.isclosed is null,%queue%.price,0.00)),0.00) as pricesum FROM %resttables% "; $sql = "SELECT %resttables%.id as id,%resttables%.tableno as name,IFNULL(SUM(IF(%queue%.toremove='0' AND %queue%.paidtime is null AND %queue%.isclosed is null,%queue%.price,0.00)),0.00) as pricesum FROM %resttables% ";
$sql .= " LEFT OUTER JOIN %queue% ON %queue%.tablenr=%resttables%.id WHERE %resttables%.removed is null AND "; $sql .= " LEFT OUTER JOIN %queue% ON %queue%.tablenr=%resttables%.id WHERE %resttables%.removed is null AND ";
$sql .= " %resttables%.roomid=? GROUP BY %resttables%.id,name"; $sql .= " %resttables%.roomid=? GROUP BY %resttables%.id,name";
@ -489,7 +489,7 @@ class Reports {
$stat = array(); $stat = array();
$sql = "SELECT HOUR(paidtime) as hour,ROUND(AVG(TIME_TO_SEC(TIMEDIFF(paidtime,ordertime))/60)) as average"; $sql = "SELECT HOUR(paidtime) as hour,ROUND(AVG(TIME_TO_SEC(TIMEDIFF(paidtime,ordertime))/60)) as average";
$sql .= " FROM %queue% WHERE paidtime is not null AND ordertime is not null AND DATE(paidtime) = DATE(NOW()) AND HOUR(paidtime)=? GROUP BY hour"; $sql .= " FROM %queue% WHERE paidtime is not null AND %queue%.toremove='0' AND DATE(paidtime) = DATE(NOW()) AND HOUR(paidtime)=? GROUP BY hour";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
for ($hour = 0; $hour <= $currentHour; $hour++) { for ($hour = 0; $hour <= $currentHour; $hour++) {
$stmt->execute(array($hour)); $stmt->execute(array($hour));

11
webapp/php/roomtables.php
View File

@ -88,8 +88,8 @@ class Roomtables {
FROM %queue% FROM %queue%
INNER JOIN %products% ON %queue%.productid = %products%.id INNER JOIN %products% ON %queue%.productid = %products%.id
INNER JOIN %pricelevel% ON %queue%.pricelevel = %pricelevel%.id INNER JOIN %pricelevel% ON %queue%.pricelevel = %pricelevel%.id
WHERE tablenr = ? AND paidtime is null AND toremove <> '1' WHERE tablenr = ? AND paidtime is null AND toremove = '0'
AND ordertime is not null AND isclosed is null"; AND isclosed is null";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
$stmt->execute(array($tableid)); $stmt->execute(array($tableid));
@ -136,8 +136,7 @@ class Roomtables {
FROM %queue% FROM %queue%
INNER JOIN %products% ON %queue%.productid = %products%.id INNER JOIN %products% ON %queue%.productid = %products%.id
INNER JOIN %pricelevel% ON %queue%.pricelevel = %pricelevel%.id INNER JOIN %pricelevel% ON %queue%.pricelevel = %pricelevel%.id
WHERE tablenr = $tableid AND paidtime is null AND toremove <> '1' WHERE tablenr = $tableid AND paidtime is null AND toremove = '0'
AND ordertime is not null
ORDER BY ordertime;"; ORDER BY ordertime;";
$pdo = $this->dbutils->openDbAndReturnPdo(); $pdo = $this->dbutils->openDbAndReturnPdo();
@ -179,7 +178,7 @@ class Roomtables {
} }
private function getUnpaidSumOfTakeAway($pdo) { private function getUnpaidSumOfTakeAway($pdo) {
$sql = "SELECT IFNULL(SUM(IF(%queue%.ordertime is not null AND %queue%.paidtime is null,%queue%.price,0.00)),0.00) as pricesum FROM %queue% "; $sql = "SELECT IFNULL(SUM(IF(%queue%.toremove='0' AND %queue%.paidtime is null,%queue%.price,0.00)),0.00) as pricesum FROM %queue% ";
$sql .= " WHERE %queue%.tablenr is null AND isclosed is null"; $sql .= " WHERE %queue%.tablenr is null AND isclosed is null";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
$stmt->execute(); $stmt->execute();
@ -246,7 +245,7 @@ class Roomtables {
} }
$sql = "SELECT R.id as id,R.tableno as name,R.sorting as sorting,"; $sql = "SELECT R.id as id,R.tableno as name,R.sorting as sorting,";
$sql .= " IFNULL(SUM(IF(Q.ordertime is not null AND Q.paidtime is null AND Q.isclosed is null,Q.price,0.00)),0.00) as pricesum FROM %resttables% R"; $sql .= " IFNULL(SUM(IF(Q.toremove='0' AND Q.paidtime is null AND Q.isclosed is null,Q.price,0.00)),0.00) as pricesum FROM %resttables% R";
$sql .= " LEFT OUTER JOIN %queue% Q ON Q.tablenr=R.id WHERE R.removed is null AND active='1' AND "; $sql .= " LEFT OUTER JOIN %queue% Q ON Q.tablenr=R.id WHERE R.removed is null AND active='1' AND ";
$sql .= " R.roomid=? $areaWhere GROUP BY R.id,name "; $sql .= " R.roomid=? $areaWhere GROUP BY R.id,name ";
$sql .= " ORDER BY R.sorting"; $sql .= " ORDER BY R.sorting";

13
webapp/php/utilities/version.php
View File

@ -1150,6 +1150,16 @@ class Version {
} }
} }
public static function upd_1520_1521($pdo, $prefix, $dbname) {
try {
$sql = "UPDATE %queue% SET toremove=?";
self::execSqlWithParam($pdo, $sql, array(0));
return array(true);
} catch (PDOException $e) {
return array(false,$e);
}
}
public static $updateOrder = array( public static $updateOrder = array(
"1.3.0" => array("upd_1300_1301","1.3.1"), "1.3.0" => array("upd_1300_1301","1.3.1"),
"1.3.1" => array("upd_1301_1302","1.3.2"), "1.3.1" => array("upd_1301_1302","1.3.2"),
@ -1217,7 +1227,8 @@ class Version {
"1.5.16" => array("upd_1516_1517","1.5.17"), "1.5.16" => array("upd_1516_1517","1.5.17"),
"1.5.17" => array("upd_1517_1518","1.5.18"), "1.5.17" => array("upd_1517_1518","1.5.18"),
"1.5.18" => array("upd_1518_1519","1.5.19"), "1.5.18" => array("upd_1518_1519","1.5.19"),
"1.5.19" => array("upd_1519_1520","1.5.20") "1.5.19" => array("upd_1519_1520","1.5.20"),
"1.5.20" => array("upd_1520_1521","1.5.21")
); );
public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) { public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) {

4
webapp/pickups.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,7 +13,7 @@
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.5.20"></script> <script src="utilities.js?v=1.5.21"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script> <script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>

2
webapp/preferences.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

6
webapp/products.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -15,8 +15,8 @@
<script src="php/3rdparty/jquery-2.0.3.min.js"></script> <script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js"></script> <script src="utilities.js"></script>
<script src="elements/product.js?v=1.5.20"></script> <script src="elements/product.js?v=1.5.21"></script>
<script src="elements/extra.js?v=1.5.20"></script> <script src="elements/extra.js?v=1.5.21"></script>
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet"> <link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script> <script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
</head> </head>

2
webapp/productsdesktop.php
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="css/ospage.css" /> <link rel="stylesheet" href="css/ospage.css" />
<link rel="stylesheet" href="css/tablepanel.css" /> <link rel="stylesheet" href="css/tablepanel.css" />

2
webapp/rating.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

2
webapp/reports.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

2
webapp/reservation.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

6
webapp/sumuphandler.php
View File

@ -30,7 +30,7 @@ var SUM_REASON = ["Grund","Reason","Razón"];
var SUM_CANCEL_ITEM = ["Stornierung","Cancellation","Revocación"]; var SUM_CANCEL_ITEM = ["Stornierung","Cancellation","Revocación"];
var SUM_CANCELLATION_OK = ["Die Zahlung wurde in OrderSprinter storniert.","The payment was cancelled in OrderSprinter.","El pago se canceló en OrderSprinter."]; var SUM_CANCELLATION_OK = ["Die Zahlung wurde in OrderSprinter storniert.","The payment was cancelled in OrderSprinter.","El pago se canceló en OrderSprinter."];
var nextpage = "paydesk.html?version=1.5.20"; var nextpage = "paydesk.html?version=1.5.21";
var lang; var lang;
@ -84,10 +84,10 @@ function setLanguage(language) {
if (nextPage == "p") { if (nextPage == "p") {
$("#nextpagebtntxt").html(SUM_TO_PAYMENT[lang]); $("#nextpagebtntxt").html(SUM_TO_PAYMENT[lang]);
nextpage = "paydesk.html?t=" + tableid + "&version=1.5.20"; nextpage = "paydesk.html?t=" + tableid + "&version=1.5.21";
} else { } else {
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]); $("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
nextpage = "waiter.html?version=1.5.20"; nextpage = "waiter.html?version=1.5.21";
} }
var txt = "<table class='viewtable'>"; var txt = "<table class='viewtable'>";

2
webapp/supplydesk.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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
webapp/tasks.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,7 +13,7 @@
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.5.20"></script> <script src="utilities.js?v=1.5.21"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script> <script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>

2
webapp/timetracking.html
View File

@ -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.5.20"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.21">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

6
webapp/waiter.html
View File

File diff suppressed because one or more lines are too long