From 5a47b15c97922385efa28342920888fa539ce64a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sun, 8 Feb 2026 21:58:14 +0100 Subject: [PATCH] Use the information from info provider whether prices includes VAT or not --- assets/controllers/elements/collection_type_controller.js | 2 +- src/Services/InfoProviderSystem/DTOtoEntityConverter.php | 3 ++- tests/Services/InfoProviderSystem/DTOtoEntityConverterTest.php | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/assets/controllers/elements/collection_type_controller.js b/assets/controllers/elements/collection_type_controller.js index 67022ef2..048600a9 100644 --- a/assets/controllers/elements/collection_type_controller.js +++ b/assets/controllers/elements/collection_type_controller.js @@ -86,7 +86,7 @@ export default class extends Controller { targetTable.insertAdjacentHTML('beforeend', newElementStr); ret = targetTable.lastElementChild; } - + //Trigger an event to notify other components that a new element has been created, so they can for example initialize select2 on it targetTable.dispatchEvent(new CustomEvent("collection:elementAdded", {bubbles: true})); diff --git a/src/Services/InfoProviderSystem/DTOtoEntityConverter.php b/src/Services/InfoProviderSystem/DTOtoEntityConverter.php index d3a7c52c..1a93b111 100644 --- a/src/Services/InfoProviderSystem/DTOtoEntityConverter.php +++ b/src/Services/InfoProviderSystem/DTOtoEntityConverter.php @@ -94,13 +94,14 @@ final class DTOtoEntityConverter $entity->setPrice($dto->getPriceAsBigDecimal()); $entity->setPriceRelatedQuantity($dto->price_related_quantity); - //Currency TODO if ($dto->currency_iso_code !== null) { $entity->setCurrency($this->getCurrency($dto->currency_iso_code)); } else { $entity->setCurrency(null); } + $entity->setIncludesVat($dto->includes_tax); + return $entity; } diff --git a/tests/Services/InfoProviderSystem/DTOtoEntityConverterTest.php b/tests/Services/InfoProviderSystem/DTOtoEntityConverterTest.php index 78e79167..54878bbf 100644 --- a/tests/Services/InfoProviderSystem/DTOtoEntityConverterTest.php +++ b/tests/Services/InfoProviderSystem/DTOtoEntityConverterTest.php @@ -101,6 +101,8 @@ class DTOtoEntityConverterTest extends WebTestCase //For base currencies, the currency field is null $this->assertNull($entity->getCurrency()); + + $this->assertTrue($entity->getIncludesVat()); } public function testConvertPurchaseInfo(): void