Merge branch 'bug_9367' into 3.12-master

[koha.git] / members / mancredit.pl

diff --git a/members/mancredit.pl b/members/mancredit.pl
index 0e80861..88200d0 100755 (executable)
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -33,6 +33,7 @@ use C4::Members;
 use C4::Branch;
 use C4::Accounts;
 use C4::Items;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 
 my $input=new CGI;
 
@@ -43,14 +44,20 @@ 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)) {
+        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",
@@ -71,6 +78,14 @@ if ($add){
     $template->param( adultborrower => 1 ) if ( $data->{category_type} eq 'A' );
     my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
     $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 +98,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 +106,7 @@ if ($add){
                    branchcode => $data->{'branchcode'},
                    branchname => GetBranchName($data->{'branchcode'}),
                    is_child        => ($data->{'category_type'} eq 'C'),
+                       activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
         );
     output_html_with_http_headers $input, $cookie, $template->output;
 }