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

(-)a/acqui/neworderempty.pl (+21 lines)
Lines 196-201 else { #modify order Link Here
196
my $suggestion;
196
my $suggestion;
197
$suggestion = GetSuggestionInfo($suggestionid) if $suggestionid;
197
$suggestion = GetSuggestionInfo($suggestionid) if $suggestionid;
198
198
199
my ( undef, $reserves ) =
200
  C4::Reserves::GetReservesFromBiblionumber( $biblionumber, 1 );
201
foreach my $res ( @{$reserves} ) {
202
    my $reserveborrower = GetMember( borrowernumber => $res->{borrowernumber} );
203
    $res->{cardnumber} = $reserveborrower->{cardnumber};
204
    $res->{firstname}  = $reserveborrower->{firstname};
205
    $res->{surname}    = $reserveborrower->{surname};
206
}
207
199
# get currencies (for change rates calcs if needed)
208
# get currencies (for change rates calcs if needed)
200
my $active_currency = GetCurrency();
209
my $active_currency = GetCurrency();
201
my $default_currency;
210
my $default_currency;
Lines 357-362 my @gst_values = map { Link Here
357
    option => $_
366
    option => $_
358
}, split( '\|', C4::Context->preference("gist") );
367
}, split( '\|', C4::Context->preference("gist") );
359
368
369
my $items = get_items_list($ordernumber);
370
360
$template->param(
371
$template->param(
361
    existing         => $biblionumber,
372
    existing         => $biblionumber,
362
    ordernumber           => $ordernumber,
373
    ordernumber           => $ordernumber,
Lines 399-404 $template->param( Link Here
399
    ean              => $data->{'ean'},
410
    ean              => $data->{'ean'},
400
    seriestitle      => $data->{'seriestitle'},
411
    seriestitle      => $data->{'seriestitle'},
401
    itemtypeloop     => \@itemtypes,
412
    itemtypeloop     => \@itemtypes,
413
    itemnumber       => $items,
402
    quantity         => $data->{'quantity'},
414
    quantity         => $data->{'quantity'},
403
    quantityrec      => $data->{'quantity'},
415
    quantityrec      => $data->{'quantity'},
404
    rrp              => $data->{'rrp'},
416
    rrp              => $data->{'rrp'},
Lines 413-418 $template->param( Link Here
413
    barcode_subfield => $barcode_subfield,
425
    barcode_subfield => $barcode_subfield,
414
    import_batch_id  => $import_batch_id,
426
    import_batch_id  => $import_batch_id,
415
    subscriptionid   => $subscriptionid,
427
    subscriptionid   => $subscriptionid,
428
    reserveloop      => $reserves,
416
    acqcreate        => C4::Context->preference("AcqCreateItem") eq "ordering" ? 1 : "",
429
    acqcreate        => C4::Context->preference("AcqCreateItem") eq "ordering" ? 1 : "",
417
    (uc(C4::Context->preference("marcflavour"))) => 1
430
    (uc(C4::Context->preference("marcflavour"))) => 1
418
);
431
);
Lines 553-555 sub Load_Duplicate { Link Here
553
566
554
  output_html_with_http_headers $input, $cookie, $template->output;
567
  output_html_with_http_headers $input, $cookie, $template->output;
555
}
568
}
569
570
sub get_items_list {
571
    my $ordernumber = shift;
572
    my $list = [];
573
574
    @{$list} = map { GetItem($_) } GetItemnumbersFromOrder($ordernumber);
575
    return $list;
576
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-2 / +59 lines)
Lines 2-8 Link Here
2
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Acquisitions &rsaquo; Basket [% basketno %] &rsaquo; [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% END %]</title>
3
<title>Koha &rsaquo; Acquisitions &rsaquo; Basket [% basketno %] &rsaquo; [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% END %]</title>
4
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
5
6
<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
5
<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
7
[% INCLUDE 'additem.js.inc' %]
6
[% INCLUDE 'additem.js.inc' %]
8
<script type="text/javascript" src="[% themelang %]/js/additem.js"></script>
7
<script type="text/javascript" src="[% themelang %]/js/additem.js"></script>
Lines 142-147 $(document).ready(function() Link Here
142
            }
141
            }
143
        });
142
        });
144
    });
143
    });
