Lines 77-83
my $hold_transferred;
Link Here
|
77 |
my $hold_processed; |
77 |
my $hold_processed; |
78 |
my $reqmessage; |
78 |
my $reqmessage; |
79 |
my $cancelled; |
79 |
my $cancelled; |
80 |
my $setwaiting; |
80 |
my $settransit; |
81 |
|
81 |
|
82 |
my $request = $query->param('request') || ''; |
82 |
my $request = $query->param('request') || ''; |
83 |
my $borrowernumber = $query->param('borrowernumber') || 0; |
83 |
my $borrowernumber = $query->param('borrowernumber') || 0; |
Lines 98-118
if ( $request eq "KillWaiting" ) {
Link Here
|
98 |
$reqmessage = 1; |
98 |
$reqmessage = 1; |
99 |
} # FIXME else? |
99 |
} # FIXME else? |
100 |
} |
100 |
} |
101 |
elsif ( $request eq "SetWaiting" ) { |
101 |
elsif ( $request eq "SetTransit" ) { |
102 |
my $item = $query->param('itemnumber'); |
102 |
my $item = $query->param('itemnumber'); |
103 |
ModReserveAffect( $item, $borrowernumber ); |
103 |
my $reserve_id = $query->param('reserve_id'); |
|
|
104 |
ModReserveAffect( $item, $borrowernumber, 1, $reserve_id ); |
104 |
$ignoreRs = 1; |
105 |
$ignoreRs = 1; |
105 |
$setwaiting = 1; |
106 |
$settransit = 1; |
106 |
$reqmessage = 1; |
107 |
$reqmessage = 1; |
107 |
} |
108 |
} |
108 |
elsif ( $request eq 'KillReserved' ) { |
109 |
elsif ( $request eq 'KillReserved' ) { |
109 |
my $biblionumber = $query->param('biblionumber'); |
110 |
my $biblionumber = $query->param('biblionumber'); |
110 |
my $holds = Koha::Holds->search({ |
111 |
my $reserve_id = $query->param('reserve_id'); |
111 |
biblionumber => $biblionumber, |
112 |
my $hold = Koha::Holds->find({ reserve_id => $reserve_id }); |
112 |
borrowernumber => $borrowernumber |
113 |
if ( $hold ) { |
113 |
}); |
114 |
$hold->cancel; |
114 |
if ( $holds->count ) { |
|
|
115 |
$holds->next->cancel; |
116 |
$cancelled = 1; |
115 |
$cancelled = 1; |
117 |
$reqmessage = 1; |
116 |
$reqmessage = 1; |
118 |
} # FIXME else? |
117 |
} # FIXME else? |
Lines 170-189
my $biblionumber;
Link Here
|
170 |
|
169 |
|
171 |
##################### |
170 |
##################### |
172 |
|
171 |
|
173 |
if ($found) { |
172 |
my $hold; |
174 |
my $res = $messages->{'ResFound'}; |
173 |
if ($found){ |
175 |
$itemnumber = $res->{'itemnumber'}; |
174 |
$hold = Koha::Holds->find( |
176 |
$borrowernumber = $res->{'borrowernumber'}; |
175 |
{ reserve_id => $found->{reserve_id} }, |
|
|
176 |
{ prefetch => ['item','patron'] } |
177 |
); |
178 |
$itemnumber = $found->{'itemnumber'}; |
179 |
$borrowernumber = $found->{'borrowernumber'}; |
177 |
|
180 |
|
178 |
if ( $res->{'ResFound'} eq "Waiting" ) { |
181 |
if ( $found->{'ResFound'} eq "Waiting" ) { |
179 |
$waiting = 1; |
182 |
$waiting = 1; |
180 |
} elsif ( $res->{'ResFound'} eq "Transferred" ) { |
183 |
} elsif ( $found->{'ResFound'} eq "Transferred" ) { |
181 |
$hold_transferred = 1; |
184 |
$hold_transferred = 1; |
182 |
} elsif ( $res->{'ResFound'} eq "Processing" ) { |
185 |
} elsif ( $found->{'ResFound'} eq "Processing" ) { |
183 |
$hold_processed = 1; |
186 |
$hold_processed = 1; |
184 |
} elsif ( $res->{'ResFound'} eq "Reserved" ) { |
187 |
} elsif ( $found->{'ResFound'} eq "Reserved" ) { |
185 |
$reserved = 1; |
188 |
$reserved = 1; |
186 |
$biblionumber = $res->{'biblionumber'}; |
189 |
$biblionumber = $found->{'biblionumber'}; |
187 |
} |
190 |
} |
188 |
} |
191 |
} |
189 |
|
192 |
|
Lines 221-226
foreach my $code ( keys %$messages ) {
Link Here
|
221 |
|
224 |
|
222 |
$template->param( |
225 |
$template->param( |
223 |
found => $found, |
226 |
found => $found, |
|
|
227 |
hold => $hold, |
224 |
reserved => $reserved, |
228 |
reserved => $reserved, |
225 |
waiting => $waiting, |
229 |
waiting => $waiting, |
226 |
transferred => $hold_transferred, |
230 |
transferred => $hold_transferred, |
Lines 232-238
$template->param(
Link Here
|
232 |
tobranchcd => $tobranchcd, |
236 |
tobranchcd => $tobranchcd, |
233 |
reqmessage => $reqmessage, |
237 |
reqmessage => $reqmessage, |
234 |
cancelled => $cancelled, |
238 |
cancelled => $cancelled, |
235 |
setwaiting => $setwaiting, |
239 |
settransit => $settransit, |
236 |
trsfitemloop => \@trsfitemloop, |
240 |
trsfitemloop => \@trsfitemloop, |
237 |
errmsgloop => \@errmsgloop, |
241 |
errmsgloop => \@errmsgloop, |
238 |
PatronAutoComplete => C4::Context->preference("PatronAutoComplete"), |
242 |
PatronAutoComplete => C4::Context->preference("PatronAutoComplete"), |