From d4d4df1102b3958ebe94c8e450af152b90a0820a Mon Sep 17 00:00:00 2001
From: Andrew Fuerste Henry <andrew@bywatersolutions.com>
Date: Tue, 4 Feb 2025 13:16:29 +0000
Subject: [PATCH] Bug 39025: Use old_issue_id for issue details on patron
 account screens

To test:
1: Have an item that is checked out, overdue, and showing an accruing fine
2: On the patron account, check both Make A Payment and Transactions tabs, confirm that the fine shows Due Date, Checkout Date, and Checked Out From values
3: Check your item in
4: Reload the patron account, confirm that the fine no longer shows checkout data on either Make A Payment or Transactions
5: Apply patch
6: Reload pages, confirm Make A Payment and Transactions tabs now show values in Due Date, Checkin Date, Checkout Date, and Checked Out From

Signed-off-by: Roman Dolny <roman.dolny@jezuici.pl>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 41a368f35efc8b7471b1e8c5217af446e38664d7)
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
---
 .../intranet-tmpl/prog/en/modules/members/boraccount.tt   | 8 ++++----
 koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
index 13cc95051b..45d6834476 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
@@ -122,11 +122,11 @@
         &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>[% END %]</td>
       <td>[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% account.itemnumber | uri %]&amp;biblionumber=[% account.item.biblionumber | uri %]#item[% account.itemnumber | uri %]">[% account.item.barcode | html %]</a>[% END %]</td>
       <td>[% IF ( account.itemnumber ) %][% account.item.itemcallnumber | html %][% END %]</td>
-      <td>[% IF ( account.issue_id ) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %]</td>
-      <td>[% IF ( account.issue_id ) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %]</td>
-      <td>[% IF ( account.issue_id ) %][% account.checkout.issuedate | $KohaDates %][% END %]</td>
+      <td>[% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %]</td>
+      <td>[% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %]</td>
+      <td>[% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.issuedate | $KohaDates %][% END %]</td>
       <td class="checked_out_from">
-          [% IF account.issue_id && account.checkout.library %]
+          [% IF ( account.issue_id ) || (account.old_issue_id) && account.checkout.library %]
               [% account.checkout.library.branchname | html %]
           [% END %]
       </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
index 918afe0890..c4dd639842 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
@@ -143,22 +143,22 @@
         [% END %]
     </td>
     <td>
-        [% IF line.issue_id %]
+        [% IF line.issue_id || line.old_issue_id %]
             [% line.checkout.date_due | $KohaDates as_due_date => 1 %]
         [% END %]
     </td>
     <td>
-        [% IF line.issue_id %]
+        [% IF line.issue_id || line.old_issue_id %]
             [% line.checkout.returndate | $KohaDates with_hours => 1 %]
         [% END %]
     </td>
     <td>
-        [% IF line.issue_id %]
+        [% IF line.issue_id || line.old_issue_id %]
             [% line.checkout.issuedate | $KohaDates %]
         [% END %]
     </td>
     <td class="checked_out_from">
-        [% IF line.issue_id && line.checkout.library %]
+        [% IF (line.issue_id || line.old_issue_id) && line.checkout.library %]
             [% line.checkout.library.branchname | html %]
         [% END %]
     </td>