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

Fix sql errors

Browse Source
This commit is contained in:
Laurent Destailleur 2022-03-17 11:49:14 +01:00
parent c6338e0de0
commit 43e7547611
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/product/class/api_products.class.php
View File

@ -1122,7 +1122,9 @@ class Products extends DolibarrApi
throw new RestException(401); throw new RestException(401);
} }
$sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".$this->db->prefix()."product_attribute WHERE ref LIKE '".trim($ref)."' AND entity IN (".getEntity('product').")"; $ref = trim($ref);
$sql = "SELECT rowid, ref, ref_ext, label, position, entity FROM ".$this->db->prefix()."product_attribute WHERE ref LIKE '".$this->db->escape($ref)."' AND entity IN (".getEntity('product').")";
$query = $this->db->query($sql); $query = $this->db->query($sql);
@ -1137,7 +1139,8 @@ class Products extends DolibarrApi
$attr['ref'] = $result->ref; $attr['ref'] = $result->ref;
$attr['ref_ext'] = $result->ref_ext; $attr['ref_ext'] = $result->ref_ext;
$attr['label'] = $result->label; $attr['label'] = $result->label;
$attr['rang'] = $result->rang; $attr['rang'] = $result->position;
$attr['position'] = $result->position;
$attr['entity'] = $result->entity; $attr['entity'] = $result->entity;
$sql = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."product_attribute_combination2val as pac2v"; $sql = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."product_attribute_combination2val as pac2v";
@ -1169,7 +1172,9 @@ class Products extends DolibarrApi
throw new RestException(401); throw new RestException(401);
} }
$sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".$this->db->prefix()."product_attribute WHERE ref_ext LIKE '".trim($ref_ext)."' AND entity IN (".getEntity('product').")"; $ref_ext = trim($ref_ext);
$sql = "SELECT rowid, ref, ref_ext, label, position, entity FROM ".$this->db->prefix()."product_attribute WHERE ref_ext LIKE '".$this->db->escape($ref_ext)."' AND entity IN (".getEntity('product').")";
$query = $this->db->query($sql); $query = $this->db->query($sql);
@ -1184,7 +1189,8 @@ class Products extends DolibarrApi
$attr['ref'] = $result->ref; $attr['ref'] = $result->ref;
$attr['ref_ext'] = $result->ref_ext; $attr['ref_ext'] = $result->ref_ext;
$attr['label'] = $result->label; $attr['label'] = $result->label;
$attr['rang'] = $result->rang; $attr['rang'] = $result->position;
$attr['position'] = $result->position;
$attr['entity'] = $result->entity; $attr['entity'] = $result->entity;
$sql = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."product_attribute_combination2val as pac2v"; $sql = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."product_attribute_combination2val as pac2v";

15
htdocs/variants/class/ProductAttribute.class.php
View File

@ -60,6 +60,9 @@ class ProductAttribute extends CommonObject
*/ */
public $rang; public $rang;
public $position;
/** /**
* Constructor * Constructor
* *
@ -85,7 +88,7 @@ class ProductAttribute extends CommonObject
return -1; return -1;
} }
$sql = "SELECT rowid, ref, ref_ext, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".((int) $id)." AND entity IN (".getEntity('product').")"; $sql = "SELECT rowid, ref, ref_ext, label, position FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".((int) $id)." AND entity IN (".getEntity('product').")";
$query = $this->db->query($sql); $query = $this->db->query($sql);
@ -99,7 +102,8 @@ class ProductAttribute extends CommonObject
$this->ref = $obj->ref; $this->ref = $obj->ref;
$this->ref_ext = $obj->ref_ext; $this->ref_ext = $obj->ref_ext;
$this->label = $obj->label; $this->label = $obj->label;
$this->rang = $obj->rang; $this->rang = $obj->position;
$this->position = $obj->position;
return 1; return 1;
} }
@ -113,8 +117,8 @@ class ProductAttribute extends CommonObject
{ {
$return = array(); $return = array();
$sql = 'SELECT rowid, ref, ref_ext, label, rang FROM '.MAIN_DB_PREFIX."product_attribute WHERE entity IN (".getEntity('product').')'; $sql = 'SELECT rowid, ref, ref_ext, label, position FROM '.MAIN_DB_PREFIX."product_attribute WHERE entity IN (".getEntity('product').')';
$sql .= $this->db->order('rang', 'asc'); $sql .= $this->db->order('position', 'asc');
$query = $this->db->query($sql); $query = $this->db->query($sql);
if ($query) { if ($query) {
while ($result = $this->db->fetch_object($query)) { while ($result = $this->db->fetch_object($query)) {
@ -123,7 +127,8 @@ class ProductAttribute extends CommonObject
$tmp->ref = $result->ref; $tmp->ref = $result->ref;
$tmp->ref_ext = $result->ref_ext; $tmp->ref_ext = $result->ref_ext;
$tmp->label = $result->label; $tmp->label = $result->label;
$tmp->rang = $result->rang; $tmp->rang = $result->position;
$tmp->position = $result->position;
$return[] = $tmp; $return[] = $tmp;
} }