From 8998e4c6a3e248b3c7c8d86b73bd511afa85b007 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 Mar 2019 18:40:02 +0100 Subject: [PATCH] Fix add of a table in floor for Bar and Restaurant --- htdocs/langs/en_US/cashdesk.lang | 3 ++- htdocs/takepos/admin/setup.php | 7 ++++--- htdocs/takepos/floors.php | 13 +++++++++---- htdocs/takepos/pay.php | 2 -- htdocs/takepos/takepos.php | 2 -- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 83e5191086e..dc6ae7dc02e 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -59,4 +59,5 @@ OrderNotes=Order Notes CashDeskBankAccountFor=Default account to use for payments in NoPaimementModesDefined=No paiment mode defined in TakePOS configuration TicketVatGrouped=Group VAT by rate in tickets -AutoPrintTickets=Automatically print tickets \ No newline at end of file +AutoPrintTickets=Automatically print tickets +EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant \ No newline at end of file diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php index 973c8cbd9cc..e17ea0ee036 100644 --- a/htdocs/takepos/admin/setup.php +++ b/htdocs/takepos/admin/setup.php @@ -64,7 +64,7 @@ if (GETPOST('action', 'alpha') == 'set') if (GETPOST('socid', 'int') < 0) $_POST["socid"]=''; $res = dolibarr_set_const($db, "CASHDESK_ID_THIRDPARTY", (GETPOST('socid', 'int') > 0 ? GETPOST('socid', 'int') : ''), 'chaine', 0, '', $conf->entity); - + $res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CASH", (GETPOST('CASHDESK_ID_BANKACCOUNT_CASH', 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CASH', 'alpha') : ''), 'chaine', 0, '', $conf->entity); $res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CHEQUE", (GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE', 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE', 'alpha') : ''), 'chaine', 0, '', $conf->entity); $res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CB", (GETPOST('CASHDESK_ID_BANKACCOUNT_CB', 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CB', 'alpha') : ''), 'chaine', 0, '', $conf->entity); @@ -177,7 +177,8 @@ if ($conf->global->TAKEPOSCONNECTOR){ // Bar Restaurant mode print ''; -print 'Bar Restaurant'; +print $langs->trans("EnableBarOrRestaurantFeatures"); +print ''; print ''; print $form->selectyesno("TAKEPOS_BAR_RESTAURANT", $conf->global->TAKEPOS_BAR_RESTAURANT, 1); print "\n"; @@ -276,7 +277,7 @@ if (! empty($conf->banque->enabled)) print ''; $form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CB, 'CASHDESK_ID_BANKACCOUNT_CB', 0, "courant=1", 1); print ''; - + foreach($paiements as $modep) { if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue; $name="CASHDESK_ID_BANKACCOUNT_".$modep->code; diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php index ceb8c73f211..d2728e50c03 100644 --- a/htdocs/takepos/floors.php +++ b/htdocs/takepos/floors.php @@ -25,8 +25,6 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); -$_GET['theme']="md"; // Force theme. MD theme provides better look and feel to TakePOS - require '../main.inc.php'; // Load $user and permissions $langs->loadLangs(array("bills","orders","commercial","cashdesk")); @@ -69,7 +67,8 @@ if ($action=="updatename") if ($action=="add") { - $asdf=$db->query("insert into ".MAIN_DB_PREFIX."takepos_floor_tables values ('', '', '', '45', '45', $floor)"); + $sql="INSERT INTO ".MAIN_DB_PREFIX."takepos_floor_tables(entity, label, leftpos, toppos, floor) VALUES (".$conf->entity.", '', '45', '45', ".$floor.")"; + $asdf=$db->query($sql); $db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label=rowid where label=''"); // No empty table names } @@ -171,7 +170,13 @@ $( document ).ready(function() {
-

';">trans("Floor")." ".$floor; ?>

+

+ 1) { ?> + ';"> + + trans("Floor")." ".$floor; ?> + +

diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php index 589b4fe6479..6dd80bed342 100644 --- a/htdocs/takepos/pay.php +++ b/htdocs/takepos/pay.php @@ -31,8 +31,6 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); -//$_GET['theme']="md"; // Force theme. MD theme provides better look and feel to TakePOS - require '../main.inc.php'; // Load $user and permissions require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php index 53b4cf36acf..ce19f2c4f16 100644 --- a/htdocs/takepos/takepos.php +++ b/htdocs/takepos/takepos.php @@ -26,8 +26,6 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); -//$_GET['theme']="md"; // Force theme. MD theme provides better look and feel to TakePOS - require '../main.inc.php'; // Load $user and permissions require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';