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

(-)a/C4/Members.pm (-2 / +4 lines)
Lines 2-7 package C4::Members; Link Here
2
2
3
# Copyright 2000-2003 Katipo Communications
3
# Copyright 2000-2003 Katipo Communications
4
# Copyright 2010 BibLibre
4
# Copyright 2010 BibLibre
5
# Parts Copyright 2010 Catalyst IT
5
#
6
#
6
# This file is part of Koha.
7
# This file is part of Koha.
7
#
8
#
Lines 352-362 sub GetMemberDetails { Link Here
352
    my $query;
353
    my $query;
353
    my $sth;
354
    my $sth;
354
    if ($borrowernumber) {
355
    if ($borrowernumber) {
355
        $sth = $dbh->prepare("select borrowers.*,category_type,categories.description from borrowers left join categories on borrowers.categorycode=categories.categorycode where  borrowernumber=?");
356
        $sth = $dbh->prepare("SELECT borrowers.*,category_type,categories.description,reservefee FROM borrowers LEFT JOIN categories ON borrowers.categorycode=categories.categorycode WHERE  borrowernumber=?");
356
        $sth->execute($borrowernumber);
357
        $sth->execute($borrowernumber);
357
    }
358
    }
358
    elsif ($cardnumber) {
359
    elsif ($cardnumber) {
359
        $sth = $dbh->prepare("select borrowers.*,category_type,categories.description from borrowers left join categories on borrowers.categorycode=categories.categorycode where cardnumber=?");
360
        $sth = $dbh->prepare("SELECT borrowers.*,category_type,categories.description,reservefee FROM borrowers LEFT JOIN categories ON borrowers.categorycode=categories.categorycode WHERE cardnumber=?");
360
        $sth->execute($cardnumber);
361
        $sth->execute($cardnumber);
361
    }
362
    }
362
    else {
363
    else {
Lines 386-391 sub GetMemberDetails { Link Here
386
    $sth->execute( $borrower->{'categorycode'} );
387
    $sth->execute( $borrower->{'categorycode'} );
387
    my $enrolment = $sth->fetchrow;
388
    my $enrolment = $sth->fetchrow;
388
    $borrower->{'enrolmentperiod'} = $enrolment;
389
    $borrower->{'enrolmentperiod'} = $enrolment;
390
    
389
    return ($borrower);    #, $flags, $accessflagshash);
391
    return ($borrower);    #, $flags, $accessflagshash);
390
}
392
}
391
393
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt (+5 lines)
Lines 220-225 Link Here
220
                        [% USER_INF.firstname %] [% USER_INF.surname %] ([% USER_INF.cardnumber %])
220
                        [% USER_INF.firstname %] [% USER_INF.surname %] ([% USER_INF.cardnumber %])
221
                      [% END %]
221
                      [% END %]
222
                    </h3>[% END %]
222
                    </h3>[% END %]
223
	      [% IF (RESERVE_CHARGE) %]
224
	      <div class="dialog alert">
225
	        There is a charge of [% RESERVE_CHARGE %] for placing this reserve
226
	      </div>
227
	      [% END %]
223
228
224
            <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
229
            <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
225
            <input type="hidden" name="place_reserve" value="1"/>
230
            <input type="hidden" name="place_reserve" value="1"/>
(-)a/opac/opac-reserve.pl (-1 / +4 lines)
Lines 54-59 sub get_out ($$$) { Link Here
54
# get borrower information ....
54
# get borrower information ....
55
my ( $borr ) = GetMemberDetails( $borrowernumber );
55
my ( $borr ) = GetMemberDetails( $borrowernumber );
56
56
57
# Pass through any reserve charge
58
if ($borr->{reservefee} > 0){
59
    $template->param( RESERVE_CHARGE => sprintf("%.2f",$borr->{reservefee}));
60
}
57
# get branches and itemtypes
61
# get branches and itemtypes
58
my $branches = GetBranches();
62
my $branches = GetBranches();
59
my $itemTypes = GetItemTypes();
63
my $itemTypes = GetItemTypes();
60
- 

Return to bug 6857