Account summary: [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])
- --
- [% IF Koha.Preference( 'AddressFormat' ) %]
- [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
- [% ELSE %]
- [% INCLUDE 'member-display-address-style-us.inc' %]
- [% END %]
-
- [% IF ( patron.phone ) %][% patron.phone | html %][% ELSE %](no phone number on file)[% END %] -
- [% IF ( patron.email ) %][% patron.email | html %][% ELSE %](no primary email on file)[% END %] - [% IF ( patron.emailpro ) %] -
- [% patron.emailpro | html %] - [% END %] -
- Registration date: [% patron.dateenrolled | $KohaDates %] -
- Expiration date: [% patron.dateexpiry | $KohaDates %] -
- Library: [% Branches.GetName( patron.branchcode ) | html %] -
- Category: [% patron.category.description | html %] -
Title | -Author | -Placed on | -Expires on | -Pick up location | -
---|---|---|---|---|
[% reserve.title | html %] | -[% reserve.author | html %] | -[% reserve.reservedate | $KohaDates %] | -[% reserve.expirationdate | $KohaDates %] | -[% reserve.waiting_at | html %] | -
Date | -Description of charges | -Note | -Amount | -Outstanding | -||
---|---|---|---|---|---|---|
[% account.date | $KohaDates %] | -- [% INCLUDE 'accounttype.inc' accountline => account %] - [%- IF account.payment_type %] - , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %] - [% END %] - [%- IF account.description %] - , [% account.description | html %] - [% END %] - - [% IF ( account.itemnumber AND account.accounttype != 'F' AND account.accounttype != 'FU' ) %] - [% account.item.biblio.title | html %] - [% END %] - | -- [% account.note | html_line_break %] - | - [% IF ( account.amount < 0 ) %] -- [% ELSE %] - | - [% END %][% account.amount | $Price %] - | - [% IF ( account.amountoutstanding < 0 ) %] -- [% ELSE %] - | - [% END %] - [% account.amountoutstanding | $Price %] - | -
Total due | -[% totaldue | $Price %] | -
[% LibraryName | html %]
-[% IF ( branchname ) %][% branchname | html %][% END %] -Checked out to [% firstname | html %] [% surname | html %]
-([% cardnumber | html %])
- -[% todaysdate | html %]
- -[% IF ( quickslip ) %] -
Checked out today
-[% FOREACH issueloo IN issueloop %] -[% IF ( issueloo.red ) %][% ELSE %] -[% IF ( issueloo.today ) %] -[% issueloo.title | html %]
-Barcode: [% issueloo.barcode | html %]
-Date due: [% issueloo.date_due | html %]
Checked out
-[% FOREACH issueloo IN issueloop %] -[% IF ( issueloo.red ) %][% ELSE %] -[% issueloo.title | html %]
-Barcode: [% issueloo.barcode | html %]
-Date due: [% issueloo.date_due | html %]
Overdues
- [% FOREACH issueloo IN issueloop %] - [% IF ( issueloo.red ) %] -[% issueloo.title | html %]
-Barcode: [% issueloo.barcode | html %]
-Date due: [% issueloo.date_due | html %]
News
- - [% FOREACH koha_new IN koha_news %] -[% koha_new.title | html %]
-[% koha_new.content | $raw %]
-- @@ -434,15 +435,15 @@
- Library: - [% branchname | html %] + [% Branches.GetName( patron.branchcode ) | html %] - [% IF ( OPACPrivacy ) %] + [% IF Koha.Preference( 'OPACPrivacy') %]
- Privacy Pref: - [% IF ( privacy0 ) %]Forever[% END %] - [% IF ( privacy1 ) %]Default[% END %] - [% IF ( privacy2 ) %]Never[% END %] + [% IF ( patron.privacy == 0 ) %]Forever[% END %] + [% IF ( patron.privacy == 1 ) %]Default[% END %] + [% IF ( patron.privacy == 2 ) %]Never[% END %] [% END %] @@ -646,7 +647,7 @@ [% IF relatives_issues_count %]
- - Relatives' checkouts + [% relatives_issues_count | html %] Relatives' checkouts [% END %]
-
@@ -706,8 +707,8 @@
[% END %]
- [% IF ( totaldue_raw ) %] -
Total due: [% totaldue | html %]
+ [% IF ( fines ) %] +Total due: [% fines | $Price %]
[% ELSE %]No outstanding charges
[% END %] --- a/members/moremember.pl +++ a/members/moremember.pl @@ -22,98 +22,48 @@ =head1 moremember.pl - script to do a borrower enquiry/bring up borrower details etc - Displays all the details about a borrower - written 20/12/99 by chris@katipo.co.nz - last modified 21/1/2000 by chris@katipo.co.nz - modified 31/1/2001 by chris@katipo.co.nz - to not allow items on request to be renewed - - needs html removed and to use the C4::Output more, but its tricky + script to do a borrower enquiry/bring up patron details etc + Displays all the details about a patron =cut use Modern::Perl; use CGI qw ( -utf8 ); -use HTML::Entities; use C4::Context; use C4::Auth; use C4::Output; -use C4::Members; -use C4::Members::Attributes; use C4::Members::AttributeTypes; -use C4::Reserves; -use C4::Circulation; -use C4::Koha; -use C4::Letters; -use C4::Biblio; use C4::Form::MessagingPreferences; use List::MoreUtils qw/uniq/; use C4::Members::Attributes qw(GetBorrowerAttributes); -use Koha::Account::Lines; -use Koha::AuthorisedValues; -use Koha::CsvProfiles; use Koha::Patron::Debarments qw(GetDebarments); use Koha::Patron::Messages; -#use Smart::Comments; -#use Data::Dumper; -use DateTime; use Koha::DateUtils; -use Koha::Database; +use Koha::CsvProfiles; use Koha::Patrons; -use Koha::Patron::Categories; use Koha::Token; +use Koha::Checkouts; use vars qw($debug); BEGIN { - $debug = $ENV{DEBUG} || 0; + $debug = $ENV{DEBUG} || 0; } -my $dbh = C4::Context->dbh; - my $input = CGI->new; $debug or $debug = $input->param('debug') || 0; -my $print = $input->param('print'); - -my $template_name; -my $quickslip = 0; - -my $flagsrequired; -if (defined $print and $print eq "page") { - $template_name = "members/moremember-print.tt"; - # circ staff who process checkouts but can't edit - # patrons still need to be able to access print view - $flagsrequired = { circulate => "circulate_remaining_permissions" }; -} elsif (defined $print and $print eq "slip") { - $template_name = "members/moremember-receipt.tt"; - # circ staff who process checkouts but can't edit - # patrons still need to be able to print receipts - $flagsrequired = { circulate => "circulate_remaining_permissions" }; -} elsif (defined $print and $print eq "qslip") { - $template_name = "members/moremember-receipt.tt"; - $quickslip = 1; - $flagsrequired = { circulate => "circulate_remaining_permissions" }; -} elsif (defined $print and $print eq "brief") { - $template_name = "members/moremember-brief.tt"; - $flagsrequired = { borrowers => 'edit_borrowers' }; -} else { - $template_name = "members/moremember.tt"; - $flagsrequired = { borrowers => 'edit_borrowers' }; -} my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => $template_name, + template_name => "members/moremember.tt", query => $input, type => "intranet", authnotrequired => 0, - flagsrequired => $flagsrequired, + flagsrequired => { borrowers => 'edit_borrowers' }, debug => 1, } ); my $borrowernumber = $input->param('borrowernumber'); -$borrowernumber = HTML::Entities::encode($borrowernumber); my $error = $input->param('error'); $template->param( error => $error ) if ( $error ); @@ -121,46 +71,21 @@ my $patron = Koha::Patrons->find( $borrowernumber ); my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in"; output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } ); -my $issues = $patron->checkouts; -my $balance = $patron->account->balance; -$template->param( - issuecount => $issues->count, - fines => $balance, -); - my $category_type = $patron->category->category_type; -my $data = $patron->unblessed; - -$debug and printf STDERR "dates (enrolled,expiry,birthdate) raw: (%s, %s, %s)\n", map {$data->{$_}} qw(dateenrolled dateexpiry dateofbirth); -foreach (qw(dateenrolled dateexpiry dateofbirth)) { # FIXME This should be removed - my $userdate = $data->{$_}; - unless ($userdate) { - $debug and warn sprintf "Empty \$data{%12s}", $_; - $data->{$_} = ''; - next; - } - $data->{$_} = dt_from_string( $userdate ); -} -for (qw(gonenoaddress lost borrowernotes)) { - $data->{$_} and $template->param(flagged => 1) and last; +for (qw(gonenoaddress lost borrowernotes is_debarred)) { + $patron->$_ and $template->param(flagged => 1) and last; } if ( $patron->is_debarred ) { $template->param( - userdebarred => 1, # FIXME Template should use patron->is_debarred - flagged => 1, debarments => scalar GetDebarments({ borrowernumber => $borrowernumber }), ); - my $debar = $data->{'debarred'}; - if ( $debar ne "9999-12-31" ) { - $template->param( 'userdebarreddate' => output_pref( { dt => dt_from_string( $debar ), dateonly => 1 } ) ); - $template->param( 'debarredcomment' => $data->{debarredcomment} ); + if ( $patron->debarred ne "9999-12-31" ) { + $template->param( 'userdebarreddate' => $patron->debarred ); } } -$data->{ "sex_".$data->{'sex'}."_p" } = 1 if defined $data->{sex}; - my @relatives; if ( my $guarantor = $patron->guarantor ) { $template->param( guarantor => $guarantor ); @@ -180,71 +105,13 @@ if ( my $guarantor = $patron->guarantor ) { } my $relatives_issues_count = - Koha::Database->new()->schema()->resultset('Issue') - ->count( { borrowernumber => \@relatives } ); - -my %bor; -$bor{'borrowernumber'} = $borrowernumber; - -# Converts the branchcode to the branch name -my $samebranch; -if ( C4::Context->preference("IndependentBranches") ) { - if ( C4::Context->IsSuperLibrarian() ) { - $samebranch = 1; - } - else { - my $userenv = C4::Context->userenv; - $samebranch = ( $data->{'branchcode'} eq $userenv->{branch} ); - } -} -else { - $samebranch = 1; -} -my $library = Koha::Libraries->find( $data->{branchcode})->unblessed; -@{$data}{keys %$library} = values %$library; # merge in all branch columns # FIXME This is really ugly, we should pass the library instead - -# If printing a page, send the account informations to the template -if (defined $print and $print eq "page") { - my $accts = Koha::Account::Lines->search( - { borrowernumber => $patron->borrowernumber, amountoutstanding => { '>' => 0 } }, - { order_by => { -desc => 'accountlines_id' } } - ); - $template->param( accounts => $accts ); -} - -# Show OPAC privacy preference is system preference is set -if ( C4::Context->preference('OPACPrivacy') ) { # FIXME Should be moved the the template - $template->param( OPACPrivacy => 1); - $template->param( "privacy".$data->{'privacy'} => 1); -} - -my $today = DateTime->now( time_zone => C4::Context->tz); -$today->truncate(to => 'day'); -my $overdues_exist = 0; -my $totalprice = 0; - -# Calculate and display patron's age -if ( $data->{dateofbirth} ) { - $template->param( age => Koha::Patron->new({ dateofbirth => $data->{dateofbirth} })->get_age ); -} - -### ############################################################################### -# BUILD HTML -# show all reserves of this borrower, and the position of the reservation .... -if ($borrowernumber) { - $template->param( - holds_count => Koha::Database->new()->schema()->resultset('Reserve') - ->count( { borrowernumber => $borrowernumber } ) ); -} + Koha::Checkouts->count({ borrowernumber => \@relatives }); # Generate CSRF token for upload and delete image buttons $template->param( csrf_token => Koha::Token->new->generate_csrf({ session_id => $input->cookie('CGISESSID'),}), ); - -$template->param(%$data); # FIXME This should be removed and used $patron instead, but too many things are processed above - if (C4::Context->preference('ExtendedPatronAttributes')) { my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber); my @classes = uniq( map {$_->{class}} @$attributes ); @@ -267,7 +134,6 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { } $template->param( - ExtendedPatronAttributes => 1, attributes_loop => \@attributes_loop ); @@ -280,8 +146,6 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { if (C4::Context->preference('EnhancedMessagingPreferences')) { C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $borrowernumber }, $template); $template->param(messaging_form_inactive => 1); - $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver")); - $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification")); } if ( C4::Context->preference("ExportCircHistory") ) { @@ -290,7 +154,7 @@ if ( C4::Context->preference("ExportCircHistory") ) { my $patron_messages = Koha::Patron::Messages->search( { - 'me.borrowernumber' => $borrowernumber, + 'me.borrowernumber' => $patron->borrowernumber, }, { join => 'manager', @@ -308,23 +172,16 @@ if( $patron_messages->count > 0 ){ my ( $subtag, $region ) = split '-', $patron->lang; my $translated_language = C4::Languages::language_get_description( $subtag, $subtag, 'language' ); -my $total = $patron->account->balance; $template->param( patron => $patron, + issuecount => $patron->checkouts->count, + holds_count => $patron->holds->count, + fines => $patron->account->balance, translated_language => $translated_language, detailview => 1, was_renewed => scalar $input->param('was_renewed') ? 1 : 0, - todaysdate => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }), - totalprice => sprintf("%.2f", $totalprice), - totaldue => sprintf("%.2f", $total), - totaldue_raw => $total, - overdues_exist => $overdues_exist, - StaffMember => $category_type eq 'S', $category_type => 1, # [% IF ( I ) %] = institutional/organisation - samebranch => $samebranch, - quickslip => $quickslip, housebound_role => scalar $patron->housebound_role, - PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20, relatives_issues_count => $relatives_issues_count, relatives_borrowernumbers => \@relatives, ); --