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

(-)a/C4/Members.pm (-8 / +11 lines)
Lines 352-358 sub GetMemberDetails { Link Here
352
    my $query;
352
    my $query;
353
    my $sth;
353
    my $sth;
354
    if ($borrowernumber) {
354
    if ($borrowernumber) {
355
        $sth = $dbh->prepare("select borrowers.*,category_type,categories.description from borrowers left join categories on borrowers.categorycode=categories.categorycode where  borrowernumber=?");
355
        $sth = $dbh->prepare("select borrowers.*,category_type,categories.description,enrolmentperiod from borrowers left join categories on borrowers.categorycode=categories.categorycode where  borrowernumber=?");
356
        $sth->execute($borrowernumber);
356
        $sth->execute($borrowernumber);
357
    }
357
    }
358
    elsif ($cardnumber) {
358
    elsif ($cardnumber) {
Lines 379-391 sub GetMemberDetails { Link Here
379
    $borrower->{'flags'}     = $flags;
379
    $borrower->{'flags'}     = $flags;
380
    $borrower->{'authflags'} = $accessflagshash;
380
    $borrower->{'authflags'} = $accessflagshash;
381
381
382
    # find out how long the membership lasts
382
    # For the purposes of making templates easier, we'll define a
383
    $sth =
383
    # 'showname' which is the alternate form the user's first name if 
384
      $dbh->prepare(
384
    # 'other name' is defined.
385
        "select enrolmentperiod from categories where categorycode = ?");
385
    if ($borrower->{category_type} eq 'I') {
386
    $sth->execute( $borrower->{'categorycode'} );
386
        $borrower->{'showname'} = $borrower->{'othernames'};
387
    my $enrolment = $sth->fetchrow;
387
        $borrower->{'showname'} .= " $borrower->{'firstname'}" if $borrower->{'firstname'};
388
    $borrower->{'enrolmentperiod'} = $enrolment;
388
    } else {
389
        $borrower->{'showname'} = $borrower->{'firstname'};
390
    }
391
389
    return ($borrower);    #, $flags, $accessflagshash);
392
    return ($borrower);    #, $flags, $accessflagshash);
390
}
393
}
391
394
(-)a/circ/circulation.pl (-2 / +5 lines)
Lines 627-635 my (undef, $roadttype_hashref) = &GetRoadTypes(); Link Here
627
my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'};
627
my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'};
628
628
629
my $fast_cataloging = 0;
629
my $fast_cataloging = 0;
630
    if (defined getframeworkinfo('FA')) {
630
if (defined getframeworkinfo('FA')) {
631
    $fast_cataloging = 1 
631
    $fast_cataloging = 1 
632
    }
632
}
633
633
634
$template->param(
634
$template->param(
635
    lib_messages_loop => $lib_messages_loop,
635
    lib_messages_loop => $lib_messages_loop,
Lines 644-649 $template->param( Link Here
644
    printername       => $printer,
644
    printername       => $printer,
645
    firstname         => $borrower->{'firstname'},
645
    firstname         => $borrower->{'firstname'},
646
    surname           => $borrower->{'surname'},
646
    surname           => $borrower->{'surname'},
647
    showname          => $borrower->{'showname'},
648
    category_type     => $borrower->{'category_type'},
647
    dateexpiry        => format_date($newexpiry),
649
    dateexpiry        => format_date($newexpiry),
648
    expiry            => format_date($borrower->{'dateexpiry'}),
650
    expiry            => format_date($borrower->{'dateexpiry'}),
649
    categorycode      => $borrower->{'categorycode'},
651
    categorycode      => $borrower->{'categorycode'},
Lines 659-664 $template->param( Link Here
659
    country           => $borrower->{'country'},
661
    country           => $borrower->{'country'},
660
    phone             => $borrower->{'phone'} || $borrower->{'mobile'},
662
    phone             => $borrower->{'phone'} || $borrower->{'mobile'},
661
    cardnumber        => $borrower->{'cardnumber'},
663
    cardnumber        => $borrower->{'cardnumber'},
664
    othernames        => $borrower->{'othernames'},
662
    amountold         => $amountold,
665
    amountold         => $amountold,
663
    barcode           => $barcode,
666
    barcode           => $barcode,
664
    stickyduedate     => $stickyduedate,
667
    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 167-175 function refocus(calendar) { Link Here
167
[% INCLUDE 'header.inc' %]
163
[% INCLUDE 'header.inc' %]
168
[% INCLUDE 'circ-search.inc' %]
164
[% INCLUDE 'circ-search.inc' %]
169
165
170
<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>
166
<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;
171
167
[% IF ( borrowernumber ) %]
172
168
    <a href="/cgi-bin/koha/circ/circulation.pl">Checkouts</a> &rsaquo; [% INCLUDE 'patron-title.inc' %]
169
[% ELSE %]
170
    <strong>Checkouts</strong>
171
[% END %]
172
</div>
173
[% IF ( CGIselectborrower ) %]
173
[% IF ( CGIselectborrower ) %]
174
<div id="doc" class="yui-t7">
174
<div id="doc" class="yui-t7">
175
175
Lines 461-467 No patron matched <span class="ex">[% message %]</span> Link Here
461
	    <input type="button" value="Clear Screen" onclick="window.location = '/cgi-bin/koha/circ/circulation.pl'" />
461
	    <input type="button" value="Clear Screen" onclick="window.location = '/cgi-bin/koha/circ/circulation.pl'" />
462
    [% END %]
462
    [% END %]
463
463
464
    <label for="barcode">Checking out to [% firstname %] [% surname %] ([% cardnumber %]) </label>
464
    <label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
465
465
	<div class="hint">Enter item barcode:</div>
466
	<div class="hint">Enter item barcode:</div>
466
467
467
    [% IF ( NEEDSCONFIRMATION ) %]
468
    [% IF ( NEEDSCONFIRMATION ) %]
Lines 528-534 No patron matched <span class="ex">[% message %]</span> Link Here
528
529
529
    [% IF ( flagged ) %]
530
    [% IF ( flagged ) %]
530
		[% IF ( noissues ) %]
531
		[% IF ( noissues ) %]
531
		 <h4>Checking out to [% firstname %] [% surname %] ([% cardnumber %])</h4>
532
		<h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4>
532
        <div id="circmessages" class="circmessage warning">
533
        <div id="circmessages" class="circmessage warning">
533
		[% ELSE %]
534
		[% ELSE %]
534
        <div id="circmessages" class="circmessage attention">
535
        <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/messaging.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; [% IF ( unknowuser ) %]Patron does not exist[% ELSE %]Patron Details for [% firstname %] [% surname %] ([% cardnumber %])[% END %]</title>
2
<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( unknowuser ) %]Patron does not exist[% ELSE %]Patron Details for [% INCLUDE 'patron-title.inc' %][% END %]</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; [% IF ( unknowuser ) %]Patron does not exist[% ELSE %]Patron Details for [% firstname %] [% surname %] ([% cardnumber %])[% END %] </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; [% IF ( unknowuser ) %]Patron does not exist[% ELSE %]Patron Details for [% INCLUDE 'patron-title.inc' %][% END %] </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/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 19-25 Link Here
19
[% INCLUDE 'header.inc' %]
19
[% INCLUDE 'header.inc' %]
20
[% INCLUDE 'patron-search.inc' %]
20
[% INCLUDE 'patron-search.inc' %]
21
21
22
<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>
22
<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>
23
23
24
<div id="doc3" class="yui-t2">
24
<div id="doc3" class="yui-t2">
25
   
25
   
Lines 27-33 Link Here
27
	<div id="yui-main">
27
	<div id="yui-main">
28
	<div class="yui-b">
28
	<div class="yui-b">
29
[% INCLUDE 'circ-toolbar.inc' %]
29
[% INCLUDE 'circ-toolbar.inc' %]
30
<h1>Sent notices for [% firstname %] [% surname %]</h1>
30
<h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1>
31
31
32
    <table id="noticestable">
32
    <table id="noticestable">
33
	<thead>
33
	<thead>
(-)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 21-27 Link Here
21
[% INCLUDE 'header.inc' %]
21
[% INCLUDE 'header.inc' %]
22
[% INCLUDE 'patron-search.inc' %]
22
[% INCLUDE 'patron-search.inc' %]
23
23
24
<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>
24
<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>
25
25
26
<div id="doc3" class="yui-t2">
26
<div id="doc3" class="yui-t2">
27
   
27
   
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-2 / +2 lines)
Lines 201-207 Link Here
201
									for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% object %]">Bibliographic Record [% object %]</a>
201
									for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% object %]">Bibliographic Record [% object %]</a>
202
								[% END %]
202
								[% END %]
203
								[% IF ( MEMBERS ) %]
203
								[% IF ( MEMBERS ) %]
204
									for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% object %]">[% firstname %] [% surname %] ([% cardnumber %])</a>
204
									for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% object %]">[% INCLUDE 'patron-title.inc' %]</a>
205
								[% END %]
205
								[% END %]
206
								.
206
								.
207
							</div>
207
							</div>
Lines 274-280 Link Here
274
                                for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% object %]">Bibliographic Record [% object %]</a>
