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

OrderSprinter 1.5.16

This commit is contained in:
Geno 2020-11-19 23:12:13 +01:00
parent 62e0501270
commit 7880581c22
35 changed files with 225 additions and 90 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 name="author" content="Stefan Pichel">
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.15" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.15" />
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.16" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.16" />
<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" />
<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 class="ui-grid-a">
<div class="ui-block-a">&nbsp;&nbsp;OrderSprinter</div>
<div class="ui-block-b grid_right" id="versioninfo">1.5.15&nbsp;&nbsp;</div>
<div class="ui-block-b grid_right" id="versioninfo">1.5.16&nbsp;&nbsp;</div>
</div><!-- /grid-a -->
</div>
</div>

4
gastsystem/install.php
View File

@ -90,10 +90,10 @@ if (isset($_POST['code'])) {
} else {
echo "<html>";
echo "<head><title>Installation Gastsystem</title>";
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.15">';
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.16">';
echo "</head>";
echo "<body><div class=surround>";
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.15</span><br><br>";
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.16</span><br><br>";
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 "</form></div></html>";

2
gastsystem/php/config.php
View File

@ -1,5 +1,5 @@
<?php
error_reporting(E_ALL);
error_reporting(E_ERROR);
// Datenbank-Zugangsdaten
defined('MYSQL_HOST') || define ( 'MYSQL_HOST','localhost' );

BIN
printserver/OrderSprinterPrintserver.exe
View File

Binary file not shown.

7
spider/install/installer.php
View File

@ -85,7 +85,7 @@ class Installer {
}
Database::dropTables($pdo);
Database::createEmptyTables($pdo, $prefix);
Database::setVersion($pdo,$prefix,"1.5.15");
Database::setVersion($pdo,$prefix,"1.5.16");
Database::setAccessPassword($pdo,$prefix,$adminpass);
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
return array("status" => "OK","msg" => "Installation successful");
@ -109,6 +109,9 @@ if ($command == 'getConfig') {
}
$_SESSION = array();
session_destroy();
// Swipe via memory
if (ini_get("session.use_cookies")) {
// Prepare and swipe cookies
@ -124,8 +127,6 @@ if ($command == 'getConfig') {
ini_set('session.gc_max_lifetime', 0);
ini_set('session.gc_probability', 1);
ini_set('session.gc_divisor', 1);
session_destroy();
echo json_encode($ok);
} else {

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 name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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" />
<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="utilities.js?v=1.5.15"></script>
<script src="kitchenbar.js?v=1.5.15"></script>
<script src="utilities.js?v=1.5.16"></script>
<script src="kitchenbar.js?v=1.5.16"></script>
<style>
#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 name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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 http-equiv="content-type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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 name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.16">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.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") {
useInstallation();
} else {
setTimeout(function(){document.location.href = "install.html?v=1.5.15"},500);
setTimeout(function(){document.location.href = "install.html?v=1.5.16"},500);
}
}

2
webapp/install.html
View File

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

4
webapp/install/installer.php
View File

@ -80,8 +80,10 @@ $extensions_status = 0;
}
set_time_limit(60*5+1);
if(session_id() == '') {
ini_set('session.gc_maxlifetime',65535);
session_set_cookie_params(65535);
}
$max_execution_status = 1;
// 5 minutes = 5*60
@ -379,7 +381,7 @@ $zones[] = $timezone_identifiers[$i];
echo json_encode($zones);
} else if ($command == 'update') {
set_time_limit(60*30);
$installerVersion = "1.5.15";
$installerVersion = "1.5.16";
$admin = new InstallAdmin();
$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 name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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" />
<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="utilities.js?v=1.5.15"></script>
<script src="kitchenbar.js?v=1.5.15"></script>
<script src="utilities.js?v=1.5.16"></script>
<script src="kitchenbar.js?v=1.5.16"></script>
<style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

16
webapp/manager.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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" />
<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="utilities.js?v=1.5.15"></script>
<script src="elements/tablemap.js?v=1.5.15"></script>
<script src="elements/roommap.js?v=1.5.15"></script>
<script src="elements/groundplan.js?v=1.5.15"></script>
<script src="utilities.js?v=1.5.16"></script>
<script src="elements/tablemap.js?v=1.5.16"></script>
<script src="elements/roommap.js?v=1.5.16"></script>
<script src="elements/groundplan.js?v=1.5.16"></script>
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
@ -1530,7 +1530,7 @@ function initRestoreFileUpload() {
} else {
alert("Import war erfolgreich.");
setTimeout(function(){
document.location.href = "index.html?v=1.5.15";
document.location.href = "index.html?v=1.5.16";
},250);
}
},
@ -2084,9 +2084,9 @@ function handleUpdateCheckResult(answer) {
var millis=getMillis();
setTimeout(function(){
document.location.href = "install.html?v=1.5.15&mode=onlyupdate&n=" + millis;
document.location.href = "install.html?v=1.5.16&mode=onlyupdate&n=" + millis;
},250);
document.location.href = "install.html?v=1.5.15&mode=onlyupdate&n=" + millis;
document.location.href = "install.html?v=1.5.16&mode=onlyupdate&n=" + millis;
}
function handleUpdateReplace(answer) {

2
webapp/paydesk.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

4
webapp/php/3rdparty/phpexcel/classes/PHPExcel/Calculation.php vendored
View File

@ -1722,7 +1722,7 @@ class PHPExcel_Calculation {
$setPrecision = (PHP_INT_SIZE == 4) ? 14 : 16;
$this->_savedPrecision = ini_get('precision');
if ($this->_savedPrecision < $setPrecision) {
ini_set('precision',$setPrecision);
@ini_set('precision',$setPrecision);
}
if ($workbook !== NULL) {
@ -1737,7 +1737,7 @@ class PHPExcel_Calculation {
public function __destruct() {
if ($this->_savedPrecision != ini_get('precision')) {
ini_set('precision',$this->_savedPrecision);
@ini_set('precision',$this->_savedPrecision);
}
}

4
webapp/php/3rdparty/phpexcel/classes/PHPExcel/Reader/CSV.php vendored
View File

@ -242,7 +242,7 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
{
$lineEnding = ini_get('auto_detect_line_endings');
ini_set('auto_detect_line_endings', true);
@ini_set('auto_detect_line_endings', true);
// Open file
$this->_openFile($pFilename);
@ -299,7 +299,7 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
$this->_contiguousRow = $currentRow;
}
ini_set('auto_detect_line_endings', $lineEnding);
@ini_set('auto_detect_line_endings', $lineEnding);
// Return
return $objPHPExcel;

8
webapp/php/3rdparty/phpmailer/phpmailer.php vendored
View File

@ -1411,7 +1411,7 @@ class PHPMailer
}
if ($this->Sender != '' and !ini_get('safe_mode')) {
$old_from = ini_get('sendmail_from');
ini_set('sendmail_from', $this->Sender);
@ini_set('sendmail_from', $this->Sender);
}
$result = false;
if ($this->SingleTo && count($toArr) > 1) {
@ -1424,7 +1424,7 @@ class PHPMailer
$this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
}
if (isset($old_from)) {
ini_set('sendmail_from', $old_from);
@ini_set('sendmail_from', $old_from);
}
if (!$result) {
throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL);
@ -2583,7 +2583,7 @@ class PHPMailer
//Doesn't exist in PHP 5.4, but we don't need to check because
//get_magic_quotes_runtime always returns false in 5.4+
//so it will never get here
ini_set('magic_quotes_runtime', false);
@ini_set('magic_quotes_runtime', false);
}
}
$file_buffer = file_get_contents($path);
@ -2592,7 +2592,7 @@ class PHPMailer
if (version_compare(PHP_VERSION, '5.3.0', '<')) {
set_magic_quotes_runtime($magic_quotes);
} else {
ini_set('magic_quotes_runtime', $magic_quotes);
@ini_set('magic_quotes_runtime', $magic_quotes);
}
}
return $file_buffer;

