X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fmaninvoice.pl;h=c4a9294aa02f2e3897f867ee66c734f10b62d246;hb=2249ee1216ed004e61a34bc821d216f3471ef87b;hp=34c2349dce39a56277d52d31453491e5eb5e5137;hpb=868b8cdbaa079a948a6015f713fa3384a7f404b5;p=koha_fer diff --git a/members/maninvoice.pl b/members/maninvoice.pl index 34c2349dce..c4a9294aa0 100755 --- a/members/maninvoice.pl +++ b/members/maninvoice.pl @@ -5,6 +5,7 @@ # Copyright 2000-2002 Katipo Communications +# Copyright 2010 BibLibre # # This file is part of Koha. # @@ -17,9 +18,9 @@ # 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., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# 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. use strict; use warnings; @@ -31,42 +32,50 @@ use C4::Members; use C4::Accounts; use C4::Items; use C4::Branch; +use C4::Members::Attributes qw(GetBorrowerAttributes); my $input=new CGI; +my $flagsrequired = { borrowers => 1 }; my $borrowernumber=$input->param('borrowernumber'); # get borrower details -my $data=GetMember($borrowernumber,'borrowernumber'); +my $data=GetMember('borrowernumber'=>$borrowernumber); my $add=$input->param('add'); if ($add){ -# print $input->header; - my $barcode=$input->param('barcode'); - my $itemnum = GetItemnumberFromBarcode($barcode) if $barcode; - my $desc=$input->param('desc'); - my $amount=$input->param('amount'); - my $type=$input->param('type'); - my $error=manualinvoice($borrowernumber,$itemnum,$desc,$type,$amount); - if ($error){ - my ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "members/maninvoice.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {borrowers => 1}, - debug => 1, - }); - if ($error =~ /FOREIGN KEY/ && $error =~ /itemnumber/){ - $template->param('ITEMNUMBER' => 1); - } - $template->param('ERROR' => $error); - output_html_with_http_headers $input, $cookie, $template->output; - } - else { - print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber"); - exit; - } + if ( checkauth( $input, 0, $flagsrequired, 'intranet' ) ) { + # print $input->header; + my $barcode=$input->param('barcode'); + my $itemnum; + if ($barcode) { + $itemnum = GetItemnumberFromBarcode($barcode); + } + my $desc=$input->param('desc'); + my $amount=$input->param('amount'); + my $type=$input->param('type'); + my $note = $input->param('note'); + my $error = manualinvoice( $borrowernumber, $itemnum, $desc, $type, $amount, $note ); + if ($error) { + my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { template_name => "members/maninvoice.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => $flagsrequired, + debug => 1, + } + ); + if ( $error =~ /FOREIGN KEY/ && $error =~ /itemnumber/ ) { + $template->param( 'ITEMNUMBER' => 1 ); + } + $template->param( 'ERROR' => $error ); + output_html_with_http_headers $input, $cookie, $template->output; + } else { + print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber"); + exit; + } + } } else { my ($template, $loggedinuser, $cookie) @@ -96,9 +105,16 @@ if ($add){ } $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' ); - my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'}); + 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 + ); +} $template->param( borrowernumber => $borrowernumber, firstname => $data->{'firstname'}, @@ -110,6 +126,7 @@ if ($add){ address => $data->{'address'}, address2 => $data->{'address2'}, city => $data->{'city'}, + state => $data->{'state'}, zipcode => $data->{'zipcode'}, country => $data->{'country'}, phone => $data->{'phone'}, @@ -117,6 +134,8 @@ if ($add){ branchcode => $data->{'branchcode'}, branchname => GetBranchName($data->{'branchcode'}), is_child => ($data->{'category_type'} eq 'C'), + activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), + RoutingSerials => C4::Context->preference('RoutingSerials'), ); output_html_with_http_headers $input, $cookie, $template->output; }