View | Details | Raw Unified | Return to bug 19287
Collapse All | Expand All

(-)a/circ/waitingreserves.pl (-5 / +5 lines)
Lines 43-54 use Koha::Patrons; Link Here
43
43
44
my $input = new CGI;
44
my $input = new CGI;
45
45
46
my $op             = $input->param('op') || '';
46
my $item           = $input->param('itemnumber');
47
my $item           = $input->param('itemnumber');
47
my $borrowernumber = $input->param('borrowernumber');
48
my $borrowernumber = $input->param('borrowernumber');
48
my $fbr            = $input->param('fbr') || '';
49
my $fbr            = $input->param('fbr') || '';
49
my $tbr            = $input->param('tbr') || '';
50
my $tbr            = $input->param('tbr') || '';
50
my $all_branches   = $input->param('allbranches') || '';
51
my $all_branches   = $input->param('allbranches') || '';
51
my $cancelall      = $input->param('cancelall');
52
my $tab            = $input->param('tab');
52
my $tab            = $input->param('tab');
53
53
54
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
54
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
Lines 69-75 $template->param( TransferWhenCancelAllWaitingHolds => 1 ) if $transfer_when_can Link Here
69
69
70
my @cancel_result;
70
my @cancel_result;
71
# if we have a return from the form we cancel the holds
71
# if we have a return from the form we cancel the holds
72
if ($item) {
72
if ( $op eq 'cancel_reserve' and $item) {
73
    my $res = cancel( $item, $borrowernumber, $fbr, $tbr );
73
    my $res = cancel( $item, $borrowernumber, $fbr, $tbr );
74
    push @cancel_result, $res if $res;
74
    push @cancel_result, $res if $res;
75
}
75
}
Lines 138-144 foreach my $num (@getreserves) { Link Here
138
    }
138
    }
139
139
140
    if ($today > $calcDate) {
140
    if ($today > $calcDate) {
141
        if ($cancelall) {
141
        if ($op eq 'cancel_all') {
142
            my $res = cancel( $itemnumber, $borrowernum, $holdingbranch, $homebranch, !$transfer_when_cancel_all );
142
            my $res = cancel( $itemnumber, $borrowernum, $holdingbranch, $homebranch, !$transfer_when_cancel_all );
143
            push @cancel_result, $res if $res;
143
            push @cancel_result, $res if $res;
144
            next;
144
            next;
Lines 167-175 $template->param( Link Here
167
# Checking if there is a Fast Cataloging Framework
167
# Checking if there is a Fast Cataloging Framework
168
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
168
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
169
169
170
if ($item && $tab eq 'holdsover' && !@cancel_result) {
170
if ($op eq 'cancel_reserve' && $tab eq 'holdsover' && !@cancel_result) {
171
    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover");
171
    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover");
172
} elsif ($cancelall) {
172
} elsif ($op eq 'cancel_all') {
173
    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl");
173
    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl");
174
} else {
174
} else {
175
    output_html_with_http_headers $input, $cookie, $template->output;
175
    output_html_with_http_headers $input, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-3 / +4 lines)
Lines 115-120 Link Here
115
                    <td>[% reserveloo.enumchron %]</td>
115
                    <td>[% reserveloo.enumchron %]</td>
116
                    <td>
116
                    <td>
117
                        <form name="cancelReserve" action="waitingreserves.pl" method="post">
117
                        <form name="cancelReserve" action="waitingreserves.pl" method="post">
118
                            <input type="hidden" name="op" value="cancel_reserve" />
118
                            <input type="hidden" name="borrowernumber" value="[% reserveloo.borrowernum %]" />
119
                            <input type="hidden" name="borrowernumber" value="[% reserveloo.borrowernum %]" />
119
                            <input type="hidden" name="itemnumber" value="[% reserveloo.itemnumber %]" />
120
                            <input type="hidden" name="itemnumber" value="[% reserveloo.itemnumber %]" />
120
                            <input type="hidden" name="fbr" value="[% reserveloo.holdingbranch %]" />
121
                            <input type="hidden" name="fbr" value="[% reserveloo.holdingbranch %]" />
Lines 125-131 Link Here
125
                            [% ELSE %]
126
                            [% ELSE %]
126
                            <input type="submit" value="Cancel hold" />
127
                            <input type="submit" value="Cancel hold" />
127
                            [% END %]
128
                            [% END %]
128
                       </form>
129
                        </form>
129
                    </td>
130
                    </td>
130
                </tr>
131
                </tr>
131
                [% END %]</tbody>
132
                [% END %]</tbody>
Lines 138-144 Link Here
138
                [% IF ( ReservesMaxPickUpDelay ) %]<p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay %] days.</p>[% END %]
139
                [% IF ( ReservesMaxPickUpDelay ) %]<p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay %] days.</p>[% END %]
139
               [% IF ( overloop ) %]
140
               [% IF ( overloop ) %]
140
               <form name="cancelAllReserve" action="waitingreserves.pl" method="post">
141
               <form name="cancelAllReserve" action="waitingreserves.pl" method="post">
141
                   <input type="hidden" name="cancelall" value="1" />
142
                   <input type="hidden" name="op" value="cancel_all" />
142
                   <input type="hidden" name="allbranches" value="[% allbranches %]" />
143
                   <input type="hidden" name="allbranches" value="[% allbranches %]" />
143
                   <input type="hidden" name="tab" value="holdsover">
144
                   <input type="hidden" name="tab" value="holdsover">
144
                   [% IF TransferWhenCancelAllWaitingHolds %]
145
                   [% IF TransferWhenCancelAllWaitingHolds %]
Lines 182-187 Link Here
182
                    <td>[% overloo.copynumber %]</td>
183
                    <td>[% overloo.copynumber %]</td>
183
                    <td>[% overloo.enumchron %]</td>
184
                    <td>[% overloo.enumchron %]</td>
184
                    <td><form name="cancelReserve" action="waitingreserves.pl" method="post">
185
                    <td><form name="cancelReserve" action="waitingreserves.pl" method="post">
186
                            <input type="hidden" name="op" value="cancel_reserve" />
185
                            <input type="hidden" name="borrowernumber" value="[% overloo.borrowernum %]" />
187
                            <input type="hidden" name="borrowernumber" value="[% overloo.borrowernum %]" />
186
                            <input type="hidden" name="itemnumber" value="[% overloo.itemnumber %]" />
188
                            <input type="hidden" name="itemnumber" value="[% overloo.itemnumber %]" />
187
                            <input type="hidden" name="fbr" value="[% overloo.holdingbranch %]" />
189
                            <input type="hidden" name="fbr" value="[% overloo.holdingbranch %]" />
188
- 

Return to bug 19287