diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index a0eec9a10a..7ee619bf18 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -104,10 +104,16 @@ Using this account is not recommended because some parts of Koha will not functi
[% IF ( userdebarred ) %]
- - Please note: Your account has been frozen.
- [% IF ( BORROWER_INFO.debarredcomment ) %] Comment: [% END %]
- [% IF ( BORROWER_INFO.userdebarreddate ) %] End date: [% BORROWER_INFO.userdebarreddate | $KohaDates %][% END %]
- Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library. Go to your account page
+ [% IF ( discharge_available ) %]
+ -
+ Please note: Your account is frozen because it has been discharged. Get your discharge
+
+ [% ELSE %]
+ - Please note: Your account has been frozen.
+ [% IF ( BORROWER_INFO.debarredcomment ) %] Comment: [% END %]
+ [% IF ( BORROWER_INFO.userdebarreddate ) %] End date: [% BORROWER_INFO.userdebarreddate | $KohaDates %][% END %]
+ Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library. Go to your account page
+ [% END %]
[% END %]
[% IF ( BORROWER_INFO.gonenoaddress ) %]
- Please note: According to our records, we don't have up-to-date contact information. Please contact the library.
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 0d6f089b37..e3caf1aa6d 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -36,6 +36,7 @@ use C4::Letters;
use C4::Branch; # GetBranches
use Koha::DateUtils;
use Koha::Borrower::Debarments qw(IsDebarred);
+use Koha::Borrower::Discharge;
use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';
@@ -96,6 +97,11 @@ if ($debar) {
if ( $debar ne "9999-12-31" ) {
$borr->{'userdebarreddate'} = $debar;
}
+ my $available = Koha::Borrower::Discharge::count({
+ borrowernumber => $borrowernumber,
+ validated => 1,
+ });
+ $template->param( 'discharge_available' => $available && Koha::Borrower::Discharge::is_discharged({borrowernumber => $borrowernumber}) );
}
if ( $userdebarred || $borr->{'gonenoaddress'} || $borr->{'lost'} ) {