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

(-)a/C4/Members.pm (-10 / +12 lines)
Lines 313-323 sub GetMemberDetails { Link Here
313
    my $query;
313
    my $query;
314
    my $sth;
314
    my $sth;
315
    if ($borrowernumber) {
315
    if ($borrowernumber) {
316
        $sth = $dbh->prepare("SELECT borrowers.*,category_type,categories.description,reservefee FROM borrowers LEFT JOIN categories ON borrowers.categorycode=categories.categorycode WHERE  borrowernumber=?");
316
        $sth = $dbh->prepare("SELECT borrowers.*,category_type,categories.description,reservefee,enrolmentperiod FROM borrowers LEFT JOIN categories ON borrowers.categorycode=categories.categorycode WHERE  borrowernumber=?");
317
        $sth->execute($borrowernumber);
317
        $sth->execute($borrowernumber);
318
    }
318
    }
319
    elsif ($cardnumber) {
319
    elsif ($cardnumber) {
320
        $sth = $dbh->prepare("SELECT borrowers.*,category_type,categories.description,reservefee FROM borrowers LEFT JOIN categories ON borrowers.categorycode=categories.categorycode WHERE cardnumber=?");
320
        $sth = $dbh->prepare("SELECT borrowers.*,category_type,categories.description,reservefee,enrolmentperiod FROM borrowers LEFT JOIN categories ON borrowers.categorycode=categories.categorycode WHERE cardnumber=?");
321
        $sth->execute($cardnumber);
321
        $sth->execute($cardnumber);
322
    }
322
    }
323
    else {
323
    else {
Lines 340-353 sub GetMemberDetails { Link Here
340
    $borrower->{'flags'}     = $flags;
340
    $borrower->{'flags'}     = $flags;
341
    $borrower->{'authflags'} = $accessflagshash;
341
    $borrower->{'authflags'} = $accessflagshash;
342
342
343
    # find out how long the membership lasts
343
    # For the purposes of making templates easier, we'll define a
344
    $sth =
344
    # 'showname' which is the alternate form the user's first name if 
345
      $dbh->prepare(
345
    # 'other name' is defined.
346
        "select enrolmentperiod from categories where categorycode = ?");
346
    if ($borrower->{category_type} eq 'I') {
347
    $sth->execute( $borrower->{'categorycode'} );
347
        $borrower->{'showname'} = $borrower->{'othernames'};
348
    my $enrolment = $sth->fetchrow;
348
        $borrower->{'showname'} .= " $borrower->{'firstname'}" if $borrower->{'firstname'};
349
    $borrower->{'enrolmentperiod'} = $enrolment;
349
    } else {
350
    
350
        $borrower->{'showname'} = $borrower->{'firstname'};
351
    }
352
351
    return ($borrower);    #, $flags, $accessflagshash);
353
    return ($borrower);    #, $flags, $accessflagshash);
352
}
354
}
353
355
(-)a/circ/circulation.pl (-2 / +5 lines)
Lines 629-637 my (undef, $roadttype_hashref) = &GetRoadTypes(); Link Here
629
my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'};
629
my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'};
630
630
631
my $fast_cataloging = 0;
631
my $fast_cataloging = 0;
632
    if (defined getframeworkinfo('FA')) {
632
if (defined getframeworkinfo('FA')) {
633
    $fast_cataloging = 1 
633
    $fast_cataloging = 1 
634
    }
634
}
635
635
636
if (C4::Context->preference('ExtendedPatronAttributes')) {
636
if (C4::Context->preference('ExtendedPatronAttributes')) {
637
    my $attributes = GetBorrowerAttributes($borrowernumber);
637
    my $attributes = GetBorrowerAttributes($borrowernumber);
Lines 654-659 $template->param( Link Here
654
    printername       => $printer,
654
    printername       => $printer,
655
    firstname         => $borrower->{'firstname'},
655
    firstname         => $borrower->{'firstname'},
656
    surname           => $borrower->{'surname'},
656
    surname           => $borrower->{'surname'},
657
    showname          => $borrower->{'showname'},
658
    category_type     => $borrower->{'category_type'},
657
    dateexpiry        => format_date($newexpiry),
659
    dateexpiry        => format_date($newexpiry),
658
    expiry            => format_date($borrower->{'dateexpiry'}),
660
    expiry            => format_date($borrower->{'dateexpiry'}),
659
    categorycode      => $borrower->{'categorycode'},
661
    categorycode      => $borrower->{'categorycode'},
Lines 669-674 $template->param( Link Here
669
    country           => $borrower->{'country'},
671
    country           => $borrower->{'country'},
670
    phone             => $borrower->{'phone'} || $borrower->{'mobile'},
672
    phone             => $borrower->{'phone'} || $borrower->{'mobile'},
671
    cardnumber        => $borrower->{'cardnumber'},
673
    cardnumber        => $borrower->{'cardnumber'},
674
    othernames        => $borrower->{'othernames'},
672
    amountold         => $amountold,
675
    amountold         => $amountold,
673
    barcode           => $barcode,
676
    barcode           => $barcode,
674
    stickyduedate     => $stickyduedate,
677
    stickyduedate     => $stickyduedate,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-1 / +1 lines)
Lines 1-5 Link Here
1
[% IF ( borrowernumber ) %]
1
[% IF ( borrowernumber ) %]
2
<div class="patroninfo"><h5>[% firstname %] [% surname %] ([% cardnumber %])</h5>
2
<div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>
3
<!--[if IE 6]>
3
<!--[if IE 6]>
4
<style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
4
<style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
5
}</style>
5
}</style>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc (+6 lines)
Line 0 Link Here
1
[% IF category_type == 'I' %]
2
    [% surname %] [% IF othernames %] ([% othernames %]) [% END %]
3
[% ELSE %]
4
    [% firstname %] [% surname %]
5
[% END %]
6
([% cardnumber %])
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-10 / +11 lines)
Lines 1-9 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Circulation
2
<title>Koha &rsaquo; Circulation [% IF ( borrowernumber ) %] &rsaquo; Checking out to [% INCLUDE 'patron-title.inc' %] [% END %]</title>
3
[% IF ( borrowernumber ) %]
4
&rsaquo; Checking out to [% surname %], [% firstname %]
5
([% cardnumber %])
6
[% END %]</title>
7
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
8
[% IF ( UseTablesortForCirc ) %]<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>[% END %]
4
[% IF ( UseTablesortForCirc ) %]<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>[% END %]
9
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
5
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
Lines 166-174 function refocus(calendar) { Link Here
166
[% INCLUDE 'header.inc' %]
162
[% INCLUDE 'header.inc' %]
167
[% INCLUDE 'circ-search.inc' %]
163
[% INCLUDE 'circ-search.inc' %]
168
164
169
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo;[% IF ( borrowernumber ) %] <a href="/cgi-bin/koha/circ/circulation.pl">Checkouts</a> &rsaquo; [% firstname %] [% surname %][% ELSE %] <strong>Checkouts</strong>[% END %]</div>
165
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo;
170
166
[% IF ( borrowernumber ) %]
171
167
    <a href="/cgi-bin/koha/circ/circulation.pl">Checkouts</a> &rsaquo; [% INCLUDE 'patron-title.inc' %]
168
[% ELSE %]
169
    <strong>Checkouts</strong>
170
[% END %]
171
</div>
172
[% IF ( CGIselectborrower ) %]
172
[% IF ( CGIselectborrower ) %]
173
<div id="doc" class="yui-t7">
173
<div id="doc" class="yui-t7">
174
174
Lines 456-462 No patron matched <span class="ex">[% message %]</span> Link Here
456
        <span id="clearscreen"><a href="/cgi-bin/koha/circ/circulation.pl" title="Clear screen">x</a></span>
456
        <span id="clearscreen"><a href="/cgi-bin/koha/circ/circulation.pl" title="Clear screen">x</a></span>
457
    [% END %]
457
    [% END %]
458
458
459
    <label for="barcode">Checking out to [% firstname %] [% surname %] ([% cardnumber %]) </label>
459
    <label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
460
460
	<div class="hint">Enter item barcode:</div>
461
	<div class="hint">Enter item barcode:</div>
461
462
462
    [% IF ( NEEDSCONFIRMATION ) %]
463
    [% IF ( NEEDSCONFIRMATION ) %]
Lines 523-529 No patron matched <span class="ex">[% message %]</span> Link Here
523
524
524
    [% IF ( flagged ) %]
525
    [% IF ( flagged ) %]
525
		[% IF ( noissues ) %]
526
		[% IF ( noissues ) %]
526
		 <h4>Checking out to [% firstname %] [% surname %] ([% cardnumber %])</h4>
527
		<h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4>
527
        <div id="circmessages" class="circmessage warning">
528
        <div id="circmessages" class="circmessage warning">
528
		[% ELSE %]
529
		[% ELSE %]
529
        <div id="circmessages" class="circmessage attention">
530
        <div id="circmessages" class="circmessage attention">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-2 / +2 lines)
Lines 1-12 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Patrons &rsaquo; Account for [% firstname %] [% surname %]</title>
2
<title>Koha &rsaquo; Patrons &rsaquo; Account for [% INCLUDE 'patron-title.inc' %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
</head>
4
</head>
5
<body>
5
<body>
6
[% INCLUDE 'header.inc' %]
6
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'patron-search.inc' %]
7
[% INCLUDE 'patron-search.inc' %]
8
8
9
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Account for [% firstname %] [% surname %]</div>
9
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Account for [% INCLUDE 'patron-title.inc' %]</div>
10
10
11
<div id="doc3" class="yui-t2">
11
<div id="doc3" class="yui-t2">
12
   
12
   
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-1 / +3 lines)
Lines 60-66 Link Here
60
							[% END %]
60
							[% END %]
61
							[% END %]
61
							[% END %]
62
							<td>[% resultsloo.cardnumber %]</td>
62
							<td>[% resultsloo.cardnumber %]</td>
63
							<td style="white-space: nowrap;"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resultsloo.borrowernumber %]">[% resultsloo.surname %], [% resultsloo.firstname %]</a> <br /> [% resultsloo.address %][% IF ( resultsloo.address2 ) %]<br />[% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]<br />[% resultsloo.city %][% IF ( resultsloo.state ) %],[% END %][% END %][% IF ( resultsloo.state ) %] [% resultsloo.state %][% END %] [% IF ( resultsloo.zipcode ) %]  [% resultsloo.zipcode %][% END %][% IF ( resultsloo.country ) %], [% resultsloo.country %][% END %]</td>
