@@ -, +, @@ --- circ/circulation.pl | 8 +- .../prog/en/modules/members/statistics.tt | 8 +- members/boraccount.pl | 4 + members/deletemem.pl | 4 + members/discharge.pl | 143 +++++++++++---------- members/files.pl | 5 + members/mancredit.pl | 4 + members/maninvoice.pl | 5 + members/member-flags.pl | 5 + members/member-password.pl | 5 + members/memberentry.pl | 5 + members/notices.pl | 4 + members/pay.pl | 4 + members/paycollect.pl | 4 + members/printfeercpt.pl | 4 + members/printinvoice.pl | 4 + members/purchase-suggestions.pl | 5 +- members/readingrec.pl | 10 +- members/routing-lists.pl | 57 ++++---- members/statistics.pl | 3 +- members/summary-print.pl | 4 + members/update-child.pl | 4 + tools/viewlog.pl | 4 + 23 files changed, 188 insertions(+), 115 deletions(-) --- a/circ/circulation.pl +++ a/circ/circulation.pl @@ -261,8 +261,8 @@ if ($findborrower) { } # get the borrower information..... -if ($borrowernumber) { - $patron = Koha::Patrons->find( $borrowernumber ); +$patron ||= Koha::Patrons->find( $borrowernumber ) if $borrowernumber; +if ($patron) { my $overdues = $patron->get_overdues; my $issues = $patron->checkouts; my $balance = $patron->account->balance; @@ -443,8 +443,8 @@ if (@$barcodes) { ################################################################################## # BUILD HTML # show all reserves of this borrower, and the position of the reservation .... -if ($borrowernumber) { - my $holds = Koha::Holds->search( { borrowernumber => $borrowernumber } ); +if ($patron) { + my $holds = Koha::Holds->search( { borrowernumber => $borrowernumber } ); # FIXME must be Koha::Patron->holds my $waiting_holds = $holds->waiting; $template->param( holds_count => $holds->count(), --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt @@ -3,11 +3,7 @@ [% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] Koha › Patrons › -[% IF ( unknowuser ) %] - Patron does not exist -[% ELSE %] - Statistics for [% INCLUDE 'patron-title.inc' %] -[% END %] +Statistics for [% INCLUDE 'patron-title.inc' %] [% INCLUDE 'doc-head-close.inc' %] @@ -30,7 +26,7 @@
--- a/members/boraccount.pl +++ a/members/boraccount.pl @@ -54,6 +54,10 @@ my $action = $input->param('action') || ''; #get patron details my $patron = Koha::Patrons->find( $borrowernumber ); +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; +} if ( $action eq 'reverse' ) { ReversePayment( $input->param('accountlines_id') ); --- a/members/deletemem.pl +++ a/members/deletemem.pl @@ -75,6 +75,10 @@ my $issues = GetPendingIssues($member); # FIXME: wasteful call when really, my $countissues = scalar(@$issues); my $patron = Koha::Patrons->find( $member ); +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; +} my $flags = C4::Members::patronflags( $patron->unblessed ); my $userenv = C4::Context->userenv; --- a/members/discharge.pl +++ a/members/discharge.pl @@ -58,85 +58,86 @@ unless ( C4::Context->preference('useDischarge') ) { exit; } -if ( $input->param('borrowernumber') ) { - $borrowernumber = $input->param('borrowernumber'); +$borrowernumber = $input->param('borrowernumber'); - # Getting member data - my $patron = Koha::Patrons->find( $borrowernumber ); +my $patron = Koha::Patrons->find( $borrowernumber ); +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; +} - my $can_be_discharged = Koha::Patron::Discharge::can_be_discharged({ - borrowernumber => $borrowernumber - }); +my $can_be_discharged = Koha::Patron::Discharge::can_be_discharged({ + borrowernumber => $borrowernumber +}); - my $holds = $patron->holds; - my $has_reserves = $holds->count; +my $holds = $patron->holds; +my $has_reserves = $holds->count; - # Generating discharge if needed - if ( $input->param('discharge') and $can_be_discharged ) { - my $is_discharged = Koha::Patron::Discharge::is_discharged({ - borrowernumber => $borrowernumber, +# Generating discharge if needed +if ( $input->param('discharge') and $can_be_discharged ) { + my $is_discharged = Koha::Patron::Discharge::is_discharged({ + borrowernumber => $borrowernumber, + }); + unless ($is_discharged) { + Koha::Patron::Discharge::discharge({ + borrowernumber => $borrowernumber }); - unless ($is_discharged) { - Koha::Patron::Discharge::discharge({ - borrowernumber => $borrowernumber - }); - } - eval { - my $pdf_path = Koha::Patron::Discharge::generate_as_pdf( - { borrowernumber => $borrowernumber, branchcode => $patron->branchcode } ); - - binmode(STDOUT); - print $input->header( - -type => 'application/pdf', - -charset => 'utf-8', - -attachment => "discharge_$borrowernumber.pdf", - ); - open my $fh, '<', $pdf_path; - my @lines = <$fh>; - close $fh; - print @lines; - exit; - }; - if ( $@ ) { - carp $@; - $template->param( messages => [ {type => 'error', code => 'unable_to_generate_pdf'} ] ); - } } + eval { + my $pdf_path = Koha::Patron::Discharge::generate_as_pdf( + { borrowernumber => $borrowernumber, branchcode => $patron->branchcode } ); + + binmode(STDOUT); + print $input->header( + -type => 'application/pdf', + -charset => 'utf-8', + -attachment => "discharge_$borrowernumber.pdf", + ); + open my $fh, '<', $pdf_path; + my @lines = <$fh>; + close $fh; + print @lines; + exit; + }; + if ( $@ ) { + carp $@; + $template->param( messages => [ {type => 'error', code => 'unable_to_generate_pdf'} ] ); + } +} - # Already generated discharges - my $validated_discharges = Koha::Patron::Discharge::get_validated({ - borrowernumber => $borrowernumber, - }); +# Already generated discharges +my $validated_discharges = Koha::Patron::Discharge::get_validated({ + borrowernumber => $borrowernumber, +}); - $template->param( picture => 1 ) if $patron->image; - - $template->param( - # FIXME The patron object should be passed to the template - borrowernumber => $borrowernumber, - title => $patron->title, - initials => $patron->initials, - surname => $patron->surname, - borrowernumber => $borrowernumber, - firstname => $patron->firstname, - cardnumber => $patron->cardnumber, - categorycode => $patron->categorycode, - category_type => $patron->category->category_type, - categoryname => $patron->category->description, - address => $patron->address, - streetnumber => $patron->streetnumber, - streettype => $patron->streettype, - address2 => $patron->address2, - city => $patron->city, - zipcode => $patron->zipcode, - country => $patron->country, - phone => $patron->phone, - email => $patron->email, - branchcode => $patron->branchcode, - has_reserves => $has_reserves, - can_be_discharged => $can_be_discharged, - validated_discharges => $validated_discharges, - ); -} +$template->param( picture => 1 ) if $patron->image; + +$template->param( + # FIXME The patron object should be passed to the template + borrowernumber => $borrowernumber, + title => $patron->title, + initials => $patron->initials, + surname => $patron->surname, + borrowernumber => $borrowernumber, + firstname => $patron->firstname, + cardnumber => $patron->cardnumber, + categorycode => $patron->categorycode, + category_type => $patron->category->category_type, + categoryname => $patron->category->description, + address => $patron->address, + streetnumber => $patron->streetnumber, + streettype => $patron->streettype, + address2 => $patron->address2, + city => $patron->city, + zipcode => $patron->zipcode, + country => $patron->country, + phone => $patron->phone, + email => $patron->email, + branchcode => $patron->branchcode, + has_reserves => $has_reserves, + can_be_discharged => $can_be_discharged, + validated_discharges => $validated_discharges, +); $template->param( dischargeview => 1, ); --- a/members/files.pl +++ a/members/files.pl @@ -64,6 +64,11 @@ if ( $op eq 'download' ) { } else { my $patron = Koha::Patrons->find( $borrowernumber ); + unless ( $patron ) { + print $cgi->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; + } + my $patron_category = $patron->category; $template->param(%{ $patron->unblessed}); --- a/members/mancredit.pl +++ a/members/mancredit.pl @@ -43,6 +43,10 @@ my $flagsrequired = { borrowers => 1, updatecharges => 1 }; my $borrowernumber=$input->param('borrowernumber'); my $patron = Koha::Patrons->find( $borrowernumber ); +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; +} my $add=$input->param('add'); if ($add){ --- a/members/maninvoice.pl +++ a/members/maninvoice.pl @@ -43,6 +43,11 @@ my $flagsrequired = { borrowers => 1 }; my $borrowernumber=$input->param('borrowernumber'); my $patron = Koha::Patrons->find( $borrowernumber ); +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; +} + my $add=$input->param('add'); if ($add){ if ( checkauth( $input, 0, $flagsrequired, 'intranet' ) ) { --- a/members/member-flags.pl +++ a/members/member-flags.pl @@ -27,6 +27,11 @@ my $input = new CGI; my $flagsrequired = { permissions => 1 }; my $member=$input->param('member'); my $patron = Koha::Patrons->find( $member ); +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$member"); + exit; +} + my $category_type = $patron->category->category_type; my $bor = $patron->unblessed; if( $category_type eq 'S' ) { --- a/members/member-password.pl +++ a/members/member-password.pl @@ -49,6 +49,11 @@ my $newpassword2 = $input->param('newpassword2'); my @errors; my $patron = Koha::Patrons->find( $member ); +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$member"); + exit; +} + my $category_type = $patron->category->category_type; my $bor = $patron->unblessed; --- a/members/memberentry.pl +++ a/members/memberentry.pl @@ -155,6 +155,11 @@ $template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' ); $template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 ); if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' ) { my $patron = Koha::Patrons->find( $borrowernumber ); + unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; + } + $borrower_data = $patron->unblessed; $borrower_data->{category_type} = $patron->category->category_type; } --- a/members/notices.pl +++ a/members/notices.pl @@ -34,6 +34,10 @@ my $input=new CGI; my $borrowernumber = $input->param('borrowernumber'); my $patron = Koha::Patrons->find( $borrowernumber ); +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; +} my $borrower = $patron->unblessed; my ($template, $loggedinuser, $cookie) --- a/members/pay.pl +++ a/members/pay.pl @@ -68,6 +68,10 @@ if ( !$borrowernumber ) { # get borrower details my $patron = Koha::Patrons->find( $borrowernumber ); +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; +} my $category = $patron->category; our $borrower = $patron->unblessed; $borrower->{description} = $category->description; --- a/members/paycollect.pl +++ a/members/paycollect.pl @@ -50,6 +50,10 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( # get borrower details my $borrowernumber = $input->param('borrowernumber'); my $patron = Koha::Patrons->find( $borrowernumber ); +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; +} my $borrower = $patron->unblessed; my $category = $patron->category; $borrower->{description} = $category->description; --- a/members/printfeercpt.pl +++ a/members/printfeercpt.pl @@ -51,6 +51,10 @@ my $action = $input->param('action') || ''; my $accountlines_id = $input->param('accountlines_id'); my $patron = Koha::Patrons->find( $borrowernumber ); +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; +} my $category = $patron->category; my $data = $patron->unblessed; $data->{description} = $category->description; --- a/members/printinvoice.pl +++ a/members/printinvoice.pl @@ -50,6 +50,10 @@ my $action = $input->param('action') || ''; my $accountlines_id = $input->param('accountlines_id'); my $patron = Koha::Patrons->find( $borrowernumber ); +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; +} my $category = $patron->category; my $data = $patron->unblessed; $data->{description} = $category->description; --- a/members/purchase-suggestions.pl +++ a/members/purchase-suggestions.pl @@ -42,8 +42,11 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( my $borrowernumber = $input->param('borrowernumber'); -# Set informations for the patron my $patron = Koha::Patrons->find( $borrowernumber ); +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; +} my $category = $patron->category; my $data = $patron->unblessed; $data->{description} = $category->description; --- a/members/readingrec.pl +++ a/members/readingrec.pl @@ -55,15 +55,19 @@ my $patron; if ($input->param('cardnumber')) { $cardnumber = $input->param('cardnumber'); $patron = Koha::Patrons->find( { cardnumber => $cardnumber } ); - $data = $patron->unblessed; - $borrowernumber = $data->{'borrowernumber'}; # we must define this as it is used to retrieve other data about the patron } if ($input->param('borrowernumber')) { $borrowernumber = $input->param('borrowernumber'); $patron = Koha::Patrons->find( $borrowernumber ); - $data = $patron->unblessed; } +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; +} +$data = $patron->unblessed; +$borrowernumber = $patron->borrowernumber; + my $order = 'date_due desc'; my $limit = 0; my $issues = (); --- a/members/routing-lists.pl +++ a/members/routing-lists.pl @@ -48,37 +48,38 @@ my $borrowernumber = $query->param('borrowernumber'); my $branch = C4::Context->userenv->{'branch'}; -# get the borrower information..... -my ( $patron, $patron_info ); -if ($borrowernumber) { - $patron = Koha::Patrons->find( $borrowernumber ); - my $category = $patron->category; - $patron_info = $patron->unblessed; - $patron_info->{description} = $category->description; - $patron_info->{category_type} = $category->category_type; - - my $count; - my @borrowerSubscriptions; - ($count, @borrowerSubscriptions) = GetSubscriptionsFromBorrower($borrowernumber ); - my @subscripLoop; - - foreach my $num_res (@borrowerSubscriptions) { - my %getSubscrip; - $getSubscrip{subscriptionid} = $num_res->{'subscriptionid'}; - $getSubscrip{title} = $num_res->{'title'}; - $getSubscrip{borrowernumber} = $num_res->{'borrowernumber'}; - push( @subscripLoop, \%getSubscrip ); - } - - $template->param( - countSubscrip => scalar @subscripLoop, - subscripLoop => \@subscripLoop, - routinglistview => 1 - ); +my $patron = Koha::Patrons->find( $borrowernumber ) if $borrowernumber; +unless ( $patron ) { + print $query->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; +} - $template->param( adultborrower => 1 ) if ( $patron_info->{category_type} =~ /^(A|I)$/ ); +my $category = $patron->category; +my $patron_info = $patron->unblessed; +$patron_info->{description} = $category->description; +$patron_info->{category_type} = $category->category_type; + +my $count; +my @borrowerSubscriptions; +($count, @borrowerSubscriptions) = GetSubscriptionsFromBorrower($borrowernumber ); +my @subscripLoop; + +foreach my $num_res (@borrowerSubscriptions) { + my %getSubscrip; + $getSubscrip{subscriptionid} = $num_res->{'subscriptionid'}; + $getSubscrip{title} = $num_res->{'title'}; + $getSubscrip{borrowernumber} = $num_res->{'borrowernumber'}; + push( @subscripLoop, \%getSubscrip ); } +$template->param( + countSubscrip => scalar @subscripLoop, + subscripLoop => \@subscripLoop, + routinglistview => 1 +); + +$template->param( adultborrower => 1 ) if ( $patron_info->{category_type} =~ /^(A|I)$/ ); + ################################################################################## $template->param(%$patron_info); --- a/members/statistics.pl +++ a/members/statistics.pl @@ -50,8 +50,7 @@ my $borrowernumber = $input->param('borrowernumber'); # Set informations for the patron my $patron = Koha::Patrons->find( $borrowernumber ); unless ( $patron ) { - $template->param (unknowuser => 1); - output_html_with_http_headers $input, $cookie, $template->output; + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); exit; } --- a/members/summary-print.pl +++ a/members/summary-print.pl @@ -44,6 +44,10 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( ); my $patron = Koha::Patrons->find( $borrowernumber ); +unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; +} my $category = $patron->category; my $data = $patron->unblessed; $data->{description} = $category->description; --- a/members/update-child.pl +++ a/members/update-child.pl @@ -73,6 +73,10 @@ if ( $op eq 'multi' ) { elsif ( $op eq 'update' ) { my $patron = Koha::Patrons->find( $borrowernumber ); + unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; + } my $member = $patron->unblessed; $member->{'guarantorid'} = 0; $member->{'categorycode'} = $catcode; --- a/tools/viewlog.pl +++ a/tools/viewlog.pl @@ -74,6 +74,10 @@ if ( $src eq 'circ' ) { use C4::Members::Attributes qw(GetBorrowerAttributes); my $borrowernumber = $object; my $patron = Koha::Patrons->find( $borrowernumber ); + unless ( $patron ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber"); + exit; + } $template->param( picture => 1 ) if $patron->image; my $data = $patron->unblessed; --