boonkerz/calc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Calc

Browse Source
This commit is contained in:
Thomas Peterson 2022-06-28 11:53:11 +02:00
parent 68dcc64dfd
commit 7c1adb2aba
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Calc/Valid.php
View File

@ -42,14 +42,10 @@ class Valid
foreach($this->article->getOptions() as $option) { foreach($this->article->getOptions() as $option) {
if($option instanceof Input) { if($option instanceof Input) {
if($option->getMaxValue() && $option->getMaxValue() <= $option->getRawValue()) { if($option->getMaxValue() && $option->getMaxValue() <= $option->getRawValue()) {
$option->setIsValid(false);
$option->addValidationError(new Max($option->getRawValue(), $option->getMaxValue())); $option->addValidationError(new Max($option->getRawValue(), $option->getMaxValue()));
continue;
} }
if($option->getMinValue() && $option->getMinValue() >= $option->getRawValue()) { if($option->getMinValue() && $option->getMinValue() >= $option->getRawValue()) {
$option->setIsValid(false);
$option->addValidationError(new Min($option->getRawValue(), $option->getMinValue())); $option->addValidationError(new Min($option->getRawValue(), $option->getMinValue()));
continue;
} }
} }
if($option instanceof Select|| $option instanceof Checkbox) { if($option instanceof Select|| $option instanceof Checkbox) {

4
tests/Customer/P/CalcTest.php
View File

@ -53,7 +53,7 @@ class CalcTest extends TestCase
$this->engine->setVariable('breite_frei', 600); $this->engine->setVariable('breite_frei', 600);
$this->engine->calc(); $this->engine->calc();
$this->assertFalse($article->getOptionById('breite_frei')->isValid()); $this->assertTrue($article->getOptionById('breite_frei')->isValid());
$this->assertEquals(1, count($article->getOptionById('breite_frei')->getValidationErrors())); $this->assertEquals(1, count($article->getOptionById('breite_frei')->getValidationErrors()));
$this->assertInstanceOf(Max::class, $article->getOptionById('breite_frei')->getValidationErrors()->first()); $this->assertInstanceOf(Max::class, $article->getOptionById('breite_frei')->getValidationErrors()->first());
} }
@ -64,7 +64,7 @@ class CalcTest extends TestCase
$this->engine->setVariable('breite_frei', 10); $this->engine->setVariable('breite_frei', 10);
$this->engine->calc(); $this->engine->calc();
$this->assertFalse($article->getOptionById('breite_frei')->isValid()); $this->assertTrue($article->getOptionById('breite_frei')->isValid());
$this->assertEquals(1, count($article->getOptionById('breite_frei')->getValidationErrors())); $this->assertEquals(1, count($article->getOptionById('breite_frei')->getValidationErrors()));
$this->assertInstanceOf(Min::class, $article->getOptionById('breite_frei')->getValidationErrors()->first()); $this->assertInstanceOf(Min::class, $article->getOptionById('breite_frei')->getValidationErrors()->first());
} }