From f8ccd5bc22bbc25188077dc20f0049f7068852ea Mon Sep 17 00:00:00 2001 From: d-buchmann Date: Wed, 25 Oct 2023 13:58:59 +0200 Subject: [PATCH 1/4] Add price_related_quantity to PriceDTO.php --- src/Services/InfoProviderSystem/DTOs/PriceDTO.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Services/InfoProviderSystem/DTOs/PriceDTO.php b/src/Services/InfoProviderSystem/DTOs/PriceDTO.php index 8c563149..f1eb28f7 100644 --- a/src/Services/InfoProviderSystem/DTOs/PriceDTO.php +++ b/src/Services/InfoProviderSystem/DTOs/PriceDTO.php @@ -41,6 +41,8 @@ class PriceDTO public readonly ?string $currency_iso_code, /** @var bool If the price includes tax */ public readonly ?bool $includes_tax = true, + /** @var float the price related quantity */ + public readonly ?float $price_related_quantity = 1.0, ) { $this->price_as_big_decimal = BigDecimal::of($this->price); @@ -54,4 +56,4 @@ class PriceDTO { return $this->price_as_big_decimal; } -} \ No newline at end of file +} From e6870c61ee727da0e427c55e40a9d42d4b504795 Mon Sep 17 00:00:00 2001 From: d-buchmann Date: Wed, 25 Oct 2023 14:01:46 +0200 Subject: [PATCH 2/4] Update DTOtoEntityConverter.php --- src/Services/InfoProviderSystem/DTOtoEntityConverter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Services/InfoProviderSystem/DTOtoEntityConverter.php b/src/Services/InfoProviderSystem/DTOtoEntityConverter.php index 881d5f20..abccf444 100644 --- a/src/Services/InfoProviderSystem/DTOtoEntityConverter.php +++ b/src/Services/InfoProviderSystem/DTOtoEntityConverter.php @@ -87,6 +87,7 @@ final class DTOtoEntityConverter { $entity->setMinDiscountQuantity($dto->minimum_discount_amount); $entity->setPrice($dto->getPriceAsBigDecimal()); + $entity->setPriceRelatedQuantity($dto->price_related_quantity); //Currency TODO if ($dto->currency_iso_code !== null) { @@ -95,7 +96,6 @@ final class DTOtoEntityConverter $entity->setCurrency(null); } - return $entity; } @@ -295,4 +295,4 @@ final class DTOtoEntityConverter return $tmp; } -} \ No newline at end of file +} From aeed7c08028a4c369229b6405b3068e594dc1673 Mon Sep 17 00:00:00 2001 From: buchmann Date: Wed, 25 Oct 2023 14:29:18 +0200 Subject: [PATCH 3/4] fix line breaks --- src/Services/InfoProviderSystem/DTOtoEntityConverter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Services/InfoProviderSystem/DTOtoEntityConverter.php b/src/Services/InfoProviderSystem/DTOtoEntityConverter.php index abccf444..df890a90 100644 --- a/src/Services/InfoProviderSystem/DTOtoEntityConverter.php +++ b/src/Services/InfoProviderSystem/DTOtoEntityConverter.php @@ -295,4 +295,4 @@ final class DTOtoEntityConverter return $tmp; } -} +} \ No newline at end of file From 5144b75ed7c9f8c5b95cec2f15ace4097cde08a9 Mon Sep 17 00:00:00 2001 From: buchmann Date: Wed, 25 Oct 2023 15:56:40 +0200 Subject: [PATCH 4/4] Fix image type alt name if newly generated --- src/Services/InfoProviderSystem/DTOtoEntityConverter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Services/InfoProviderSystem/DTOtoEntityConverter.php b/src/Services/InfoProviderSystem/DTOtoEntityConverter.php index df890a90..c88ab429 100644 --- a/src/Services/InfoProviderSystem/DTOtoEntityConverter.php +++ b/src/Services/InfoProviderSystem/DTOtoEntityConverter.php @@ -289,7 +289,7 @@ final class DTOtoEntityConverter //If the entity was newly created, set the file filter if ($tmp->getID() === null) { $tmp->setFiletypeFilter('image/*'); - $tmp->setAlternativeNames(self::TYPE_DATASHEETS_NAME); + $tmp->setAlternativeNames(self::TYPE_IMAGE_NAME); } return $tmp;