From 4950c26787ece20ed4b12e1196ca14d5a3fc62d2 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 23 Apr 2019 14:12:55 -0400 Subject: [PATCH] Bug 22761: Add ability to use print version of ACCOUNT_PAYMENT/ACCOUNT_WRITEOFF" slip --- .../prog/en/modules/members/printfeercpt.tt | 7 ++++ members/printfeercpt.pl | 32 +++++++++---------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt index 45d6eda698..2b12a70b05 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt @@ -18,6 +18,10 @@
+ +[% IF letter %] + [% letter.content | evaltt %] +[% ELSE %] [% IF ( LibraryName ) %] @@ -69,6 +73,9 @@
+ +[% END %] +
[% MACRO jsinclude BLOCK %] diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl index b8fed81551..035dc45a64 100755 --- 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; @@ -59,7 +60,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 +77,22 @@ 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_code = $accountline_object->accounttype eq 'WO' ? 'ACCOUNT_WRITEOFF' : 'ACCOUNT_PAYMENT'; +my $letter = C4::Letters::getletter( 'circulation', $letter_code, 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! ); output_html_with_http_headers $input, $cookie, $template->output; -- 2.20.1 (Apple Git-117)