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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-96 / +185 lines)
Lines 19-24 function Dopop(link) { Link Here
19
    $("#barcode").focus();
19
    $("#barcode").focus();
20
}
20
}
21
$(document).ready(function () {
21
$(document).ready(function () {
22
    $(".modal").modal({ backdrop: 'static' }).on('shown', function() {
23
        $("#barcode").prop("disabled", true);
24
    }).on('hidden', function() {
25
        $("#barcode").prop("disabled", false).focus();
26
    });
22
27
23
    [% IF print_slip %]
28
    [% IF print_slip %]
24
        Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&biblionumber=[% biblionumber %]');
29
        Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&biblionumber=[% biblionumber %]');
Lines 195-249 $(document).ready(function () { Link Here
195
[% END %]
200
[% END %]
196
201
197
[% IF ( found ) %]
202
[% IF ( found ) %]
198
<!-- found -->
199
<!-- case of a reservation found, and display info -->
200
    [% IF ( waiting ) %]
203
    [% IF ( waiting ) %]
201
	<!-- waiting -->
204
        <div id="hold-found1" class="modal fade audio-alert-action">
202
205
            <form method="post" action="returns.pl" class="confirm">
203
    <div id="hold-found1" class="dialog message audio-alert-action">
206
                <div class="modal-header">
204
        <h3>Hold found (item is already waiting):  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
207
                    <h3>Hold found (item is already waiting):  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title | html %]</a></h3>
205
        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
208
                </div>
206
        <h4>Hold for:</h4>
209
207
			<ul>
210
                <div class="modal-body">
208
            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
211
                    [% IF ( reservenotes ) %]
209
            <li>[% borstnum %] [% boraddress %]<br />
212
                        <h4>Notes: [% reservenotes %]</h4>
210
			[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
213
                    [% END %]
211
            [% borcity %] [% borzip %]</li>
212
           [% IF ( borphone ) %]<li> [% borphone %]</li>[% END %]
213
		   [% IF ( boremail ) %]<li><a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a></li>[% END %]
214
[% IF ( debarred ) %]<li class="error">Patron is RESTRICTED</li>[% END %]
215
[% IF ( gonenoaddress ) %]<li class="error">Patron's address is in doubt</li>[% END %]</ul>
216
		[% IF ( transfertodo ) %]
217
            <h4><strong>Transfer to:</strong> [% destbranchname %]</h4>
218
		[% ELSE %]
219
		<h4><strong>Hold at</strong> [% destbranchname %]</h4>
220
        [% END %]
221
        <form method="post" action="returns.pl" class="confirm">
222
            <input type="hidden" name="cancel_reserve" value="0" />
223
            <input type="submit" class="deny" value="Cancel" onclick="this.form.cancel_reserve.value = 1; this.form.submit();" />
224
214
225
            <input type="submit" class="approve" value="Confirm" />
215
                    <h4>Hold for:</h4>
226
216
227
            <input type="hidden" name="print_slip" value="0" />
217
                    <li>
228
            <input type="submit" value="Print and confirm" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();" />
218
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])
229
            [% FOREACH inputloo IN inputloop %]
219
                    </li>
230
                <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
220
231
                <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
221
                    <li>
232
                <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
222
                        [% borstnum %] [% boraddress %]<br />
233
            [% END %]
223
                        [% IF ( boraddress2 ) %]
234
                <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
224
                            [% boraddress2 %]<br />
235
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
225
                        [% END %]
236
                <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
226
                        [% borcity %] [% borzip %]
237
                <input type="hidden" name="resbarcode" value="[% barcode %]" />
227
                    </li>
238
                <input type="hidden" name="diffBranch" value="[% destbranch %]" />
228
239
                <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
229
                    [% IF ( borphone ) %]
240
                <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
230
                        <li> [% borphone %]</li>
241
                <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" />
231
                    [% END %]
242
232
243
                <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
233
                    [% IF ( boremail ) %]
244
                <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
234
                        <li><a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a></li>
245
                </form>
235
                    [% END %]
246
	</div>
236
237
                    [% IF ( debarred ) %]
238
                        <li class="error">Patron is RESTRICTED</li>
239
                    [% END %]
240
241
                    [% IF ( gonenoaddress ) %]
242
                        <li class="error">Patron's address is in doubt</li>
243
                    [% END %]
244
245
                    [% IF ( transfertodo ) %]
246
                        <h4><strong>Transfer to:</strong> [% destbranchname %]</h4>
247
                    [% ELSE %]
248
                        <h4><strong>Hold at</strong> [% destbranchname %]</h4>
249
                    [% END %]
250
251
                    [% FOREACH inputloo IN inputloop %]
252
                        <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
253
                        <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
254
                        <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
255
                    [% END %]
256
257
                    <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
258
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
259
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
260
                    <input type="hidden" name="resbarcode" value="[% barcode %]" />
261
                    <input type="hidden" name="diffBranch" value="[% destbranch %]" />
262
                    <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
263
                    <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
264
                    <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" />
265
266
                    <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
267
                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
268
                </div>
269
270
                <div class="modal-footer">
271
                    <input type="hidden" name="cancel_reserve" value="0" />
272
                    <button type="submit" class="btn btn-danger deny" onclick="this.form.cancel_reserve.value = 1; this.form.submit();">
273
                        <i class="fa fa-times"></i> Cancel
274
                    </button>
275
276
                    <button type="submit" class="btn approve">
277
                        <i class="fa fa-check"></i> Confirm
278
                    </button>
279
280
                    <input type="hidden" name="print_slip" value="0" />
281
                    <button type="submit" class="btn btn-primary print" onclick="this.form.print_slip.value = 1; this.form.submit();">
282
                        <i class="fa fa-print"></i> Print and confirm
283
                    </button>
284
                </div>
285
            </form>
286
        </div>
247
    [% END %]
287
    [% END %]
248
288
249
    [% IF ( diffbranch ) %]
289
    [% IF ( diffbranch ) %]
Lines 352-406 $(document).ready(function () { Link Here
352
392
353
    <!-- case of simple return no issue or transfer but with a reservation  -->
393
    <!-- case of simple return no issue or transfer but with a reservation  -->
354
    [% IF ( reserved ) %]
394
    [% IF ( reserved ) %]
355
	<!--  reserved  -->
395
        <div id="hold-found2" class="modal fade audio-alert-action">
356
396
            <form method="post" action="returns.pl" class="confirm">
357
    <div id="hold-found2" class="dialog message audio-alert-action">
397
                <div class="modal-header">
358
      <h3>Hold found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
398
                    <h3>Hold found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
359
        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
399
                </div>
360
        <h5>Hold for:</h5>
400
361
		<ul>
401
                <div class="modal-body">
362
            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
402
                    [% IF ( reservenotes ) %]
363
                [% borsurname %], [% borfirstname %]
403
                        <h4>Notes: [% reservenotes %]</h4>
364
            </a> ([% borcnum %])</li>
404
                    [% END %]
365
            <li>[% borstnum %] [% boraddress %]<br />
405
                    <h5>Hold for:</h5>
366
			[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
406
367
			[% borcity %] [% borzip %]</li>
407
                        <li>
368
            [% IF ( borphone ) %]<li>[% borphone %]</li>[% END %]
408
                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
369
            [% IF ( boremail ) %]<li>[% IF ( transfertodo ) %][% boremail %][% ELSE %]<a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a>[% END %]</li>[% END %]
409
                                [% borsurname %], [% borfirstname %]
370
[% IF ( debarred ) %]<li class="error">Patron is RESTRICTED</li>[% END %]
410
                            </a>
371
[% IF ( gonenoaddress ) %]<li class="error">Patron's address is in doubt</li>[% END %]
411
                            ([% borcnum %])
372
        </ul>
412
                        </li>
373
        [% IF ( transfertodo ) %]
413
374
            <h4><strong>Transfer to:</strong> [% destbranchname %]</h4>
414
                        <li>
375
		[% ELSE %]
415
                            [% borstnum %] [% boraddress %]<br />
376
		<h4><strong>Hold at</strong> [% destbranchname %]</h4>
416
                            [% IF ( boraddress2 ) %]
377
        [% END %]
417
                                [% boraddress2 %]<br />
378
        <form method="post" action="returns.pl" class="confirm">
418
                            [% END %]
379
            <input type="hidden" name="print_slip" value="0" />
419
                            [% borcity %] [% borzip %]
380
            [% IF ( transfertodo ) %]
420
                        </li>
381
                <input type="submit" class="approve" value="Confirm hold and transfer" />
421
382
                <input type="submit" value="Print slip, transfer, and confirm" class="print" onclick="this.form.print_slip.value = 1; this.form.submit()" />
422
                        [% IF ( borphone ) %]
383
            [% ELSE %]
423
                            <li>[% borphone %]</li>
384
                <input type="submit" class="approve" value="Confirm hold" />
424
                        [% END %]
385
                <input type="submit" value="Print slip and confirm" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();" />
425
386
            [% END %]
426
                        [% IF ( boremail ) %]
387
                <input type="submit" class="deny" value="Ignore" onclick="$('.dialog:visible').hide('slow'); $('#barcode').focus(); return false;" />
427
                            <li>
388
            [% FOREACH inputloo IN inputloop %]
428
                                [% IF ( transfertodo ) %]
389
	<input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
429
                                    [% boremail %]
390
	<input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
430
                                [% ELSE %]
391
	<input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />[% END %]
431
                                    <a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a>
392
            <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
432
                                [% END %]
393
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
433
                            </li>
394
            <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
434
                        [% END %]
395
            <input type="hidden" name="resbarcode" value="[% barcode %]" />
435
396
            <input type="hidden" name="diffBranch" value="[% destbranch %]" />
436
                        [% IF ( debarred ) %]
397
            <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
437
                            <li class="error">Patron is RESTRICTED</li>
398
            <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
438
                        [% END %]
399
            <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" />
439
400
            <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
440
                        [% IF ( gonenoaddress ) %]
401
            <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
441
                            <li class="error">Patron's address is in doubt</li>
402
        </form>
442
                        [% END %]
403
	</div>
443
444
                    [% IF ( transfertodo ) %]
445
                        <h4><strong>Transfer to:</strong> [% destbranchname %]</h4>
446
                    [% ELSE %]
447
                        <h4><strong>Hold at</strong> [% destbranchname %]</h4>
448
                    [% END %]
449
450
                    <input type="hidden" name="print_slip" value="0" />
451
452
453
                    [% FOREACH inputloo IN inputloop %]
454
                        <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
455
                        <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
456
                        <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
457
                    [% END %]
458
459
                    <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
460
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
461
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
462
                    <input type="hidden" name="resbarcode" value="[% barcode %]" />
463
                    <input type="hidden" name="diffBranch" value="[% destbranch %]" />
464
                    <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
465
                    <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
466
                    <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" />
467
                    <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
468
                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
469
                </div>
470
471
                <div class="modal-footer">
472
                    [% IF ( transfertodo ) %]
473
                        <button type="submit" class="btn approve">
474
                            <i class="fa fa-check"></i> Confirm hold and transfer
475
                        </button>
476
                        <button type="submit" class="btn btn-primary print" onclick="this.form.print_slip.value = 1; this.form.submit()">
477
                            <i class="fa fa-print"></i> Print slip, transfer, and confirm
478
                        </button>
479
                    [% ELSE %]
480
                        <button type="submit" class="btn approve">
481
                            <i class="fa fa-check"></i> Confirm hold
482
                        </button>
483
                        <button type="submit" class="btn btn-primary print" onclick="this.form.print_slip.value = 1; this.form.submit();">
484
                            <i class="fa fa-print"></i> Print slip and confirm
485
                        </button>
486
                    [% END %]
487
488
                    <button data-dismiss="modal" aria-hidden="true" type="submit" class="btn btn-danger deny" onclick="$('.dialog:visible').hide('slow'); $('#barcode').focus(); return false;">
489
                        <i class="fa fa-times"></i> Ignore
490
                    </button>
491
                </div>
492
            </form>
493
        </div>
404
    [% END %]
494
    [% END %]
405
[% END %]
495
[% END %]
406
496
407
- 

Return to bug 11360