144
[% IF (itemnumber) %]
145
    $(document).ready(function() {
146
        [% UNLESS ( borrowernumber || borrower_list ) %]
147
        [% IF ( CircAutocompl ) %]
148
            $( "#patron" ).autocomplete({
149
                source: "/cgi-bin/koha/circ/ysearch.pl",
150
                minLength: 3,
151
                select: function( event, ui ) {
152
                $( "#patron" ).val( ui.item.cardnumber );
153
                $( "#holds_patronsearch" ).submit();
154
                return false;
155
        }
156
    })
157
    .data( "autocomplete" )._renderItem = function( ul, item ) {
158
        return $( "<li></li>" )
159
        .data( "item.autocomplete", item )
160
        .append( "<a>" + item.surname + ", " + item.firstname +
161
                 " (" + item.cardnumber + ") <small>" + item.address +
162
                 " " + item.city + " " + item.zipcode + " " +
163
                 item.country + "</small></a>" )
164
        .appendTo( ul );
165
    };
166
    [% END %]
167
[% END %]
168
 });
169
[% END %]
145
//]]>
170
//]]>
146
</script>
171
</script>
147
</head>
172
</head>
Lines 206-212 $(document).ready(function() Link Here
206
    </fieldset>
231
    </fieldset>
207
    </div>
232
    </div>
208
[% END %]
233
[% END %]
209
234
[% IF (itemnumber) %]
235
    <fieldset class="brief">
236
    <legend>Reserve for</legend>
237
    <form id="holds_patronsearch" action="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]" method="post">
238
        <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
239
        <input type="hidden" name="basketno" value="[% basketno %]" />
240
        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
241
        <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
242
        <label for="patron">Patron: </label>
243
        <div class="hint">Enter patron card number or partial name:</div>
244
        <input type="text" size="40" id="patron" class="focus" name="findborrower" />
245
        <input type="submit" value="Place hold" />
246
    </form>
247
    [% IF reserveloop %]
248
        <table>
249
        <tr>
250
            <th>Priority</th>
251
            <th>Cardnumber</th>
252
            <th>Name</th>
253
            <th>Reserve date</th>
254
        </tr>
255
        [% FOREACH reserve IN reserveloop %]
256
            <tr>
257
                <td>[% reserve.priority %]</td>
258
                <td>[% reserve.cardnumber %]</td>
259
                <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserve.borrowernumber%]">[% reserve.firstname %]&nbsp;[% reserve.surname %]</a></td>
260
                <td>[% reserve.reservedate | $KohaDates %]</td>
261
            </tr>
262
        [% END %]
263
        </table>
264
    [% END %]
265
    </fieldset>
