Attachment #77403 for bug #21137

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

Lines 1-5 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc (-5 / +8 lines)
1	[% IF category_type == 'I' %]	1	[%- IF patron.category.category_type == 'I' -%]
2	[% surname %] [% IF othernames %] ([% othernames %]) [% END %]	2	[% patron.surname %][% IF patron.othernames %] ([% patron.othernames %]) [%- END -%]
3	[% ELSE %]	3	[%- ELSE -%]
4	[% firstname %] [% surname %]	4	[%- IF patron.title -%]
5	[% END %]	5	<span class="patron-title">[% patron.title %]</span>
		6	[%- END -%]
		7	[% patron.firstname %] [% patron.surname %]
		8	[%- END -%]

Lines 9-15 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt (-1 / +1 lines)
9	<div class="main">	9	<div class="main">
10	<ul class="breadcrumb">	10	<ul class="breadcrumb">
11	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>	11	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
12	<li><a href="/cgi-bin/koha/opac-user.pl">[% borrower.firstname %] [% borrower.surname %]</a> <span class="divider">&rsaquo;</span></li>	12	<li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">&rsaquo;</span></li>
13	<li><a href="#">Your payment</a></li>	13	<li><a href="#">Your payment</a></li>
14	</ul>	14	</ul>
15		15

Lines 19-25 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt (-1 / +1 lines)
19	<div class="main">	19	<div class="main">
20	<ul class="breadcrumb">	20	<ul class="breadcrumb">
21	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>	21	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
22	<li>[% IF BORROWER_INFO %]<a href="/cgi-bin/koha/opac-user.pl">[% BORROWER_INFO.firstname %] [% BORROWER_INFO.surname %]</a>[% END %] <span class="divider">&rsaquo;</span></li>	22	<li>[% IF logged_in_user %]<a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a>[% END %] <span class="divider">&rsaquo;</span></li>
23	<li><a href="#">Your fines and charges</a></li>	23	<li><a href="#">Your fines and charges</a></li>
24	</ul>	24	</ul>
25		25

Lines 17-23 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt (-1 / +1 lines)
17	<ul class="breadcrumb noprint">	17	<ul class="breadcrumb noprint">
18	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>	18	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
19	[% IF ( logged_in_user ) %]	19	[% IF ( logged_in_user ) %]
20	<li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE patron-title.inc patron = logged_in_user %]</a> <span class="divider">&rsaquo;</span></li>	20	<li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">&rsaquo;</span></li>
21	[% END %]	21	[% END %]
22		22
23	[% IF method != 'list' %]	23	[% IF method != 'list' %]

Lines 12-18 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt (-1 / +1 lines)
12	<div class="main">	12	<div class="main">
13	<ul class="breadcrumb">	13	<ul class="breadcrumb">
14	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>	14	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
15	<li><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]</a><span class="divider">&rsaquo;</span></li>	15	<li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a><span class="divider">&rsaquo;</span></li>
16	<li><a href="#">Editing issue note for [% ISSUE.title %] - [% ISSUE.author %]</a></li>	16	<li><a href="#">Editing issue note for [% ISSUE.title %] - [% ISSUE.author %]</a></li>
17	</ul>	17	</ul>
18		18

Lines 10-16 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt (-1 / +1 lines)
10	<div class="main">	10	<div class="main">
11	<ul class="breadcrumb">	11	<ul class="breadcrumb">
12	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>	12	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
13	<li><a href="/cgi-bin/koha/opac-user.pl">[% borrower.firstname %] [% borrower.surname %]</a> <span class="divider">&rsaquo;</span></li>	13	<li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">&rsaquo;</span></li>
14	<li><a href="#">Updates to your record</a></li>	14	<li><a href="#">Updates to your record</a></li>
15	</ul>	15	</ul>
16		16

Lines 24-30 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (-1 / +1 lines)
24	<ul class="breadcrumb">	24	<ul class="breadcrumb">
25	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>	25	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
26	[% IF action == 'edit' %]	26	[% IF action == 'edit' %]
27	<li><a href="/cgi-bin/koha/opac-user.pl">[% borrower.firstname %] [% borrower.surname %]</a> <span class="divider">&rsaquo;</span></li>	27	<li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">&rsaquo;</span></li>
28	<li><a href="#">Your personal details</a></li>	28	<li><a href="#">Your personal details</a></li>
29	[% ELSE %]	29	[% ELSE %]
30	<li><a href="#">Register a new account</a></li>	30	<li><a href="#">Register a new account</a></li>

Lines 10-16 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (-1 / +1 lines)
10	<div class="main">	10	<div class="main">
11	<ul class="breadcrumb">	11	<ul class="breadcrumb">
12	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>	12	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
13	<li><a href="/cgi-bin/koha/opac-user.pl">[% BORROWER_INFO.firstname %] [% BORROWER_INFO.surname %]</a> <span class="divider">&rsaquo;</span></li>	13	<li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">&rsaquo;</span></li>
14	<li><a href="#">Your messaging settings</a></li>	14	<li><a href="#">Your messaging settings</a></li>
15	</ul>	15	</ul>
16		16

