lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code of not used method

Browse Source
This commit is contained in:
Laurent Destailleur 2022-05-10 14:38:40 +02:00
parent 218749ead4
commit 91d539bbef
3 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/core/class/cunits.class.php
View File

@ -463,22 +463,30 @@ class CUnits // extends CommonObject
} }
/** /**
* get scale of unit factor * Get scale of unit factor
* @param int $id id of unit in dictionary *
* @return float|int * @param int $id Id of unit in dictionary
* @return float|int Scale of unit
*/ */
public function scaleOfUnitPow($id) public function scaleOfUnitPow($id)
{ {
$base = 10; $base = 10;
// TODO : add base col into unit dictionary table
$unit = $this->db->getRow("SELECT scale, unit_type from ".$this->db->prefix()."c_units WHERE rowid = ".intval($id));
if ($unit) {
// TODO : if base exist in unit dictionary table remove this convertion exception and update convertion infos in database exemple time hour currently scale 3600 will become scale 2 base 60
if ($unit->unit_type == 'time') {
return floatval($unit->scale);
}
return pow($base, floatval($unit->scale)); $sql = "SELECT scale, unit_type FROM ".$this->db->prefix()."c_units WHERE rowid = ".((int) $id);
$resql = $this->db->query($sql);
if ($resql) {
// TODO : add base col into unit dictionary table
$unit = $this->db->fetch_object($sql);
if ($unit) {
// TODO : if base exists in unit dictionary table, remove this convertion exception and update convertion infos in database.
// Example time hour currently scale 3600 will become scale 2 base 60
if ($unit->unit_type == 'time') {
return floatval($unit->scale);
}
return pow($base, floatval($unit->scale));
}
} }
return 0; return 0;

15
htdocs/core/class/validate.class.php
View File

@ -281,14 +281,17 @@ class Validate
} }
foreach ($value_arr as $val) { foreach ($value_arr as $val) {
$sql = "SELECT ".$col." FROM ".$this->db->prefix().$table." WHERE ".$col." = '".$this->db->escape($val)."'"; // nore quick than count(*) to check existing of a row $sql = "SELECT ".$col." FROM ".$this->db->prefix().$table." WHERE ".$col." = '".$this->db->escape($val)."' LIMIT 1"; // more quick than count(*) to check existing of a row
$resql = $this->db->getRow($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
continue; $obj = $this->db->fetch_object($resql);
} else { if ($obj) {
$this->error = $this->outputLang->trans('RequireValidExistingElement'); continue;
return false; }
} }
// If something was wrong
$this->error = $this->outputLang->trans('RequireValidExistingElement');
return false;
} }
return true; return true;

25
htdocs/variants/class/ProductCombination.class.php
View File

@ -1057,12 +1057,16 @@ class ProductCombinationLevel
*/ */
public function fetch($rowid) public function fetch($rowid)
{ {
$sql = "SELECT rowid, fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage FROM ".MAIN_DB_PREFIX.$this->table_element." WHERE rowid = ".(int) $rowid; $sql = "SELECT rowid, fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage";
$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
$sql .= " WHERE rowid = ".(int) $rowid;
$obj = $this->db->getRow($sql); $resql = $this->db->query($sql);
if ($resql) {
if ($obj) { $obj = $this->db->fetch_object($resql);
return $this->fetchFormObj($obj); if ($obj) {
return $this->fetchFormObj($obj);
}
} }
return -1; return -1;
@ -1141,11 +1145,14 @@ class ProductCombinationLevel
$sql = "SELECT rowid id"; $sql = "SELECT rowid id";
$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element; $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
$sql .= " WHERE fk_product_attribute_combination = ".(int) $this->fk_product_attribute_combination; $sql .= " WHERE fk_product_attribute_combination = ".(int) $this->fk_product_attribute_combination;
$sql .= ' AND fk_price_level = '.intval($this->fk_price_level); $sql .= ' AND fk_price_level = '.((int) $this->fk_price_level);
$existObj = $this->db->getRow($sql); $resql = $this->db->query($sql);
if ($existObj) { if ($resql) {
$this->id = $existObj->id; $obj = $this->db->fetch_object($resql);
if ($obj) {
$this->id = $obj->id;
}
} }
} }