From e0360c1b314153ea7ec0aeabb6a291db4641dea9 Mon Sep 17 00:00:00 2001 From: ByWater Migration Support <migrations@bywatersolutions.com> Date: Tue, 17 Dec 2013 05:30:58 -0800 Subject: [PATCH] Bug 6427 [Part 15] - Auto-print payment and manual fee receipts --- .../prog/en/modules/members/account.tt | 6 ++++++ members/account.pl | 4 ++++ members/account_debit_do.pl | 2 +- members/account_payment_do.pl | 6 ++++-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/account.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/account.tt index df56a22..1595307 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/account.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/account.tt @@ -13,6 +13,12 @@ <script type="text/javascript"> //<![CDATA[ $(document).ready(function() { + [% IF credit_id %] + accountPrint( 'credit', [% credit_id %] ); + [% ELSIF debit_id %] + accountPrint( 'debit', [% debit_id %] ); + [% END %] + $('#account-credits').hide(); $('#account-debits-switcher').click(function() { $('#account-debits').slideUp(); diff --git a/members/account.pl b/members/account.pl index 45d3161..6a9dd9c 100755 --- a/members/account.pl +++ b/members/account.pl @@ -61,6 +61,10 @@ $template->param( debits => \@debits, credits => \@credits, borrower => $borrower, + + # IDs for automatic receipt printing + debit_id => $cgi->param('debit_id') || undef, + credit_id => $cgi->param('credit_id') || undef, ); # Standard /members/ borrower details data diff --git a/members/account_debit_do.pl b/members/account_debit_do.pl index dd5c8b5..476dce8 100755 --- a/members/account_debit_do.pl +++ b/members/account_debit_do.pl @@ -65,5 +65,5 @@ if ( checkauth( $cgi, 0, { borrowers => 1 }, 'intranet' ) ) { my $debit_id = $debit->debit_id(); print $cgi->redirect( - "/cgi-bin/koha/members/account.pl?borrowernumber=$borrowernumber"); + "/cgi-bin/koha/members/account.pl?borrowernumber=$borrowernumber&debit_id=$debit_id"); } diff --git a/members/account_payment_do.pl b/members/account_payment_do.pl index 1f66052..9f0802f 100755 --- a/members/account_payment_do.pl +++ b/members/account_payment_do.pl @@ -47,7 +47,7 @@ if ( checkauth( $cgi, 0, { borrowers => 1 }, 'intranet' ) ) { $amount_received ||= $amount_to_pay if $type eq Koha::Accounts::CreditTypes::Payment(); - my $debit = AddCredit( + my $credit = AddCredit( { borrower => $borrower, amount_received => $amount_received, @@ -59,6 +59,8 @@ if ( checkauth( $cgi, 0, { borrowers => 1 }, 'intranet' ) ) { } ); + my $credit_id = $credit->credit_id(); + print $cgi->redirect( - "/cgi-bin/koha/members/account.pl?borrowernumber=$borrowernumber"); + "/cgi-bin/koha/members/account.pl?borrowernumber=$borrowernumber&credit_id=$credit_id"); } -- 1.7.2.5