Bug 11401: Add support for Norwegian national library card

[koha.git] / members / maninvoice.pl

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index 521989b..c72b387 100755 (executable)
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -32,8 +32,10 @@ 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');
 
@@ -42,42 +44,49 @@ my $borrowernumber=$input->param('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.tt",
+                    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)
-       = get_template_and_user({template_name => "members/maninvoice.tmpl",
-                                       query => $input,
-                                       type => "intranet",
-                                       authnotrequired => 0,
-                                       flagsrequired => {borrowers => 1, updatecharges => 1},
-                                       debug => 1,
-                                       });
+    my ($template, $loggedinuser, $cookie) = get_template_and_user({
+        template_name   => "members/maninvoice.tt",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { borrowers => 1,
+                             updatecharges => 'remaining_permissions' },
+        debug           => 1,
+    });
                                        
   # get authorised values with type of MANUAL_INV
   my @invoice_types;
@@ -97,28 +106,47 @@ 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
+    );
+}
+
+# Computes full borrower address
+my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
+my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
+
        $template->param(
+                finesview => 1,
                 borrowernumber => $borrowernumber,
                firstname => $data->{'firstname'},
                 surname  => $data->{'surname'},
+        othernames => $data->{'othernames'},
                cardnumber => $data->{'cardnumber'},
                categorycode => $data->{'categorycode'},
                category_type => $data->{'category_type'},
                categoryname  => $data->{'description'},
-               address => $data->{'address'},
+        address => $address,
                address2 => $data->{'address2'},
                city => $data->{'city'},
                state => $data->{'state'},
                zipcode => $data->{'zipcode'},
                country => $data->{'country'},
                phone => $data->{'phone'},
+        phonepro => $data->{'phonepro'},
+        mobile => $data->{'mobile'},
                email => $data->{'email'},
+        emailpro => $data->{'emailpro'},
                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;
 }