lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14587 from andreubisquerra/master

Browse Source 
NEW Keep takepos terminal when login/logout
This commit is contained in:
Laurent Destailleur 2020-08-31 16:07:09 +02:00 committed by GitHub
commit 1065e7328e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/takepos/index.php
View File

@ -44,9 +44,16 @@ $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is
$action = GETPOST('action', 'alpha'); $action = GETPOST('action', 'alpha');
$setterminal = GETPOST('setterminal', 'int'); $setterminal = GETPOST('setterminal', 'int');
if ($_SESSION["takeposterminal"] == "")
{
if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") $_SESSION["takeposterminal"] = 1; // Use terminal 1 if there is only 1 terminal
elseif (!empty($_COOKIE["takeposterminal"])) $_SESSION["takeposterminal"] = $_COOKIE["takeposterminal"]; // Restore takeposterminal from previous session
}
if ($setterminal > 0) if ($setterminal > 0)
{ {
$_SESSION["takeposterminal"] = $setterminal; $_SESSION["takeposterminal"] = $setterminal;
setcookie("takeposterminal", $setterminal, (time() + (86400 * 354)), '/', null, false, true); // Permanent takeposterminal var in a cookie
} }
$_SESSION["urlfrom"] = '/takepos/index.php'; $_SESSION["urlfrom"] = '/takepos/index.php';
@ -734,8 +741,7 @@ $( document ).ready(function() {
//IF NO TERMINAL SELECTED //IF NO TERMINAL SELECTED
if ($_SESSION["takeposterminal"] == "") if ($_SESSION["takeposterminal"] == "")
{ {
if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") $_SESSION["takeposterminal"] = 1; print "TerminalsDialog();";
else print "TerminalsDialog();";
} }
if ($conf->global->TAKEPOS_CONTROL_CASH_OPENING) if ($conf->global->TAKEPOS_CONTROL_CASH_OPENING)
{ {