Attachment #54774 for bug #16464

View | Details | Raw Unified | Return to bug 16464
Collapse All | Expand All




                        <div class="alert">
                            <ul>
                                [% IF ( userdebarred ) %]
                                    [% IF ( discharge_available ) %]
                                        <li id="discharged">
                                            <strong>Please note:</strong> Your account is frozen because it has been discharged. <a href="/cgi-bin/koha/opac-discharge.pl?op=get">Get your discharge</a>
                                        </li>
                                    [% ELSE %]
                                        <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen.
                                        [% IF ( BORROWER_INFO.debarredcomment ) %] Comment: <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment %]"</span>[% END %]
                                        [% IF ( BORROWER_INFO.userdebarreddate ) %] End date: <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %]
                                        <em>Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library.</em> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a></li>
                                    [% END %]
                                [% END %]
                                [% IF ( BORROWER_INFO.gonenoaddress ) %]
                                    <li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date contact information. Please contact the library.

Lines 38-43 use Koha::DateUtils; Link Here

(-)a/opac/opac-user.pl (-1 / +6 lines)
38	use Koha::Holds;	38	use Koha::Holds;
39	use Koha::Database;	39	use Koha::Database;
40	use Koha::Patron::Messages;	40	use Koha::Patron::Messages;
		41	use Koha::Patron::Discharge;
41		42
42	use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';	43	use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';
43		44
Lines 98-103 if ($debar) { Link Here
98	if ( $debar ne "9999-12-31" ) {	99	if ( $debar ne "9999-12-31" ) {
99	$borr->{'userdebarreddate'} = $debar;	100	$borr->{'userdebarreddate'} = $debar;
100	}	101	}
		102	my $available = Koha::Patron::Discharge::count({
		103	borrowernumber => $borrowernumber,
		104	validated => 1,
		105	});
		106	$template->param( 'discharge_available' => $available && Koha::Patron::Discharge::is_discharged({borrowernumber => $borrowernumber}) );
101	}	107	}
102		108
103	if ( $userdebarred \|\| $borr->{'gonenoaddress'} \|\| $borr->{'lost'} ) {	109	if ( $userdebarred \|\| $borr->{'gonenoaddress'} \|\| $borr->{'lost'} ) {
104	-

Return to bug 16464

Lines 106-115 Using this account is not recommended because some parts of Koha will not functi Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-4 / +10 lines)
106	<div class="alert">	106	<div class="alert">
107	<ul>	107	<ul>
108	[% IF ( userdebarred ) %]	108	[% IF ( userdebarred ) %]
109	<li id="userdebarred"><strong>Please note:</strong> Your account has been frozen.	109	[% IF ( discharge_available ) %]
110	[% IF ( BORROWER_INFO.debarredcomment ) %] Comment: <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment %]"</span>[% END %]	110	<li id="discharged">
111	[% IF ( BORROWER_INFO.userdebarreddate ) %] End date: <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate \| $KohaDates %]</span>[% END %]	111	<strong>Please note:</strong> Your account is frozen because it has been discharged. <a href="/cgi-bin/koha/opac-discharge.pl?op=get">Get your discharge</a>
112	<em>Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library.</em> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a></li>	112	</li>
		113	[% ELSE %]
		114	<li id="userdebarred"><strong>Please note:</strong> Your account has been frozen.
		115	[% IF ( BORROWER_INFO.debarredcomment ) %] Comment: <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment %]"</span>[% END %]
		116	[% IF ( BORROWER_INFO.userdebarreddate ) %] End date: <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate \| $KohaDates %]</span>[% END %]
		117	<em>Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library.</em> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a></li>
		118	[% END %]
113	[% END %]	119	[% END %]
114	[% IF ( BORROWER_INFO.gonenoaddress ) %]	120	[% IF ( BORROWER_INFO.gonenoaddress ) %]
115	<li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date contact information. Please contact the library.	121	<li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date contact information. Please contact the library.