use improved invoice calculator logic

kevinpapst · kevinpapst · commit bded034f989d · 2025-11-09T13:03:40.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Version 2.9.0
+
+Compatibility: requires minimum Kimai 2.41.0
+
+- Use improved invoice calculator logic
+
 ## Version 2.8.0
 
 Compatibility: requires minimum Kimai 2.15.0
diff --git a/Invoice/DemoSortActivityInvoiceCalculator.php b/Invoice/DemoSortActivityInvoiceCalculator.php
@@ -42,7 +42,10 @@ protected function mergeSumInvoiceItem(InvoiceItem $invoiceItem, ExportableItem
         }
     }
 
-    public function getEntries(): array
+    /**
+     * @return InvoiceItem[]
+     */
+    protected function calculateEntries(): array
     {
         $entries = $this->model->getEntries();
         if (\count($entries) === 0) {
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Showcase plugin for Kimai, with demos for many extension points within the core",
     "homepage": "https://github.com/Keleo/DemoBundle",
     "type": "kimai-plugin",
-    "version": "2.8.0",
+    "version": "2.9.0",
     "keywords": [
         "kimai",
         "kimai-plugin"
@@ -17,7 +17,7 @@
     ],
     "extra": {
         "kimai": {
-            "require": 21500,
+            "require": 24100,
             "name": "Developer demo"
         }
     },

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,10 @@ protected function mergeSumInvoiceItem(InvoiceItem $invoiceItem, ExportableItem`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`- public function getEntries(): array`
	`45`	`+ /**`
	`46`	`+ * @return InvoiceItem[]`
	`47`	`+ */`
	`48`	`+ protected function calculateEntries(): array`
`46`	`49`	`{`
`47`	`50`	`$entries = $this->model->getEntries();`
`48`	`51`	`if (\count($entries) === 0) {`