use C4::Output;
use C4::Log;
use C4::Items;
-use C4::Branch;
use C4::Debug;
use C4::Search; # enabled_staff_search_views
-use Koha::Patron::Images;
+use Koha::Patrons;
use vars qw($debug $cgi_debug);
if ( $src eq 'circ' ) {
# if we were called from circulation, use the circulation menu and get data to populate it -fbcit
- use C4::Members;
use C4::Members::Attributes qw(GetBorrowerAttributes);
my $borrowernumber = $object;
- my $data = GetMember( 'borrowernumber' => $borrowernumber );
- my $patron_image = Koha::Patron::Images->find($data->{borrowernumber});
- $template->param( picture => 1 ) if $patron_image;
-
+ my $patron = Koha::Patrons->find( $borrowernumber );
+ unless ( $patron ) {
+ print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
+ exit;
+ }
if ( C4::Context->preference('ExtendedPatronAttributes') ) {
- my $attributes = GetBorrowerAttributes( $data->{'borrowernumber'} );
+ my $attributes = GetBorrowerAttributes( $borrowernumber );
$template->param(
ExtendedPatronAttributes => 1,
extendedattributes => $attributes
);
}
- $template->param(%$data);
-
$template->param(
- menu => 1,
- borrowernumber => $borrowernumber,
- categoryname => $data->{'description'},
- RoutingSerials => C4::Context->preference('RoutingSerials'),
+ patron => $patron,
+ circulation => 1,
);
}
$result->{'biblionumber'} = q{};
$result->{'biblioitemnumber'} = q{};
$result->{'barcode'} = q{};
- $result->{'userfirstname'} = q{};
- $result->{'usersurname'} = q{};
- $result->{'borrowerfirstname'} = q{};
- $result->{'borrowersurname'} = q{};
if ( substr( $result->{'info'}, 0, 4 ) eq 'item' || $result->{module} eq "CIRCULATION" ) {
#always add firstname and surname for librarian/user
if ( $result->{'user'} ) {
- my $userdetails = C4::Members::GetMemberDetails( $result->{'user'} );
- if ($userdetails) {
- $result->{'userfirstname'} = $userdetails->{'firstname'};
- $result->{'usersurname'} = $userdetails->{'surname'};
+ my $patron = Koha::Patrons->find( $result->{'user'} );
+ if ($patron) {
+ $result->{librarian} = $patron;
}
}
#add firstname and surname for borrower, when using the CIRCULATION, MEMBERS, FINES
if ( $result->{module} eq "CIRCULATION" || $result->{module} eq "MEMBERS" || $result->{module} eq "FINES" ) {
if ( $result->{'object'} ) {
- my $borrowerdetails = C4::Members::GetMemberDetails( $result->{'object'} );
- if ($borrowerdetails) {
- $result->{'borrowerfirstname'} = $borrowerdetails->{'firstname'};
- $result->{'borrowersurname'} = $borrowerdetails->{'surname'};
+ my $patron = Koha::Patrons->find( $result->{'object'} );
+ if ($patron) {
+ $result->{patron} = $patron;
}
}
}