Bug 20518: Don't show "Messages" header and link on patron details if there are no...

[koha.git] / members / printfeercpt.pl

diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
index c92dbd6..c73f8f5 100755 (executable)
--- a/members/printfeercpt.pl
+++ b/members/printfeercpt.pl
@@ -22,16 +22,16 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use C4::Auth;
 use C4::Output;
 use CGI qw ( -utf8 );
 use C4::Members;
 use C4::Accounts;
+use Koha::Account::Lines;
 use Koha::DateUtils;
-use Koha::Patron::Images;
+use Koha::Patrons;
 use Koha::Patron::Categories;
 
 my $input=new CGI;
@@ -42,7 +42,7 @@ my ($template, $loggedinuser, $cookie)
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {borrowers => 1, updatecharges => 'remaining_permissions'},
+                            flagsrequired => {borrowers => 'edit_borrowers', updatecharges => 'remaining_permissions'},
                             debug => 1,
                             });
 
@@ -50,94 +50,61 @@ my $borrowernumber=$input->param('borrowernumber');
 my $action = $input->param('action') || '';
 my $accountlines_id = $input->param('accountlines_id');
 
-#get borrower details
-my $data=GetMember('borrowernumber' => $borrowernumber);
+my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+my $patron         = Koha::Patrons->find( $borrowernumber );
+output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
 if ( $action eq 'print' ) {
 #  ReversePayment( $borrowernumber, $input->param('accountno') );
 }
 
-if ( $data->{'category_type'} eq 'C') {
+if ( $patron->is_child ) {
     my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
     $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
-    $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
+    $template->param( 'catcode' => $patron_categories->next->categorycde )  if $patron_categories->count == 1;
 }
 
 #get account details
-my ($total,$accts,$numaccts)=GetMemberAccountRecords($borrowernumber);
+my $total = $patron->account->balance;
+
+# FIXME This whole stuff is ugly and should be rewritten
+# FIXME We should pass the $accts iterator to the template and do this formatting part there
+my $accountline = Koha::Account::Lines->find($accountlines_id)->unblessed;
 my $totalcredit;
 if($total <= 0){
         $totalcredit = 1;
 }
-my @accountrows; # this is for the tmpl-loop
-
-my $toggle;
-for (my $i=0;$i<$numaccts;$i++){
-    next if ( $accts->[$i]{'accountlines_id'} ne $accountlines_id );
-    if($i%2){
-            $toggle = 0;
-    } else {
-            $toggle = 1;
-    }
-    $accts->[$i]{'toggle'} = $toggle;
-    $accts->[$i]{'amount'}+=0.00;
-    if($accts->[$i]{'amount'} <= 0){
-        $accts->[$i]{'amountcredit'} = 1;
-       $accts->[$i]{'amount'}*=-1.00;
-    }
-    $accts->[$i]{'amountoutstanding'}+=0.00;
-    if($accts->[$i]{'amountoutstanding'} <= 0){
-        $accts->[$i]{'amountoutstandingcredit'} = 1;
-    }
-
-    my %row = ( 'date'         => dt_from_string( $accts->[$i]{'date'} ),
-                'amountcredit' => $accts->[$i]{'amountcredit'},
-                'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
-                'toggle' => $accts->[$i]{'toggle'},
-                'description'       => $accts->[$i]{'description'},
-                               'itemnumber'       => $accts->[$i]{'itemnumber'},
-                               'biblionumber'       => $accts->[$i]{'biblionumber'},
-                'amount'            => sprintf("%.2f",$accts->[$i]{'amount'}),
-                'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
-                'accountno' => $accts->[$i]{'accountno'},
-                accounttype => $accts->[$i]{accounttype},
-                'note' => $accts->[$i]{'note'},
-                );
-
-    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
-        $row{'printtitle'}=1;
-        $row{'title'} = $accts->[$i]{'title'};
-    }
-
-    push(@accountrows, \%row);
+
+$accountline->{'amount'} += 0.00;
+if ( $accountline->{'amount'} <= 0 ) {
+    $accountline->{'amountcredit'} = 1;
+    $accountline->{'amount'} *= -1.00;
+}
+$accountline->{'amountoutstanding'} += 0.00;
+if ( $accountline->{'amountoutstanding'} <= 0 ) {
+    $accountline->{'amountoutstandingcredit'} = 1;
 }
 
-$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
+my %row = (
+    'date'                    => dt_from_string( $accountline->{'date'} ),
+    'amountcredit'            => $accountline->{'amountcredit'},
+    'amountoutstandingcredit' => $accountline->{'amountoutstandingcredit'},
+    'description'             => $accountline->{'description'},
+    'amount'                  => sprintf( "%.2f", $accountline->{'amount'} ),
+    'amountoutstanding' =>
+      sprintf( "%.2f", $accountline->{'amountoutstanding'} ),
+    'accountno' => $accountline->{'accountno'},
+    accounttype => $accountline->{accounttype},
+    'note'      => $accountline->{'note'},
+);
 
-my $patron_image = Koha::Patron::Images->find($data->{borrowernumber});
-$template->param( picture => 1 ) if $patron_image;
 
 $template->param(
+    patron               => $patron,
     finesview           => 1,
-    firstname           => $data->{'firstname'},
-    surname             => $data->{'surname'},
-    borrowernumber      => $borrowernumber,
-    cardnumber          => $data->{'cardnumber'},
-    categorycode        => $data->{'categorycode'},
-    category_type       => $data->{'category_type'},
- #   category_description => $data->{'description'},
-    categoryname                => $data->{'description'},
-    address             => $data->{'address'},
-    address2            => $data->{'address2'},
-    city                => $data->{'city'},
-    zipcode             => $data->{'zipcode'},
-    country             => $data->{'country'},
-    phone               => $data->{'phone'},
-    email               => $data->{'email'},
-    branchcode          => $data->{'branchcode'},
     total               => sprintf("%.2f",$total),
     totalcredit         => $totalcredit,
-       is_child        => ($data->{'category_type'} eq 'C'),
-    accounts            => \@accountrows );
+    accounts            => [$accountline], # FIXME There is always only 1 row!
+);
 
 output_html_with_http_headers $input, $cookie, $template->output;