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

Merge pull request #13243 from andreubisquerra/develop

Browse Source 
Fix terminal popup in new TakePOS head bar
This commit is contained in:
Laurent Destailleur 2020-03-02 21:29:38 +01:00 committed by GitHub
commit 389d25a588
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/takepos/takepos.php
View File

@ -654,7 +654,7 @@ $( document ).ready(function() {
<body class="bodytakepos" style="overflow: hidden;"> <body class="bodytakepos" style="overflow: hidden;">
<?php <?php
if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") print '<div id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>'; print '<div class="hidden" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
$keyCodeForEnter = $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} > 0 ? $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} : 13; $keyCodeForEnter = $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} > 0 ? $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} : 13;
?> ?>
<div class="container"> <div class="container">
@ -669,7 +669,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
<?php echo $langs->trans("Terminal")." "; <?php echo $langs->trans("Terminal")." ";
if ($_SESSION["takeposterminal"] == "") echo "1"; if ($_SESSION["takeposterminal"] == "") echo "1";
else echo $_SESSION["takeposterminal"]; else echo $_SESSION["takeposterminal"];
echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "dayhour").'</span>'; echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>';
?> ?>
</a> </a>
<a onclick="Customer();"><?php echo $langs->trans("Customer"); ?></a> <a onclick="Customer();"><?php echo $langs->trans("Customer"); ?></a>