53
webapp/php/admin.php
View File

@ -552,9 +552,6 @@ class Admin {
$timeDiff = 1;
}
ini_set('session.gc_maxlifetime',65535);
session_set_cookie_params(65535);
if(session_id() == '') {
session_start();
}
@ -1402,7 +1399,7 @@ class Admin {
$view = "preferences.html";
}
echo json_encode($view . "?v=1.5.15");
echo json_encode($view . "?v=1.5.16");
}
}
@ -1618,31 +1615,31 @@ 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.5.15"); }
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.16"); }
} else {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.15"); }
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.16"); }
}
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.15"); }
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.15"); }
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.15"); }
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.16"); }
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.16"); }
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.16"); }
if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.15"); }
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.16"); }
}
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.15"); }
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.15"); }
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.15"); }
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.15"); }
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.15"); }
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.15"); }
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.15"); }
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.15"); }
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.15"); }
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.15"); }
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.15");
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.15"); }
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.16"); }
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.16"); }
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.16"); }
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.16"); }
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.16"); }
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.16"); }
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.16"); }
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.16"); }
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.16"); }
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.16"); }
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.16");
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.16"); }
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.15");
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.15");
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.16");
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.16");
}
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
@ -3042,6 +3039,9 @@ class Admin {
session_start();
}
$_SESSION = array();
session_destroy();
// Swipe via memory
if (ini_get("session.use_cookies")) {
// Prepare and swipe cookies
@ -3052,12 +3052,11 @@ class Admin {
$params["secure"], $params["httponly"]
);
}
ini_set('session.gc_max_lifetime', 0);
ini_set('session.gc_probability', 1);
ini_set('session.gc_divisor', 1);
session_destroy();
$ok = Version::runUpdateProcess($pdo, TAB_PREFIX, MYSQL_DB, null,false);
if ($ok["status"] != "OK") {
echo json_encode($ok);

6
webapp/php/contenthandler.php
View File

@ -34,6 +34,12 @@ Logger::logcmd($module,$command,"");
$plugins = havePlugins();
if(session_id() == '') {
ini_set('session.gc_maxlifetime',65535);
session_set_cookie_params(65535);
}
if (defined('IS_INSTALLMODE')) {
$pdo = DbUtils::openDbAndReturnPdoStatic();
$memlimit = CommonUtils::getConfigValue($pdo, "memorylimit", '256');

2
webapp/php/customers.php
View File

@ -853,7 +853,7 @@ class Customers {
$txt = "<head>";
$txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>";
$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.15">';
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.16">';
$txt .= "</head>";
return $txt;
}

2
webapp/php/debug.php
View File

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

37
webapp/php/queuecontent.php
View File

@ -67,7 +67,10 @@ class QueueContent {
if ($command == 'addProductListToQueue') {
$this->addProductListToQueue($_POST["tableid"],$_POST["prods"],$_POST["print"],$_POST["payprinttype"]);
} else if ($command == 'getRecords') {
$this->getRecords($_GET["tableid"]);
$pdo = DbUtils::openDbAndReturnPdoStatic();
$this->getRecords($pdo,$_GET["tableid"]);
} else if ($command == 'getAllTableRecords') {
$this->getAllTableRecords();
} else if ($command == 'kitchenToCook') {
$this->kitchenToCook();
} else if ($command == 'declareProductBeCookingOrCooked') {
@ -877,13 +880,37 @@ class QueueContent {
}
}
function getRecords($tableid) {
if (!($this->userrights->hasCurrentUserRight('right_waiter')) && !($this->userrights->hasCurrentUserRight('right_paydesk'))) {
function getAllTableRecords() {
if (!($this->userrights->hasCurrentUserRight('right_statistics')) ) {
echo json_encode(array("status" => "ERROR","msg" => "Benutzerrechte nicht ausreichend"));
return false;
}
$pdo = DbUtils::openDbAndReturnPdoStatic();
$sql = "SELECT id,roomname FROM %room% WHERE removed is null";
$allrooms = CommonUtils::fetchSqlAll($pdo, $sql);
$roomsOut = array();
$sql = "SELECT id,tableno FROM %resttables% WHERE roomid=? AND removed is null";
foreach($allrooms as $aRoom) {
$tablesOfRoom = CommonUtils::fetchSqlAll($pdo, $sql, array($aRoom["id"]));
$tablesOut = array();
foreach($tablesOfRoom as $aTable) {
$recordsOfThisTable = $this->getRecordsCore($pdo, $aTable["id"]);
$tablesOut[] = array("tablename" => $aTable["tableno"],"records" => $recordsOfThisTable);
}
$roomsOut[] = array("roomname" => $aRoom["roomname"],"tables" => $tablesOut);
}
echo json_encode(array("status" => "OK","msg" => $roomsOut));
}
function getRecords($pdo,$tableid) {
if (!($this->userrights->hasCurrentUserRight('right_waiter')) && !($this->userrights->hasCurrentUserRight('right_paydesk'))) {
return array("status" => "ERROR","msg" => "Benutzerrechte nicht ausreichend");
}
$out = $this->getRecordsCore($pdo, $tableid);
echo json_encode($out);
}
function getRecordsCore($pdo,$tableid) {
if ($tableid != 0) {
$sql = "SELECT id,TIME(date) as time,(IF(userid is null,'-',(SELECT username FROM %user% WHERE %user%.id=userid))) as username,action,tableid FROM %records% WHERE tableid=? ORDER BY time DESC";
$entries = CommonUtils::fetchSqlAll($pdo, $sql, array($tableid));
@ -916,7 +943,7 @@ class QueueContent {
}
$records[] = array("id" => $anEntry["id"],"time" => $anEntry["time"],"username" => $anEntry["username"],"action" => $anEntry["action"],"prods" => $prods);
}
echo json_encode(array("status" => "OK","msg" => $records));
return array("status" => "OK","msg" => $records);
}
/*

2
webapp/php/utilities/basedb.php
View File

@ -1154,7 +1154,7 @@ class Basedb {
$this->doSQL($pdo, "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'waitergopayprint', '0')");
$this->doSQL($pdo, "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'oneprodworkreceipts', '0')");
$this->doSQL($pdo, "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'digiprintwork', '1')");
$this->doSQL($pdo, "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'digiprintwork', '0')");
$this->doSQL($pdo, "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'printandqueuejobs', '0')");
$this->doSQL($pdo, "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'cashenabled', '1')");

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

@ -1112,6 +1112,14 @@ class Version {
}
}
public static function upd_1515_1516($pdo, $prefix, $dbname) {
try {
return array(true);
} catch (PDOException $e) {
return array(false,$e);
}
}
public static $updateOrder = array(
"1.3.0" => array("upd_1300_1301","1.3.1"),
"1.3.1" => array("upd_1301_1302","1.3.2"),
@ -1174,7 +1182,8 @@ class Version {
"1.5.11" => array("upd_1511_1512","1.5.12"),
"1.5.12" => array("upd_1512_1513","1.5.13"),
"1.5.13" => array("upd_1513_1514","1.5.14"),
"1.5.14" => array("upd_1514_1515","1.5.15")
"1.5.14" => array("upd_1514_1515","1.5.15"),
"1.5.15" => array("upd_1515_1516","1.5.16")
);
// RE;* also for install process no check is required

4
webapp/pickups.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.5.15"></script>
<script src="utilities.js?v=1.5.16"></script>
<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>

2
webapp/preferences.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

2
webapp/products.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

2
webapp/rating.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

95
webapp/reports.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -23,6 +23,10 @@
<script>
var REP_USERSUM = ["Kassenbestände ","Open paydesks", "Cajas" ];
var REP_TABLE_REPORTS = ["Tischprotokolle","Table reports","Records of tables","Historia de las mesas"];
var REP_TABLE_REPORTS_INFO = ["In diesem Bereich werden alle Buchungen, Umbuchungen und Stornierungen für alle Tische seit der letzten Tageserfassung angezeigt.",
"This area displays all postings, transfers, and cancellations for all tables since the last closing.",
"Esta área visualiza todas las contabilizaciones, traslados y anulaciones de todas las tablas desde la última cerra de día."];
var REP_USER = ["Benutzer","User","Usario"];
var REP_USER_TXT = ["Diese Übersicht umfasst den derzeitigen Brutto-Kassenbestand pro Kasse inkl. aller Zahlungswege und Ein-/Auslagen.",
"This overview contains the current sum of all paydesks including all payment types and cash inserts/extracs.",
@ -60,6 +64,16 @@ var REP_OK = ["Passabel","ok","Pues..."];
var REP_BAD = ["Kunde ist unzufrieden","Customer is not satisfied","Cliente no esta contento"];
var REP_COUNT = ["Anzahl","Number","Número"];
var REP_REMARKS = ["Kundenmeinungen","Customer remarks","Notas de los clientes"];
var REP_RECORD_ACTION = [
["Bestellung","Ordering","Ordenar"],
["Rechnung","Bill","Pagar"],
["Produktstorno","Discard product","Descartar producto"],
["Rechnungsstorno","Discard bill","Descartar pago"],
["Rechnungs- und Produktstorno","Discard bill and product","Descrtar pago y producto"],
["Tischwechsel Produktentfernung","Move products to other table","Productos a otra mesa"],
["Tischwechsel Produktbuchung","Received moved products","Recibo productos de otra mesa"]
];
var REP_NO_ENTRIES = ["Keine Einträge","No entries","Ningún data"];
var lang = 0;
@ -99,11 +113,79 @@ function setLanguage(language) {
var htmlUserSumsPart = fillOnePart(REP_USERSUM[lang],jsonText.usersums,REP_USER[lang],
REP_USER_TXT[lang],
"center",15,10,75);
var htmlTableReports = createStub("table_reports_section",REP_TABLE_REPORTS[lang],REP_TABLE_REPORTS_INFO[lang]);
$("#content").html(htmlToday + htmlYesterday + htmlThisMonth + htmlLastMonth + htmlProds + htmlRatings + htmlUserSumsPart);
$("#content").html(htmlToday + htmlYesterday + htmlThisMonth + htmlLastMonth + htmlProds + htmlRatings + htmlUserSumsPart + htmlTableReports);
$("#content").trigger("create");
bindExpandTableRecordsArea();
}
function bindExpandTableRecordsArea() {
$("#table_reports_section").off("collapsibleexpand").on("collapsibleexpand", function (e) {
doAjax("GET", "php/contenthandler.php?module=queue&command=getAllTableRecords", null, fillTableRecords, "Fehler keine Tischprotokolle");
});
}
function fillTableRecords(answer) {
if (answer.status == "OK") {
var txt = "";
var rooms = answer.msg;
$.each(rooms, function (i, aRoom) {
var roomname = toHtml(aRoom["roomname"]);
var tables = aRoom["tables"];
var tablesTxt = "";
$.each(tables, function (j, aTable) {
var tablename = toHtml(aTable["tablename"]);
var tablesRecordTxt = recordsOfTableAsTxt(aTable["records"]);
tablesTxt += "<h2>" + tablename + "</h2>" + tablesRecordTxt;
});
txt += "<h1>" + roomname + "<h1>";
txt += tablesTxt;
txt += "<hr>";
});
$("#content_table_reports_section").html(txt);
}
}
function recordsOfTableAsTxt(answer) {
var txt = "";
if (answer.status == "OK") {
var entries = answer.msg;
if (entries.length == 0) {
txt += REP_NO_ENTRIES[lang];
return txt;
}
txt += "<ul>";
entries.forEach(function(entry, index) {
var time = toHtml(entry.time);
var username = toHtml(entry.username);
var action = toHtml(entry.action);
var actionStr = REP_RECORD_ACTION[action][lang];
txt += "<li>" + time + " " + username + " - <b>" + actionStr + "</b>:<br>";
var prods = entry.prods;
txt += "<ul>";
prods.forEach(function(prod,i) {
var name = toHtml(prod.name);
var extras = toHtml(prod.extras);
txt += "<li>" + name;
if (extras != "") {
txt += " (" + extras + ")";
}
});
txt += "</ul>";
});
txt += "</ul>";
}
return txt;
}
function getLegend (good,ok,bad) {
var goodTxt = "<img src=img/green.png style='height:20px;width:40px;' />: " + good + "<br>";
var okTxt = "<img src=img/yellow.png style='height:20px;width:40px;' />: " + ok + "<br>";
@ -147,6 +229,15 @@ function setLanguage(language) {
return html;
}
function createStub(id,aName,infoText) {
var collapse_elem = '<div id="' + id + '" data-role="collapsible" data-content-theme="e" data-collapsed="true" data-theme="c">';
var header = '<h3>'+aName + '</h3><p><i>' + infoText + '</i></p><p>';
var content = '<div id="content_' + id + '"><img id="progressimginpopup" src="php/3rdparty/images/ajax-loader.gif" /></div>';
var html = collapse_elem + header + content + "</p></div>";
return html;
}
function fillOnePart(aName,values,iterObjName,infoText,iterAlignment,width1,width2,width3) {
var collapse_elem = '<div data-role="collapsible" data-content-theme="e" data-collapsed="true" data-theme="c">';
var header = '<h3>'+aName + '</h3><p>' + infoText + '</p><p>';

2
webapp/reservation.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

2
webapp/supplydesk.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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 http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.5.15"></script>
<script src="utilities.js?v=1.5.16"></script>
<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>

2
webapp/timetracking.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.15">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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