Lines 11-17 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt (-1 / +1 lines)
11	<div class="main">	11	<div class="main">
12	<ul class="breadcrumb">	12	<ul class="breadcrumb">
13	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>	13	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
14	<li><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]</a> <span class="divider">&rsaquo;</span></li>	14	<li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">&rsaquo;</span></li>
15	<li><a href="#">Change your password</a></li>	15	<li><a href="#">Change your password</a></li>
16	</ul>	16	</ul>
17		17

Lines 10-16 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt (-1 / +1 lines)
10	<div class="main">	10	<div class="main">
11	<ul class="breadcrumb">	11	<ul class="breadcrumb">
12	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>	12	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
13	<li><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]</a> <span class="divider">&rsaquo;</span></li>	13	<li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">&rsaquo;</span></li>
14	<li><a href="#">Your privacy management</a></li>	14	<li><a href="#">Your privacy management</a></li>
15	</ul>	15	</ul>
16		16

Lines 19-25 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt (-1 / +1 lines)
19	<div class="main">	19	<div class="main">
20	<ul class="breadcrumb">	20	<ul class="breadcrumb">
21	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>	21	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
22	<li><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]</a> <span class="divider">&rsaquo;</span></li>	22	<li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">&rsaquo;</span></li>
23	<li><a href="#">Your checkout history</a></li>	23	<li><a href="#">Your checkout history</a></li>
24	</ul>	24	</ul>
25		25

Lines 15-21 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt (-1 / +1 lines)
15	<div class="main">	15	<div class="main">
16	<ul class="breadcrumb">	16	<ul class="breadcrumb">
17	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>	17	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
18	<li><a href="/cgi-bin/koha/opac-routing-lists.pl">[% INCLUDE 'patron-title.inc' category_type = BORROWER_INFO.category_type firstname = BORROWER_INFO.firstname surname = BORROWER_INFO.surname othernames = BORROWER_INFO.othernames cardnumber = BORROWER_INFO.cardnumber %]</a> <span class="divider">&rsaquo;</span></li>	18	<li><a href="/cgi-bin/koha/opac-routing-lists.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">&rsaquo;</span></li>
19	<li><a href="#">Your routing lists</a></li>	19	<li><a href="#">Your routing lists</a></li>
20	</ul>	20	</ul>
21		21