63
							<td style="white-space: nowrap;"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resultsloo.borrowernumber %]">
64
                            [% INCLUDE 'patron-title.inc' category_type = resultsloo.category_type firstname = resultsloo.firstname surname = resultsloo.surname othernames = resultsloo.othernames cardnumber = resultsloo.cardnumber %]</a> <br />
65
                            [% resultsloo.address %][% IF ( resultsloo.address2 ) %]<br />[% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]<br />[% resultsloo.city %][% IF ( resultsloo.state ) %],[% END %][% END %][% IF ( resultsloo.state ) %] [% resultsloo.state %][% END %] [% IF ( resultsloo.zipcode ) %]  [% resultsloo.zipcode %][% END %][% IF ( resultsloo.country ) %], [% resultsloo.country %][% END %]</td>
64
							<td>[% resultsloo.category_description %] ([% resultsloo.category_type %])</td>
66
							<td>[% resultsloo.category_description %] ([% resultsloo.category_type %])</td>
65
							<td>[% resultsloo.branchcode %]</td>
67
							<td>[% resultsloo.branchcode %]</td>
66
							<td>[% resultsloo.dateexpiry %]</td>
68
							<td>[% resultsloo.dateexpiry %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-2 / +8 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( unknowuser ) %]Patron does not exist[% ELSE %]Patron Details for [% firstname %] [% surname %] ([% cardnumber %])[% END %]</title>
