X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fpaycollect.pl;h=3b8b9228a548f667877b860202fd9d79b930c000;hb=2b90ea2cb0e5e976de7ddef0151ae83d8ac578e6;hp=cbddc05be6e2f69a3f62e9c8ae079e85618651de;hpb=a118102d4e2d7cf6bc1157a560c52fd6deb6f7a7;p=srvgit diff --git a/members/paycollect.pl b/members/paycollect.pl index cbddc05be6..3b8b9228a5 100755 --- a/members/paycollect.pl +++ b/members/paycollect.pl @@ -4,49 +4,59 @@ # # 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 URI::Escape; use C4::Context; use C4::Auth; use C4::Output; -use CGI; +use CGI qw ( -utf8 ); use C4::Members; +use C4::Members::Attributes qw(GetBorrowerAttributes); use C4::Accounts; use C4::Koha; -use C4::Branch; +use Koha::Patron::Images; +use Koha::Patrons; +use Koha::Account; + +use Koha::Patron::Categories; my $input = CGI->new(); +my $updatecharges_permissions = $input->param('writeoff_individual') ? 'writeoff' : 'remaining_permissions'; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( - { template_name => 'members/paycollect.tmpl', + { template_name => 'members/paycollect.tt', query => $input, type => 'intranet', authnotrequired => 0, - flagsrequired => { borrowers => 1, updatecharges => 1 }, + flagsrequired => { borrowers => 1, updatecharges => $updatecharges_permissions }, debug => 1, } ); # get borrower details my $borrowernumber = $input->param('borrowernumber'); -my $borrower = GetMember( borrowernumber => $borrowernumber ); +my $patron = Koha::Patrons->find( $borrowernumber ); +my $borrower = $patron->unblessed; +my $category = $patron->category; +$borrower->{description} = $category->description; +$borrower->{category_type} = $category->category_type; my $user = $input->remote_user; -# get account details -my $branch = GetBranch( $input, GetBranches() ); +my $branch = C4::Context->userenv->{'branch'}; my ( $total_due, $accts, $numaccts ) = GetMemberAccountRecords($borrowernumber); my $total_paid = $input->param('paid'); @@ -55,7 +65,9 @@ my $individual = $input->param('pay_individual'); my $writeoff = $input->param('writeoff_individual'); my $select_lines = $input->param('selected'); my $select = $input->param('selected_accts'); +my $payment_note = uri_unescape $input->param('payment_note'); my $accountno; +my $accountlines_id; if ( $individual || $writeoff ) { if ($individual) { @@ -64,9 +76,11 @@ if ( $individual || $writeoff ) { $template->param( writeoff_individual => 1 ); } my $accounttype = $input->param('accounttype'); + $accountlines_id = $input->param('accountlines_id'); my $amount = $input->param('amount'); my $amountoutstanding = $input->param('amountoutstanding'); $accountno = $input->param('accountno'); + my $itemnumber = $input->param('itemnumber'); my $description = $input->param('description'); my $title = $input->param('title'); my $notify_id = $input->param('notify_id'); @@ -74,37 +88,43 @@ if ( $individual || $writeoff ) { $total_due = $amountoutstanding; $template->param( accounttype => $accounttype, + accountlines_id => $accountlines_id, accountno => $accountno, amount => $amount, amountoutstanding => $amountoutstanding, title => $title, - description => $description, + itemnumber => $itemnumber, + individual_description => $description, notify_id => $notify_id, notify_level => $notify_level, + payment_note => $payment_note, ); } elsif ($select_lines) { $total_due = $input->param('amt'); $template->param( selected_accts => $select_lines, - amt => $total_due + amt => $total_due, + selected_accts_notes => scalar $input->param('notes'), ); } if ( $total_paid and $total_paid ne '0.00' ) { if ( $total_paid < 0 or $total_paid > $total_due ) { $template->param( - error => sprintf( 'You must pay a value less than or equal to %f.2', - $total_due ) + error_over => 1, + total_due => $total_due ); } else { if ($individual) { - if ( $total_paid == $total_due ) { - makepayment( $borrowernumber, $accountno, $total_paid, $user, - $branch ); - } else { - makepartialpayment( $borrowernumber, $accountno, $total_paid, - $user, $branch ); - } + my $line = Koha::Account::Lines->find($accountlines_id); + Koha::Account->new( { patron_id => $borrowernumber } )->pay( + { + lines => [$line], + amount => $total_paid, + library_id => $branch, + note => $payment_note + } + ); print $input->redirect( "/cgi-bin/koha/members/pay.pl?borrowernumber=$borrowernumber"); } else { @@ -113,13 +133,34 @@ if ( $total_paid and $total_paid ne '0.00' ) { $select = $1; # ensure passing no junk } my @acc = split /,/, $select; - recordpayment_selectaccts( $borrowernumber, $total_paid, - \@acc ); - } else { - recordpayment( $borrowernumber, $total_paid ); + my $note = $input->param('selected_accts_notes'); + + my @lines = Koha::Account::Lines->search( + { + borrowernumber => $borrowernumber, + amountoutstanding => { '<>' => 0 }, + accountno => { 'IN' => \@acc }, + }, + { order_by => 'date' } + ); + + return Koha::Account->new( + { + patron_id => $borrowernumber, + } + )->pay( + { + amount => $total_paid, + lines => \@lines, + note => $note, + } + ); + } + else { + my $note = $input->param('selected_accts_notes'); + Koha::Account->new( { patron_id => $borrowernumber } ) + ->pay( { amount => $total_paid, note => $note } ); } - -# recordpayment does not return success or failure so lets redisplay the boraccount print $input->redirect( "/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber" @@ -130,42 +171,41 @@ if ( $total_paid and $total_paid ne '0.00' ) { $total_paid = '0.00'; #TODO not right with pay_individual } -borrower_add_additional_fields($borrower); +borrower_add_additional_fields($borrower, $template); -$template->param( +$template->param(%$borrower); - #borrowenumber => $borrower->{borrowernumber}, # some templates require global - borrowenumber => $borrowernumber, # some templates require global +$template->param( + borrowernumber => $borrowernumber, # some templates require global borrower => $borrower, - total => $total_due + categoryname => $borrower->{description}, + total => $total_due, + RoutingSerials => C4::Context->preference('RoutingSerials'), + ExtendedPatronAttributes => C4::Context->preference('ExtendedPatronAttributes'), ); output_html_with_http_headers $input, $cookie, $template->output; sub borrower_add_additional_fields { - my $b_ref = shift; + my ( $b_ref, $template ) = @_; # some borrower info is not returned in the standard call despite being assumed # in a number of templates. It should not be the business of this script but in lieu of # a revised api here it is ... if ( $b_ref->{category_type} eq 'C' ) { - my ( $catcodes, $labels ) = - GetborCatFromCatType( 'A', 'WHERE category_type = ?' ); - if ( @{$catcodes} ) { - if ( @{$catcodes} > 1 ) { - $b_ref->{CATCODE_MULTI} = 1; - } elsif ( @{$catcodes} == 1 ) { - $b_ref->{catcode} = $catcodes->[0]; - } - } - } elsif ( $b_ref->{category_type} eq 'A' ) { + my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']}); + $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1; + $template->param( 'catcode' => $patron_categories->next ) if $patron_categories->count == 1; + } elsif ( $b_ref->{category_type} eq 'A' || $b_ref->{category_type} eq 'I' ) { $b_ref->{adultborrower} = 1; } - my ( $picture, $dberror ) = GetPatronImage( $b_ref->{cardnumber} ); - if ($picture) { - $b_ref->{has_picture} = 1; + + my $patron_image = Koha::Patron::Images->find($b_ref->{borrowernumber}); + $template->param( picture => 1 ) if $patron_image; + + if (C4::Context->preference('ExtendedPatronAttributes')) { + $b_ref->{extendedattributes} = GetBorrowerAttributes($b_ref->{borrowernumber}); } - $b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} ); return; }