commenting warn

[koha.git] / members / maninvoice.pl

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index e462c27..f3ad4cb 100755 (executable)
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -24,7 +24,6 @@
 use strict;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use CGI;
 use C4::Members;
 use C4::Accounts;
@@ -36,16 +35,34 @@ 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($borrowernumber,$itemnum,$desc,$type,$amount);
-    print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
+    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;
+       }
 } else {
+
        my ($template, $loggedinuser, $cookie)
        = get_template_and_user({template_name => "members/maninvoice.tmpl",
                                        query => $input,
@@ -54,13 +71,25 @@ if ($add){
                                        flagsrequired => {borrowers => 1},
                                        debug => 1,
                                        });
+
+    $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
+    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+    $template->param( picture => 1 ) if $picture;
+
        $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 => guesstype($template->output),
-           -cookie => $cookie
-    ),$template->output;
+    output_html_with_http_headers $input, $cookie, $template->output;
 }