[% 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 %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -720,13 +720,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 ) %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -591,8 +591,8 @@
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 %]
--- a/reserve/request.pl
+++ a/reserve/request.pl
@@ -558,7 +558,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();
--- a/svc/holds
+++ a/svc/holds
@@ -114,11 +114,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;
--- a/t/db_dependent/Hold.t
+++ a/t/db_dependent/Hold.t
@@ -27,7 +27,7 @@ use Koha::Item;
use Koha::DateUtils;
use t::lib::TestBuilder;
-use Test::More tests => 32;
+use Test::More tests => 28;
use Test::Warn;
use_ok('Koha::Hold');
@@ -97,29 +97,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' );
--
|