LP 1797934: adding canceled status to Booking OPAC view

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Remington Steed <rjs7@calvin.edu>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Booking.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Booking.pm
index cc233e2..2afdd6b 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Booking.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Booking.pm
@@ -629,7 +629,7 @@ sub upcoming_reservation_list_by_user {
         return $e->event unless $e->allowed('VIEW_TRANSACTION');
     }
 
-    my $select = { 'bresv' => [qw/start_time end_time capture_time pickup_time pickup_lib/],
+    my $select = { 'bresv' => [qw/start_time end_time cancel_time capture_time pickup_time pickup_lib/],
         'brsrc' => [ 'barcode' ],
         'brt' => [{'column' => 'name', 'alias' => 'resource_type_name'}],
         'aou' => ['shortname', {'column' => 'name', 'alias' => 'pickup_name'}] };

diff --git a/Open-ILS/src/templates/opac/myopac/reservations.tt2 b/Open-ILS/src/templates/opac/myopac/reservations.tt2
index 0f0c42a..50d5c0f 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/reservations.tt2
+++ b/Open-ILS/src/templates/opac/myopac/reservations.tt2
@@ -20,7 +20,9 @@
             <td>[% date.format(ctx.parse_datetime(r.end_time, 1), DATE_FORMAT _ ' %I:%M %p') %]</td>
             <td><a href="../library/[% r.shortname %]">[% r.pickup_name %]</a></td>
             <td>
-            [% IF r.pickup_time %]
+            [% IF r.cancel_time %]
+                [% l('Canceled') %]
+            [% ELSIF r.pickup_time %]
                 [% l('Checked Out') %]
             [% ELSIF r.capture_time %]
                 [% l('Ready for Pickup') %]