Bug 7684: QA Followup and bugfixes

[koha.git] / members / mancredit.pl

diff --git a/members/mancredit.pl b/members/mancredit.pl
index 0e80861..a2c2258 100755 (executable)
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -33,8 +33,10 @@ use C4::Members;
 use C4::Branch;
 use C4::Accounts;
 use C4::Items;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 
 my $input=new CGI;
+my $flagsrequired = { borrowers => 1, updatecharges => 1 };
 
 my $borrowernumber=$input->param('borrowernumber');
 
@@ -43,21 +45,27 @@ my $data=GetMember('borrowernumber' => $borrowernumber);
 my $add=$input->param('add');
 
 if ($add){
-    my $barcode=$input->param('barcode');
-    my $itemnum = GetItemnumberFromBarcode($barcode) if $barcode;
-    my $desc=$input->param('desc');
-    my $amount=$input->param('amount') || 0;
-    $amount = -$amount;
-    my $type=$input->param('type');
-    manualinvoice($borrowernumber,$itemnum,$desc,$type,$amount);
-    print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
+    if ( checkauth( $input, 0, $flagsrequired, 'intranet' ) ) {
+        my $barcode = $input->param('barcode');
+        my $itemnum;
+        if ($barcode) {
+            $itemnum = GetItemnumberFromBarcode($barcode);
+        }
+        my $desc    = $input->param('desc');
+        my $note    = $input->param('note');
+        my $amount  = $input->param('amount') || 0;
+        $amount = -$amount;
+        my $type = $input->param('type');
+        manualinvoice( $borrowernumber, $itemnum, $desc, $type, $amount, $note );
+        print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
+    }
 } else {
        my ($template, $loggedinuser, $cookie)
          = get_template_and_user({template_name => "members/mancredit.tmpl",
                                          query => $input,
                                          type => "intranet",
                                          authnotrequired => 0,
-                                         flagsrequired => {borrowers => 1, updatecharges => 1},
+                      flagsrequired => $flagsrequired,
                                          debug => 1,
                                          });
                                          
@@ -67,10 +75,18 @@ if ($add){
         $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
         $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
     }
-                                         
+
     $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,
@@ -83,6 +99,7 @@ if ($add){
                    address => $data->{'address'},
                    address2 => $data->{'address2'},
                    city => $data->{'city'},
+                   state => $data->{'state'},
                    zipcode => $data->{'zipcode'},
                    country => $data->{'country'},
                    phone => $data->{'phone'},
@@ -90,6 +107,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;
 }