projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch (parent: 45c1cd1)
Bug 22761: Add ability to use print version of ACCOUNT_CREDIT slip
authorKyle M Hall <kyle@bywatersolutions.com>
Tue, 23 Apr 2019 18:12:55 +0000 (14:12 -0400)
committerNick Clemens <nick@bywatersolutions.com>
Fri, 10 May 2019 14:11:32 +0000 (14:11 +0000)
Signed-off-by: Michal Denar <black23@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt patch | blob | history
members/printfeercpt.pl patch | blob | history

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 45d6eda..2b12a70 100644 (file)
--- 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 @@
 <body id="pat_printfeercpt" class="pat">
 
 <div id="receipt">
+
+[% IF letter %]
+    [% letter.content | evaltt %]
+[% ELSE %]
 <!-- The table with the account items -->
 <table>
 [% IF ( LibraryName ) %]
@@ -69,6 +73,9 @@
   </tr>
   </tfoot>
 </table>
+<!-- / The table with the account items -->
+[% END %]
+
 </div>
 
 [% MACRO jsinclude BLOCK %]
diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
index b8fed81..85d9b17 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;
@@ -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,21 @@ 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!
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
Mirror of git://git.koha-community.org/koha.git