Bug 12063 - Remove Koha::Hold::waiting_expires_on since dateexpiration is set on...

Signed-off-by: sonia BOUIS <sonia.bouis@univ-lyon3.fr>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/Koha/Hold.pm b/Koha/Hold.pm
index 3b2216e..c125bfc 100644 (file)
--- 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 adfe9c0..eed4340 100644 (file)
--- 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 <span class="ex">[% message | html %]</span>
 
                                 <br/>
                                 [% IF ( w.branch.branchcode == Branches.GetLoggedInBranchcode()  ) %]<strong class="waitinghere">[% ELSE %]<strong>[% 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 %]
                                 </strong>
                             </li>
                         </ul>

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 34a7304..706cb6d 100644 (file)
--- 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() {
         </td>
         <td>[% reserveloo.notes %]</td>
         <td>[% reserveloo.date %]</td>
-        <td>
-            [% IF reserveloo.waiting_until %]
-                [% reserveloo.waiting_until | $KohaDates %]
-            [% ELSE %]
-                [% reserveloo.expirationdate %]
-            [% END %]
-        </td>
+        <td>[% reserveloo.expirationdate %]</td>
         <td>
     [% 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 cded80d..d8539d4 100644 (file)
--- 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 <b> [% RESERVE.branch.branchname %]</b>
                                                             [% 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 %]
                                                             <input type="hidden" name="pickup" value="[% RESERVE.branchcode %]" />

diff --git a/reserve/request.pl b/reserve/request.pl
index f8122c7..ba4eb0a 100755 (executable)
--- 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 3c3a2b0..c1a5a9a 100755 (executable)
--- 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 098aced..71ce265 100755 (executable)
--- 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' );