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

Fix can't find link to edit table plan

Browse Source
This commit is contained in:
Laurent Destailleur 2020-06-30 12:07:24 +02:00
parent 9bb0ef04f5
commit 4f1ac84a19
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/langs/en_US/cashdesk.lang
View File

@ -111,4 +111,5 @@ AutoOrder=Order by the customer himself
RestaurantMenu=Menu RestaurantMenu=Menu
CustomerMenu=Customer menu CustomerMenu=Customer menu
ScanToMenu=Scan QR code to see the menu ScanToMenu=Scan QR code to see the menu
ScanToOrder=Scan QR code to order ScanToOrder=Scan QR code to order
DefineTablePlan=Define table plan

23
htdocs/takepos/admin/bar.php
View File

@ -66,12 +66,14 @@ if (GETPOST('action', 'alpha') == 'set')
$form = new Form($db); $form = new Form($db);
$formproduct = new FormProduct($db); $formproduct = new FormProduct($db);
llxHeader('', $langs->trans("CashDeskSetup")); $arrayofcss = array("/takepos/css/colorbox.css");
llxHeader('', $langs->trans("CashDeskSetup"), '', '', 0, 0, $arrayofjs, $arrayofcss);
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup'); print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
$head = takepos_prepare_head(); $head = takepos_prepare_head();
dol_fiche_head($head, 'bar', 'TakePOS', -1); dol_fiche_head($head, 'bar', 'TakePOS', -1, 'cash-register');
print '<br>'; print '<br>';
@ -80,6 +82,20 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="set">'; print '<input type="hidden" name="action" value="set">';
?>
<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/takepos/js/jquery.colorbox-min.js"></script> <!-- TODO It seems we don't need this -->
<script type="text/javascript">
function Floors() {
console.log("Open box to select floor");
$.colorbox({href:"<?php echo DOL_URL_ROOT ?>/takepos/floors.php?mode=edit&place=0", width:"90%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Floors"); ?>"});
}
</script>
<?php
print '<a href="" onclick="Floors(); return false;"><span class="fa fa-glass-cheers"></span> '.$langs->trans("DefineTablePlan").'</a><br>';
print '<br><br>';
print '<div class="div-table-responsive">'; print '<div class="div-table-responsive">';
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -138,9 +154,9 @@ print '<td colspan="2">';
print ajax_constantonoff("TAKEPOS_QR_MENU", array(), $conf->entity, 0, 0, 1, 0); print ajax_constantonoff("TAKEPOS_QR_MENU", array(), $conf->entity, 0, 0, 1, 0);
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';
if ($conf->global->TAKEPOS_AUTO_ORDER) if ($conf->global->TAKEPOS_AUTO_ORDER)
{ {
print '<br>'; print '<br>';
@ -168,6 +184,7 @@ if ($conf->global->TAKEPOS_AUTO_ORDER)
print '</table>'; print '</table>';
} }
if ($conf->global->TAKEPOS_QR_MENU) if ($conf->global->TAKEPOS_QR_MENU)
{ {
$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

1
htdocs/takepos/admin/setup.php
View File

@ -121,6 +121,7 @@ if ($action != '') {
} }
} }
/* /*
* View * View
*/ */

2
htdocs/takepos/index.php
View File

@ -433,7 +433,7 @@ function CloseBill() {
} }
function Floors() { function Floors() {
console.log("Open box to select floor"); console.log("Open box to select floor place="+place);
$.colorbox({href:"floors.php?place="+place, width:"90%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Floors"); ?>"}); $.colorbox({href:"floors.php?place="+place, width:"90%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Floors"); ?>"});
} }