diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php index 4849a81a80e..58601201fbe 100644 --- a/htdocs/takepos/admin/setup.php +++ b/htdocs/takepos/admin/setup.php @@ -55,7 +55,7 @@ if (GETPOST('action','alpha') == 'set') $res = dolibarr_set_const($db,"CASHDESK_ID_WAREHOUSE",(GETPOST('CASHDESK_ID_WAREHOUSE','alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE','alpha') : ''),'chaine',0,'',$conf->entity); $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",GETPOST('CASHDESK_NO_DECREASE_STOCK','alpha'),'chaine',0,'',$conf->entity); $res = dolibarr_set_const($db,"CASHDESK_SERVICES", GETPOST('CASHDESK_SERVICES','alpha'),'chaine',0,'',$conf->entity); - $res = dolibarr_set_const($db,"TAKEBOX", GETPOST('TAKEBOX','alpha'),'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db,"TAKEPOSCONNECTOR", GETPOST('TAKEPOSCONNECTOR','alpha'),'chaine',0,'',$conf->entity); $res = dolibarr_set_const($db,"TAKEPOS_BAR_RESTAURANT", GETPOST('TAKEPOS_BAR_RESTAURANT','alpha'),'chaine',0,'',$conf->entity); $res = dolibarr_set_const($db,"TAKEPOS_PRINT_SERVER", GETPOST('TAKEPOS_PRINT_SERVER','alpha'),'chaine',0,'',$conf->entity); $res = dolibarr_set_const($db,"TAKEPOS_ORDER_PRINTERS", GETPOST('TAKEPOS_ORDER_PRINTERS','alpha'),'chaine',0,'',$conf->entity); @@ -172,10 +172,10 @@ if (! empty($conf->service->enabled)) print ''; print $langs->trans("DolibarrReceiptPrinter").' ('.$langs->trans("TakeposConnectorNecesary").')'; print ''; -print $form->selectyesno("TAKEBOX",$conf->global->TAKEBOX,1); +print $form->selectyesno("TAKEPOSCONNECTOR",$conf->global->TAKEPOSCONNECTOR,1); print "\n"; -if ($conf->global->TAKEBOX){ +if ($conf->global->TAKEPOSCONNECTOR){ print ''; print $langs->trans("IPAddress").' ('.$langs->trans("TakeposConnectorNecesary").')'; print ''; @@ -190,7 +190,7 @@ print ''; print $form->selectyesno("TAKEPOS_BAR_RESTAURANT",$conf->global->TAKEPOS_BAR_RESTAURANT,1); print "\n"; -if ($conf->global->TAKEPOS_BAR_RESTAURANT and $conf->global->TAKEBOX){ +if ($conf->global->TAKEPOS_BAR_RESTAURANT and $conf->global->TAKEPOSCONNECTOR){ print ''; print $langs->trans("OrderPrinters").' ('.$langs->trans("Setup").')'; print ''; diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php index 8dd6f729950..325e806af30 100644 --- a/htdocs/takepos/floors.php +++ b/htdocs/takepos/floors.php @@ -29,6 +29,8 @@ $_GET['theme']="md"; // Force theme. MD theme provides better look and feel to T require '../main.inc.php'; // Load $user and permissions +$langs->loadLangs(array("bills","orders","commercial","cashdesk")); + $floor=GETPOST('floor','alpha'); if ($floor=="") $floor=1; $id = GETPOST('id','int'); diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index d79b957e1a3..52d4864385f 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -151,7 +151,7 @@ if ($action=="updatereduction"){ $invoice->fetch($placeid); } -if ($action=="order"){ +if ($action=="order" and $placeid!=0){ require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; $headerorder='
'.$langs->trans('Place').' '.$place.'
'; $footerorder='
'.$langs->trans("Label").''.$langs->trans("Qty").'
'.dol_print_date(dol_now(), 'dayhour').'
'; @@ -281,7 +281,7 @@ print ': '.price($invoice->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'&nbs //} if ($action=="valid"){ print '

'.$invoice->facnumber." ".$langs->trans('BillShortStatusValidated').'

'; - if ($conf->global->TAKEBOX) print '
'; + if ($conf->global->TAKEPOSCONNECTOR) print '
'; else print '
'; } if ($action=="search"){ diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php index e6c519e460a..e47ce27009d 100644 --- a/htdocs/takepos/pay.php +++ b/htdocs/takepos/pay.php @@ -101,11 +101,11 @@ $langs->loadLangs(array("main", "bills", "cashdesk")); - + - + @@ -114,7 +114,7 @@ $langs->loadLangs(array("main", "bills", "cashdesk")); - + diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php index c84f283d9f2..44da2914fe8 100644 --- a/htdocs/takepos/takepos.php +++ b/htdocs/takepos/takepos.php @@ -355,7 +355,7 @@ if($conf->global->TAKEPOS_BAR_RESTAURANT){ 'action'=>'TakeposPrintingOrder();'); } } -if ($conf->global->TAKEBOX){ +if ($conf->global->TAKEPOSCONNECTOR){ $menus[$r++]=array('title'=>$langs->trans("DOL_OPEN_DRAWER"), 'action'=>'OpenDrawer();'); }