266
[% END %]
210
<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" id="Aform" onsubmit="return Check(this);">
267
<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" id="Aform" onsubmit="return Check(this);">
211
268
212
<fieldset class="rows">
269
<fieldset class="rows">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-1 / +11 lines)
Lines 280-286 function checkMultiHold() { Link Here
280
        [% ELSE %]
280
        [% ELSE %]
281
            <form action="placerequest.pl" method="post" onsubmit="return checkMultiHold();" name="form">
281
            <form action="placerequest.pl" method="post" onsubmit="return checkMultiHold();" name="form">
282
        [% END %]
282
        [% END %]
283
283
        <input type="hidden" size="10" name="basketno" value="[% basketno %]" />
284
        <input type="hidden" size="10" name="booksellerid" value="[% booksellerid %]" />
285
        <input type="hidden" size="10" name="ordernumber" value="[% ordernumber %]" />
284
        <input type="hidden" size="10" name="borrowernumber" value="[% borrowernumber %]" />
286
        <input type="hidden" size="10" name="borrowernumber" value="[% borrowernumber %]" />
285
        <input type="hidden" name="type" value="str8" />
287
        <input type="hidden" name="type" value="str8" />
286
288
Lines 360-367 function checkMultiHold() { Link Here
360
                [% ELSIF ( none_available ) %]
362
                [% ELSIF ( none_available ) %]
361
                    <input type="submit" disabled="disabled" value="Place hold" />
363
                    <input type="submit" disabled="disabled" value="Place hold" />
362
                [% ELSE %]
364
                [% ELSE %]
365
                [% IF(basketno) %]
366
                    <input type="submit" value="Place hold and return to order page" />
367
                [% ELSE %]
363
                    <input type="submit" value="Place hold" />
368
                    <input type="submit" value="Place hold" />
364
                [% END %]
369
                [% END %]
370
                [% END %]
365
            [% END %]
371
            [% END %]
366
        </fieldset>
372
        </fieldset>
367
        [% FOREACH bibitemloo IN bibitemloop %]
373
        [% FOREACH bibitemloo IN bibitemloop %]
Lines 548-555 function checkMultiHold() { Link Here
548
            [% ELSIF ( none_available ) %]
554
            [% ELSIF ( none_available ) %]
549
                <input type="submit" disabled="disabled" value="Place hold" />
555
                <input type="submit" disabled="disabled" value="Place hold" />
550
            [% ELSE %]
556
            [% ELSE %]
557
            [% IF(basketno) %]
558
                <input type="submit" value="Place hold and return to order page" />
559
            [% ELSE %]
551
                <input type="submit" value="Place hold" />
560
                <input type="submit" value="Place hold" />
552
            [% END %]
561
            [% END %]
562
            [% END %]
553
        [% END %]
563
        [% END %]
554
    </fieldset>
564
    </fieldset>
555
    </form>
565
    </form>
(-)a/reserve/placerequest.pl (-1 / +7 lines)
Lines 54-60 my $title=$input->param('title'); Link Here
54
my $borrower=GetMember('borrowernumber'=>$borrowernumber);
54
my $borrower=GetMember('borrowernumber'=>$borrowernumber);
55
my $checkitem=$input->param('checkitem');
55
my $checkitem=$input->param('checkitem');
56
my $expirationdate = $input->param('expiration_date');
56
my $expirationdate = $input->param('expiration_date');
57
57
my $basketno = $input->param('basketno');
58
my $ordernumber = $input->param('ordernumber');
59
my $booksellerid = $input->param('booksellerid');
58
my $multi_hold = $input->param('multi_hold');
60
my $multi_hold = $input->param('multi_hold');
59
my $biblionumbers = $multi_hold ? $input->param('biblionumbers') : ($biblionumber . '/');
61
my $biblionumbers = $multi_hold ? $input->param('biblionumbers') : ($biblionumber . '/');
60
my $bad_bibs = $input->param('bad_bibs');
62
my $bad_bibs = $input->param('bad_bibs');
Lines 125-130 if ($type eq 'str8' && $borrower){ Link Here
125
        }
127
        }
126
    }
128
    }
127
129
130
    if ($basketno) {
131
        print $input->redirect("/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=$ordernumber&booksellerid=$booksellerid&basketno=$basketno");
132
    }
133
128
    if ($multi_hold) {
134
    if ($multi_hold) {
129
        if ($bad_bibs) {
135
        if ($bad_bibs) {
130
            $biblionumbers .= $bad_bibs;
136
            $biblionumbers .= $bad_bibs;
(-)a/reserve/request.pl (-2 / +8 lines)
Lines 60-66 my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user( Link Here
60
my $multihold = $input->param('multi_hold');
60
my $multihold = $input->param('multi_hold');
61
$template->param(multi_hold => $multihold);
61
$template->param(multi_hold => $multihold);
62
my $showallitems = $input->param('showallitems');
62
my $showallitems = $input->param('showallitems');
63
63
my $basketno = $input->param('basketno');
64
my $ordernumber = $input->param('ordernumber');
65
my $booksellerid = $input->param('booksellerid');
64
# get Branches and Itemtypes
66
# get Branches and Itemtypes
65
my $branches = GetBranches();
67
my $branches = GetBranches();
66
my $itemtypes = GetItemTypes();
68
my $itemtypes = GetItemTypes();
Lines 162-167 if ($borrowernumber_hold && !$action) { Link Here
162
                cardnumber          => $borrowerinfo->{'cardnumber'},
164
                cardnumber          => $borrowerinfo->{'cardnumber'},
163
                expiry              => $expiry,
165
                expiry              => $expiry,
164
                diffbranch          => $diffbranch,
166
                diffbranch          => $diffbranch,
167
                basketno            => $basketno,
168
                ordernumber         => $ordernumber,
169
                booksellerid        => $booksellerid,
170
		messages            => $messages,
171
		warnings            => $warnings
165
    );
172
    );
166
}
173
}
167
174
168
- 

Return to bug 10498