From fb4593dda24a5baf6dad2f88a0a04bbe83b6843a Mon Sep 17 00:00:00 2001 From: Thomas Peterson Date: Thu, 26 Sep 2019 14:09:56 +0200 Subject: [PATCH] Fixes --- src/Calc/Calc.php | 11 ++++++++++- src/Option/Parser.php | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Calc/Calc.php b/src/Calc/Calc.php index 4c728b3..e998f97 100644 --- a/src/Calc/Calc.php +++ b/src/Calc/Calc.php @@ -113,7 +113,7 @@ class Calc $formel = $this->formelCalc->parse($edge->getFormel()); if ($formel != "" && $option->getId() != 'weight' && !$option->isAjaxExport()) { $p = 0; - + $formel = str_replace("tonumber", '$this->toNumber', $formel); eval('@$p = ' . $formel . ';'); if($p > 0 || $p < 0) { $price += $p; @@ -129,4 +129,13 @@ class Calc return $price; } + private function toNumber($value) + { + if(strpos($value,',') == (strlen($value)-1)) { + return str_replace(',', '', $value); + } + + return str_replace(',', '.', $value); + + } } \ No newline at end of file diff --git a/src/Option/Parser.php b/src/Option/Parser.php index de09f3c..f7b2b1d 100644 --- a/src/Option/Parser.php +++ b/src/Option/Parser.php @@ -28,6 +28,7 @@ class Parser case 'select': $obj = new Select($node); break; + case 'text': case 'textarea': $obj = new Text($node); break;