From 42d90deb3fd7f6a4565e518998bdd8a83a4007db Mon Sep 17 00:00:00 2001 From: Andrew Fuerste Henry 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 --- .../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 4c325e5f46..9937f6f981 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 @@  [% IF ( account.itemnumber ) %][% account.item.biblio.title | html %][% END %] [% IF ( account.itemnumber ) %][% account.item.barcode | html %][% END %] [% IF ( account.itemnumber ) %][% account.item.itemcallnumber | html %][% END %] - [% IF ( account.issue_id ) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %] - [% IF ( account.issue_id ) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %] - [% IF ( account.issue_id ) %][% account.checkout.issuedate | $KohaDates %][% END %] + [% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %] + [% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %] + [% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.issuedate | $KohaDates %][% END %] - [% IF account.issue_id && account.checkout.library %] + [% IF ( account.issue_id ) || (account.old_issue_id) && account.checkout.library %] [% account.checkout.library.branchname | html %] [% END %] 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 c4ab985583..17c626e057 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 %] - [% IF line.issue_id %] + [% IF line.issue_id || line.old_issue_id %] [% line.checkout.date_due | $KohaDates as_due_date => 1 %] [% END %] - [% IF line.issue_id %] + [% IF line.issue_id || line.old_issue_id %] [% line.checkout.returndate | $KohaDates with_hours => 1 %] [% END %] - [% IF line.issue_id %] + [% IF line.issue_id || line.old_issue_id %] [% line.checkout.issuedate | $KohaDates %] [% END %] - [% IF line.issue_id && line.checkout.library %] + [% IF (line.issue_id || line.old_issue_id) && line.checkout.library %] [% line.checkout.library.branchname | html %] [% END %] -- 2.39.5