fix for #1788 : Locations do not sort alphabetically by name in list on "Set" location

[koha.git] / members / pay.pl

diff --git a/members/pay.pl b/members/pay.pl
index a473826..35faea3 100755 (executable)
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -39,6 +39,17 @@ use C4::Branch; # GetBranches
 
 my $input = new CGI;
 
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "members/pay.tmpl",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { borrowers => 1 },
+        debug           => 1,
+    }
+);
+
 my $borrowernumber = $input->param('borrowernumber');
 if ( $borrowernumber eq '' ) {
     $borrowernumber = $input->param('borrowernumber0');
@@ -73,16 +84,6 @@ for ( my $i = 0 ; $i < @names ; $i++ ) {
 }
 my $total = $input->param('total');
 if ( $check == 0 ) {
-    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-        {
-            template_name   => "members/pay.tmpl",
-            query           => $input,
-            type            => "intranet",
-            authnotrequired => 0,
-            flagsrequired   => { borrowers => 1 },
-            debug           => 1,
-        }
-    );
     if ( $total ne '' ) {
         recordpayment( $borrowernumber, $total );
     }
@@ -130,9 +131,9 @@ if ( $check == 0 ) {
           };
     }
        
-my $borrowercategory = GetBorrowercategory( $data->{'categorycode'} );
-my $category_type = $borrowercategory->{'category_type'};
-( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' );
+$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
+my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
        
     $template->param(
         allfile        => \@allfile,
@@ -179,13 +180,14 @@ else {
     }
     $borrowernumber = $input->param('borrowernumber');
     print $input->redirect(
-        "/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
+        "/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
 }
 
 sub writeoff {
     my ( $borrowernumber, $accountnum, $itemnum, $accounttype, $amount ) = @_;
     my $user = $input->remote_user;
     my $dbh  = C4::Context->dbh;
+    undef $itemnum unless $itemnum; # if no item is attached to fine, make sure to store it as a NULL
     my $sth =
       $dbh->prepare(
 "Update accountlines set amountoutstanding=0 where (accounttype='Res' OR accounttype='FU' OR accounttype ='IP' OR accounttype='CH' OR accounttype='N' OR accounttype='F' OR accounttype='A' OR accounttype='M' OR accounttype='L' OR accounttype='RE' OR accounttype='RL') and accountno=? and borrowernumber=?"