From d477cc24f66938abf2503f871043378b10460475 Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Thu, 30 Jun 2016 10:00:26 +0200 Subject: [PATCH] Bug 12063 - Remove Koha::Hold::waiting_expires_on since dateexpiration is set on database Signed-off-by: sonia BOUIS Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall --- Koha/Hold.pm | 24 ------------------- .../prog/en/modules/circ/circulation.tt | 4 ++-- .../prog/en/modules/reserve/request.tt | 8 +------ .../bootstrap/en/modules/opac-user.tt | 4 ++-- reserve/request.pl | 1 - svc/holds | 5 ---- t/db_dependent/Hold.t | 14 +---------- 7 files changed, 6 insertions(+), 54 deletions(-) diff --git a/Koha/Hold.pm b/Koha/Hold.pm index 3b2216e0bc..c125bfcc1b 100644 --- a/Koha/Hold.pm +++ b/Koha/Hold.pm @@ -107,30 +107,6 @@ sub delete { return $deleted; } -=head3 waiting_expires_on - -Returns a DateTime for the date a waiting holds expires on. -Returns undef if the system peference ReservesMaxPickUpDelay is not set. -Returns undef if the hold is not waiting ( found = 'W' ). - -=cut - -sub waiting_expires_on { - my ($self) = @_; - - my $found = $self->found; - return unless $found && $found eq 'W'; - - my $ReservesMaxPickUpDelay = C4::Context->preference('ReservesMaxPickUpDelay'); - return unless $ReservesMaxPickUpDelay; - - my $dt = dt_from_string( $self->waitingdate() ); - - $dt->add( days => $ReservesMaxPickUpDelay ); - - return $dt; -} - =head3 set_waiting =cut diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index adfe9c02dd..eed434098f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -837,8 +837,8 @@ No patron matched [% message | html %]
[% IF ( w.branch.branchcode == Branches.GetLoggedInBranchcode() ) %][% ELSE %][% END %] - [% SET waiting_expires_on = w.waiting_expires_on %] - Waiting at [% w.branch.branchname | html %] [% IF waiting_expires_on %] until [% waiting_expires_on | $KohaDates %] [% END %] + [% SET expires_on = w.expirationdate %] + Waiting at [% w.branch.branchname | html %] [% IF expires_on %] until [% expires_on | $KohaDates %] [% END %] 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 34a730493d..706cb6d04a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -783,13 +783,7 @@ function checkMultiHold() { [% reserveloo.notes %] [% reserveloo.date %] - - [% IF reserveloo.waiting_until %] - [% reserveloo.waiting_until | $KohaDates %] - [% ELSE %] - [% reserveloo.expirationdate %] - [% END %] - + [% reserveloo.expirationdate %] [% IF ( reserveloo.found ) %] [% IF ( reserveloo.atdestination ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index cded80d2e5..d8539d4cea 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -651,8 +651,8 @@ Using this account is not recommended because some parts of Koha will not functi Item waiting at [% RESERVE.branch.branchname %] [% IF ( RESERVE.waitingdate ) %] since [% RESERVE.waitingdate | $KohaDates %] - [% IF RESERVE.waiting_expires_on %] - until [% RESERVE.waiting_expires_on | $KohaDates %] + [% IF RESERVE.expirationdate %] + until [% RESERVE.expirationdate | $KohaDates %] [% END %] [% END %] diff --git a/reserve/request.pl b/reserve/request.pl index f8122c7201..ba4eb0adef 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -575,7 +575,6 @@ foreach my $biblionumber (@biblionumbers) { $reserve{'surname'} = $res->borrower()->surname(); $reserve{'notes'} = $res->reservenotes(); $reserve{'waiting_date'} = $res->waitingdate(); - $reserve{'waiting_until'} = $res->is_waiting() ? $res->waiting_expires_on() : undef; $reserve{'ccode'} = $res->item() ? $res->item()->ccode() : undef; $reserve{'barcode'} = $res->item() ? $res->item()->barcode() : undef; $reserve{'priority'} = $res->priority(); diff --git a/svc/holds b/svc/holds index 3c3a2b0f69..c1a5a9a83c 100755 --- a/svc/holds +++ b/svc/holds @@ -119,11 +119,6 @@ while ( my $h = $holds_rs->next() ) { : q{}, }; - if ( my $e = $h->waiting_expires_on() ) { - $hold->{expirationdate} = $e->ymd(); - $hold->{expirationdate_formatted} = output_pref( { dt => $e, dateonly => 1 }); - } - $hold->{transfered} = 0; $hold->{not_transfered} = 0; diff --git a/t/db_dependent/Hold.t b/t/db_dependent/Hold.t index 098aced576..71ce265ebb 100755 --- a/t/db_dependent/Hold.t +++ b/t/db_dependent/Hold.t @@ -28,7 +28,7 @@ use Koha::Item; use Koha::DateUtils; use t::lib::TestBuilder; -use Test::More tests => 33; +use Test::More tests => 29; use Test::Warn; use_ok('Koha::Hold'); @@ -98,29 +98,17 @@ my $hold_borrower = $hold->borrower(); ok( $hold_borrower, 'Got hold borrower' ); is( $hold_borrower->borrowernumber(), $borrower->{borrowernumber}, 'Hold borrower matches correct borrower' ); -t::lib::Mocks::mock_preference( 'ReservesMaxPickUpDelay', '' ); -$dt = $hold->waiting_expires_on(); -is( $dt, undef, "Koha::Hold->waiting_expires_on returns undef if ReservesMaxPickUpDelay is not set" ); - is( $hold->is_waiting, 1, 'The hold is waiting' ); is( $hold->is_found, 1, 'The hold is found'); ok( !$hold->is_in_transit, 'The hold is not in transit' ); t::lib::Mocks::mock_preference( 'ReservesMaxPickUpDelay', '5' ); -$dt = $hold->waiting_expires_on(); -is( $dt->ymd, "2000-01-06", - "Koha::Hold->waiting_expires_on returns DateTime of waitingdate + ReservesMaxPickUpDelay if set" ); - $hold->found('T'); -$dt = $hold->waiting_expires_on(); -is( $dt, undef, "Koha::Hold->waiting_expires_on returns undef if found is not 'W' ( Set to 'T' )" ); isnt( $hold->is_waiting, 1, 'The hold is not waiting (T)' ); is( $hold->is_found, 1, 'The hold is found'); is( $hold->is_in_transit, 1, 'The hold is in transit' ); $hold->found(q{}); -$dt = $hold->waiting_expires_on(); -is( $dt, undef, "Koha::Hold->waiting_expires_on returns undef if found is not 'W' ( Set to empty string )" ); isnt( $hold->is_waiting, 1, 'The hold is not waiting (W)' ); is( $hold->is_found, 0, 'The hold is not found' ); ok( !$hold->is_in_transit, 'The hold is not in transit' ); -- 2.39.5