Lines 19-24
my $dbh = C4::Context->dbh;
Link Here
|
19 |
$dbh->{AutoCommit} = 0; |
19 |
$dbh->{AutoCommit} = 0; |
20 |
$dbh->{RaiseError} = 1; |
20 |
$dbh->{RaiseError} = 1; |
21 |
$dbh->do(q{DELETE FROM special_holidays}); |
21 |
$dbh->do(q{DELETE FROM special_holidays}); |
|
|
22 |
$dbh->do(q{DELETE FROM repeatable_holidays}); |
23 |
$dbh->do("DELETE FROM reserves"); |
22 |
|
24 |
|
23 |
my $builder = t::lib::TestBuilder->new(); |
25 |
my $builder = t::lib::TestBuilder->new(); |
24 |
|
26 |
|
Lines 111-116
my $item4 = $builder->build({
Link Here
|
111 |
}, |
113 |
}, |
112 |
}); |
114 |
}); |
113 |
|
115 |
|
|
|
116 |
my $letter = $builder->build({ |
117 |
source => 'Letter', |
118 |
value => { |
119 |
module => 'reserves', |
120 |
code => 'HOLD', |
121 |
message_transport_type => 'print', |
122 |
branchcode => '', |
123 |
}, |
124 |
}); |
125 |
|
114 |
my $today = dt_from_string(); |
126 |
my $today = dt_from_string(); |
115 |
|
127 |
|
116 |
my $reserve1_reservedate = $today->clone; |
128 |
my $reserve1_reservedate = $today->clone; |
Lines 135-141
my $reserve1 = $builder->build({
Link Here
|
135 |
t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelay', 1); |
147 |
t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelay', 1); |
136 |
t::lib::Mocks::mock_preference('ReservesMaxPickUpDelay', 6); |
148 |
t::lib::Mocks::mock_preference('ReservesMaxPickUpDelay', 6); |
137 |
|
149 |
|
138 |
ModReserveAffect( $item1->{itemnumber}, $patron1->{borrowernumber}, 0); |
150 |
ModReserveAffect( $item1->{itemnumber}, $patron1->{borrowernumber}); |
139 |
my $r = Koha::Holds->find($reserve1->{reserve_id}); |
151 |
my $r = Koha::Holds->find($reserve1->{reserve_id}); |
140 |
|
152 |
|
141 |
is($r->waitingdate, $today->ymd, 'Waiting date should be set to today' ); |
153 |
is($r->waitingdate, $today->ymd, 'Waiting date should be set to today' ); |
Lines 157-163
my $reserve2 = $builder->build({
Link Here
|
157 |
}, |
169 |
}, |
158 |
}); |
170 |
}); |
159 |
|
171 |
|
160 |
ModReserveAffect( $item2->{itemnumber}, $patron2->{borrowernumber}, 1); |
172 |
ModReserveAffect( $item2->{itemnumber}, $patron2->{borrowernumber}); |
161 |
my $r2 = Koha::Holds->find($reserve2->{reserve_id}); |
173 |
my $r2 = Koha::Holds->find($reserve2->{reserve_id}); |
162 |
|
174 |
|
163 |
is($r2->found, 'T', '2nd reserve - Reserve status is now "To transfer"' ); |
175 |
is($r2->found, 'T', '2nd reserve - Reserve status is now "To transfer"' ); |
Lines 207-214
my $holiday2 = $builder->build({
Link Here
|
207 |
}, |
219 |
}, |
208 |
}); |
220 |
}); |
209 |
|
221 |
|
|
|
222 |
Koha::Caches->get_instance->flush_all; |
223 |
|
210 |
t::lib::Mocks::mock_preference('ExcludeHolidaysFromMaxPickUpDelay', 1); |
224 |
t::lib::Mocks::mock_preference('ExcludeHolidaysFromMaxPickUpDelay', 1); |
211 |
ModReserveAffect( $item3->{itemnumber}, $patron2->{borrowernumber}, 0); |
225 |
ModReserveAffect( $item3->{itemnumber}, $patron2->{borrowernumber}); |
212 |
|
226 |
|
213 |
# Add 6 days of pickup delay + 1 day of holiday. |
227 |
# Add 6 days of pickup delay + 1 day of holiday. |
214 |
my $expected_expiration = $today->clone; |
228 |
my $expected_expiration = $today->clone; |
215 |
- |
|
|