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