[open-ils-commits] r15609 - branches/rel_1_6_0/Open-ILS/src/perlmods/OpenILS/Application/Circ (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2010-02-22 09:19:44 -0500 (Mon, 22 Feb 2010)
New Revision: 15609

Modified:
   branches/rel_1_6_0/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
Log:
keep in-db circ consistent with script circs WRT dissallowing checkouts and renewals for inactive patrons, inactive cards, and expired patrons

Modified: branches/rel_1_6_0/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
===================================================================
--- branches/rel_1_6_0/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm	2010-02-22 14:19:27 UTC (rev 15608)
+++ branches/rel_1_6_0/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm	2010-02-22 14:19:44 UTC (rev 15609)
@@ -550,16 +550,21 @@
     # Grab the patron
     # --------------------------------------------------------------------------
     my $patron;
+	my $flesh = {
+		flesh => 1,
+		flesh_fields => {au => [ qw/ card / ]}
+	};
+
 	if( $self->patron_id ) {
-		$patron = $e->retrieve_actor_user($self->patron_id) or return $e->event;
+		$patron = $e->retrieve_actor_user([$self->patron_id, $flesh]) or return $e->event;
 
 	} elsif( $self->patron_barcode ) {
 
 		my $card = $e->search_actor_card( 
 			{barcode => $self->patron_barcode})->[0] or return $e->event;
 
-		$patron = $e->search_actor_user( 
-			{card => $card->id})->[0] or return $e->event;
+		$patron = $e->search_actor_user([ 
+			{card => $card->id}, $flesh])->[0] or return $e->event;
 
 	} else {
 		if( my $copy = $self->copy ) {
@@ -567,7 +572,7 @@
 				{target_copy => $copy->id, checkin_time => undef});
 
 			if( my $circ = $circs->[0] ) {
-				$patron = $e->retrieve_actor_user($circ->usr)
+				$patron = $e->retrieve_actor_user([$circ->usr, $flesh])
 					or return $e->event;
 			}
 		}
@@ -575,6 +580,23 @@
 
     return $self->bail_on_events(OpenILS::Event->new('ACTOR_USER_NOT_FOUND'))
         unless $self->patron($patron) or $self->is_checkin;
+
+    unless($self->is_checkin) {
+
+        # Check for inactivity and patron reg. expiration
+
+        $self->bail_on_events(OpenILS::Event->new('PATRON_INACTIVE'))
+			unless $U->is_true($patron->active);
+	
+		$self->bail_on_events(OpenILS::Event->new('PATRON_CARD_INACTIVE'))
+			unless $U->is_true($patron->card->active);
+	
+		my $expire = DateTime::Format::ISO8601->new->parse_datetime(
+			cleanse_ISO8601($patron->expire_date));
+	
+		$self->bail_on_events(OpenILS::Event->new('PATRON_ACCOUNT_EXPIRED'))
+			if( CORE::time > $expire->epoch ) ;
+    }
 }
 
 # --------------------------------------------------------------------------