From 438137ebf62d0b2849dc538dec8fb3b104d0148e Mon Sep 17 00:00:00 2001 From: Baptiste Wojtkowski Date: Fri, 18 Apr 2025 10:30:31 +0200 Subject: [PATCH] Bug 14250: (QA follow-up) Small changes Signed-off-by: Marcel de Rooy [EDIT] Changed commit title. Tidied opac script. Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt | 5 +---- opac/opac-discharge.pl | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt index 88f85eadcb..9d9d1497ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt @@ -53,7 +53,7 @@ [% END %] [% UNLESS can_be_discharged %] -

A discharge cannot be generated for this patron because:

+

A discharge cannot be generated for this patron for following reasons:

    [% IF discharge_problems.checkouts %]
  • The patron has [% discharge_problems.checkouts | html %] item(s) checked out
  • @@ -68,9 +68,6 @@

    The patron has holds. The holds will be cancelled if the discharge is generated.

    [% END %] - [% IF discharge_problems.debt %] -
  • The patron has unpaid charges of [% discharge_problems.debt | $Price %]
  • - [% END %]
    [% INCLUDE 'csrf-token.inc' %] diff --git a/opac/opac-discharge.pl b/opac/opac-discharge.pl index cc79467382..7edf18a623 100755 --- a/opac/opac-discharge.pl +++ b/opac/opac-discharge.pl @@ -47,8 +47,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( my ( $can_be_discharged, $discharge_problems ) = Koha::Patron::Discharge::can_be_discharged( { borrowernumber => $loggedinuser } ); -my $patron = Koha::Patrons->find($loggedinuser); -my $has_pending_checkouts = $patron->checkouts->count; +my $patron = Koha::Patrons->find($loggedinuser); $template->param( can_be_discharged => $can_be_discharged,