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

Merge pull request #14433 from c3do/patch-1

Browse Source 
NEW Triggers Attributes and Attributes values
This commit is contained in:
Laurent Destailleur 2020-08-16 23:45:32 +02:00 committed by GitHub
commit b7c38f4617
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 230 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,8 +287,8 @@ class Products extends DolibarrApi
foreach ($request_data as $field => $value) { foreach ($request_data as $field => $value) {
if ($field == 'id') { continue; if ($field == 'id') { continue;
} }
if ($field == 'stock_reel') { if ($field == 'stock_reel') {
throw new RestException(400, 'Stock reel cannot be updated here. Use the /stockmovements endpoint instead'); throw new RestException(400, 'Stock reel cannot be updated here. Use the /stockmovements endpoint instead');
} }
$this->product->$field = $value; $this->product->$field = $value;
} }
@ -578,12 +578,12 @@ class Products extends DolibarrApi
} }
if ($result > 0) { if ($result > 0) {
require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
$prodcustprice = new Productcustomerprice($this->db); $prodcustprice = new Productcustomerprice($this->db);
$filter = array(); $filter = array();
$filter['t.fk_product'] .= $id; $filter['t.fk_product'] .= $id;
if ($thirdparty_id) $filter['t.fk_soc'] .= $thirdparty_id; if ($thirdparty_id) $filter['t.fk_soc'] .= $thirdparty_id;
$result = $prodcustprice->fetch_all('', '', 0, 0, $filter); $result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
} }
if (empty($prodcustprice->lines)) { if (empty($prodcustprice->lines)) {
@ -624,8 +624,8 @@ class Products extends DolibarrApi
} }
return array( return array(
'prices_by_qty'=>$this->product->prices_by_qty[0], // 1 if price by quantity was activated for the product 'prices_by_qty'=>$this->product->prices_by_qty[0], // 1 if price by quantity was activated for the product
'prices_by_qty_list'=>$this->product->prices_by_qty_list[0] 'prices_by_qty_list'=>$this->product->prices_by_qty_list[0]
); );
} }
@ -641,11 +641,11 @@ class Products extends DolibarrApi
* @param string $ref_fourn Supplier ref * @param string $ref_fourn Supplier ref
* @param float $tva_tx New VAT Rate (For example 8.5. Should not be a string) * @param float $tva_tx New VAT Rate (For example 8.5. Should not be a string)
* @param string $charges costs affering to product * @param string $charges costs affering to product
* @param float $remise_percent Discount regarding qty (percent) * @param float $remise_percent Discount regarding qty (percent)
* @param float $remise Discount regarding qty (amount) * @param float $remise Discount regarding qty (amount)
* @param int $newnpr Set NPR or not * @param int $newnpr Set NPR or not
* @param int $delivery_time_days Delay in days for delivery (max). May be '' if not defined. * @param int $delivery_time_days Delay in days for delivery (max). May be '' if not defined.
* @param string $supplier_reputation Reputation with this product to the defined supplier (empty, FAVORITE, DONOTORDER) * @param string $supplier_reputation Reputation with this product to the defined supplier (empty, FAVORITE, DONOTORDER)
* @param array $localtaxes_array Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function). * @param array $localtaxes_array Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
* @param string $newdefaultvatcode Default vat code * @param string $newdefaultvatcode Default vat code
* @param float $multicurrency_buyprice Purchase price for the quantity min in currency * @param float $multicurrency_buyprice Purchase price for the quantity min in currency
@ -749,77 +749,77 @@ class Products extends DolibarrApi
*/ */
public function getSupplierProducts($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $supplier = 0, $sqlfilters = '') public function getSupplierProducts($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $supplier = 0, $sqlfilters = '')
{ {
global $db, $conf; global $db, $conf;
$obj_ret = array(); $obj_ret = array();
$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : ''; $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
$sql = "SELECT t.rowid, t.ref, t.ref_ext"; $sql = "SELECT t.rowid, t.ref, t.ref_ext";
$sql .= " FROM ".MAIN_DB_PREFIX."product as t"; $sql .= " FROM ".MAIN_DB_PREFIX."product as t";
if ($category > 0) { if ($category > 0) {
$sql .= ", ".MAIN_DB_PREFIX."categorie_product as c"; $sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
} }
$sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as s"; $sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as s";
$sql .= ' WHERE t.entity IN ('.getEntity('product').')'; $sql .= ' WHERE t.entity IN ('.getEntity('product').')';
if ($supplier > 0) { if ($supplier > 0) {
$sql .= " AND s.fk_soc = ".$db->escape($supplier); $sql .= " AND s.fk_soc = ".$db->escape($supplier);
} }
$sql .= " AND s.fk_product = t.rowid"; $sql .= " AND s.fk_product = t.rowid";
// Select products of given category // Select products of given category
if ($category > 0) { if ($category > 0) {
$sql .= " AND c.fk_categorie = ".$db->escape($category); $sql .= " AND c.fk_categorie = ".$db->escape($category);
$sql .= " AND c.fk_product = t.rowid"; $sql .= " AND c.fk_product = t.rowid";
} }
if ($mode == 1) { if ($mode == 1) {
// Show only products // Show only products
$sql .= " AND t.fk_product_type = 0"; $sql .= " AND t.fk_product_type = 0";
} elseif ($mode == 2) { } elseif ($mode == 2) {
// Show only services // Show only services
$sql .= " AND t.fk_product_type = 1"; $sql .= " AND t.fk_product_type = 1";
} }
// Add sql filters // Add sql filters
if ($sqlfilters) { if ($sqlfilters) {
if (!DolibarrApi::_checkFilters($sqlfilters)) { if (!DolibarrApi::_checkFilters($sqlfilters)) {
throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters); throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
} }
$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)'; $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")"; $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
} }
$sql .= $db->order($sortfield, $sortorder); $sql .= $db->order($sortfield, $sortorder);
if ($limit) { if ($limit) {
if ($page < 0) { if ($page < 0) {
$page = 0; $page = 0;
} }
$offset = $limit * $page; $offset = $limit * $page;
$sql .= $db->plimit($limit + 1, $offset); $sql .= $db->plimit($limit + 1, $offset);
} }
$result = $db->query($sql); $result = $db->query($sql);
if ($result) { if ($result) {
$num = $db->num_rows($result); $num = $db->num_rows($result);
$min = min($num, ($limit <= 0 ? $num : $limit)); $min = min($num, ($limit <= 0 ? $num : $limit));
$i = 0; $i = 0;
while ($i < $min) while ($i < $min)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$product_fourn = new ProductFournisseur($this->db); $product_fourn = new ProductFournisseur($this->db);
$product_fourn_list = $product_fourn->list_product_fournisseur_price($obj->rowid, '', '', 0, 0); $product_fourn_list = $product_fourn->list_product_fournisseur_price($obj->rowid, '', '', 0, 0);
foreach ($product_fourn_list as $tmpobj) { foreach ($product_fourn_list as $tmpobj) {
$this->_cleanObjectDatas($tmpobj); $this->_cleanObjectDatas($tmpobj);
} }
//var_dump($product_fourn_list->db);exit; //var_dump($product_fourn_list->db);exit;
$obj_ret[$obj->rowid] = $product_fourn_list; $obj_ret[$obj->rowid] = $product_fourn_list;
$i++; $i++;
} }
} else { } else {
throw new RestException(503, 'Error when retrieve product list : '.$db->lasterror()); throw new RestException(503, 'Error when retrieve product list : '.$db->lasterror());
} }
if (!count($obj_ret)) { if (!count($obj_ret)) {
throw new RestException(404, 'No product found'); throw new RestException(404, 'No product found');
} }
return $obj_ret; return $obj_ret;
} }
/** /**
@ -1057,7 +1057,7 @@ class Products extends DolibarrApi
$result = $prodattr->delete(DolibarrApiAccess::$user); $result = $prodattr->delete(DolibarrApiAccess::$user);
if ($result <= 0) { if ($result <= 0) {
throw new RestException(500, "Error deleting attribute"); throw new RestException(500, "Error deleting attribute");
} }
return $result; return $result;
@ -1161,9 +1161,23 @@ class Products extends DolibarrApi
throw new RestException(401); throw new RestException(401);
} }
$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id; $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id." AND entity IN (".getEntity('product').")";
$query = $this->db->query($sql);
if ($this->db->query($sql)) { if (!$query) {
throw new RestException(401);
}
if (!$this->db->num_rows($query)) {
throw new RestException(404, 'Attribute value not found');
}
$result = $this->db->fetch_object($query);
$attrval = new ProductAttributeValue($this->db);
$attrval->id = $result->rowid;
$result = $attrval->delete(DolibarrApiAccess::$user);
if ($result > 0) {
return 1; return 1;
} }
@ -1328,7 +1342,7 @@ class Products extends DolibarrApi
$objectval = new ProductAttributeValue($this->db); $objectval = new ProductAttributeValue($this->db);
$objectval->id = (int) $id; $objectval->id = (int) $id;
if ($objectval->delete() > 0) { if ($objectval->delete(DolibarrApiAccess::$user) > 0) {
return 1; return 1;
} }
throw new RestException(500, "Error deleting attribute value"); throw new RestException(500, "Error deleting attribute value");
@ -1448,9 +1462,9 @@ class Products extends DolibarrApi
$result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact, $reference); $result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact, $reference);
if ($result > 0) if ($result > 0)
{ {
return $result; return $result;
} else { } else {
throw new RestException(500, "Error creating new product variant"); throw new RestException(500, "Error creating new product variant");
} }
} }
@ -1573,7 +1587,7 @@ class Products extends DolibarrApi
$result = $prodcomb->delete(DolibarrApiAccess::$user); $result = $prodcomb->delete(DolibarrApiAccess::$user);
if ($result <= 0) if ($result <= 0)
{ {
throw new RestException(500, "Error deleting variant"); throw new RestException(500, "Error deleting variant");
} }
return $result; return $result;
} }
@ -1665,17 +1679,17 @@ class Products extends DolibarrApi
} }
if ($includestockdata) { if ($includestockdata) {
$this->product->load_stock(); $this->product->load_stock();
if (is_array($this->product->stock_warehouse)) { if (is_array($this->product->stock_warehouse)) {
foreach ($this->product->stock_warehouse as $keytmp => $valtmp) { foreach ($this->product->stock_warehouse as $keytmp => $valtmp) {
if (is_array($this->product->stock_warehouse[$keytmp]->detail_batch)) { if (is_array($this->product->stock_warehouse[$keytmp]->detail_batch)) {
foreach ($this->product->stock_warehouse[$keytmp]->detail_batch as $keytmp2 => $valtmp2) { foreach ($this->product->stock_warehouse[$keytmp]->detail_batch as $keytmp2 => $valtmp2) {
unset($this->product->stock_warehouse[$keytmp]->detail_batch[$keytmp2]->db); unset($this->product->stock_warehouse[$keytmp]->detail_batch[$keytmp2]->db);
} }
} }
} }
} }
} }
if ($includesubproducts) { if ($includesubproducts) {

6
htdocs/variants/card.php
View File

@ -90,9 +90,9 @@ if ($confirm == 'yes') {
if ($action == 'confirm_delete') { if ($action == 'confirm_delete') {
$db->begin(); $db->begin();
$res = $objectval->deleteByFkAttribute($object->id); $res = $objectval->deleteByFkAttribute($object->id, $user);
if ($res < 1 || ($object->delete() < 1)) { if ($res < 1 || ($object->delete($user) < 1)) {
$db->rollback(); $db->rollback();
setEventMessages($langs->trans('CoreErrorMessage'), $object->errors, 'errors'); setEventMessages($langs->trans('CoreErrorMessage'), $object->errors, 'errors');
header('Location: '.dol_buildpath('/variants/card.php?id='.$object->id, 2)); header('Location: '.dol_buildpath('/variants/card.php?id='.$object->id, 2));
@ -105,7 +105,7 @@ if ($confirm == 'yes') {
} elseif ($action == 'confirm_deletevalue') } elseif ($action == 'confirm_deletevalue')
{ {
if ($objectval->fetch($valueid) > 0) { if ($objectval->fetch($valueid) > 0) {
if ($objectval->delete() < 1) { if ($objectval->delete($user) < 1) {
setEventMessages($langs->trans('CoreErrorMessage'), $objectval->errors, 'errors'); setEventMessages($langs->trans('CoreErrorMessage'), $objectval->errors, 'errors');
} else { } else {
setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');

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

@ -16,17 +16,18 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
/** /**
* Class ProductAttribute * Class ProductAttribute
* Used to represent a product attribute * Used to represent a product attribute
*/ */
class ProductAttribute class ProductAttribute extends CommonObject
{ {
/** /**
* Database handler * Database handler
* @var DoliDB * @var DoliDB
*/ */
private $db; public $db;
/** /**
* Id of the product attribute * Id of the product attribute
@ -119,7 +120,8 @@ class ProductAttribute
$return[] = $tmp; $return[] = $tmp;
} }
} else dol_print_error($this->db); }
else dol_print_error($this->db);
return $return; return $return;
} }
@ -127,11 +129,21 @@ class ProductAttribute
/** /**
* Creates a product attribute * Creates a product attribute
* *
* @param User $user Object user that create * @param User $user Object user
* @param int $notrigger Do not execute trigger
* @return int <0 KO, Id of new variant if OK * @return int <0 KO, Id of new variant if OK
*/ */
public function create(User $user) public function create(User $user, $notrigger = 0)
{ {
if (empty($notrigger)) {
// Call trigger
$result = $this->call_trigger('PRODUCT_ATTRIBUTE_CREATE', $user);
if ($result < 0) {
return -1;
}
// End call triggers
}
//Ref must be uppercase //Ref must be uppercase
$this->ref = strtoupper($this->ref); $this->ref = strtoupper($this->ref);
@ -152,11 +164,21 @@ class ProductAttribute
/** /**
* Updates a product attribute * Updates a product attribute
* *
* @param User $user Object user * @param User $user Object user
* @param int $notrigger Do not execute trigger
* @return int <0 KO, >0 OK * @return int <0 KO, >0 OK
*/ */
public function update(User $user) public function update(User $user, $notrigger = 0)
{ {
if (empty($notrigger)) {
// Call trigger
$result = $this->call_trigger('PRODUCT_ATTRIBUTE_MODIFY', $user);
if ($result < 0) {
return -1;
}
// End call triggers
}
//Ref must be uppercase //Ref must be uppercase
$this->ref = trim(strtoupper($this->ref)); $this->ref = trim(strtoupper($this->ref));
$this->label = trim($this->label); $this->label = trim($this->label);
@ -173,11 +195,21 @@ class ProductAttribute
/** /**
* Deletes a product attribute * Deletes a product attribute
* *
* @param User $user Object user * @param User $user Object user
* @return int <0 KO, >0 OK * @param int $notrigger Do not execute trigger
* @return int <0 KO, >0 OK
*/ */
public function delete($user = null) public function delete(User $user, $notrigger = 0)
{ {
if (empty($notrigger)) {
// Call trigger
$result = $this->call_trigger('PRODUCT_ATTRIBUTE_DELETE', $user);
if ($result < 0) {
return -1;
}
// End call triggers
}
$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $this->id; $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $this->id;
if ($this->db->query($sql)) { if ($this->db->query($sql)) {

95
htdocs/variants/class/ProductAttributeValue.class.php
View File

@ -16,17 +16,18 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
/** /**
* Class ProductAttributeValue * Class ProductAttributeValue
* Used to represent a product attribute value * Used to represent a product attribute value
*/ */
class ProductAttributeValue class ProductAttributeValue extends CommonObject
{ {
/** /**
* Database handler * Database handler
* @var DoliDB * @var DoliDB
*/ */
private $db; public $db;
/** /**
* Attribute value id * Attribute value id
@ -144,10 +145,11 @@ class ProductAttributeValue
/** /**
* Creates a value for a product attribute * Creates a value for a product attribute
* *
* @param User $user Object user * @param User $user Object user
* @return int <0 KO >0 OK * @param int $notrigger Do not execute trigger
* @return int <0 KO >0 OK
*/ */
public function create(User $user) public function create(User $user, $notrigger = 0)
{ {
if (!$this->fk_product_attribute) { if (!$this->fk_product_attribute) {
return -1; return -1;
@ -155,15 +157,25 @@ class ProductAttributeValue
// Ref must be uppercase // Ref must be uppercase
$this->ref = strtoupper($this->ref); $this->ref = strtoupper($this->ref);
$this->value = $this->db->escape($this->value);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_value (fk_product_attribute, ref, value, entity) $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_value (fk_product_attribute, ref, value, entity)
VALUES ('".(int) $this->fk_product_attribute."', '".$this->db->escape($this->ref)."', VALUES ('".(int) $this->fk_product_attribute."', '".$this->db->escape($this->ref)."',
'".$this->db->escape($this->value)."', ".(int) $this->entity.")"; '".$this->value."', ".(int) $this->entity.")";
$query = $this->db->query($sql); $query = $this->db->query($sql);
if ($query) { if ($query) {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_value'); $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_value');
if (empty($notrigger)) {
// Call trigger
$result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_CREATE', $user);
if ($result < 0) {
return -1;
}
// End call triggers
}
return 1; return 1;
} }
@ -173,11 +185,21 @@ class ProductAttributeValue
/** /**
* Updates a product attribute value * Updates a product attribute value
* *
* @param User $user Object user * @param User $user Object user
* @return int <0 if KO, >0 if OK * @param int $notrigger Do not execute trigger
* @return int <0 if KO, >0 if OK
*/ */
public function update(User $user) public function update(User $user, $notrigger = 0)
{ {
if (empty($notrigger)) {
// Call trigger
$result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_MODIFY', $user);
if ($result < 0) {
return -1;
}
// End call triggers
}
//Ref must be uppercase //Ref must be uppercase
$this->ref = trim(strtoupper($this->ref)); $this->ref = trim(strtoupper($this->ref));
$this->value = trim($this->value); $this->value = trim($this->value);
@ -196,33 +218,62 @@ class ProductAttributeValue
/** /**
* Deletes a product attribute value * Deletes a product attribute value
* *
* @param User $user Object user
* @param int $notrigger Do not execute trigger
* @return int <0 KO, >0 OK * @return int <0 KO, >0 OK
*/ */
public function delete() public function delete(User $user, $notrigger = 0)
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $this->id;
if ($this->db->query($sql)) { if (empty($notrigger)) {
return 1; // Call trigger
} $result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_DELETE', $user);
if ($result < 0) {
return -1;
}
// End call triggers
}
$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $this->id;
if ($this->db->query($sql)) {
return 1;
}
return -1; return -1;
} }
/** /**
* Deletes all product attribute values by a product attribute id * Deletes all product attribute values by a product attribute id
* *
* @param int $fk_attribute Product attribute id * @param int $fk_attribute Product attribute id
* @param User $user Object user
* @return int <0 KO, >0 OK * @return int <0 KO, >0 OK
*/ */
public function deleteByFkAttribute($fk_attribute) public function deleteByFkAttribute($fk_attribute, User $user)
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE fk_product_attribute = ".(int) $fk_attribute; $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE fk_product_attribute = ".(int) $fk_attribute;
if ($this->db->query($sql)) { $query = $this->db->query($sql);
return 1;
}
return -1; if (!$query) {
return -1;
}
if (!$this->db->num_rows($query)) {
return 1;
}
while ($obj = $this->db->fetch_object($query)) {
$tmp = new ProductAttributeValue($this->db);
if ($tmp->fetch($obj->rowid) > 0) {
$result = $tmp->delete($user);
if ($result < 0) {
return -1;
}
} else {
return -1;
}
}
return 1;
} }
} }