diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc index 3c116d0ace..035ee0aa06 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -129,7 +129,11 @@ [% END %] - + [% UNLESS hold.expired %] + + [% ELSE %] + [% hold.expirationdate | $KohaDates %] + [% END %] [%- IF ( hold.found ) -%] diff --git a/reserve/request.pl b/reserve/request.pl index f9c51cb4a4..f9f18aa62f 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -610,8 +610,9 @@ if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) $reserve{'item_level_hold'} = 1; } } - $reserve{'expirationdate'} = $res->expirationdate; + $reserve{'expired'} = 1 + if ( DateTime->compare( dt_from_string( $res->expirationdate ), dt_from_string() ) == -1 ); $reserve{'date'} = $res->reservedate; $reserve{'borrowernumber'} = $res->borrowernumber(); $reserve{'biblionumber'} = $res->biblionumber();