From 4251e6ed67447f458f6632e938c9c28da73f980c Mon Sep 17 00:00:00 2001 From: miker Date: Wed, 27 Oct 2010 18:29:22 +0000 Subject: [PATCH] And ... move the CIRC_CLAIMS_RETURNED event check back up git-svn-id: svn://svn.open-ils.org/ILS/trunk@18501 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm index 9d30af57f..abf234e60 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm @@ -2207,6 +2207,11 @@ sub do_checkin { $self->push_events($self->check_copy_alert()); $self->push_events($self->check_checkin_copy_status()); + # 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 @@ -2390,13 +2395,6 @@ sub do_checkin { # 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