From 6259f4ce59efd71f765161631a025eb0cc902828 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Thu, 21 Feb 2013 23:08:58 +0100 Subject: [PATCH 1/5] Fix : some & -> & --- htdocs/core/menus/standard/eldy.lib.php | 46 ++++++++++++------------- htdocs/index.php | 4 +-- htdocs/main.inc.php | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 5eb0c74a685..fe5bb2c26af 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -466,7 +466,7 @@ function print_eldy_menu($db,$atarget,$type_user) { if (! preg_match('/\?/',$url)) $url.='?'; else $url.='&'; - $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; + $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu='; } //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad } @@ -649,7 +649,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) $langs->load("help"); // Setup - $newmenu->add("/admin/index.php?mainmenu=home&leftmenu=setup", $langs->trans("Setup"), 0, 1, '', $mainmenu, 'setup'); + $newmenu->add("/admin/index.php?mainmenu=home&leftmenu=setup", $langs->trans("Setup"), 0, 1, '', $mainmenu, 'setup'); if ($leftmenu=="setup") { $warnpicto=''; @@ -684,38 +684,38 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) } // System tools - $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("SystemTools"), 0, 1, '', $mainmenu, 'admintools'); + $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("SystemTools"), 0, 1, '', $mainmenu, 'admintools'); if (preg_match('/^admintools/',$leftmenu)) { - $newmenu->add('/admin/system/dolibarr.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('InfoDolibarr'), 1); - if ($leftmenu=='admintools_info') $newmenu->add('/admin/system/modules.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('Modules'), 2); - if ($leftmenu=='admintools_info') $newmenu->add('/admin/triggers.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('Triggers'), 2); - $newmenu->add('/admin/system/os.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoOS'), 1); - $newmenu->add('/admin/system/web.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoWebServer'), 1); - $newmenu->add('/admin/system/phpinfo.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoPHP'), 1); + $newmenu->add('/admin/system/dolibarr.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('InfoDolibarr'), 1); + if ($leftmenu=='admintools_info') $newmenu->add('/admin/system/modules.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('Modules'), 2); + if ($leftmenu=='admintools_info') $newmenu->add('/admin/triggers.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('Triggers'), 2); + $newmenu->add('/admin/system/os.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoOS'), 1); + $newmenu->add('/admin/system/web.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoWebServer'), 1); + $newmenu->add('/admin/system/phpinfo.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoPHP'), 1); //if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1); - $newmenu->add('/admin/system/database.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoDatabase'), 1); + $newmenu->add('/admin/system/database.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoDatabase'), 1); - $newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&leftmenu=admintools", $langs->trans("Backup"),1); - $newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&leftmenu=admintools", $langs->trans("Restore"),1); - $newmenu->add("/admin/tools/update.php?mainmenu=home&leftmenu=admintools", $langs->trans("MenuUpgrade"),1); - if (function_exists('eaccelerator_info')) $newmenu->add("/admin/tools/eaccelerator.php?mainmenu=home&leftmenu=admintools", $langs->trans("EAccelerator"),1); - $newmenu->add("/admin/tools/listevents.php?mainmenu=home&leftmenu=admintools", $langs->trans("Audit"),1); - $newmenu->add("/admin/tools/listsessions.php?mainmenu=home&leftmenu=admintools", $langs->trans("Sessions"),1); - $newmenu->add("/admin/tools/purge.php?mainmenu=home&leftmenu=admintools", $langs->trans("Purge"),1); - $newmenu->add('/admin/system/about.php?mainmenu=home&leftmenu=admintools', $langs->trans('About'), 1); - $newmenu->add("/support/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("HelpCenter"),1,1,'targethelp'); + $newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&leftmenu=admintools", $langs->trans("Backup"),1); + $newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&leftmenu=admintools", $langs->trans("Restore"),1); + $newmenu->add("/admin/tools/update.php?mainmenu=home&leftmenu=admintools", $langs->trans("MenuUpgrade"),1); + if (function_exists('eaccelerator_info')) $newmenu->add("/admin/tools/eaccelerator.php?mainmenu=home&leftmenu=admintools", $langs->trans("EAccelerator"),1); + $newmenu->add("/admin/tools/listevents.php?mainmenu=home&leftmenu=admintools", $langs->trans("Audit"),1); + $newmenu->add("/admin/tools/listsessions.php?mainmenu=home&leftmenu=admintools", $langs->trans("Sessions"),1); + $newmenu->add("/admin/tools/purge.php?mainmenu=home&leftmenu=admintools", $langs->trans("Purge"),1); + $newmenu->add('/admin/system/about.php?mainmenu=home&leftmenu=admintools', $langs->trans('About'), 1); + $newmenu->add("/support/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("HelpCenter"),1,1,'targethelp'); } // Modules system tools if (! empty($conf->product->enabled) || ! empty($conf->service->enabled) || ! empty($conf->global->MAIN_MENU_ENABLE_MODULETOOLS)) { if (empty($user->societe_id)) { - $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ModulesSystemTools"), 0, 1, '', $mainmenu, 'modulesadmintools'); + $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ModulesSystemTools"), 0, 1, '', $mainmenu, 'modulesadmintools'); if ($leftmenu=="modulesadmintools" && $user->admin) { $langs->load("products"); - $newmenu->add("/product/admin/product_tools.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ProductVatMassChange"), 1, $user->admin); + $newmenu->add("/product/admin/product_tools.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ProductVatMassChange"), 1, $user->admin); } } } @@ -892,7 +892,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) { $langs->load("interventions"); $newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter'); - $newmenu->add("/fichinter/fiche.php?action=create&leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer); + $newmenu->add("/fichinter/fiche.php?action=create&leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer); $newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire); } @@ -1180,7 +1180,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) { $langs->load("sendings"); $newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings'); - if ($leftmenu=="sendings") $newmenu->add("/expedition/fiche.php?action=create2&leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer); + if ($leftmenu=="sendings") $newmenu->add("/expedition/fiche.php?action=create2&leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer); if ($leftmenu=="sendings") $newmenu->add("/expedition/liste.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire); if ($leftmenu=="sendings") $newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire); } diff --git a/htdocs/index.php b/htdocs/index.php index 8119e3a83be..756b1f2c60b 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -368,7 +368,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) $board->load_board($user,"inactives"); $board->warning_delay=$conf->contrat->services->inactifs->warning_delay/60/60/24; $board->label=$langs->trans("BoardNotActivatedServices"); - $board->url=DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=0'; + $board->url=DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=0'; $board->img=img_object($langs->trans("Contract"),"contract"); $rowspan++; $dashboardlines[]=$board; @@ -384,7 +384,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) $board->load_board($user,"expired"); $board->warning_delay=$conf->contrat->services->expires->warning_delay/60/60/24; $board->label=$langs->trans("BoardRunningServices"); - $board->url=DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=4&filter=expired'; + $board->url=DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=4&filter=expired'; $board->img=img_object($langs->trans("Contract"),"contract"); $rowspan++; $dashboardlines[]=$board; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 202a7c0dfb1..caec4de00ae 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1369,7 +1369,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone)) { $qs=$_SERVER["QUERY_STRING"].($_SERVER["QUERY_STRING"]?'&':'').$morequerystring; - $text =''; + $text =''; $text.= img_picto('', 'printer.png', 'class="printer"'); $text.=''; $toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'',1); From d26024d8fc44009e1366139408f1646ca71f5faf Mon Sep 17 00:00:00 2001 From: frederic34 Date: Thu, 21 Feb 2013 23:40:25 +0100 Subject: [PATCH 2/5] WIP : Admin for Carriers (Activate/Desactivate) --- htdocs/admin/carrier.php | 140 +++++++ htdocs/admin/confexped.php | 4 + htdocs/admin/expedition.php | 10 +- htdocs/admin/livraison.php | 370 ++++++++++--------- htdocs/expedition/class/expedition.class.php | 59 +++ 5 files changed, 397 insertions(+), 186 deletions(-) create mode 100644 htdocs/admin/carrier.php diff --git a/htdocs/admin/carrier.php b/htdocs/admin/carrier.php new file mode 100644 index 00000000000..5b8eb3724cc --- /dev/null +++ b/htdocs/admin/carrier.php @@ -0,0 +1,140 @@ +. + */ + +/** + * \file htdocs/admin/carrier.php + * \ingroup expedition + * \brief Page d'administration des Transporteurs + */ + +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; + +$langs->load("admin"); +$langs->load("sendings"); +$langs->load("deliveries"); +$langs->load('other'); + +if (! $user->admin) + accessforbidden(); + +$action=GETPOST('action','alpha'); +$carrier=GETPOST('carrier','int'); + +$object = new Expedition($db); + + +/* + * Actions + */ + +if ($action==activate_carrier AND $carrier) +{ + $object->activ_delivery_method($carrier); +} + +if ($action==disable_carrier AND $carrier) +{ + $object->disable_delivery_method($carrier); +} + +/* + * View + */ + +$form=new Form($db); + +llxHeader("",""); + +$linkback=''.$langs->trans("BackToModuleList").''; +print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'setup'); +print '
'; + + +//if ($mesg) print $mesg.'
'; + + +$h = 0; + +$head[$h][0] = DOL_URL_ROOT."/admin/confexped.php"; +$head[$h][1] = $langs->trans("Setup"); +$h++; + +$head[$h][0] = DOL_URL_ROOT."/admin/carrier.php"; +$head[$h][1] = $langs->trans("Carriers"); +$hselected=$h; +$h++; + +if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) +{ + $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php"; + $head[$h][1] = $langs->trans("Sending"); + $h++; +} + +if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON)) +{ + $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php"; + $head[$h][1] = $langs->trans("Receivings"); + $h++; +} + +dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); + +/* + * Carrier List + */ + +$object->all_delivery_methods(); +$var=true; +print_titre($langs->trans("CarrierList")); + +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print "\n"; +for ($i=0; $ilistmeths); $i++) +{ + $var=!$var; + print ""; + print ''; + print ''; + print ''; + print ''; + print ''; +print "\n"; + +print '
'.$langs->trans("Code").''.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("TracingUrl").''.$langs->trans("Status").'
'.$object->listmeths[$i][code].''.$object->listmeths[$i][libelle].''.$object->listmeths[$i][description].''.$object->listmeths[$i][tracing].''; + if($object->listmeths[$i][active] == 0) + { + print ''.img_picto($langs->trans("Disabled"),'switch_off').''; + } + else + { + print ''.img_picto($langs->trans("Enabled"),'switch_on').''; + } +} +print '

