Improve existing slot detection in the CurbsideSlot reactor

Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/CurbsideSlot.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/CurbsideSlot.pm
index e95b09f..763e041 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/CurbsideSlot.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/CurbsideSlot.pm
@@ -23,7 +23,18 @@ sub handler {
     my $e = new_editor(xact => 1);
 
     my $h = $$env{target};
-    my ($slot) = $e->search_action_curbside({patron => $h->usr, org => $h->pickup_lib, slot => undef});
+
+    # see if there's an undelivered appointment in the future
+    my ($slot) = $e->search_action_curbside({
+        patron => $h->usr,
+        org => $h->pickup_lib,
+        delivered => undef,
+        '-or' => [
+            { slot => { '>=' => 'now' } },
+            { slot => undef }
+        ]
+    });
+
     if (!$slot) {
         $slot = Fieldmapper::action::curbside->new;
         $slot->org($h->pickup_lib);