From 1ad288607f9830c13f4693831f56efed5dd31827 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 5 Jan 2015 10:54:27 -0500 Subject: [PATCH] Bug 13517 - Show waiting date on reserve/request.pl The holds table should show the waiting date for a hold in s similar manner to the way it does on catalogue/detail.pl Test Plan: 1) Apply this patch 2) Find a waiting hold 3) Browse to reserve/request.pl for that record 4) Notice the "Item waiting" message now has "since " Signed-off-by: Aleisha --- C4/Reserves.pm | 18 +----------------- C4/SIP/ILS/Item.pm | 2 +- .../prog/en/modules/reserve/request.tt | 1 + reserve/request.pl | 1 + 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index a188f96..e62d74d 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -303,23 +303,7 @@ sub GetReservesFromBiblionumber { # Find the desired items in the reserves my @params; my $query = " - SELECT reserve_id, - branchcode, - timestamp AS rtimestamp, - priority, - biblionumber, - borrowernumber, - reservedate, - constrainttype, - found, - itemnumber, - reservenotes, - expirationdate, - lowestPriority, - suspend, - suspend_until - FROM reserves - WHERE biblionumber = ? "; + SELECT * FROM reserves WHERE biblionumber = ? "; push( @params, $biblionumber ); unless ( $all_dates ) { $query .= " AND reservedate <= CAST(NOW() AS DATE) "; diff --git a/C4/SIP/ILS/Item.pm b/C4/SIP/ILS/Item.pm index 0f5f816..6e8a4bd 100644 --- a/C4/SIP/ILS/Item.pm +++ b/C4/SIP/ILS/Item.pm @@ -50,7 +50,7 @@ our $VERSION = 3.07.00.049; constrainttype => 'a', reservedate => '2008-10-09', found => undef, - rtimestamp => '2008-10-09 11:15:06', + timestamp => '2008-10-09 11:15:06', biblionumber => '406', borrowernumber => '756', branchcode => 'CPL' diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index db044b5..be917d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -680,6 +680,7 @@ function checkMultiHold() { [% IF ( reserveloo.atdestination ) %] [% IF ( reserveloo.found ) %] Item waiting at [% reserveloo.wbrname %] + [% IF ( reserveloo.waitingdate ) %] since [% reserveloo.waitingdate | $KohaDates %] [% END %] [% ELSE %] Waiting to be pulled [% END %] diff --git a/reserve/request.pl b/reserve/request.pl index ce0e70f..80103fd 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -539,6 +539,7 @@ foreach my $biblionumber (@biblionumbers) { $reserve{'suspend'} = $res->{'suspend'}; $reserve{'suspend_until'} = $res->{'suspend_until'}; $reserve{'reserve_id'} = $res->{'reserve_id'}; + $reserve{'waitingdate'} = $res->{'waitingdate'}; if ( C4::Context->preference('IndependentBranches') && $flags->{'superlibrarian'} != 1 ) { $reserve{'branchloop'} = [ GetBranchDetail($res->{'branchcode'}) ]; -- 1.7.2.5