2
<title>Koha &rsaquo; Patrons &rsaquo;
3
[% IF ( unknowuser ) %]
4
    Patron does not exist
5
[% ELSE %]
6
    Patron Details for [% INCLUDE 'patron-title.inc' %]
7
[% END %]
8
</title>
3
[% INCLUDE 'doc-head-close.inc' %]
9
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'calendar.inc' %]
10
[% INCLUDE 'calendar.inc' %]
5
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
11
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
Lines 119-125 function validate1(date) { Link Here
119
<div id="breadcrumbs">
125
<div id="breadcrumbs">
120
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
126
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
121
&rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
127
&rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
122
&rsaquo; [% IF ( unknowuser ) %]Patron does not exist[% ELSE %]Patron Details for [% firstname %] [% surname %] ([% cardnumber %])[% END %]
128
&rsaquo; [% IF ( unknowuser ) %]Patron does not exist[% ELSE %]Patron Details for [% INCLUDE 'patron-title.inc' %][% END %]
123
</div>
129
</div>
124
130
125
<div id="doc3" class="yui-t1">
131
<div id="doc3" class="yui-t1">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt (-3 / +3 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Sent notices for [% firstname %] [% surname %]</title>
2
<title>Sent notices for [% INCLUDE 'patron-title.inc' %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
4
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
5
<script type="text/javascript" language="javascript">
5
<script type="text/javascript" language="javascript">
Lines 29-42 Link Here
29
[% INCLUDE 'header.inc' %]
29
[% INCLUDE 'header.inc' %]
30
[% INCLUDE 'patron-search.inc' %]
30
[% INCLUDE 'patron-search.inc' %]
31
31
32
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Sent notices for [% firstname %] [% surname %]</div>
32
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Sent notices for [% INCLUDE 'patron-title.inc' %]</div>
33
33
34
<div id="doc3" class="yui-t2">
34
<div id="doc3" class="yui-t2">
35
    <div id="bd">
35
    <div id="bd">
36
    <div id="yui-main">
36
    <div id="yui-main">
37
    <div class="yui-b">
37
    <div class="yui-b">
38
[% INCLUDE 'circ-toolbar.inc' %]
38
[% INCLUDE 'circ-toolbar.inc' %]
39
<h1>Sent notices for [% firstname %] [% surname %]</h1>
39
<h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1>
40
40
41
41
42
    <table id="noticestable">
42
    <table id="noticestable">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt (-2 / +2 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Circulation History for [% firstname %] [% surname %]</title>
2
<title>Circulation History for [% INCLUDE 'patron-title.inc' %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
4
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
5
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
5
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
Lines 22-28 Link Here
22
[% INCLUDE 'header.inc' %]
22
[% INCLUDE 'header.inc' %]
23
[% INCLUDE 'patron-search.inc' %]
23
[% INCLUDE 'patron-search.inc' %]
24
24
25
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Circulation History for [% firstname %] [% surname %]</div>
25
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Circulation History for [% INCLUDE 'patron-title.inc' %]</div>
26
26
27
<div id="doc3" class="yui-t2">
27
<div id="doc3" class="yui-t2">
28
   
28
   
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-4 / +13 lines)
Lines 133-139 Link Here
133
						<input type="submit" value="Submit" />
133
						<input type="submit" value="Submit" />
134
						<input type="hidden" name="do_it" value="1" />
134
						<input type="hidden" name="do_it" value="1" />
135
					</fieldset>
135
					</fieldset>
136
				</form>
136
			</form>
137
                [% END %]
137
                [% END %]
138
                [% IF ( do_it ) %]
138
                [% IF ( do_it ) %]
139
                    [% IF ( total ) %]
139
                    [% IF ( total ) %]
Lines 148-153 Link Here
148
                                <th>Info</th>
148
                                <th>Info</th>
149
                            </tr>
149
                            </tr>
150
                            [% FOREACH loopro IN looprow %]
150
                            [% FOREACH loopro IN looprow %]
151
                                [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
151
                                <tr>
152
                                <tr>
152
                                    <td>[% loopro.timestamp %]</td>
153
                                    <td>[% loopro.timestamp %]</td>
153
                                    <td>
154
                                    <td>
Lines 164-170 Link Here
164
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> member [% loopro.object %] </a>
165
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> member [% loopro.object %] </a>
165
                                        [% ELSE %]
166
                                        [% ELSE %]
166
                                            [% IF ( module == 'CIRCULATION' ) %]
167
                                            [% IF ( module == 'CIRCULATION' ) %]
167
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> member [% loopro.object %] </a>
168
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details.">
169
                                                [% IF ( loopro.object ) %]
170
                                                    member [% loopro.object %]
171
                                                [% END %]
172
                                            </a>
168
                                            [% ELSE %]
173
                                            [% ELSE %]
169
                                                [% IF ( module == 'CATALOGUING' ) %]
174
                                                [% IF ( module == 'CATALOGUING' ) %]
170
                                                    [% IF ( info == 'item' ) %]
175
                                                    [% IF ( info == 'item' ) %]
Lines 176-182 Link Here
176
                                                    [% IF ( module == 'SERIAL' ) %]
181
                                                    [% IF ( module == 'SERIAL' ) %]
177
                                                        <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object %]"> [% loopro.object %] </a>
182
                                                        <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object %]"> [% loopro.object %] </a>
178
                                                    [% ELSE %]
183
                                                    [% ELSE %]
179
                                                        [% loopro.object %]
184
                                                        [% IF ( module == 'AUTHORITIES' ) %]
185
                                                            <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% loopro.object %]" title="Display detail for this authority">auth [% loopro.object %]</a>
186
                                                        [% ELSE %]
187
                                                            [% loopro.object %]
188
                                                        [% END %]
180
                                                    [% END %]
189
                                                    [% END %]
181
                                                [% END %]
190
                                                [% END %]
182
                                            [% END %]
191
                                            [% END %]
Lines 199-205 Link Here
199
                                for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% object %]">Bibliographic Record [% object %]</a>
208
                                for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% object %]">Bibliographic Record [% object %]</a>
