From 5b49ac8b66c2ee10c375c319b7088889767a21c2 Mon Sep 17 00:00:00 2001
From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Date: Mon, 18 Nov 2024 09:30:52 +0000
Subject: [PATCH] Bug 36454: (QA follow-up) Use native is_expired instead of
 redundant JS calculation

Test plan:
1) $ yarn api:bundle
2) $ koha-plack --restart kohadev
3) Make a patron expired, search for them. Verify the 'expired' badge still shows

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 Koha/Patron.pm                                  | 4 ++++
 api/v1/swagger/definitions/patron.yaml          | 4 ++++
 koha-tmpl/intranet-tmpl/prog/js/staff-global.js | 8 +-------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Koha/Patron.pm b/Koha/Patron.pm
index 48b2ee75c72..20ac75196d8 100644
--- a/Koha/Patron.pm
+++ b/Koha/Patron.pm
@@ -2519,6 +2519,10 @@ sub to_api {
                                     ? Mojo::JSON->true
                                     : Mojo::JSON->false;
 
+    $json_patron->{expired} = ( $self->is_expired )
+                                    ? Mojo::JSON->true
+                                    : Mojo::JSON->false;
+
     return $json_patron;
 }
 
diff --git a/api/v1/swagger/definitions/patron.yaml b/api/v1/swagger/definitions/patron.yaml
index 331989f303f..4adf5dcd534 100644
--- a/api/v1/swagger/definitions/patron.yaml
+++ b/api/v1/swagger/definitions/patron.yaml
@@ -209,6 +209,10 @@ properties:
       - boolean
       - "null"
     description: set to 1 if library marked this patron as having lost his card
+  expired:
+    type: boolean
+    readOnly: true
+    description: If patron is expired
   restricted:
     type: boolean
     readOnly: true
diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
index e993f8fe011..e76bf876f68 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
@@ -695,12 +695,6 @@ function patron_autocomplete(node, options) {
         } else {
             loggedInClass = "";
         }
-        let new_date = new Date();
-        let today = Date.parse($date_to_rfc3339($date(new_date.toString())));
-        let expiration = Date.parse(
-            $date_to_rfc3339($date(item.expiry_date.toString()))
-        );
-        let expired = today > expiration;
         return $("<li></li>")
             .addClass(loggedInClass)
             .data("ui-autocomplete-item", item)
@@ -735,7 +729,7 @@ function patron_autocomplete(node, options) {
                           item.library.name.escapeHtml() +
                           "</span>"
                         : "") +
-                    (expired
+                    (item.expired
                         ? '<span class="badge text-bg-warning">' +
                           __("Expired") +
                           "</span>"
-- 
2.34.1