@@ -, +, @@ - it would be nice to get feedback on what was successfully renewed as well - In general I think I would prefer to see 'ok' and 'not_ok' returned as - There is no listing of errors if I use the 'pay' button on an --- Koha/Account.pm | 19 ++++------ .../prog/en/includes/renew_results.inc | 12 ++++++ .../{renew_error_strings.inc => renew_strings.inc} | 0 .../prog/en/modules/members/boraccount.tt | 11 +----- .../intranet-tmpl/prog/en/modules/members/pay.tt | 9 +---- members/boraccount.pl | 20 +++++++--- members/pay.pl | 21 +++++++---- members/paycollect.pl | 43 ++++++++++++---------- 8 files changed, 75 insertions(+), 60 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/renew_results.inc rename koha-tmpl/intranet-tmpl/prog/en/includes/{renew_error_strings.inc => renew_strings.inc} (100%) --- a/Koha/Account.pm +++ a/Koha/Account.pm @@ -758,16 +758,12 @@ and, if the syspref is set, renew them sub _maybe_renew { my ($items, $patron_id) = @_; - my $results = { - ok => [], - not_ok => [] - }; + my @results = (); if ( C4::Context->preference('RenewAccruingItemWhenPaid') && keys %{$items} ) { - foreach my $itemnumber (keys %{$items}) { # Only do something if this item has no fines left on it my $fine = C4::Overdues::GetFine( $itemnumber, $patron_id ); @@ -784,20 +780,21 @@ sub _maybe_renew { undef, 1 ); - push @{$results->{ok}}, { + push @results, { itemnumber => $itemnumber, - due_date => $due_date + due_date => $due_date, + success => 1 }; } else { - push @{$results->{not_ok}}, { + push @results, { itemnumber => $itemnumber, - error => $error + error => $error, + success => 0 }; } } - return $results; } - return $results; + return \@results; } 1; --- a/koha-tmpl/intranet-tmpl/prog/en/includes/renew_results.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/renew_results.inc @@ -0,0 +1,12 @@ +[% IF renew_results && renew_results.size > 0 %] +
[% INCLUDE 'biblio-title.inc' biblio=result.item.biblio %] ( [% result.item.barcode | html %] ): Renewed - due [% result.info | html %]
+ [% ELSE %] +[% INCLUDE 'biblio-title.inc' biblio=result.item.biblio %] ( [% result.item.barcode | html %] ): Not renewed - [% INCLUDE 'renew_strings.inc' error=result.info %]
+ [% END %] + [% END %] +[% INCLUDE 'biblio-title.inc' biblio=problem.item.biblio %] ( [% problem.item.barcode | html %] ): [% INCLUDE 'renew_error_strings.inc' error=problem.error %]
- [% END %] -