@@ -, +, @@
- Apply this patch (on top of 21896)
- On a patron's 'Fines' tab, create a 'manual invoice' (maybe more than
one)
- Go to the 'Pay fines' tab
- On the 'create manual credit' tab, create a couple credits.
- Go to the 'Pay fines'
- Click on 'Normalize account'
- Play with different options (credit excedes debts and vice-versa, they
match, etc)
- Sign off :-D
---
.../prog/en/modules/members/pay.tt | 3 +++
members/pay.pl | 21 ++++++++++++++++++-
2 files changed, 23 insertions(+), 1 deletion(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
@@ -123,6 +123,9 @@
[% IF CAN_user_updatecharges_writeoff %][% END %]
+[% IF outstanding_credits.total_outstanding < 0 %]
+
+[% END %]
Cancel
--- a/members/pay.pl
+++ a/members/pay.pl
@@ -87,6 +87,9 @@ elsif ( $input->param('writeoff_selected') ) {
elsif ( $input->param('woall') ) {
writeoff_all(@names);
}
+elsif ( $input->param('normalize_account') ) {
+ normalize_account({ patron => $patron, cgi => $input });
+}
elsif ( $input->param('confirm_writeoff') ) {
my $accountlines_id = $input->param('accountlines_id');
my $amount = $input->param('amountwrittenoff');
@@ -138,7 +141,9 @@ output_html_with_http_headers $input, $cookie, $template->output;
sub add_accounts_to_template {
my $patron = Koha::Patrons->find( $borrowernumber );
- my $account_lines = $patron->account->outstanding_debits;
+ my $account = $patron->account;
+ my $outstanding_credits = $account->outstanding_credits;
+ my $account_lines = $account->outstanding_debits;
my $total = $account_lines->total_outstanding;
my @accounts;
while ( my $account_line = $account_lines->next ) {
@@ -157,7 +162,9 @@ sub add_accounts_to_template {
patron => $patron,
accounts => \@accounts,
total => $total,
+ outstanding_credits => $outstanding_credits
);
+
return;
}
@@ -273,3 +280,15 @@ sub payselected {
print $input->redirect($redirect);
return;
}
+
+sub normalize_account {
+ my ($args) = @_;
+
+ my $patron = $args->{patron};
+ my $cgi = $args->{cgi};
+
+ $patron->account->normalize_balance();
+
+ print $cgi->redirect("/cgi-bin/koha/members/pay.pl?borrowernumber=" . $patron->borrowernumber );
+ return;
+}
--