diff --git a/src/AdType.php b/src/AdType.php index 79d93c7..02189fa 100644 --- a/src/AdType.php +++ b/src/AdType.php @@ -5,7 +5,6 @@ use eiriksm\FinnTransfer\Traits\ContactTrait; use eiriksm\FinnTransfer\Traits\EngineTrait; use eiriksm\FinnTransfer\Traits\HeaderTrait; -use eiriksm\FinnTransfer\Traits\InteriorMeasurementsTrait; use eiriksm\FinnTransfer\Traits\MoreInfoTrait; use eiriksm\FinnTransfer\Traits\MotorPriceTrait; use eiriksm\FinnTransfer\Traits\ObjectTrait; @@ -14,7 +13,6 @@ abstract class AdType extends XmlBase implements AdTypeInterface { use MotorPriceTrait; use EngineTrait; - use InteriorMeasurementsTrait; use MoreInfoTrait; use ContactTrait; use HeaderTrait; diff --git a/src/AdTypes/BusXml.php b/src/AdTypes/BusXml.php index 91ba177..0835078 100644 --- a/src/AdTypes/BusXml.php +++ b/src/AdTypes/BusXml.php @@ -3,12 +3,14 @@ namespace eiriksm\FinnTransfer\AdTypes; use eiriksm\FinnTransfer\AdType; +use eiriksm\FinnTransfer\Traits\InteriorMeasurementsTrait; use eiriksm\FinnTransfer\Traits\ModelPropertyTrait; class BusXml extends AdType { use ModelPropertyTrait; + use InteriorMeasurementsTrait; protected $dtd = 'http://www.iad.no/dtd/IADIF-bus1.dtd'; diff --git a/src/AdTypes/VanTruckXml.php b/src/AdTypes/VanTruckXml.php index bbe4280..63521dd 100644 --- a/src/AdTypes/VanTruckXml.php +++ b/src/AdTypes/VanTruckXml.php @@ -3,12 +3,14 @@ namespace eiriksm\FinnTransfer\AdTypes; use eiriksm\FinnTransfer\AdType; +use eiriksm\FinnTransfer\Traits\InteriorMeasurementsTrait; use eiriksm\FinnTransfer\Traits\ModelPropertyTrait; class VanTruckXml extends AdType { use ModelPropertyTrait; + use InteriorMeasurementsTrait; protected $dtd = 'http://www.iad.no/dtd/IADIF-van-truck-10.dtd'; diff --git a/src/Traits/InteriorMeasurementsTrait.php b/src/Traits/InteriorMeasurementsTrait.php index f2b5810..b1640a1 100644 --- a/src/Traits/InteriorMeasurementsTrait.php +++ b/src/Traits/InteriorMeasurementsTrait.php @@ -25,23 +25,22 @@ trait InteriorMeasurementsTrait */ protected $interiorMeasurementsHeightBody; - public function setInteriorMeasurements() + protected function createInteriorMeasurementsElements() { if (!isset($this->interiorMeasurementsBody)) { - $this->createInteriorMeasurementsElements(); - } - } + $this->interiorMeasurementsBody = $this->dom->createElement('INTERIOR_MEASUREMENTS'); - protected function createInteriorMeasurementsElements() - { - $this->interiorMeasurementsBody = $this->dom->createElement('INTERIOR_MEASUREMENTS'); - $this->interiorMeasurementsLengthBody = $this->dom->createElement('LENGTH'); - $this->interiorMeasurementsWidthBody = $this->dom->createElement('WIDTH'); - $this->interiorMeasurementsHeightBody = $this->dom->createElement('HEIGHT'); - $this->interiorMeasurementsBody->appendChild($this->interiorMeasurementsHeightBody); - $this->interiorMeasurementsBody->appendChild($this->interiorMeasurementsWidthBody); - $this->interiorMeasurementsBody->appendChild($this->interiorMeasurementsLengthBody); - $this->adBody->appendChild($this->interiorMeasurementsBody); + $this->interiorMeasurementsLengthBody = $this->dom->createElement('LENGTH'); + $this->interiorMeasurementsBody->appendChild($this->interiorMeasurementsLengthBody); + + $this->interiorMeasurementsWidthBody = $this->dom->createElement('WIDTH'); + $this->interiorMeasurementsBody->appendChild($this->interiorMeasurementsWidthBody); + + $this->interiorMeasurementsHeightBody = $this->dom->createElement('HEIGHT'); + $this->interiorMeasurementsBody->appendChild($this->interiorMeasurementsHeightBody); + + $this->adBody->appendChild($this->interiorMeasurementsBody); + } } public function setInteriorMeasurementsLength($length)