Fix : url was given even if value of tracking was empty + remove old …

…use of "methode_expedition..." files
Dolibarr · Apr 20, 2013 · a9974f6 · a9974f6
1 parent bfb05c7
commit a9974f6
Showing 1 changed file with 3 additions and 21 deletions.
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
@@ -1199,7 +1199,7 @@ function list_delivery_methods($id='')
     {
         global $langs;
 
-        $listmeths = array();
+        $this->listmeths = array();
         $i=0;
 
         $sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
@@ -1216,29 +1216,11 @@ function list_delivery_methods($id='')
                 $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;
-                }
-                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]['tracking'] = $obj->tracking;
                 $this->listmeths[$i]['active'] = $obj->active;
                 $i++;
             }
         }
-        else dol_print_error($this->db,'');
     }
 
     /**
@@ -1325,7 +1307,7 @@ function GetUrlTrackingStatus($value='')
 			}
 		}
 
-		if (!empty($tracking))
+		if (!empty($tracking) && !empty($value))
 		{
 			$url = str_replace('{TRACKID}', $value, $tracking);
 			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value?$value:'url').'</a>',$url,$url);