274
                                for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% object %]">Bibliographic Record [% object %]</a>
275
                            [% END %]
275
                            [% END %]
276
                            [% IF ( MEMBERS ) %]
276
                            [% IF ( MEMBERS ) %]
277
                                for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% object %]">[% firstname %] [% surname %] ([% cardnumber %])</a>
277
                                for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% object %]">[% INCLUDE 'patron-title.inc' %]</a>
278
                            [% END %]
278
                            [% END %]
279
                            .
279
                            .
280
                        </div>
280
                        </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.tablesorter.min.js"></script>
7
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
Lines 93-99 $.tablesorter.addParser({ Link Here
93
	       </div>
93
	       </div>
94
	[% END %]
94
	[% END %]
95
    [% FOREACH BORROWER_INF IN BORROWER_INFO %]
95
    [% FOREACH BORROWER_INF IN BORROWER_INFO %]
96
        <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>
96
        <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 %]
97
        <span class="hint">(<a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Click here</a> if you're not
98
        [% 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 %])
99
        </span></h2>
97
        
100
        
98
		[% 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 %]
101
		[% 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 %]
99
		
102
		
(-)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 101-111 $template->param( Link Here
101
    finesview           => 1,
101
    finesview           => 1,
102
    firstname           => $data->{'firstname'},
102
    firstname           => $data->{'firstname'},
103
    surname             => $data->{'surname'},
103
    surname             => $data->{'surname'},
104
    othernames          => $data->{'othernames'},
104
    borrowernumber      => $borrowernumber,
105
    borrowernumber      => $borrowernumber,
105
    cardnumber          => $data->{'cardnumber'},
106
    cardnumber          => $data->{'cardnumber'},
106
    categorycode        => $data->{'categorycode'},
107
    categorycode        => $data->{'categorycode'},
107
    category_type       => $data->{'category_type'},
108
    category_type       => $data->{'category_type'},
108
    categoryname		 => $data->{'description'},
109
    categoryname		=> $data->{'description'},
109
    address             => $data->{'address'},
110
    address             => $data->{'address'},
110
    address2            => $data->{'address2'},
111
    address2            => $data->{'address2'},
111
    city                => $data->{'city'},
112
    city                => $data->{'city'},
(-)a/members/messaging.pl (-1 / +6 lines)
Lines 84-93 $template->param( messagingview => 1, Link Here
84
                  message_queue               => $message_queue,
84
                  message_queue               => $message_queue,
85
                  DHTMLcalendar_dateformat    => C4::Dates->DHTMLcalendar(), 
85
                  DHTMLcalendar_dateformat    => C4::Dates->DHTMLcalendar(), 
86
                  borrowernumber              => $borrowernumber,
86
                  borrowernumber              => $borrowernumber,
87
                  firstname                   => $borrower->{'firstname'},
88
                  surname                     => $borrower->{'surname'},
89
                  othernames                  => $borrower->{'othernames'},
90
                  cardnumber                  => $borrower->{'cardnumber'},
91
                  branchcode                  => $borrower->{'branchcode'},
87
                  branchname		      => GetBranchName($borrower->{'branchcode'}),
92
                  branchname		      => GetBranchName($borrower->{'branchcode'}),
88
                  dateformat                  => C4::Context->preference("dateformat"),
93
                  dateformat                  => C4::Context->preference("dateformat"),
89
                  categoryname                => $borrower->{'description'},
94
                  categoryname                => $borrower->{'description'},
90
                  $borrower->{'categorycode'} => 1,
95
                  category_type               => $borrower->{'category_type'},
91
);
96
);
92
97
93
#$messaging_preferences->{'SMSnumber'}{'value'} = defined $borrower->{'smsalertnumber'}
98
#$messaging_preferences->{'SMSnumber'}{'value'} = defined $borrower->{'smsalertnumber'}
(-)a/members/moremember.pl (-3 / +4 lines)
Lines 131-139 my $category_type = $data->{'category_type'}; Link Here
131
131
132
### $category_type
132
### $category_type
133
133
134
# in template <TMPL_IF name="I"> => instutitional (A for Adult& C for children) 
135
$template->param( $data->{'categorycode'} => 1 ); 
136
137
$debug and printf STDERR "dates (enrolled,expiry,birthdate) raw: (%s, %s, %s)\n", map {$data->{$_}} qw(dateenrolled dateexpiry dateofbirth);
134
$debug and printf STDERR "dates (enrolled,expiry,birthdate) raw: (%s, %s, %s)\n", map {$data->{$_}} qw(dateenrolled dateexpiry dateofbirth);
138
foreach (qw(dateenrolled dateexpiry dateofbirth)) {
135
foreach (qw(dateenrolled dateexpiry dateofbirth)) {
139
		my $userdate = $data->{$_};
136
		my $userdate = $data->{$_};
Lines 445-450 if (C4::Context->preference('EnhancedMessagingPreferences')) { Link Here
445
    $template->param(SMSnumber     => defined $data->{'smsalertnumber'} ? $data->{'smsalertnumber'} : $data->{'mobile'});
442
    $template->param(SMSnumber     => defined $data->{'smsalertnumber'} ? $data->{'smsalertnumber'} : $data->{'mobile'});
446
}
443
}
447
444
445
# in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) 
446
$template->param( $data->{'categorycode'} => 1 ); 
448
$template->param(
447
$template->param(
449
    detailview => 1,
448
    detailview => 1,
450
    AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
449
    AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
Lines 452-457 $template->param( Link Here
452
    CANDELETEUSER    => $candeleteuser,
451
    CANDELETEUSER    => $candeleteuser,
453
    roaddetails     => $roaddetails,
452
    roaddetails     => $roaddetails,
454
    borrowernumber  => $borrowernumber,
453
    borrowernumber  => $borrowernumber,
454
    othernames      => $data->{'othernames'},
455
    categoryname    => $data->{'description'},
455
    categoryname    => $data->{'description'},
456
    reregistration  => $reregistration,
456
    reregistration  => $reregistration,
457
    branch          => $branch,
457
    branch          => $branch,
Lines 473-478 $template->param( Link Here
473
    "dateformat_" . (C4::Context->preference("dateformat") || '') => 1,
473
    "dateformat_" . (C4::Context->preference("dateformat") || '') => 1,
474
    samebranch     => $samebranch,
474
    samebranch     => $samebranch,
475
    quickslip		  => $quickslip,
475
    quickslip		  => $quickslip,
476
    category_type   => $category_type,
476
);
477
);
477
478
478
#Get the slip news items
479
#Get the slip news items
(-)a/members/notices.pl (+6 lines)
Lines 55-61 $template->param( %{$borrower} ); Link Here
55
55
56
$template->param(
56
$template->param(
57
			QUEUED_MESSAGES 	=> $queued_messages,
57
			QUEUED_MESSAGES 	=> $queued_messages,
58
 			BORROWER_INFO         	=> [ $borrower ],
59
            firstname 		=> $borrower->{'firstname'},
60
			surname 		=> $borrower->{'surname'},
61
			othernames      => $borrower->{'othernames'},
62
			cardnumber      => $borrower->{'cardnumber'},
58
			borrowernumber 		=> $borrowernumber,
63
			borrowernumber 		=> $borrowernumber,
64
            category_type   => $borrower->{'category_type'},
59
			sentnotices 		=> 1
65
			sentnotices 		=> 1
60
		);
66
		);
61
output_html_with_http_headers $input, $cookie, $template->output;
67
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/members/readingrec.pl (+1 lines)
Lines 102-107 $template->param( Link Here
102
						title => $data->{'title'},
102
						title => $data->{'title'},
103
						initials => $data->{'initials'},
103
						initials => $data->{'initials'},
104
						surname => $data->{'surname'},
104
						surname => $data->{'surname'},
105
						othernames => $data->{'othernames'},
105
						borrowernumber => $borrowernumber,
106
						borrowernumber => $borrowernumber,
106
						limit => $limit,
107
						limit => $limit,
107
						firstname => $data->{'firstname'},
108
						firstname => $data->{'firstname'},
(-)a/opac/opac-user.pl (+3 lines)
Lines 101-106 $template->param( BORROWER_INFO => \@bordat, Link Here
101
                    borrowernumber    => $borrowernumber,
101
                    borrowernumber    => $borrowernumber,
102
                    patron_flagged    => $borr->{flagged},
102
                    patron_flagged    => $borr->{flagged},
103
                    OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
103
                    OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
104
                    surname           => $borr->{surname},
105
                    showname          => $borr->{showname},
106
                    patron_flagged    => $borr->{flagged},
104
                );
107
                );
105
108
106
#get issued items ....
109
#get issued items ....
(-)a/tools/viewlog.pl (-1 / +3 lines)
Lines 73-86 if ($src eq 'circ') { # if we were called from circulation, use the circulatio Link Here
73
    my $data = GetMember('borrowernumber'=>$borrowernumber);
73
    my $data = GetMember('borrowernumber'=>$borrowernumber);
74
    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
74
    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
75
    $template->param( picture => 1 ) if $picture;
75
    $template->param( picture => 1 ) if $picture;
76
    
76
    $template->param(   menu            => 1,
77
    $template->param(   menu            => 1,
77
                        title           => $data->{'title'},
78
                        title           => $data->{'title'},
78
                        initials        => $data->{'initials'},
79
                        initials        => $data->{'initials'},
79
                        surname         => $data->{'surname'},
80
                        surname         => $data->{'surname'},
81
                        othernames      => $data->{'othernames'},
80
                        borrowernumber  => $borrowernumber,
82
                        borrowernumber  => $borrowernumber,
81
                        firstname       => $data->{'firstname'},
83
                        firstname       => $data->{'firstname'},
82
                        cardnumber      => $data->{'cardnumber'},
84
                        cardnumber      => $data->{'cardnumber'},
83
                        categorycode    => $data->{'categorycode'},
85
                        categorycode    => $data->{'categorycode'},
86
                        category_type   => $data->{'category_type'},
84
                        categoryname	=> $data->{'description'},
87
                        categoryname	=> $data->{'description'},
85
                        address         => $data->{'address'},
88
                        address         => $data->{'address'},
86
                        address2        => $data->{'address2'},
89
                        address2        => $data->{'address2'},
87
- 

Return to bug 6303