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

Merge pull request #4661 from IonAgorria/dynamic-prices-fixes

Browse Source 
Dynamic prices fixes
This commit is contained in:
Laurent Destailleur 2016-02-21 19:08:41 +01:00
commit 00841ea3fd
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/product/dynamic_price/class/price_parser.class.php
View File

@ -36,7 +36,7 @@ class PriceParser
// Limit of expressions per price // Limit of expressions per price
public $limit = 100; public $limit = 100;
// The error that occurred when parsing price // The error that occurred when parsing price
public $error; public $error_parser;
// The expression that caused the error // The expression that caused the error
public $error_expr; public $error_expr;
//The special char //The special char
@ -94,10 +94,10 @@ class PriceParser
16, internal error 16, internal error
18, internal error 18, internal error
*/ */
if (empty($this->error)) { if (empty($this->error_parser)) {
return $langs->trans("ErrorPriceExpressionUnknown", 0); //this is not supposed to happen return $langs->trans("ErrorPriceExpressionUnknown", 0); //this is not supposed to happen
} }
list($code, $info) = $this->error; list($code, $info) = $this->error_parser;
if (in_array($code, array(9, 14, 19, 20))) //Errors which have 0 arg if (in_array($code, array(9, 14, 19, 20))) //Errors which have 0 arg
{ {
return $langs->trans("ErrorPriceExpression".$code); return $langs->trans("ErrorPriceExpression".$code);
@ -136,7 +136,7 @@ class PriceParser
$expression = trim($expression); $expression = trim($expression);
if (empty($expression)) if (empty($expression))
{ {
$this->error = array(20, null); $this->error_parser = array(20, null);
return -2; return -2;
} }
@ -198,8 +198,8 @@ class PriceParser
if (!empty($expr)) if (!empty($expr))
{ {
$last_result = $em->evaluate($expr); $last_result = $em->evaluate($expr);
$this->error = $em->last_error_code; $this->error_parser = $em->last_error_code;
if ($this->error !== null) { //$em->last_error is null if no error happened, so just check if error is not null if ($this->error_parser !== null) { //$em->last_error_code is null if no error happened, so just check if error_parser is not null
$this->error_expr = $expr; $this->error_expr = $expr;
return -3; return -3;
} }
@ -211,12 +211,12 @@ class PriceParser
} }
if (!isset($vars["price"])) if (!isset($vars["price"]))
{ {
$this->error = array(21, $expression); $this->error_parser = array(21, $expression);
return -4; return -4;
} }
if ($vars["price"] < 0) if ($vars["price"] < 0)
{ {
$this->error = array(22, $expression); $this->error_parser = array(22, $expression);
return -5; return -5;
} }
return $vars["price"]; return $vars["price"];
@ -235,7 +235,7 @@ class PriceParser
$price_expression = new PriceExpression($this->db); $price_expression = new PriceExpression($this->db);
$res = $price_expression->fetch($product->fk_price_expression); $res = $price_expression->fetch($product->fk_price_expression);
if ($res < 1) { if ($res < 1) {
$this->error = array(19, null); $this->error_parser = array(19, null);
return -1; return -1;
} }
@ -250,7 +250,7 @@ class PriceParser
//Parse the expression and return the price, if not error occurred check if price is higher than min //Parse the expression and return the price, if not error occurred check if price is higher than min
$result = $this->parseExpression($product, $price_expression->expression, $extra_values); $result = $this->parseExpression($product, $price_expression->expression, $extra_values);
if (empty($this->error)) { if (empty($this->error_parser)) {
if ($result < $product->price_min) { if ($result < $product->price_min) {
$result = $product->price_min; $result = $product->price_min;
} }
@ -272,7 +272,7 @@ class PriceParser
$res = $price_expression->fetch($product_supplier->fk_supplier_price_expression); $res = $price_expression->fetch($product_supplier->fk_supplier_price_expression);
if ($res < 1) if ($res < 1)
{ {
$this->error = array(19, null); $this->error_parser = array(19, null);
return -1; return -1;
} }

8
htdocs/product/fournisseurs.php
View File

@ -228,14 +228,8 @@ if (empty($reshook))
if (!empty($conf->dynamicprices->enabled) && $price_expression !== '') if (!empty($conf->dynamicprices->enabled) && $price_expression !== '')
{ {
//Check the expression validity by parsing it //Check the expression validity by parsing it
$prod_supplier = new ProductFournisseur($this->db);
$prod_supplier->id = $prodid;
$prod_supplier->fourn_qty = $quantity;
$prod_supplier->fourn_tva_tx = $tva_tx;
$prod_supplier->fourn_id = $id_fourn;
$prod_supplier->fk_supplier_price_expression = $price_expression;
$priceparser = new PriceParser($db); $priceparser = new PriceParser($db);
$price_result = $priceparser->parseProductSupplier($prod_supplier); $price_result = $priceparser->parseProductSupplier($object);
if ($price_result < 0) { //Expression is not valid if ($price_result < 0) { //Expression is not valid
$error++; $error++;
setEventMessages($priceparser->translatedError(), null, 'errors'); setEventMessages($priceparser->translatedError(), null, 'errors');