Fixed SQL error in revenueAndProfits view if a year has no invoices

MasterZydra · Oct 3, 2024 · d0fabeb · d0fabeb · MasterZydra · Oct 3, 2024
1 parent 1fddc9b
commit d0fabeb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,11 @@ Types of changes: `Added`, `Changed`, `Deprecate`, `Removed`, `Fixed`, `Secruity
 
 ## [Unreleased]
 
+## v2.6.1 - 03.10.2024 - Bugfix in 'Revenue and Profits' view
+
+### Fixed
+- Fixed SQL error in revenueAndProfits view if a year has no invoices
+
 ## v2.6.0 - 19.04.2024 - Added support for SQLite
 
 ### Added

diff --git a/app/Http/Controllers/FinancialRevenueProfitStatsController.php b/app/Http/Controllers/FinancialRevenueProfitStatsController.php
@@ -43,9 +43,13 @@ private function calculate(int $year): array
 
         $invoiceIds = array_map(fn(Invoice $invoice): int => $invoice->getId(), $invoices);
 
-        $deliveryNotes = DeliveryNote::all(DeliveryNote::getQueryBuilder()
-            ->where(ColType::Int, 'invoiceId', Condition::In, $invoiceIds)
-        );
+        $deliveryNotes = [];
+        if (count($invoiceIds) > 0) {
+            // TODO Where IN -> if array is empty, some condition that is always false?
+            $deliveryNotes = DeliveryNote::all(
+                DeliveryNote::getQueryBuilder()->where(ColType::Int, 'invoiceId', Condition::In, $invoiceIds)
+            );
+        }
 
         $revenue = 0.0;
         $payouts = 0.0;

diff --git a/resources/Views/about.php b/resources/Views/about.php
@@ -5,7 +5,7 @@
 <table class="scrollable">
     <tr>
         <td>Bio-Manager Version</td>
-        <td class="right">2.6.0</td>
+        <td class="right">2.6.1</td>
     </tr>
     <tr>
         <td><?= __('Developer') ?></td>