Bug 12068: (rm followup) remove useless newline introduced on merging

[srvgit] / members / mancredit.pl

diff --git a/members/mancredit.pl b/members/mancredit.pl
index 3c664c2..c8eb619 100755 (executable)
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -36,6 +36,7 @@ use C4::Items;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
 
 my $input=new CGI;
+my $flagsrequired = { borrowers => 1, updatecharges => 1 };
 
 my $borrowernumber=$input->param('borrowernumber');
 
@@ -44,7 +45,7 @@ my $data=GetMember('borrowernumber' => $borrowernumber);
 my $add=$input->param('add');
 
 if ($add){
-    if(checkauth($input)) {
+    if ( checkauth( $input, 0, $flagsrequired, 'intranet' ) ) {
         my $barcode = $input->param('barcode');
         my $itemnum;
         if ($barcode) {
@@ -59,14 +60,17 @@ if ($add){
         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},
-                                         debug => 1,
-                                         });
+    my ($template, $loggedinuser, $cookie) = get_template_and_user(
+        {
+            template_name   => "members/mancredit.tt",
+            query           => $input,
+            type            => "intranet",
+            authnotrequired => 0,
+            flagsrequired   => { borrowers     => 1,
+                                 updatecharges => 'remaining_permissions' },
+            debug           => 1,
+        }
+    );
                                          
     if ( $data->{'category_type'} eq 'C') {
         my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
@@ -74,9 +78,9 @@ 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')) {
@@ -86,26 +90,37 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
         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;
 }