<div class="main">
    <ul class="breadcrumb">
        <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
        <li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">&rsaquo;</span></li>
        <li><a href="#">Your summary</a></li>
    </ul>



                    [% INCLUDE 'opac-note.inc' %]

                    <h2>Hello, [% INCLUDE 'patron-title.inc' patron = logged_in_user %]
                    </h2>

                    <p><a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Click here if you're not [% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a></p>

                    [% IF ( patronupdate ) %]<div class="alert alert-info"><h3>Thank you!</h3><p>Your corrections have been submitted to the library, and a staff member will update your record as soon as possible.</p></div>[% END %]


                        </div>
                    [% END %]

                    [% IF ( borrower.warndeparture ) %]
                        <div class="alert" id="warndeparture">
                            <strong>Please note:</strong><span> Your card will expire on <span id="warndeparture_date">[% borrower.warndeparture | $KohaDates %]</span>. Please contact the library for more information.</span>
                                [% IF ( borrower.returnbeforeexpiry ) %]<span id="warndeparture_returnbeforeexpiry"> Also note that you must return all checked out items before your card expires.</span>[% END %]
                        </div>
                    [% END %]

                    [% IF ( borrower.warnexpired ) %]
                        <div class="alert" id="warnexpired">
                            <strong>Please note: </strong><span>Your account has expired as of [% borrower.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account.</span>
                        </div>
                    [% END %]


                                        </li>
                                    [% ELSE %]
                                        <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen.
                                        [% IF ( borrower.debarredcomment ) %]
                                            Comment:
                                            <span id="userdebarred_comment">
                                                <strong>
                                                    [% IF borrower.debarredcomment.search('OVERDUES_PROCESS') %]
                                                        Restriction added by overdues process [% borrower.debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %]
                                                    [% ELSE %]
                                                        [% borrower.debarredcomment | html_line_break %]
                                                    [% END %]
                                                </strong>
                                            </span>
                                        [% END %]
                                        [% IF ( borrower.userdebarreddate && debarred_date != '9999-12-31' ) %]
                                            End date:
                                            <span id="userdebarred_date">[% borrower.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.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.
                                <a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %]</a>
                                [% IF ( Koha.Preference('OPACPatronDetails') ) %]<em>(Please note: there may be a delay in restoring your account if you submit online.)</em>[% END %]
                                    </li>
                                [% END %]
                                [% IF ( borrower.lost ) %]
                                    <li id="lost"><strong>Please note: </strong> Your library card has been marked as lost or stolen. <em>If this is an error, please contact the library.</em></li>
                                [% END %]
                                [% IF ( renewal_blocked_fines.defined ) && ( OpacRenewalAllowed ) %]

                            [% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
                            [% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %]
                            [% IF ( OPACFinesTab ) %]
                                [% IF ( borrower.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %]
                                [% IF ( borrower.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %]
                                [% IF ( borrower.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% amountoutstanding | $Price %])</a></li>[% END %]
                            [% END %]

                            [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %]


                        [% IF ( OPACFinesTab ) %]
                            <!-- FINES BOX -->
                            [% IF borrower.amountoverfive %]
                                <div id="opac-user-fines"> <h3>Fines and charges</h3>
                                    <table class="table table-bordered table-striped">
                                        <thead><tr><th colspan="2">Amount</th></tr></thead>

                                </div>
                            [% END %]

                            [% IF borrower.amountoverzero %]
                               <div id="opac-user-fines"> <h3>Fines and charges</h3>
                                    <table class="table table-bordered table-striped">
                                        <thead><tr><th colspan="2">Amount</th></tr></thead>

                                </div>
                            [% END %]

                            [% IF borrower.amountlessthanzero %]
                                <div id="opac-user-fines">  <h3>Credits</h3>
                                    <table class="table table-bordered table-striped">
                                        <thead><tr><th colspan="2">Amount</th></tr></thead>




);

my $patron = Koha::Patrons->find( $borrowernumber );
my $category = $patron->category;
my $borrower= $patron->unblessed;
$borrower->{description} = $category->description;
$borrower->{category_type} = $category->category_type;
$template->param( BORROWER_INFO => $borrower );

my $total = $patron->account->balance;
my $accts = Koha::Account::Lines->search(
    { borrowernumber => $patron->borrowernumber },

Lines 71-77 if ( defined $query->param('modify') && $query->param('modify') eq 'yes' ) { Link Here

(-)a/opac/opac-messaging.pl (-1 / +1 lines)
71		71
72	C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $patron->borrowernumber }, $template);	72	C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $patron->borrowernumber }, $template);
73		73
74	$template->param( BORROWER_INFO => $patron->unblessed,	74	$template->param(
75	messagingview => 1,	75	messagingview => 1,
76	SMSnumber => $patron->smsalertnumber, # FIXME This is already sent 2 lines above	76	SMSnumber => $patron->smsalertnumber, # FIXME This is already sent 2 lines above
77	SMSSendDriver => C4::Context->preference("SMSSendDriver"),	77	SMSSendDriver => C4::Context->preference("SMSSendDriver"),

Lines 42-52 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-routing-lists.pl (-5 lines)
42	);	42	);
43		43
44	my $patron = Koha::Patrons->find( $borrowernumber );	44	my $patron = Koha::Patrons->find( $borrowernumber );
45	my $category = $patron->category;
46	my $borrower= $patron->unblessed;
47	$borrower->{description} = $category->description;
48	$borrower->{category_type} = $category->category_type;
49	$template->param( BORROWER_INFO => $borrower );
50		45
51	$template->param(	46	$template->param(
52	routinglistsview => 1,	47	routinglistsview => 1,

Lines 163-169 if ( $borr->{'dateexpiry'} && C4::Context->preference('NotifyBorrowerDeparture') Link Here

(-)a/opac/opac-user.pl (-3 / +1 lines)
163	# pass on any renew errors to the template for displaying	163	# pass on any renew errors to the template for displaying
164	my $renew_error = $query->param('renew_error');	164	my $renew_error = $query->param('renew_error');
165		165
166	$template->param( BORROWER_INFO => $borr,	166	$template->param(
167	amountoutstanding => $amountoutstanding,	167	amountoutstanding => $amountoutstanding,
168	borrowernumber => $borrowernumber,	168	borrowernumber => $borrowernumber,
169	patron_flagged => $borr->{flagged},	169	patron_flagged => $borr->{flagged},
Lines 350-356 if ( C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor' Link Here
350	}	350	}
351		351
352	$template->param(	352	$template->param(
353	borrower => scalar Koha::Patrons->find($borrowernumber),
354	patron_messages => $patron_messages,	353	patron_messages => $patron_messages,
355	opacnote => $borr->{opacnote},	354	opacnote => $borr->{opacnote},
356	patronupdate => $patronupdate,	355	patronupdate => $patronupdate,
357	-

Return to bug 21137

Lines 40-51 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-account.pl (-6 lines)
40	);	40	);
41		41
42	my $patron = Koha::Patrons->find( $borrowernumber );	42	my $patron = Koha::Patrons->find( $borrowernumber );
43	my $category = $patron->category;
44	my $borrower= $patron->unblessed;
45	$borrower->{description} = $category->description;
46	$borrower->{category_type} = $category->category_type;
47	$template->param( BORROWER_INFO => $borrower );
48
49	my $total = $patron->account->balance;	43	my $total = $patron->account->balance;
50	my $accts = Koha::Account::Lines->search(	44	my $accts = Koha::Account::Lines->search(
51	{ borrowernumber => $patron->borrowernumber },	45	{ borrowernumber => $patron->borrowernumber },