From 99002529c35d01dcbe44afdcbe2c134b8c08d9d3 Mon Sep 17 00:00:00 2001 From: andreubisquerra Date: Thu, 17 Jan 2019 14:07:15 +0100 Subject: [PATCH] Revert "New Use ajax switch into setup of TakePos" --- htdocs/takepos/admin/setup.php | 78 +++++++--------------------------- 1 file changed, 15 insertions(+), 63 deletions(-) diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php index ae0ea6a0dcc..7ed220d1787 100644 --- a/htdocs/takepos/admin/setup.php +++ b/htdocs/takepos/admin/setup.php @@ -40,38 +40,9 @@ if (!$user->admin) accessforbidden(); $langs->loadLangs(array("admin", "cashdesk")); - /* - * Action + * Actions */ -if (preg_match('/set_([a-z0-9_\-]+)/i',$action,$reg)) -{ - $code=$reg[1]; - if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0) - { - header("Location: ".$_SERVER["PHP_SELF"]); - exit; - } - else - { - dol_print_error($db); - } -} - -if (preg_match('/del_([a-z0-9_\-]+)/i',$action,$reg)) -{ - $code=$reg[1]; - if (dolibarr_del_const($db, $code, $conf->entity) > 0) - { - header("Location: ".$_SERVER["PHP_SELF"]); - exit; - } - else - { - dol_print_error($db); - } -} - if (GETPOST('action','alpha') == 'set') { $db->begin(); @@ -121,38 +92,32 @@ $linkback=''.$langs->trans("BackToM print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)',$linkback,'title_setup'); print '
'; + // Mode +print '
'; +print ''; +print ''; + print ''; print ''; -print ''."\n"; -print ''."\n"; +print ''; print "\n"; if (! empty($conf->service->enabled)) { print '\n"; } // Use Takepos printing print '\n"; if ($conf->global->TAKEPOSCONNECTOR){ @@ -166,25 +131,15 @@ if ($conf->global->TAKEPOSCONNECTOR){ // Bar Restaurant mode print '\n"; if ($conf->global->TAKEPOS_BAR_RESTAURANT && $conf->global->TAKEPOSCONNECTOR){ print ''; } @@ -230,9 +185,6 @@ print '
'.$langs->trans("Parameters").''.$langs->trans("Status").''.$langs->trans("Parameters").''.$langs->trans("Value").'
'; print $langs->trans("CashdeskShowServices"); - print ''; -if ($conf->use_javascript_ajax) { - print ajax_constantonoff('CASHDESK_SERVICES'); -} else { - $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); - print $form->selectarray("CASHDESK_SERVICES", $arrval, $conf->global->CASHDESK_SERVICES); -} + print ''; + print $form->selectyesno("CASHDESK_SERVICES",$conf->global->CASHDESK_SERVICES,1); print "
'; print $langs->trans("DolibarrReceiptPrinter").' ('.$langs->trans("TakeposConnectorNecesary").')'; -print ''; -if ($conf->use_javascript_ajax) { - print ajax_constantonoff('TAKEPOSCONNECTOR'); -} else { - $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); - print $form->selectarray("TAKEPOSCONNECTOR", $arrval, $conf->global->TAKEPOSCONNECTOR); -} +print ''; +print $form->selectyesno("TAKEPOSCONNECTOR",$conf->global->TAKEPOSCONNECTOR,1); print "
'; print 'Bar Restaurant'; -print ''; -if ($conf->use_javascript_ajax) { - print ajax_constantonoff('TAKEPOS_BAR_RESTAURANT'); -} else { - $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); - print $form->selectarray("TAKEPOS_BAR_RESTAURANT", $arrval, $conf->global->TAKEPOS_BAR_RESTAURANT); -} - +print ''; +print $form->selectyesno("TAKEPOS_BAR_RESTAURANT",$conf->global->TAKEPOS_BAR_RESTAURANT,1); print "
'; print $langs->trans("OrderPrinters").' ('.$langs->trans("Setup").')'; -if ($conf->use_javascript_ajax) { - print ajax_constantonoff('TAKEPOS_ORDER_PRINTERS'); -} else { - $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); - print $form->selectarray("TAKEPOS_ORDER_PRINTERS", $arrval, $conf->global->TAKEPOS_ORDER_PRINTERS); -} + print ''; + print $form->selectyesno("TAKEPOS_ORDER_PRINTERS",$conf->global->TAKEPOS_ORDER_PRINTERS,1); print '
'; print '
'; -print ''; -print ''; -print ''; print ''; print '';