From a0ef6a1fc8c404e9ada08de2a2f222fcc36d36fa Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 30 Mar 2024 09:56:51 +0100
Subject: [PATCH] Fix https://github.com/firefly-iii/firefly-iii/issues/8725

---
 app/Support/Search/OperatorQuerySearch.php | 2 +-
 app/Transformers/BillTransformer.php       | 5 ++++-
 config/firefly.php                         | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Support/Search/OperatorQuerySearch.php b/app/Support/Search/OperatorQuerySearch.php
index 23c127ead2..407cb38b84 100644
--- a/app/Support/Search/OperatorQuerySearch.php
+++ b/app/Support/Search/OperatorQuerySearch.php
@@ -177,7 +177,7 @@ class OperatorQuerySearch implements SearchInterface
             default:
                 app('log')->error(sprintf('Cannot handle node %s', $class));
 
-                throw new FireflyException(sprintf('Firefly III search cant handle "%s"-nodes', $class));
+                throw new FireflyException(sprintf('Firefly III search can\'t handle "%s"-nodes', $class));
 
             case Subquery::class:
                 // loop all notes in subquery:
diff --git a/app/Transformers/BillTransformer.php b/app/Transformers/BillTransformer.php
index 36988b5e2a..62d2232197 100644
--- a/app/Transformers/BillTransformer.php
+++ b/app/Transformers/BillTransformer.php
@@ -110,7 +110,10 @@ class BillTransformer extends AbstractTransformer
             $nem     = $nemDate->toAtomString();
 
             // nullify again when it's outside the current view range.
-            if ($nemDate->lt($this->parameters->get('start')) || $nemDate->gt($this->parameters->get('end'))) {
+            if (
+                (null !== $this->parameters->get('start') && $nemDate->lt($this->parameters->get('start'))) ||
+                (null !== $this->parameters->get('end') && $nemDate->gt($this->parameters->get('end')))
+            ) {
                 $nem          = null;
                 $nemDate      = null;
                 $firstPayDate = null;
diff --git a/config/firefly.php b/config/firefly.php
index a636f31084..685dca8189 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -118,7 +118,7 @@ return [
         // see cer.php for exchange rates feature flag.
     ],
     'version'                      => 'develop/2024-03-28',
-    'api_version'                  => '2.0.12',
+    'api_version'                  => '2.0.13',
     'db_version'                   => 23,
 
     // generic settings