From 22ec823e25a60158a4b99580b53b6f27959cf3bf Mon Sep 17 00:00:00 2001 From: miker Date: Wed, 27 Oct 2010 18:21:10 +0000 Subject: [PATCH] Move generate_fines_finish even further down the do_checkin path git-svn-id: svn://svn.open-ils.org/ILS/trunk@18500 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../src/perlmods/OpenILS/Application/Circ/Circulate.pm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm index fe54ed80d..9d30af57f 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm @@ -2207,14 +2207,6 @@ sub do_checkin { $self->push_events($self->check_copy_alert()); $self->push_events($self->check_checkin_copy_status()); - # gather any updates to the circ after fine generation, if there was a circ - $self->generate_fines_finish if ($self->circ); - - # if the circ is marked as 'claims returned', add the event to the list - $self->push_events(OpenILS::Event->new('CIRC_CLAIMS_RETURNED')) - if ($self->circ and $self->circ->stop_fines - and $self->circ->stop_fines eq OILS_STOP_FINES_CLAIMSRETURNED); - $self->check_circ_deposit(); # handle the overridable events @@ -2395,6 +2387,16 @@ sub do_checkin { unless @{$self->events}; } + # gather any updates to the circ after fine generation, if there was a circ + $self->generate_fines_finish if ($self->circ); + + # if the circ is marked as 'claims returned', add the event to the list + $self->push_events(OpenILS::Event->new('CIRC_CLAIMS_RETURNED')) + if ($self->circ and $self->circ->stop_fines + and $self->circ->stop_fines eq OILS_STOP_FINES_CLAIMSRETURNED); + + $self->override_events; # One final time to handle CIRC_CLAIMS_RETURNED + OpenILS::Utils::Penalty->calculate_penalties( $self->editor, $self->patron->id, $self->circ_lib) if $self->patron; -- 2.11.0