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

Add Saved Values vom DB

Browse Source
This commit is contained in:
Thomas Peterson 2020-03-19 11:03:43 +01:00
parent ca26e6a7d1
commit 1bfb9cbd6f
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Calc/Valid.php
View File

@ -72,13 +72,15 @@ class Valid
if($this->engine->getVariables()[$option->getId()] == $opt->getId()) {
$opt->setIsSelected(true);
}else{
$opt->setIsSelected(false);
}
if($opt->isValid() && !$valid) {
$valid = true;
}
}
$option->processValue();
$option->setIsValid($valid);
}

3
src/Option/Type/PaperDbSelect.php
View File

@ -22,6 +22,7 @@ class PaperDbSelect extends Select
$opt->setId($this->savedCalcValues[$this->getId()]['art_nr']);
$opt->setLabel($this->savedCalcValues[$this->getId()]['description_1']);
$paper = $this->newPaperObject;
$paper->setId($this->savedCalcValues[$this->getId()]['id']);
$paper->setArtNr($this->savedCalcValues[$this->getId()]['art_nr']);
@ -37,6 +38,8 @@ class PaperDbSelect extends Select
$opt->setPaper($paper);
$this->addOption($opt);
return $opt;
}
}

9
src/Option/Type/Select.php
View File

@ -37,12 +37,9 @@ class Select extends Base
*/
public function processValue()
{
/** @var Opt $opt */
foreach($this->options as $opt)
{
if($opt->getId() == $this->getRawValue()) {
$this->setValue($opt->getLabel());
}
$option = $this->getSelectedOption();
if($option) {
$this->setValue($option->getLabel());
}
}

2
tests/Complex/PaperSavedTest.php
View File

@ -52,5 +52,7 @@ class PaperSavedTest extends \PHPUnit_Framework_TestCase
"offset_fix" => "0", "offset_var" => "0", "digital_fix" => "0", "digital_var" => "0", "volume" => "0.118" ] ]);
$this->assertEquals(162.19, $this->engine->getPrice());
$this->assertEquals("Bilderdruck matt 250 gr", $this->engine->getArticle()->getOptionById('papier')->getValue());
}
}