Bugzilla – Attachment 88622 Details for
Bug 22761
Move "Fee receipt" from template to a slip
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22761: Add ability to use print version of ACCOUNT_PAYMENT/ACCOUNT_WRITEOFF" slip
Bug-22761-Add-ability-to-use-print-version-of-ACCO.patch (text/plain), 3.53 KB, created by
Michal Denar
on 2019-04-24 13:40:17 UTC
(
hide
)
Description:
Bug 22761: Add ability to use print version of ACCOUNT_PAYMENT/ACCOUNT_WRITEOFF" slip
Filename:
MIME Type:
Creator:
Michal Denar
Created:
2019-04-24 13:40:17 UTC
Size:
3.53 KB
patch
obsolete
>From 4748b81ae6be93b8636cbe0b968fbf0be6e06a25 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >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 > >Signed-off-by: Michal Denar <black23@gmail.com> > >Signed-off-by: Michal Denar <black23@gmail.com> >--- > .../prog/en/modules/members/printfeercpt.tt | 7 +++++ > members/printfeercpt.pl | 31 +++++++++++----------- > 2 files changed, 22 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 @@ > <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 b8fed81551..85d9b17e4b 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,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; >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 22761
:
88552
|
88553
|
88554
|
88557
|
88558
|
88559
|
88560
|
88622
|
88623
|
88624
|
88629
|
88630
|
88631
|
89222
|
89223
|
89224
|
89225
|
89227