Taking out warn

[koha.git] / members / maninvoice.pl

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index bb265c8..25903f1 100755 (executable)
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -24,39 +24,78 @@
 use strict;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use C4::Members;
-use C4::Accounts2;
-use HTML::Template;
+use C4::Accounts;
 
 my $input=new CGI;
 
-my $bornum=$input->param('bornum');
-#get borrower details
-my $data=borrdata('',$bornum);
+my $borrowernumber=$input->param('borrowernumber');
+
+# get borrower details
+my $data=GetMember($borrowernumber,'borrowernumber');
 my $add=$input->param('add');
 if ($add){
 #  print $input->header;
-  my $itemnum=$input->param('itemnum');
-  my $desc=$input->param('desc');
-  my $amount=$input->param('amount');
-  my $type=$input->param('type');
-  manualinvoice($bornum,$itemnum,$desc,$type,$amount);
-  print $input->redirect("/cgi-bin/koha/members/boraccount.pl?bornum=$bornum");
+    my $itemnum=$input->param('itemnum');
+    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);
+               print $input->header(
+                       -type => 'utf-8',
+                       -cookie => $cookie
+               ),$template->output;
+       }
+       else {
+               print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
+               exit;
+       }
 } else {
+
        my ($template, $loggedinuser, $cookie)
-       = get_template_and_user({template_name => "maninvoice.tmpl",
+       = get_template_and_user({template_name => "members/maninvoice.tmpl",
                                        query => $input,
                                        type => "intranet",
                                        authnotrequired => 0,
                                        flagsrequired => {borrowers => 1},
                                        debug => 1,
                                        });
-       $template->param(bornum => $bornum);
-       print $input->header(
-           -type => guesstype($template->output),
-           -cookie => $cookie
-       ),$template->output;
 
+my $borrowercategory = GetBorrowercategory( $data->{'categorycode'} );
+my $category_type = $borrowercategory->{'category_type'};
+( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' );
+
+       $template->param(
+                    borrowernumber => $borrowernumber,
+                    firstname => $data->{'firstname'},
+                    surname  => $data->{'surname'},
+                                       cardnumber => $data->{'cardnumber'},
+                                   categorycode => $data->{'categorycode'},
+                               category_type => $data->{'category_type'},
+                                   category_description => $data->{'description'},
+                                   address => $data->{'address'},
+                                       address2 => $data->{'address2'},
+                                   city => $data->{'city'},
+                                       zipcode => $data->{'zipcode'},
+                                       phone => $data->{'phone'},
+                                       email => $data->{'email'},
+    );
+    print $input->header(
+           -type => 'utf-8',
+           -cookie => $cookie
+    ),$template->output;
 }