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 b8fed81..5c56514 100755 (executable)
--- a/members/printfeercpt.pl
+++ b/members/printfeercpt.pl
@@ -29,6 +29,7 @@ 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;
@@ -49,8 +50,9 @@ 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 } );
 
@@ -59,7 +61,8 @@ 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 $accountline_object = Koha::Account::Lines->find($accountlines_id);
+my $accountline = $accountline_object->unblessed;
 my $totalcredit;
 if($total <= 0){
         $totalcredit = 1;
@@ -75,24 +78,23 @@ if ( $accountline->{'amountoutstanding'} <= 0 ) {
     $accountline->{'amountoutstandingcredit'} = 1;
 }
 
-my %row = (
-    'date'                    => dt_from_string( $accountline->{'date'} ),
-    'amountcredit'            => $accountline->{'amountcredit'},
-    'amountoutstandingcredit' => $accountline->{'amountoutstandingcredit'},
-    'description'             => $accountline->{'description'},
-    'amount'                  => $accountline->{'amount'},
-    'amountoutstanding'       => $accountline->{'amountoutstanding'},
-    accounttype => $accountline->{accounttype},
-    'note'      => $accountline->{'note'},
-);
+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               => $total,
-    totalcredit         => $totalcredit,
-    accounts            => [$accountline], # FIXME There is always only 1 row!
+    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;