Bug 3137: (follow-up) Rename using 'collapse', remove syspref lettering and fix guara...

[srvgit] / members / printfeercpt.pl

diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
index d6080fb..5c56514 100755 (executable)
--- a/members/printfeercpt.pl
+++ b/members/printfeercpt.pl
@@ -29,6 +29,8 @@ use C4::Output;
 use CGI qw ( -utf8 );
 use C4::Members;
 use C4::Accounts;
+use C4::Letters;
+use Koha::Account::Lines;
 use Koha::DateUtils;
 use Koha::Patrons;
 use Koha::Patron::Categories;
@@ -48,77 +50,51 @@ my ($template, $loggedinuser, $cookie)
 my $borrowernumber=$input->param('borrowernumber');
 my $action = $input->param('action') || '';
 my $accountlines_id = $input->param('accountlines_id');
+my $change_given = $input->param('change_given');
 
-my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+my $logged_in_user = Koha::Patrons->find( $loggedinuser );
 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 } );
 
-my $category = $patron->category;
-
-if ( $action eq 'print' ) {
-#  ReversePayment( $borrowernumber, $input->param('accountno') );
-}
-
-if ( $category->category_type eq 'C') {
-    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->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_object = Koha::Account::Lines->find($accountlines_id);
+my $accountline = $accountline_object->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;
 }
 
+my $letter = C4::Letters::getletter( 'circulation', 'ACCOUNT_CREDIT', C4::Context::mybranch, 'print', $patron->lang );
+
+my @account_offsets = Koha::Account::Offsets->search( { credit_id => $accountline_object->id } );
+
 $template->param(
-    patron               => $patron,
-    finesview           => 1,
-    total               => sprintf("%.2f",$total),
-    totalcredit         => $totalcredit,
-    accounts            => \@accountrows );
+    letter      => $letter,
+    patron      => $patron,
+    library     => C4::Context::mybranch,
+    offsets     => \@account_offsets,
+    credit      => $accountline_object,
+
+    finesview   => 1,
+    total       => $total,
+    totalcredit => $totalcredit,
+    accounts    => [$accountline],        # FIXME There is always only 1 row!
+
+    change_given => $change_given,
+);
 
 output_html_with_http_headers $input, $cookie, $template->output;