From d2f54bb41c90f71303bea1add760e1aaf272b03c Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sun, 30 Dec 2018 17:51:09 +0100 Subject: [PATCH 1/3] Fix ajax toogle --- htdocs/takepos/admin/setup.php | 78 +++++++++++++++++++++++++++------- 1 file changed, 63 insertions(+), 15 deletions(-) diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php index 654ef42431f..3ab54ace187 100644 --- a/htdocs/takepos/admin/setup.php +++ b/htdocs/takepos/admin/setup.php @@ -39,9 +39,38 @@ if (!$user->admin) accessforbidden(); $langs->loadLangs(array("admin", "cashdesk")); + /* - * Actions + * Action */ +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(); @@ -89,32 +118,38 @@ $linkback=''.$langs->trans("BackToM print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)',$linkback,'title_setup'); print '
'; - // Mode -print '
'; -print ''; -print ''; - print ''; print ''; -print ''; +print ''."\n"; +print ''."\n"; print "\n"; if (! empty($conf->service->enabled)) { print '\n"; } // Use Takepos printing print '\n"; if ($conf->global->TAKEPOSCONNECTOR){ @@ -128,15 +163,25 @@ if ($conf->global->TAKEPOSCONNECTOR){ // Bar Restaurant mode print '\n"; if ($conf->global->TAKEPOS_BAR_RESTAURANT && $conf->global->TAKEPOSCONNECTOR){ print ''; } @@ -144,6 +189,9 @@ print '
'.$langs->trans("Parameters").''.$langs->trans("Value").''.$langs->trans("Parameters").''.$langs->trans("Status").'
'; print $langs->trans("CashdeskShowServices"); - print ''; - print $form->selectyesno("CASHDESK_SERVICES",$conf->global->CASHDESK_SERVICES,1); + 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 $langs->trans("DolibarrReceiptPrinter").' ('.$langs->trans("TakeposConnectorNecesary").')'; -print ''; -print $form->selectyesno("TAKEPOSCONNECTOR",$conf->global->TAKEPOSCONNECTOR,1); +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 'Bar Restaurant'; -print ''; -print $form->selectyesno("TAKEPOS_BAR_RESTAURANT",$conf->global->TAKEPOS_BAR_RESTAURANT,1); +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 $langs->trans("OrderPrinters").' ('.$langs->trans("Setup").')'; - print ''; - print $form->selectyesno("TAKEPOS_ORDER_PRINTERS",$conf->global->TAKEPOS_ORDER_PRINTERS,1); +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 '
'; +print ''; +print ''; +print ''; print ''; print ''; From 511579a24b2fb30a5c3683c612a2cc488ce3f5f3 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sun, 30 Dec 2018 19:48:04 +0100 Subject: [PATCH 2/3] FIX: Ajax on socialnetworks.php --- htdocs/admin/socialnetworks.php | 61 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/htdocs/admin/socialnetworks.php b/htdocs/admin/socialnetworks.php index 959dd91f339..d25becaac4f 100644 --- a/htdocs/admin/socialnetworks.php +++ b/htdocs/admin/socialnetworks.php @@ -38,27 +38,34 @@ $action = GETPOST('action','aZ09'); /* - * Actions + * Action */ - -// Action activation d'un sous module du module adherent -if ($action == 'set') +if (preg_match('/set_([a-z0-9_\-]+)/i',$action,$reg)) { - $result=dolibarr_set_const($db, $_GET["name"], $_GET["value"], '', 0, '', $conf->entity); - if ($result < 0) - { - dol_print_error($db); - } + $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); + } } -// Action desactivation d'un sous module du module adherent -if ($action == 'unset') +if (preg_match('/del_([a-z0-9_\-]+)/i',$action,$reg)) { - $result=dolibarr_del_const($db, $_GET["name"], $conf->entity); - if ($result < 0) - { - dol_print_error($db); - } + $code=$reg[1]; + if (dolibarr_del_const($db, $code, $conf->entity) > 0) + { + header("Location: ".$_SERVER["PHP_SELF"]); + exit; + } + else + { + dol_print_error($db); + } } @@ -94,21 +101,13 @@ $arrayofsocialnetworks=array('jabber'=>'Jabber', 'skype'=>'Skype', 'twitter'=>'T foreach($arrayofsocialnetworks as $snkey => $snlabel) { $consttocheck = 'SOCIALNETWORKS_'.strtoupper($snkey); - if (! empty($conf->global->$consttocheck)) - { - //$link=img_picto($langs->trans("Active"),'tick').' '; - $link=''; - //$link.=$langs->trans("Disable"); - $link.=img_picto($langs->trans("Activated"),'switch_on'); - $link.=''; - } - else - { - $link=''; - //$link.=img_$langs->trans("Activate") - $link.=img_picto($langs->trans("Disabled"),'switch_off'); - $link.=''; - } + if ($conf->use_javascript_ajax) { + $link = ajax_constantonoff($consttocheck); +} else { + $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); + $link = $form->selectarray($consttocheck, $arrval, $conf->global->$consttocheck); +} + print $langs->trans('EnableFeatureFor', $snlabel).' '.$link.'

'; } From 932e5ef0b5bcb1e81bbbafad2d8d077f4cde6914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josep=20Llu=C3=ADs?= Date: Wed, 2 Jan 2019 08:37:26 +0100 Subject: [PATCH 3/3] FIX: delete all contact categories Delete all contact categories is not necessary on contact card. Current function setCategories will do it when necessary. --- htdocs/contact/card.php | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index c40710ceb56..38fa237cc53 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -9,6 +9,7 @@ * Copyright (C) 2014 Juanjo Menent * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2018 Frédéric France + * Copyright (C) 2019 Josep Lluís Amador * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,9 +41,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; -require_once DOL_DOCUMENT_ROOT. '/core/class/html.form.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; -require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; +require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; // Load translation files required by the page $langs->loadLangs(array('companies', 'users', 'other', 'commercial')); @@ -374,28 +375,22 @@ if (empty($reshook)) $ret = $extrafields->setOptionalsFromPost($extralabels,$object); if ($ret < 0) $error++; - $result = $object->update($contactid, $user); + $result = $object->update($contactid, $user); if ($result > 0) { // Categories association - // First we delete all categories association - $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'categorie_contact'; - $sql .= ' WHERE fk_socpeople = ' . $object->id; - $db->query($sql); - - // Then we add the associated categories $categories = GETPOST('contcats', 'array'); $object->setCategories($categories); - $object->old_lastname=''; - $object->old_firstname=''; - $action = 'view'; - } - else - { - setEventMessages($object->error, $object->errors, 'errors'); - $action = 'edit'; - } + $object->old_lastname=''; + $object->old_firstname=''; + $action = 'view'; + } + else + { + setEventMessages($object->error, $object->errors, 'errors'); + $action = 'edit'; + } } if (! $error && empty($errors))