X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Freadingrec.pl;h=b0e2a5b9a1aefe5013d9d659d5e3c3440b0feb97;hb=9d6d641d1f8b77271800f43bc027b651f9aea52b;hp=7f6d271585f8cc14da373df896dd820f5658a4f6;hpb=b1b1f8f9153ebbd3f79369f875b8416818d9bad3;p=srvgit diff --git a/members/readingrec.pl b/members/readingrec.pl index 7f6d271585..b0e2a5b9a1 100755 --- a/members/readingrec.pl +++ b/members/readingrec.pl @@ -7,153 +7,97 @@ # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); -use C4::Auth; -use C4::Output; -use C4::Members; -use C4::Branch qw(GetBranches); -use List::MoreUtils qw/any uniq/; -use Koha::DateUtils; +use C4::Auth qw( get_template_and_user ); +use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); +use C4::Members qw( GetAllIssues ); +use List::MoreUtils qw( uniq ); +use Koha::DateUtils qw( dt_from_string ); -use C4::Dates qw/format_date/; -use C4::Members::Attributes qw(GetBorrowerAttributes); +use Koha::Patrons; +use Koha::Patron::Categories; my $input = CGI->new; -#get borrower details -my $data = undef; -my $borrowernumber = undef; -my $cardnumber = undef; - my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tt", query => $input, type => "intranet", - authnotrequired => 0, - flagsrequired => {borrowers => 1}, - debug => 1, + flagsrequired => {borrowers => 'edit_borrowers'}, }); my $op = $input->param('op') || ''; +my $patron; if ($input->param('cardnumber')) { - $cardnumber = $input->param('cardnumber'); - $data = GetMember(cardnumber => $cardnumber); - $borrowernumber = $data->{'borrowernumber'}; # we must define this as it is used to retrieve other data about the patron + my $cardnumber = $input->param('cardnumber'); + $patron = Koha::Patrons->find( { cardnumber => $cardnumber } ); } if ($input->param('borrowernumber')) { - $borrowernumber = $input->param('borrowernumber'); - $data = GetMember(borrowernumber => $borrowernumber); + my $borrowernumber = $input->param('borrowernumber'); + $patron = Koha::Patrons->find( $borrowernumber ); +} + +my $logged_in_user = Koha::Patrons->find( $loggedinuser ); +output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } ); + +# barcode export +if ( $op eq 'export_barcodes' ) { + # FIXME This should be moved out of this script + if ( $patron->privacy < 2) { + my @barcodes = $patron->old_checkouts->search( {}, { prefetch => 'item' } ) + ->filter_by_todays_checkins->get_column('item.barcode'); + + my $borrowercardnumber = $patron->cardnumber; + my $delimiter = "\n"; + my $today = dt_from_string->ymd; + binmode( STDOUT, ":encoding(UTF-8)" ); + print $input->header( + -type => 'application/octet-stream', + -charset => 'utf-8', + -attachment => "$today-$borrowercardnumber-checkinexport.txt" + ); + + my $content = join $delimiter, uniq(@barcodes); + print $content; + exit; + } } my $order = 'date_due desc'; my $limit = 0; my $issues = (); # Do not request the old issues of anonymous patron -if ( $borrowernumber eq C4::Context->preference('AnonymousPatron') ){ +if ( $patron->borrowernumber eq C4::Context->preference('AnonymousPatron') ){ # use of 'eq' in the above comparison is intentional -- the # system preference value could be blank $template->param( is_anonymous => 1 ); } else { - $issues = GetAllIssues($borrowernumber,$order,$limit); + $issues = GetAllIssues($patron->borrowernumber,$order,$limit); } -my $branches = GetBranches(); - -# barcode export -if ( $op eq 'export_barcodes' ) { - my $today = C4::Dates->new(); - $today = $today->output('iso'); - my @barcodes = - map { $_->{barcode} } grep { $_->{returndate} =~ m/^$today/o } @{$issues}; - my $borrowercardnumber = - GetMember( borrowernumber => $borrowernumber )->{'cardnumber'}; - my $delimiter = "\n"; - binmode( STDOUT, ":encoding(UTF-8)" ); - print $input->header( - -type => 'application/octet-stream', - -charset => 'utf-8', - -attachment => "$today-$borrowercardnumber-checkinexport.txt" - ); - my $content = join $delimiter, uniq(@barcodes); - print $content; - exit; -} - -if ( $data->{'category_type'} eq 'C') { - my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE category_type = ?' ); - my $cnt = scalar(@$catcodes); - $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1; - $template->param( 'catcode' => $catcodes->[0]) if $cnt == 1; -} - -$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' ); if (! $limit){ $limit = 'full'; } - -my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'}); -$template->param( picture => 1 ) if $picture; - -if (C4::Context->preference('ExtendedPatronAttributes')) { - my $attributes = GetBorrowerAttributes($borrowernumber); - $template->param( - ExtendedPatronAttributes => 1, - extendedattributes => $attributes - ); -} - - -# Computes full borrower address -my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} ); -my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'}; - $template->param( + patron => $patron, readingrecordview => 1, - title => $data->{title}, - initials => $data->{initials}, - surname => $data->{surname}, - othernames => $data->{othernames}, - borrowernumber => $borrowernumber, - firstname => $data->{firstname}, - cardnumber => $data->{cardnumber}, - categorycode => $data->{categorycode}, - category_type => $data->{category_type}, - categoryname => $data->{description}, - address => $address, - address2 => $data->{address2}, - city => $data->{city}, - state => $data->{state}, - zipcode => $data->{zipcode}, - country => $data->{country}, - phone => $data->{phone}, - phonepro => $data->{phonepro}, - mobile => $data->{mobile}, - email => $data->{email}, - emailpro => $data->{emailpro}, - branchcode => $data->{branchcode}, - is_child => ( $data->{category_type} eq 'C' ), - branchname => $branches->{ $data->{branchcode} }->{branchname}, loop_reading => $issues, - activeBorrowerRelationship => - ( C4::Context->preference('borrowerRelationship') ne '' ), - RoutingSerials => C4::Context->preference('RoutingSerials'), ); output_html_with_http_headers $input, $cookie, $template->output;