Use item grouping in the email snippets

lukasbestle · Jul 30, 2023 · 7fd7728 · 7fd7728
1 parent fe5d819
commit 7fd7728
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 4 deletions.
diff --git a/src/config/snippets/roomle/configuration.php b/src/config/snippets/roomle/configuration.php
@@ -1,4 +1,5 @@
 <?php /** @var LukasBestle\Roomle\Configuration $configuration */ ?>
+<?php if ($configuration->count()): ?><?= $configuration->count() ?>x <?php endif ?>
 <?= $configuration->label() ?> (<?= $configuration->id() ?>)
 <?= $configuration->size() . "\n" ?>
 <?= $configuration->configuratorUrl() . "\n" ?>

diff --git a/src/config/snippets/roomle/plan.php b/src/config/snippets/roomle/plan.php
@@ -2,6 +2,6 @@
 <?= $plan->label() ?> (<?= $plan->id() ?>)
 <?= $plan->configuratorUrl() . "\n" ?>
 
-<?php foreach ($plan->items() as $item): ?>
+<?php foreach ($plan->groupedItems() as $item): ?>
 <?= $item . "\n" ?>
 <?php endforeach ?>
diff --git a/tests/Roomle/ConfigurationTest.php b/tests/Roomle/ConfigurationTest.php
@@ -250,4 +250,61 @@ public function testToString()
 
 		$this->assertStringEqualsFile(__DIR__ . '/fixtures/configuration.txt', (string)$configuration);
 	}
+
+	/**
+	 * @covers ::__toString
+	 */
+	public function testToString_WithCount()
+	{
+		$configuration = new Configuration([
+			'configuratorUrl' => 'https://example.com/configurator',
+			'count'           => 3,
+			'depth'           => 12,
+			'height'          => 34,
+			'id'              => 'some:id',
+			'label'           => 'Some product',
+			'width'           => 56,
+			'parts'           => [
+				[
+					'articleNr'   => '123.456.789',
+					'componentId' => 'some:component1',
+					'count'       => 2,
+					'label'       => 'Some part',
+					'parameters'  => [
+						[
+							'key'        => 'height',
+							'label'      => 'Height',
+							'type'       => 'Decimal',
+							'unitType'   => 'length',
+							'value'      => '123.0'
+						],
+						[
+							'key'        => 'width',
+							'label'      => 'Width',
+							'type'       => 'Decimal',
+							'unitType'   => 'length',
+							'value'      => '456.0'
+						]
+					]
+				],
+				[
+					'articleNr'   => '987.654.321',
+					'componentId' => 'some:component2',
+					'count'       => 1,
+					'label'       => 'Some other part',
+					'parameters'  => [
+						[
+							'key'        => 'height',
+							'label'      => 'Height',
+							'type'       => 'Decimal',
+							'unitType'   => 'length',
+							'value'      => '789.0'
+						]
+					]
+				]
+			],
+		]);
+
+		$this->assertStringEqualsFile(__DIR__ . '/fixtures/configuration_count.txt', (string)$configuration);
+	}
 }
diff --git a/tests/Roomle/PlanTest.php b/tests/Roomle/PlanTest.php
@@ -435,7 +435,54 @@ public function testToString_Plan()
 							]
 						]
 					]
-				]
+				],
+				[
+					'configuratorUrl' => 'https://example.com/configurator/item1',
+					'depth'           => 12,
+					'height'          => 34,
+					'id'              => 'some:id1',
+					'label'           => 'Some product',
+					'width'           => 56,
+					'parts'           => [
+						[
+							'articleNr'   => '123.456.789',
+							'componentId' => 'some:component1',
+							'count'       => 2,
+							'label'       => 'Some part',
+							'parameters'  => [
+								[
+									'key'        => 'height',
+									'label'      => 'Height',
+									'type'       => 'Decimal',
+									'unitType'   => 'length',
+									'value'      => '123.0'
+								],
+								[
+									'key'        => 'width',
+									'label'      => 'Width',
+									'type'       => 'Decimal',
+									'unitType'   => 'length',
+									'value'      => '456.0'
+								]
+							]
+						],
+						[
+							'articleNr'   => '987.654.321',
+							'componentId' => 'some:component2',
+							'count'       => 1,
+							'label'       => 'Some other part',
+							'parameters'  => [
+								[
+									'key'        => 'height',
+									'label'      => 'Height',
+									'type'       => 'Decimal',
+									'unitType'   => 'length',
+									'value'      => '789.0'
+								]
+							]
+						]
+					]
+				],
 			]
 		]);
 

diff --git a/tests/Roomle/fixtures/configuration_count.txt b/tests/Roomle/fixtures/configuration_count.txt
@@ -0,0 +1,11 @@
+3x Some product (some:id)
+W 5.6 cm / H 3.4 cm / D 1.2 cm
+https://example.com/configurator
+
+2x Some part (123.456.789)
+Height: 12.3 cm
+Width: 45.6 cm
+
+1x Some other part (987.654.321)
+Height: 78.9 cm
+
diff --git a/tests/Roomle/fixtures/plan.txt b/tests/Roomle/fixtures/plan.txt
@@ -1,7 +1,7 @@
 Plan (abcdefghi)
 https://example.com/configurator/plan
 
-Some product (some:id1)
+2x Some product (some:id1)
 W 5.6 cm / H 3.4 cm / D 1.2 cm
 https://example.com/configurator/item1
 
@@ -13,7 +13,7 @@ Width: 45.6 cm
 Height: 78.9 cm
 
 
-Some other product (some:id2)
+1x Some other product (some:id2)
 W 5.6 cm / H 3.4 cm / D 1.2 cm
 https://example.com/configurator/item2