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

(-)a/circ/branchtransfers.pl (-18 / +22 lines)
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"),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt (-7 / +9 lines)
Lines 26-32 Link Here
26
    <table>
26
    <table>
27
        <caption>
27
        <caption>
28
            [% IF ( reserved ) %]
28
            [% IF ( reserved ) %]
29
                Reserve found for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
29
                Reserve found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
30
            [% END %]
30
            [% END %]
31
            [% IF ( waiting ) %]
31
            [% IF ( waiting ) %]
32
                Item is marked waiting at [% branchname | html %] for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
32
                Item is marked waiting at [% branchname | html %] for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>).
Lines 34-40 Link Here
34
        </caption>
34
        </caption>
35
        <tr>
35
        <tr>
36
            <th>
36
            <th>
37
                [% IF ( reserved ) %]Set reserve to waiting and transfer book to [% branchname | html %]: [% END %]
37
                [% IF ( reserved ) %]
38
                        Set reserve to transit and transfer book to [% Branches.GetName( hold.branchcode ) | html %]:
39
                [% END %]
38
                [% IF ( waiting ) %]Cancel reservation and then attempt transfer: [% END %]
40
                [% IF ( waiting ) %]Cancel reservation and then attempt transfer: [% END %]
39
            </th>
41
            </th>
40
            <td>
42
            <td>
Lines 44-49 Link Here
44
                        <input type="hidden" name="fb-[% trsfitemloo.counter | html %]" value="[% trsfitemloo.frombrcd | html %]" />
46
                        <input type="hidden" name="fb-[% trsfitemloo.counter | html %]" value="[% trsfitemloo.frombrcd | html %]" />
45
                        <input type="hidden" name="tb-[% trsfitemloo.counter | html %]" value="[% trsfitemloo.tobrcd | html %]" />
47
                        <input type="hidden" name="tb-[% trsfitemloo.counter | html %]" value="[% trsfitemloo.tobrcd | html %]" />
46
                    [% END %]
48
                    [% END %]
49
                    <input type="hidden" name="reserve_id" value="[% hold.reserve_id | html %]" />
47
                    <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
50
                    <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
48
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
51
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
49
                    <input type="hidden" name="tobranchcd" value="[% tobranchcd | html %]" />
52
                    <input type="hidden" name="tobranchcd" value="[% tobranchcd | html %]" />
Lines 53-60 Link Here
53
                        <input type="submit" value="Cancel" />
56
                        <input type="submit" value="Cancel" />
54
                    [% END %]
57
                    [% END %]
55
                    [% IF ( reserved ) %]
58
                    [% IF ( reserved ) %]
56
                        <input type="hidden" name="request" value="SetWaiting" />
59
                        <input type="hidden" name="request" value="SetTransit" />
57
                        <input type="submit" value="Waiting" />
60
                        <input type="submit" value="Transfer" />
58
                    [% END %]
61
                    [% END %]
59
                </form>
62
                </form>
60
            </td>
63
            </td>
Lines 103-110 Link Here
103
                         [% IF ( cancelled ) %]
106
                         [% IF ( cancelled ) %]
104
                             <li>Reserve cancelled</li>
107
                             <li>Reserve cancelled</li>
105
                         [% END %]
108
                         [% END %]
106
                         [% IF ( setwaiting ) %]
109
                         [% IF ( settransit ) %]
107
                             <li>Item should now be waiting at library: [% reqbrchname | html %]</li>
110
                             <li>Item is now in transit to [% Branches.GetName(tobranchcd) | html %]</li>
108
                         [% END %]
111
                         [% END %]
109
                         </ul>
112
                         </ul>
110
                    </div>
113
                    </div>
111
- 

Return to bug 27064