200
                            [% END %]
209
                            [% END %]
201
                            [% IF ( MEMBERS ) %]
210
                            [% IF ( MEMBERS ) %]
202
                                for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% object %]">[% firstname %] [% surname %] ([% cardnumber %])</a>
211
                                for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% object %]">[% INCLUDE 'patron-title.inc' %]</a>
203
                            [% END %]
212
                            [% END %]
204
                            .
213
                            .
205
                        </div>
214
                        </div>
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/patron-title.inc (+5 lines)
Line 0 Link Here
1
[% IF category_type == 'I' %]
2
    [% surname %] [% IF othernames %] ([% othernames %]) [% END %]
3
[% ELSE %]
4
    [% firstname %] [% surname %]
5
[% END %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (-2 / +5 lines)
Lines 1-7 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Library Home for
2
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Library Home for
3
[% FOREACH BORROWER_INF IN BORROWER_INFO %]
3
[% FOREACH BORROWER_INF IN BORROWER_INFO %]
4
    [% BORROWER_INF.firstname %] [% BORROWER_INF.surname %]
4
    [% INCLUDE 'patron-title.inc' category_type = BORROWER_INF.category_type firstname = BORROWER_INF.firstname surname = BORROWER_INF.surname othernames = BORROWER_INF.othernames cardnumber = BORROWER_INF.cardnumber %]
5
[% END %]
5
[% END %]
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
7
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.metadata.min.js"></script>
7
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.metadata.min.js"></script>
Lines 75-81 $.tablesorter.addParser({ Link Here
75
	       </div>
75
	       </div>
76
	[% END %]
76
	[% END %]
77
    [% FOREACH BORROWER_INF IN BORROWER_INFO %]
77
    [% FOREACH BORROWER_INF IN BORROWER_INFO %]
78
        <h2>Hello, [% BORROWER_INF.firstname %] [% BORROWER_INF.surname %] <span class="hint">(<a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Click here</a> if you're not [% BORROWER_INF.title %] [% BORROWER_INF.firstname %] [% BORROWER_INF.surname %])</span></h2>
78
        <h2>Hello, [% INCLUDE 'patron-title.inc' category_type = BORROWER_INF.category_type firstname = BORROWER_INF.firstname surname = BORROWER_INF.surname othernames = BORROWER_INF.othernames cardnumber = BORROWER_INF.cardnumber %]
79
        <span class="hint">(<a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Click here</a> if you're not
80
        [% BORROWER_INF.title %] [% INCLUDE 'patron-title.inc' category_type = BORROWER_INF.category_type firstname = BORROWER_INF.firstname surname = BORROWER_INF.surname othernames = BORROWER_INF.othernames cardnumber = BORROWER_INF.cardnumber %])
81
        </span></h2>
79
        
82
        
80
		[% IF ( patronupdate ) %]<div class="dialog message"><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 %]
83
		[% IF ( patronupdate ) %]<div class="dialog message"><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 %]
81
		
84
		
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt (-2 / +5 lines)
Lines 1-4 Link Here
1
[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Updating Details for [% FOREACH BORROWER_INF IN BORROWER_INFO %][% BORROWER_INF.firstname %] [% BORROWER_INF.surname %][% END %]
1
[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Updating Details for
2
[% FOREACH BORROWER_INF IN BORROWER_INFO %]
3
    [% INCLUDE 'patron-title.inc' category_type = BORROWER_INF.category_type firstname = BORROWER_INF.firstname surname = BORROWER_INF.surname othernames = BORROWER_INF.othernames cardnumber = BORROWER_INF.cardnumber %]
4
[% END %]
2
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
3
</head>
6
</head>
4
<body id="opac-userupdate">
7
<body id="opac-userupdate">
Lines 11-17 Link Here
11
14
12
<div id="userupdatecontainer" class="container">
15
<div id="userupdatecontainer" class="container">
13
[% FOREACH BORROWER_INF IN BORROWER_INFO %]
16
[% FOREACH BORROWER_INF IN BORROWER_INFO %]
14
<h3><a href="/cgi-bin/koha/opac-user.pl">[% BORROWER_INF.firstname %] [% BORROWER_INF.surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Your Personal Details</h3>
17
<h3><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' ifirstname = BORROWER_INF.firstname surname = BORROWER_INF.surname othernames = BORROWER_INF.othernames cardnumber = BORROWER_INF.cardnumber %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Your Personal Details</h3>
15
18
16
[% IF ( OPACPatronDetails ) %]
19
[% IF ( OPACPatronDetails ) %]
17
<form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
20
<form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
(-)a/members/boraccount.pl (-1 / +2 lines)
Lines 107-117 $template->param( Link Here
107
    finesview           => 1,
107
    finesview           => 1,
108
    firstname           => $data->{'firstname'},
108
    firstname           => $data->{'firstname'},
109
    surname             => $data->{'surname'},
109
    surname             => $data->{'surname'},
110
    othernames          => $data->{'othernames'},
110
    borrowernumber      => $borrowernumber,
111
    borrowernumber      => $borrowernumber,
111
    cardnumber          => $data->{'cardnumber'},
112
    cardnumber          => $data->{'cardnumber'},
112
    categorycode        => $data->{'categorycode'},
113
    categorycode        => $data->{'categorycode'},
113
    category_type       => $data->{'category_type'},
114
    category_type       => $data->{'category_type'},
114
    categoryname		 => $data->{'description'},
115
    categoryname		=> $data->{'description'},
115
    address             => $data->{'address'},
116
    address             => $data->{'address'},
116
    address2            => $data->{'address2'},
117
    address2            => $data->{'address2'},
117
    city                => $data->{'city'},
118
    city                => $data->{'city'},
(-)a/members/moremember.pl (-3 / +3 lines)
Lines 132-140 my $category_type = $data->{'category_type'}; Link Here
132
132
133
### $category_type
133
### $category_type
134
134
135
# in template <TMPL_IF name="I"> => instutitional (A for Adult& C for children) 
136
$template->param( $data->{'categorycode'} => 1 ); 
137
138
$debug and printf STDERR "dates (enrolled,expiry,birthdate) raw: (%s, %s, %s)\n", map {$data->{$_}} qw(dateenrolled dateexpiry dateofbirth);
135
$debug and printf STDERR "dates (enrolled,expiry,birthdate) raw: (%s, %s, %s)\n", map {$data->{$_}} qw(dateenrolled dateexpiry dateofbirth);
139
foreach (qw(dateenrolled dateexpiry dateofbirth)) {
136
foreach (qw(dateenrolled dateexpiry dateofbirth)) {
140
		my $userdate = $data->{$_};
137
		my $userdate = $data->{$_};
Lines 443-448 if (C4::Context->preference('EnhancedMessagingPreferences')) { Link Here
443
    $template->param(SMSnumber     => defined $data->{'smsalertnumber'} ? $data->{'smsalertnumber'} : $data->{'mobile'});
440
    $template->param(SMSnumber     => defined $data->{'smsalertnumber'} ? $data->{'smsalertnumber'} : $data->{'mobile'});
444
}
441
}
445
442
443
# in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) 
444
$template->param( $data->{'categorycode'} => 1 ); 
446
$template->param(
445
$template->param(
447
    detailview => 1,
446
    detailview => 1,
448
    AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
447
    AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
Lines 450-455 $template->param( Link Here
450
    CANDELETEUSER    => $candeleteuser,
449
    CANDELETEUSER    => $candeleteuser,
451
    roaddetails     => $roaddetails,
450
    roaddetails     => $roaddetails,
452
    borrowernumber  => $borrowernumber,
451
    borrowernumber  => $borrowernumber,
452
    othernames      => $data->{'othernames'},
453
    categoryname    => $data->{'description'},
453
    categoryname    => $data->{'description'},
454
    reregistration  => $reregistration,
454
    reregistration  => $reregistration,
455
    branch          => $branch,
455
    branch          => $branch,
(-)a/members/readingrec.pl (+1 lines)
Lines 111-116 $template->param( Link Here
111
						title => $data->{'title'},
111
						title => $data->{'title'},
112
						initials => $data->{'initials'},
112
						initials => $data->{'initials'},
113
						surname => $data->{'surname'},
113
						surname => $data->{'surname'},
114
						othernames => $data->{'othernames'},
114
						borrowernumber => $borrowernumber,
115
						borrowernumber => $borrowernumber,
115
						limit => $limit,
116
						limit => $limit,
116
						firstname => $data->{'firstname'},
117
						firstname => $data->{'firstname'},
(-)a/opac/opac-user.pl (+3 lines)
Lines 124-129 $template->param( BORROWER_INFO => \@bordat, Link Here
124
                    borrowernumber    => $borrowernumber,
124
                    borrowernumber    => $borrowernumber,
125
                    patron_flagged    => $borr->{flagged},
125
                    patron_flagged    => $borr->{flagged},
126
                    OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
126
                    OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
127
                    surname           => $borr->{surname},
128
                    showname          => $borr->{showname},
129
                    patron_flagged    => $borr->{flagged},
127
                );
130
                );
128
131
129
#get issued items ....
132
#get issued items ....
(-)a/tools/viewlog.pl (-1 / +3 lines)
Lines 74-87 if ($src eq 'circ') { # if we were called from circulation, use the circulatio Link Here
74
    my $data = GetMember('borrowernumber'=>$borrowernumber);
74
    my $data = GetMember('borrowernumber'=>$borrowernumber);
75
    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
75
    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
76
    $template->param( picture => 1 ) if $picture;
76
    $template->param( picture => 1 ) if $picture;
77
    
77
    $template->param(   menu            => 1,
78
    $template->param(   menu            => 1,
78
                        title           => $data->{'title'},
79
                        title           => $data->{'title'},
79
                        initials        => $data->{'initials'},
80
                        initials        => $data->{'initials'},
80
                        surname         => $data->{'surname'},
81
                        surname         => $data->{'surname'},
82
                        othernames      => $data->{'othernames'},
81
                        borrowernumber  => $borrowernumber,
83
                        borrowernumber  => $borrowernumber,
82
                        firstname       => $data->{'firstname'},
84
                        firstname       => $data->{'firstname'},
83
                        cardnumber      => $data->{'cardnumber'},
85
                        cardnumber      => $data->{'cardnumber'},
84
                        categorycode    => $data->{'categorycode'},
86
                        categorycode    => $data->{'categorycode'},
87
                        category_type   => $data->{'category_type'},
85
                        categoryname	=> $data->{'description'},
88
                        categoryname	=> $data->{'description'},
86
                        address         => $data->{'address'},
89
                        address         => $data->{'address'},
87
                        address2        => $data->{'address2'},
90
                        address2        => $data->{'address2'},
88
- 

Return to bug 6303