Merge pull request #19918 from Je2fb/patch-3

Add new expression in Dynamic Price
This commit is contained in:
Laurent Destailleur 2022-01-25 13:55:57 +01:00 committed by GitHub
commit 037a01aa79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -263,13 +263,16 @@ class PriceParser
return -1;
} elseif ($res == 0) {
$supplier_min_price = 0;
$supplier_min_price_with_discount = 0;
} else {
$supplier_min_price = $productFournisseur->fourn_unitprice;
$supplier_min_price_with_discount = $productFournisseur->fourn_unitprice_with_discount;
}
//Accessible values by expressions
$extra_values = array_merge($extra_values, array(
"supplier_min_price" => $supplier_min_price,
"supplier_min_price_with_discount" => $supplier_min_price_with_discount,
));
//Parse the expression and return the price, if not error occurred check if price is higher than min
@ -329,12 +332,13 @@ class PriceParser
//Values for product expressions
$extra_values = array_merge($extra_values, array(
"supplier_min_price" => 1,
"supplier_min_price_with_discount" => 2,
));
//Values for supplier product expressions
$extra_values = array_merge($extra_values, array(
"supplier_quantity" => 2,
"supplier_tva_tx" => 3,
"supplier_quantity" => 3,
"supplier_tva_tx" => 4,
));
return $this->parseExpression($product, $expression, $extra_values);
}