'; + +llxFooter(); + +$db->close(); +?> \ No newline at end of file diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php index d9be768461f..6653badfb36 100644 --- a/htdocs/admin/confexped.php +++ b/htdocs/admin/confexped.php @@ -84,6 +84,10 @@ $head[$h][1] = $langs->trans("Setup"); $hselected=$h; $h++; +$head[$h][0] = DOL_URL_ROOT."/admin/carrier.php"; +$head[$h][1] = $langs->trans("Carriers"); +$h++; + if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) { $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php"; diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 709832b1968..c012d52efb1 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -201,6 +201,10 @@ $head[$h][0] = DOL_URL_ROOT."/admin/confexped.php"; $head[$h][1] = $langs->trans("Setup"); $h++; +$head[$h][0] = DOL_URL_ROOT."/admin/carrier.php"; +$head[$h][1] = $langs->trans("Carriers"); +$h++; + $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php"; $head[$h][1] = $langs->trans("Sending"); $hselected=$h; @@ -208,9 +212,9 @@ $h++; if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON)) { - $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php"; - $head[$h][1] = $langs->trans("Receivings"); - $h++; + $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php"; + $head[$h][1] = $langs->trans("Receivings"); + $h++; } dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 2603a0a1d51..fa4b7b3c1d4 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -5,8 +5,8 @@ * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2011-2012 Juanjo Menent - * Copyright (C) 2011-2012 Philippe Grand + * Copyright (C) 2011-2012 Juanjo Menent + * Copyright (C) 2011-2012 Philippe Grand * * 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 @@ -50,13 +50,13 @@ $type='delivery'; if ($action == 'updateMask') { - $maskconstdelivery=GETPOST('maskconstdelivery','alpha'); - $maskdelivery=GETPOST('maskdelivery','alpha'); - if ($maskconstdelivery) $res = dolibarr_set_const($db,$maskconstdelivery,$maskdelivery,'chaine',0,'',$conf->entity); + $maskconstdelivery=GETPOST('maskconstdelivery','alpha'); + $maskdelivery=GETPOST('maskdelivery','alpha'); + if ($maskconstdelivery) $res = dolibarr_set_const($db,$maskconstdelivery,$maskdelivery,'chaine',0,'',$conf->entity); - if (! $res > 0) $error++; + if (! $res > 0) $error++; - if (! $error) + if (! $error) { $mesg = "".$langs->trans("SetupSaved").""; } @@ -68,12 +68,12 @@ if ($action == 'updateMask') if ($action == 'set_DELIVERY_FREE_TEXT') { - $free=GETPOST('DELIVERY_FREE_TEXT','alpha'); + $free=GETPOST('DELIVERY_FREE_TEXT','alpha'); $res=dolibarr_set_const($db, "DELIVERY_FREE_TEXT",$free,'chaine',0,'',$conf->entity); if (! $res > 0) $error++; - if (! $error) + if (! $error) { $mesg = "".$langs->trans("SetupSaved").""; } @@ -85,58 +85,58 @@ if ($action == 'set_DELIVERY_FREE_TEXT') if ($action == 'specimen') { - $modele=GETPOST('module','alpha'); + $modele=GETPOST('module','alpha'); - $sending = new Livraison($db); - $sending->initAsSpecimen(); + $sending = new Livraison($db); + $sending->initAsSpecimen(); - // Search template files - $file=''; $classname=''; $filefound=0; - $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']); - foreach($dirmodels as $reldir) - { - $file=dol_buildpath($reldir."core/modules/livraison/pdf/pdf_".$modele.".modules.php",0); - if (file_exists($file)) - { - $filefound=1; - $classname = "pdf_".$modele; - break; - } - } + // Search template files + $file=''; $classname=''; $filefound=0; + $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']); + foreach($dirmodels as $reldir) + { + $file=dol_buildpath($reldir."core/modules/livraison/pdf/pdf_".$modele.".modules.php",0); + if (file_exists($file)) + { + $filefound=1; + $classname = "pdf_".$modele; + break; + } + } - if ($filefound) - { - require_once $file; + if ($filefound) + { + require_once $file; - $module = new $classname($db); + $module = new $classname($db); - if ($module->write_file($sending,$langs) > 0) - { - header("Location: ".DOL_URL_ROOT."/document.php?modulepart=livraison&file=SPECIMEN.pdf"); - return; - } - else - { - $mesg=''.$module->error.''; - dol_syslog($module->error, LOG_ERR); - } - } - else - { - $mesg=''.$langs->trans("ErrorModuleNotFound").''; - dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR); - } + if ($module->write_file($sending,$langs) > 0) + { + header("Location: ".DOL_URL_ROOT."/document.php?modulepart=livraison&file=SPECIMEN.pdf"); + return; + } + else + { + $mesg=''.$module->error.''; + dol_syslog($module->error, LOG_ERR); + } + } + else + { + $mesg=''.$langs->trans("ErrorModuleNotFound").''; + dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR); + } } if ($action == 'set') -{ - $ret = addDocumentModel($value, $type, $label, $scandir); +{ + $ret = addDocumentModel($value, $type, $label, $scandir); } if ($action == 'del') { $ret = delDocumentModel($value, $type); - if ($ret > 0) + if ($ret > 0) { if ($conf->global->LIVRAISON_ADDON_PDF == "$value") dolibarr_del_const($db, 'LIVRAISON_ADDON_PDF',$conf->entity); } @@ -146,17 +146,17 @@ if ($action == 'setdoc') { if (dolibarr_set_const($db, "LIVRAISON_ADDON_PDF",$value,'chaine',0,'',$conf->entity)) { - // La constante qui a ete lue en avant du nouveau set - // on passe donc par une variable pour avoir un affichage coherent + // La constante qui a ete lue en avant du nouveau set + // on passe donc par une variable pour avoir un affichage coherent $conf->global->LIVRAISON_ADDON_PDF = $value; } // On active le modele - $ret = delDocumentModel($value, $type); - if ($ret > 0) - { - $ret = addDocumentModel($value, $type, $label, $scandir); - } + $ret = delDocumentModel($value, $type); + if ($ret > 0) + { + $ret = addDocumentModel($value, $type, $label, $scandir); + } } if ($action == 'setmod') @@ -164,7 +164,7 @@ if ($action == 'setmod') // TODO Verifier si module numerotation choisi peut etre active // par appel methode canBeActivated - dolibarr_set_const($db, "LIVRAISON_ADDON",$value,'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "LIVRAISON_ADDON",$value,'chaine',0,'',$conf->entity); } @@ -189,11 +189,15 @@ $head[$h][0] = DOL_URL_ROOT."/admin/confexped.php"; $head[$h][1] = $langs->trans("Setup"); $h++; +$head[$h][0] = DOL_URL_ROOT."/admin/carrier.php"; +$head[$h][1] = $langs->trans("Carriers"); +$h++; + if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) { - $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php"; - $head[$h][1] = $langs->trans("Sending"); - $h++; + $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php"; + $head[$h][1] = $langs->trans("Sending"); + $h++; } $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php"; @@ -222,34 +226,34 @@ clearstatcache(); foreach ($dirmodels as $reldir) { - $dir = dol_buildpath($reldir."core/modules/livraison/"); + $dir = dol_buildpath($reldir."core/modules/livraison/"); - if (is_dir($dir)) - { - $handle = opendir($dir); - if (is_resource($handle)) - { - $var=true; - while (($file = readdir($handle))!==false) - { - if (substr($file, 0, 14) == 'mod_livraison_' && substr($file, dol_strlen($file)-3, 3) == 'php') - { - $file = substr($file, 0, dol_strlen($file)-4); + if (is_dir($dir)) + { + $handle = opendir($dir); + if (is_resource($handle)) + { + $var=true; + while (($file = readdir($handle))!==false) + { + if (substr($file, 0, 14) == 'mod_livraison_' && substr($file, dol_strlen($file)-3, 3) == 'php') + { + $file = substr($file, 0, dol_strlen($file)-4); - require_once DOL_DOCUMENT_ROOT ."/core/modules/livraison/".$file.'.php'; + require_once DOL_DOCUMENT_ROOT ."/core/modules/livraison/".$file.'.php'; - $module = new $file; + $module = new $file; - // Show modules according to features level - if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue; - if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; + // Show modules according to features level + if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue; + if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; - if ($module->isEnabled()) - { - $var=!$var; - print ''.$module->nom."\n"; - print $module->info(); - print ''; + if ($module->isEnabled()) + { + $var=!$var; + print ''.$module->nom."\n"; + print $module->info(); + print ''; // Show example of numbering module print ''; @@ -259,48 +263,48 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; - if ($conf->global->LIVRAISON_ADDON == "$file") - { - print img_picto($langs->trans("Activated"),'switch_on'); - } - else - { - print ''.img_picto($langs->trans("Disabled"),'switch_off').''; - } - print ''; + print ''; + if ($conf->global->LIVRAISON_ADDON == "$file") + { + print img_picto($langs->trans("Activated"),'switch_on'); + } + else + { + print ''.img_picto($langs->trans("Disabled"),'switch_off').''; + } + print ''; - $livraison=new Livraison($db); - $livraison->initAsSpecimen(); + $livraison=new Livraison($db); + $livraison->initAsSpecimen(); - // Info - $htmltooltip=''; - $htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
'; - $nextval=$module->getNextValue($mysoc,$livraison); - if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval - { - $htmltooltip.=''.$langs->trans("NextValue").': '; - if ($nextval) - { - $htmltooltip.=$nextval.'
'; - } - else - { - $htmltooltip.=$langs->trans($module->error).'
'; - } - } + // Info + $htmltooltip=''; + $htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
'; + $nextval=$module->getNextValue($mysoc,$livraison); + if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval + { + $htmltooltip.=''.$langs->trans("NextValue").': '; + if ($nextval) + { + $htmltooltip.=$nextval.'
'; + } + else + { + $htmltooltip.=$langs->trans($module->error).'
'; + } + } - print ''; - print $form->textwithpicto('',$htmltooltip,1,0); - print ''; + print ''; + print $form->textwithpicto('',$htmltooltip,1,0); + print ''; - print ''; - } - } - } - closedir($handle); - } - } + print ''; + } + } + } + closedir($handle); + } + } } print ''; @@ -352,77 +356,77 @@ clearstatcache(); $var=true; foreach ($dirmodels as $reldir) { - $dir = dol_buildpath($reldir."core/modules/livraison/pdf/"); + $dir = dol_buildpath($reldir."core/modules/livraison/pdf/"); - if (is_dir($dir)) - { - $handle = opendir($dir); - if (is_resource($handle)) - { - while (($file = readdir($handle))!==false) - { - if (substr($file, dol_strlen($file) -12) == '.modules.php' && substr($file,0,4) == 'pdf_') - { - $name = substr($file, 4, dol_strlen($file) - 16); - $classname = substr($file, 0, dol_strlen($file) - 12); + if (is_dir($dir)) + { + $handle = opendir($dir); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (substr($file, dol_strlen($file) -12) == '.modules.php' && substr($file,0,4) == 'pdf_') + { + $name = substr($file, 4, dol_strlen($file) - 16); + $classname = substr($file, 0, dol_strlen($file) - 12); - $var=!$var; + $var=!$var; - print ''; - print $name; - print "\n"; - require_once $dir.$file; - $module = new $classname($db); + print ''; + print $name; + print "\n"; + require_once $dir.$file; + $module = new $classname($db); - print $module->description; - print ''; + print $module->description; + print ''; - // Activ - if (in_array($name, $def)) - { - print "\n"; - print 'scandir.'&label='.urlencode($module->name).'">'; - print img_picto($langs->trans("Enabled"),'switch_on'); - print ''; - print ""; - } - else - { - print "\n"; - print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').''; - print ""; - } + // Activ + if (in_array($name, $def)) + { + print "\n"; + print 'scandir.'&label='.urlencode($module->name).'">'; + print img_picto($langs->trans("Enabled"),'switch_on'); + print ''; + print ""; + } + else + { + print "\n"; + print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').''; + print ""; + } - // Defaut - print ""; - if ($conf->global->LIVRAISON_ADDON_PDF == "$name") - { - print img_picto($langs->trans("Default"),'on'); - } - else - { - print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').''; - } - print ''; + // Defaut + print ""; + if ($conf->global->LIVRAISON_ADDON_PDF == "$name") + { + print img_picto($langs->trans("Default"),'on'); + } + else + { + print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').''; + } + print ''; - // Info - $htmltooltip = ''.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown")); - $htmltooltip.='
'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; - $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; - $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); - print ''; - print $form->textwithpicto('',$htmltooltip,1,0); - print ''; - print ''; - print ''.img_object($langs->trans("Preview"),'sending').''; - print ''; + // Info + $htmltooltip = ''.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown")); + $htmltooltip.='
'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; + $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; + $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); + print ''; + print $form->textwithpicto('',$htmltooltip,1,0); + print ''; + print ''; + print ''.img_object($langs->trans("Preview"),'sending').''; + print ''; - print ''; - } - } - closedir($handle); - } - } + print ''; + } + } + closedir($handle); + } + } } print ''; diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 1840713b0e6..ca8c5ea2dfe 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1168,6 +1168,65 @@ class Expedition extends CommonObject } } + /** + * Fetch all deliveries method and return an array. Load array this->listmeths. + * + * @return void + */ + function all_delivery_methods() + { + global $langs; + $meths = array(); + $i=0; + + $sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.active"; + $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em"; + //$sql.= " ORDER BY em.libelle ASC"; + + $resql = $this->db->query($sql); + if ($resql) + { + while ($obj = $this->db->fetch_object($resql)) + { + $this->listmeths[$i][rowid] = $obj->rowid; + $this->listmeths[$i][code] = $obj->code; + $label=$langs->trans('SendingMethod'.$obj->code); + $this->listmeths[$i][libelle] = ($label != 'SendingMethod'.$obj->code?$label:$obj->libelle); + $this->listmeths[$i][description] = $obj->description; + $this->listmeths[$i][active] = $obj->active; + $i++; + } + } + } + + /** + * Activate delivery method. + * @param id $id id method to activate + * @return void + */ + function activ_delivery_method($id) + { + $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1'; + $sql.= ' WHERE rowid='.$id; + + $resql = $this->db->query($sql); + + } + + /** + * DesActivate delivery method. + * @param id $id id method to desactivate + * @return void + */ + function disable_delivery_method($id) + { + $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0'; + $sql.= ' WHERE rowid='.$id; + + $resql = $this->db->query($sql); + + } + /** * Get tracking url status * From de4bc7f39d48a77b74572b47e64a22eeea210b83 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Fri, 22 Feb 2013 08:56:14 +0100 Subject: [PATCH 3/5] Fix : It was a bad idea to add COL in the code name of new carriers --- .../expedition/methode_expedition_chrono.modules.php | 2 +- .../modules/expedition/methode_expedition_gls.modules.php | 2 +- .../expedition/methode_expedition_kiala.modules.php | 2 +- .../modules/expedition/methode_expedition_ups.modules.php | 2 +- htdocs/install/mysql/data/llx_c_shipment_mode.sql | 8 ++++---- htdocs/install/mysql/migration/3.3.0-3.4.0.sql | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/core/modules/expedition/methode_expedition_chrono.modules.php b/htdocs/core/modules/expedition/methode_expedition_chrono.modules.php index acebea53430..412545b3f6f 100644 --- a/htdocs/core/modules/expedition/methode_expedition_chrono.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_chrono.modules.php @@ -35,7 +35,7 @@ class methode_expedition_chrono extends ModeleShippingMethod { $this->db = $db; $this->id = 8; // Do not change this value - $this->code = "COLCHRONO"; // Do not change this value + $this->code = "CHRONO"; // Do not change this value $this->name = "Chronopost"; $this->description = "Chronopost"; } diff --git a/htdocs/core/modules/expedition/methode_expedition_gls.modules.php b/htdocs/core/modules/expedition/methode_expedition_gls.modules.php index 2f63ff927af..0fc67831a38 100644 --- a/htdocs/core/modules/expedition/methode_expedition_gls.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_gls.modules.php @@ -35,7 +35,7 @@ class methode_expedition_gls extends ModeleShippingMethod { $this->db = $db; $this->id = 7; // Do not change this value - $this->code = "COLGLS"; // Do not change this value + $this->code = "GLS"; // Do not change this value $this->name = "GLS"; $this->description = "General Logistics Systems"; } diff --git a/htdocs/core/modules/expedition/methode_expedition_kiala.modules.php b/htdocs/core/modules/expedition/methode_expedition_kiala.modules.php index fa8072ecda3..503bacdc421 100644 --- a/htdocs/core/modules/expedition/methode_expedition_kiala.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_kiala.modules.php @@ -35,7 +35,7 @@ Class methode_expedition_kiala extends ModeleShippingMethod { $this->db = $db; $this->id = 6; // Do not change this value - $this->code = "COLKIALA"; // Do not change this value + $this->code = "KIALA"; // Do not change this value $this->name = "KIALA"; $this->description = "KIALA"; } diff --git a/htdocs/core/modules/expedition/methode_expedition_ups.modules.php b/htdocs/core/modules/expedition/methode_expedition_ups.modules.php index 582f23c9e0a..1225b5d7959 100644 --- a/htdocs/core/modules/expedition/methode_expedition_ups.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_ups.modules.php @@ -34,7 +34,7 @@ class methode_expedition_ups extends ModeleShippingMethod { $this->db = $db; $this->id = 5; // Do not change this value - $this->code = "COLUPS"; // Do not change this value + $this->code = "UPS"; // Do not change this value $this->name = "UPS"; $this->description = "United Parcel Service"; } diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index ba625191e3d..3bb5a056ed2 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -33,7 +33,7 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES ( INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (5,'COLUPS','UPS','United Parcel Service',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (6,'COLKIALA','KIALA','Relais Kiala',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (7,'COLGLS','GLS','General Logistics Systems',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (8,'COLCHRONO','Chronopost','Chronopost',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (5,'UPS','UPS','United Parcel Service',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (6,'KIALA','KIALA','Relais Kiala',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (7,'GLS','GLS','General Logistics Systems',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (8,'CHRONO','Chronopost','Chronopost',0); diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql index 00d50ad51d7..97f8bc60bac 100755 --- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql +++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql @@ -46,7 +46,7 @@ alter table llx_commande CHANGE COLUMN fk_adresse_livraison fk_delivery_address alter table llx_don CHANGE COLUMN adresse address text; alter table llx_adherent CHANGE COLUMN adresse address text; -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (5,'COLUPS','UPS','United Parcel Service',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (6,'COLKIALA','KIALA','Relais Kiala',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (7,'COLGLS','GLS','General Logistics Systems',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (8,'COLCHRONO','Chronopost','Chronopost',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (5,'UPS','UPS','United Parcel Service',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (6,'KIALA','KIALA','Relais Kiala',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (7,'GLS','GLS','General Logistics Systems',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (8,'CHRONO','Chronopost','Chronopost',0); From 67c06225a5e16249e8e8d75ddba0060a24eaf52e Mon Sep 17 00:00:00 2001 From: frederic34 Date: Fri, 22 Feb 2013 14:18:51 +0100 Subject: [PATCH 4/5] WIP : Admin for carriers --- htdocs/admin/carrier.php | 22 +++-- htdocs/expedition/class/expedition.class.php | 83 ++++++++++++------- .../mysql/data/llx_c_shipment_mode.sql | 17 ++-- .../install/mysql/migration/3.3.0-3.4.0.sql | 4 + .../mysql/tables/llx_c_shipment_mode.sql | 1 + 5 files changed, 85 insertions(+), 42 deletions(-) diff --git a/htdocs/admin/carrier.php b/htdocs/admin/carrier.php index 5b8eb3724cc..53f18ae0ca1 100644 --- a/htdocs/admin/carrier.php +++ b/htdocs/admin/carrier.php @@ -105,11 +105,12 @@ print_titre($langs->trans("CarrierList")); print ''; print ''; -print ''; -print ''; +print ''; +print ''; print ''; -print ''; +print ''; print ''; +print ''; print "\n"; for ($i=0; $ilistmeths); $i++) { @@ -118,8 +119,8 @@ for ($i=0; $ilistmeths); $i++) print ''; print ''; print ''; - print ''; - print ''; + print ''; } -print ''; print "\n"; print '
'.$langs->trans("Code").''.$langs->trans("Name").''.$langs->trans("Code").''.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("TracingUrl").''.$langs->trans("TrackingUrl").''.$langs->trans("Status").''.$langs->trans("Edit").'
'.$object->listmeths[$i][code].''.$object->listmeths[$i][libelle].''.$object->listmeths[$i][description].''.$object->listmeths[$i][tracing].''; + print ''.$object->listmeths[$i][tracking].''; if($object->listmeths[$i][active] == 0) { print ''.img_picto($langs->trans("Disabled"),'switch_off').''; @@ -128,8 +129,17 @@ for ($i=0; $ilistmeths); $i++) { print ''.img_picto($langs->trans("Enabled"),'switch_on').''; } + print ''; + if($object->listmeths[$i][editable] == 1) + { + print ''.img_picto($langs->trans("Edit"),'edit').''; + } + else + { + print ' '; + } + print '

'; diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index ca8c5ea2dfe..22c0593a632 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1176,12 +1176,11 @@ class Expedition extends CommonObject function all_delivery_methods() { global $langs; - $meths = array(); + $listmeths = array(); $i=0; - $sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.active"; + $sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active"; $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em"; - //$sql.= " ORDER BY em.libelle ASC"; $resql = $this->db->query($sql); if ($resql) @@ -1193,6 +1192,25 @@ class Expedition extends CommonObject $label=$langs->trans('SendingMethod'.$obj->code); $this->listmeths[$i][libelle] = ($label != 'SendingMethod'.$obj->code?$label:$obj->libelle); $this->listmeths[$i][description] = $obj->description; + if ($obj->tracking) + { + $this->listmeths[$i][tracking] = $obj->tracking; + $this->listmeths[$i][editable] = 1; + } + else + { + if ($obj->code) + { + $classname = "methode_expedition_".strtolower($obj->code); + + if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($obj->code).".modules.php") ) + { + require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($obj->code).'.modules.php'; + $shipmethod = new $classname(); + $this->listmeths[$i][tracking] = $shipmethod->provider_url_status('{TRACKID}'); + } + } + } $this->listmeths[$i][active] = $obj->active; $i++; } @@ -1239,7 +1257,7 @@ class Expedition extends CommonObject if (! empty($this->expedition_method_id)) { - $sql = "SELECT em.code"; + $sql = "SELECT em.code, em.tracking"; $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em"; $sql.= " WHERE em.rowid = ".$this->expedition_method_id; @@ -1249,36 +1267,45 @@ class Expedition extends CommonObject if ($obj = $this->db->fetch_object($resql)) { $code = $obj->code; + $tracking = $obj->tracking; } } } - if ($code) - { - $classname = "methode_expedition_".strtolower($code); + if ($tracking) + { + $url = str_replace('{TRACKID}', $value, $tracking); + $this->tracking_url = sprintf(''.($value?$value:'url').'',$url,$url); + } + else + { + if ($code) + { + $classname = "methode_expedition_".strtolower($code); - $url=''; - if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).".modules.php") && ! empty($this->tracking_number)) - { - require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).'.modules.php'; - $shipmethod = new $classname(); - $url = $shipmethod->provider_url_status($this->tracking_number); - } + $url=''; + if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).".modules.php") && ! empty($this->tracking_number)) + { + require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).'.modules.php'; + $shipmethod = new $classname(); + $url = $shipmethod->provider_url_status($this->tracking_number); + } - if ($url) - { - $this->tracking_url = sprintf(''.($value?$value:'url').'',$url,$url); - } - else - { - $this->tracking_url = $value; - } - } - else - { - $this->tracking_url = $value; - } - } + if ($url) + { + $this->tracking_url = sprintf(''.($value?$value:'url').'',$url,$url); + } + else + { + $this->tracking_url = $value; + } + } + else + { + $this->tracking_url = $value; + } + } + } /** * Classify the shipping as invoiced diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index 3bb5a056ed2..74b8eaea6ce 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -29,11 +29,12 @@ -- -- Sending method -- -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (5,'UPS','UPS','United Parcel Service',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (6,'KIALA','KIALA','Relais Kiala',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (7,'GLS','GLS','General Logistics Systems',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (8,'CHRONO','Chronopost','Chronopost',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (1,'CATCH','Catch','Catch by client','',1); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (2,'TRANS','Transporter','Generic transporter','',1); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi','',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max','',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (5,'UPS','UPS','United Parcel Service','',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (6,'KIALA','KIALA','Relais Kiala','',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (7,'GLS','GLS','General Logistics Systems','',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (8,'CHRONO','Chronopost','Chronopost','',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'EDIT','EDITABLE','Transporteur Modifiable','http://www.website.com/dir/{TRACKID}',0); diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql index 97f8bc60bac..cf31f6eb9bb 100755 --- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql +++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql @@ -1,3 +1,4 @@ +alter table llx_contratdet add column fk_product_fournisseur_price integer after info_bits; -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page @@ -50,3 +51,6 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES ( INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (6,'KIALA','KIALA','Relais Kiala',0); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (7,'GLS','GLS','General Logistics Systems',0); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (8,'CHRONO','Chronopost','Chronopost',0); + +ALTER TABLE llx_c_shipment_mode ADD COLUMN tracking VARCHAR(256) NOT NULL AFTER description; +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'EDIT','EDITABLE','Transporteur Modifiable','http://www.website.com/dir/{TRACKID}',0); diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index 7733c980ab4..591e3ff9b93 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql @@ -23,6 +23,7 @@ create table llx_c_shipment_mode code varchar(30) NOT NULL, libelle varchar(50) NOT NULL, description text, + tracking varchar(256) NOT NULL, active tinyint DEFAULT 0, module varchar(32) NULL )ENGINE=innodb; From c8872d7e982dd9535c794f871be17d44dc2261bd Mon Sep 17 00:00:00 2001 From: frederic34 Date: Sat, 23 Feb 2013 10:20:31 +0100 Subject: [PATCH 5/5] WIP : Admin for carriers --- htdocs/admin/carrier.php | 154 +++++++++++++----- htdocs/expedition/class/expedition.class.php | 6 +- .../install/mysql/migration/3.3.0-3.4.0.sql | 1 - 3 files changed, 115 insertions(+), 46 deletions(-) diff --git a/htdocs/admin/carrier.php b/htdocs/admin/carrier.php index 53f18ae0ca1..d105dd28e6a 100644 --- a/htdocs/admin/carrier.php +++ b/htdocs/admin/carrier.php @@ -41,6 +41,10 @@ $object = new Expedition($db); /* * Actions */ +if ($action==setvalue AND $carrier) +{ + //$object->update_delivery_method($carrier); +} if ($action==activate_carrier AND $carrier) { @@ -98,51 +102,115 @@ dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); /* * Carrier List */ - -$object->all_delivery_methods(); -$var=true; -print_titre($langs->trans("CarrierList")); - -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print "\n"; -for ($i=0; $ilistmeths); $i++) +if ($action=='edit_carrier' || $action=='setvalue') { - $var=!$var; - print ""; - print ''; - print ''; - print ''; - print ''; - print ''; -} -print "\n"; + // Carrier Edit + if ($carrier) $object->list_delivery_methods($carrier); + print_titre($langs->trans("CarrierEdit")); -print '
'.$langs->trans("Code").''.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("TrackingUrl").''.$langs->trans("Status").''.$langs->trans("Edit").'
'.$object->listmeths[$i][code].''.$object->listmeths[$i][libelle].''.$object->listmeths[$i][description].''.$object->listmeths[$i][tracking].''; - if($object->listmeths[$i][active] == 0) - { - print ''.img_picto($langs->trans("Disabled"),'switch_off').''; - } - else - { - print ''.img_picto($langs->trans("Enabled"),'switch_on').''; - } - print ''; - if($object->listmeths[$i][editable] == 1) - { - print ''.img_picto($langs->trans("Edit"),'edit').''; - } - else - { - print ' '; - } - print '

'; + print '
'; + print ''; + print ''; + + + print ''; + + $var=true; + print ''; + print ''; + print ''; + print "\n"; + + $var=!$var; + print ''; + + $var=!$var; + print ''; + + $var=!$var; + print ''; + + $var=!$var; + print ''; + + if ($carrier) + { + print ''; + } + else + { + print ''; + } + + print '
'.$langs->trans("CarrierParameter").''.$langs->trans("Value").'
'; + print $langs->trans("Code").''; + print ''; + print '   '.$langs->trans("Example").': CODE'; + print '
'; + print $langs->trans("Name").''; + print ''; + print '
'; + print $langs->trans("Description").''; + print ''; + print '
'; + print $langs->trans("Tracking").''; + print ''; + print '   '.$langs->trans("Example").': http://www.website.com/dir/{TRACKID}'; + print '


'; + print '
'; + +} +else +{ + // Display List + $object->list_delivery_methods(); + $var=true; + print_titre($langs->trans("CarrierList")); + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; + for ($i=0; $ilistmeths); $i++) + { + $var=!$var; + print ""; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; + } + print ''; + + print '
'.$langs->trans("Code").''.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("TrackingUrl").''.$langs->trans("Status").''.$langs->trans("Edit").'
'.$object->listmeths[$i][code].''.$object->listmeths[$i][libelle].''.$object->listmeths[$i][description].''.$object->listmeths[$i][tracking].''; + if($object->listmeths[$i][active] == 0) + { + print ''.img_picto($langs->trans("Disabled"),'switch_off').''; + } + else + { + print ''.img_picto($langs->trans("Enabled"),'switch_on').''; + } + print ''; + if($object->listmeths[$i][editable] == 1) + { + print ''.img_picto($langs->trans("Edit"),'edit').''; + } + else + { + print ' '; + } + print '

'.$langs->trans("Add").'

'; + + print ''; +} llxFooter(); diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 22c0593a632..240d5b8df13 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1170,10 +1170,10 @@ class Expedition extends CommonObject /** * Fetch all deliveries method and return an array. Load array this->listmeths. - * + * @param id $id only this carrier, all if none * @return void */ - function all_delivery_methods() + function list_delivery_methods($id='') { global $langs; $listmeths = array(); @@ -1181,6 +1181,7 @@ class Expedition extends CommonObject $sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active"; $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em"; + if ($id) $sql.= " WHERE em.rowid=".$id; $resql = $this->db->query($sql); if ($resql) @@ -1195,6 +1196,7 @@ class Expedition extends CommonObject if ($obj->tracking) { $this->listmeths[$i][tracking] = $obj->tracking; + // editable or hardcoded $this->listmeths[$i][editable] = 1; } else diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql index cf31f6eb9bb..d09e3ac6799 100755 --- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql +++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql @@ -1,4 +1,3 @@ -alter table llx_contratdet add column fk_product_fournisseur_price integer after info_bits; -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page