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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-99 / +192 lines)
Lines 38-43 function Dopop(link) { Link Here
38
    $("#barcode").focus();
38
    $("#barcode").focus();
39
}
39
}
40
$(document).ready(function () {
40
$(document).ready(function () {
41
    $(".modal").modal({ backdrop: 'static' }).on('shown', function() {
42
        $("#barcode").prop("disabled", true);
43
    }).on('hidden', function() {
44
        $("#barcode").prop("disabled", false).focus();
45
    });
41
46
42
    [% IF print_slip %]
47
    [% IF print_slip %]
43
        Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&biblionumber=[% biblionumber %]');
48
        Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&biblionumber=[% biblionumber %]');
Lines 241-297 $(document).ready(function () { Link Here
241
[% END %]
246
[% END %]
242
247
243
[% IF ( found ) %]
248
[% IF ( found ) %]
244
<!-- found -->
245
<!-- case of a reservation found, and display info -->
246
    [% IF ( waiting ) %]
249
    [% IF ( waiting ) %]
247
	<!-- waiting -->
250
        <div id="hold-found1" class="modal fade audio-alert-action">
251
            <form method="post" action="returns.pl" class="confirm">
252
                <div class="modal-header">
253
                    <h3>
254
                        Hold found (item is already waiting):
255
                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">
256
                            [% itembarcode |html %]: [% title |html %]
257
                        </a>
258
                    </h3>
259
                </div>
260
261
                <div class="modal-body">
262
                    [% IF ( reservenotes ) %]
263
                        <h4>Notes: [% reservenotes %]</h4>
264
                    [% END %]
248
265
249
    <div id="hold-found1" class="dialog message audio-alert-action">
266
                    <h4>Hold for:</h4>
250
        <h3>Hold found (item is already waiting)</h3>
251
        <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
252
        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
253
        <h4>Hold for:</h4>
254
			<ul>
255
            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
256
            <li>[% borstnum %] [% boraddress %]<br />
257
			[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
258
            [% borcity %] [% borzip %]</li>
259
           [% IF ( borphone ) %]<li> [% borphone %]</li>[% END %]
260
		   [% IF ( boremail ) %]<li><a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a></li>[% END %]
261
            [% INCLUDE display_bormessagepref %]
262
[% IF ( debarred ) %]<li class="error">Patron is RESTRICTED</li>[% END %]
263
[% IF ( gonenoaddress ) %]<li class="error">Patron's address is in doubt</li>[% END %]</ul>
264
		[% IF ( transfertodo ) %]
265
            <h4><strong>Transfer to:</strong> [% destbranchname %]</h4>
266
		[% ELSE %]
267
		<h4><strong>Hold at</strong> [% destbranchname %]</h4>
268
        [% END %]
269
        <form method="post" action="returns.pl" class="confirm">
270
            <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm</button>
271
267
272
            <input type="hidden" name="cancel_reserve" value="0" />
268
                    <li>
273
            <button type="submit" class="deny" onclick="this.form.cancel_reserve.value = 1; this.form.submit();"><i class="fa fa-times"></i> Cancel</button>
269
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])
270
                    </li>
274
271
275
            <input type="hidden" name="print_slip" value="0" />
272
                    <li>
276
            <button type="submit" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();"><i class="fa fa-print"></i> Print and confirm</button>
273
                        [% borstnum %] [% boraddress %]<br />
277
            [% FOREACH inputloo IN inputloop %]
274
                        [% IF ( boraddress2 ) %]
278
                <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
275
                            [% boraddress2 %]<br />
279
                <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
276
                        [% END %]
280
                <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
277
                        [% borcity %] [% borzip %]
281
            [% END %]
278
                    </li>
282
                <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
279
283
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
280
                    [% IF ( borphone ) %]
284
                <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
281
                        <li> [% borphone %]</li>
285
                <input type="hidden" name="resbarcode" value="[% barcode %]" />
282
                    [% END %]
286
                <input type="hidden" name="diffBranch" value="[% destbranch %]" />
283
287
                <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
284
                    [% IF ( boremail ) %]
288
                <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
285
                        <li><a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a></li>
289
                <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" />
286
                    [% END %]
290
287
291
                <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
288
                    [% IF ( debarred ) %]
292
                <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
289
                        <li class="error">Patron is RESTRICTED</li>
293
                </form>
290
                    [% END %]
294
	</div>
291
292
                    [% IF ( gonenoaddress ) %]
293
                        <li class="error">Patron's address is in doubt</li>
294
                    [% END %]
295
296
                    [% IF ( transfertodo ) %]
297
                        <h4><strong>Transfer to:</strong> [% destbranchname %]</h4>
298
                    [% ELSE %]
299
                        <h4><strong>Hold at</strong> [% destbranchname %]</h4>
300
                    [% END %]
301
302
                    [% FOREACH inputloo IN inputloop %]
303
                        <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
304
                        <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
305
                        <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
306
                    [% END %]
307
308
                    <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
309
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
310
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
311
                    <input type="hidden" name="resbarcode" value="[% barcode %]" />
312
                    <input type="hidden" name="diffBranch" value="[% destbranch %]" />
313
                    <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
314
                    <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
315
                    <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" />
316
317
                    <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
318
                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
319
                </div>
320
321
                <div class="modal-footer">
322
                    <input type="hidden" name="cancel_reserve" value="0" />
323
                    <button type="submit" class="btn btn-danger deny" onclick="this.form.cancel_reserve.value = 1; this.form.submit();">
324
                        <i class="fa fa-times"></i> Cancel hold
325
                    </button>
326
327
                    <button type="submit" class="btn approve">
328
                        <i class="fa fa-check"></i> Confirm
329
                    </button>
330
331
                    <input type="hidden" name="print_slip" value="0" />
332
                    <button type="submit" class="btn btn-primary print" onclick="this.form.print_slip.value = 1; this.form.submit();">
333
                        <i class="fa fa-print"></i> Print and confirm
334
                    </button>
335
                </div>
336
            </form>
337
        </div>
295
    [% END %]
338
    [% END %]
296
339
297
    [% IF ( diffbranch ) %]
340
    [% IF ( diffbranch ) %]
Lines 404-461 $(document).ready(function () { Link Here
404
    <!-- case of simple return no issue or transfer but with a reservation  -->
447
    <!-- case of simple return no issue or transfer but with a reservation  -->
405
    [% IF ( reserved ) %]
448
    [% IF ( reserved ) %]
406
	<!--  reserved  -->
449
	<!--  reserved  -->
450
        <div id="hold-found2" class="modal fade audio-alert-action">
451
            <form method="post" action="returns.pl" class="confirm">
452
                <div class="modal-header">
453
                    <h3>
454
                        Hold found:
455
                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">
456
                            [% itembarcode |html %]: [% title |html %]
457
                        </a>
458
                </div>
459
460
                <div class="modal-body">
461
                    [% IF ( reservenotes ) %]
462
                        <h4>Notes: [% reservenotes %]</h4>
463
                    [% END %]
464
                    <h5>Hold for:</h5>
465
466
                        <li>
467
                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
468
                                [% borsurname %], [% borfirstname %]
469
                            </a>
470
                            ([% borcnum %])
471
                        </li>
472
473
                        <li>
474
                            [% borstnum %] [% boraddress %]<br />
475
                            [% IF ( boraddress2 ) %]
476
                                [% boraddress2 %]<br />
477
                            [% END %]
478
                            [% borcity %] [% borzip %]
479
                        </li>
407
480
408
    <div id="hold-found2" class="dialog message audio-alert-action">
481
                        [% IF ( borphone ) %]
409
      <h3>Hold found</h3>
482
                            <li>[% borphone %]</li>
410
          <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
483
                        [% END %]
411
        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
484
412
        <h5>Hold for:</h5>
485
                        [% IF ( boremail ) %]
413
		<ul>
486
                            <li>
414
            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
487
                                [% IF ( transfertodo ) %]
415
                [% borsurname %], [% borfirstname %]
488
                                    [% boremail %]
416
            </a> ([% borcnum %])</li>
489
                                [% ELSE %]
417
            <li>[% borstnum %] [% boraddress %]<br />
490
                                    <a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a>
418
			[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
491
                                [% END %]
419
			[% borcity %] [% borzip %]</li>
492
                            </li>
420
            [% IF ( borphone ) %]<li>[% borphone %]</li>[% END %]
493
                        [% END %]
421
            [% IF ( boremail ) %]<li>[% IF ( transfertodo ) %][% boremail %][% ELSE %]<a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a>[% END %]</li>[% END %]
494
422
            [% UNLESS ( transfertodo) %]
495
                        [% IF ( debarred ) %]
423
                [% INCLUDE display_bormessagepref %]
496
                            <li class="error">Patron is RESTRICTED</li>
424
            [% END %]
497
                        [% END %]
425
[% IF ( debarred ) %]<li class="error">Patron is RESTRICTED</li>[% END %]
498
426
[% IF ( gonenoaddress ) %]<li class="error">Patron's address is in doubt</li>[% END %]
499
                        [% IF ( gonenoaddress ) %]
427
        </ul>
500
                            <li class="error">Patron's address is in doubt</li>
428
        [% IF ( transfertodo ) %]
501
                        [% END %]
429
            <h4><strong>Transfer to:</strong> [% destbranchname %]</h4>
502
430
		[% ELSE %]
503
                    [% IF ( transfertodo ) %]
431
		<h4><strong>Hold at</strong> [% destbranchname %]</h4>
504
                        <h4><strong>Transfer to:</strong> [% destbranchname %]</h4>
432
        [% END %]
505
                    [% ELSE %]
433
        <form method="post" action="returns.pl" class="confirm">
506
                        <h4><strong>Hold at</strong> [% destbranchname %]</h4>
434
            <input type="hidden" name="print_slip" value="0" />
507
                    [% END %]
435
            [% IF ( transfertodo ) %]
508
436
                <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm hold and transfer</button>
509
                    <input type="hidden" name="print_slip" value="0" />
437
                <button type="submit" class="print" onclick="this.form.print_slip.value = 1; this.form.submit()"><i class="fa fa-print"></i> Print slip, transfer, and confirm</button>
510
438
            [% ELSE %]
511
439
                <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm hold</button>
512
                    [% FOREACH inputloo IN inputloop %]
440
                <button type="submit" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();"><i class="fa fa-print"></i> Print slip and confirm</button>
513
                        <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
441
            [% END %]
514
                        <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
442
                <button type="submit" class="deny" onclick="$('.dialog:visible').hide('slow'); $('#barcode').focus(); return false;"><i class="fa fa-times"></i> Ignore</button>
515
                        <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
443
            [% FOREACH inputloo IN inputloop %]
516
                    [% END %]
444
	<input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
517
445
	<input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
518
                    <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
446
	<input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />[% END %]
519
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
447
            <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
520
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
448
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
521
                    <input type="hidden" name="resbarcode" value="[% barcode %]" />
449
            <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
522
                    <input type="hidden" name="diffBranch" value="[% destbranch %]" />
450
            <input type="hidden" name="resbarcode" value="[% barcode %]" />
523
                    <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
451
            <input type="hidden" name="diffBranch" value="[% destbranch %]" />
524
                    <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
452
            <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
525
                    <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" />
453
            <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
526
                    <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
454
            <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" />
527
                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
455
            <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
528
                </div>
456
            <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
529
457
        </form>
530
                <div class="modal-footer">
458
	</div>
531
                    [% IF ( transfertodo ) %]
532
                        <button type="submit" class="btn approve">
533
                            <i class="fa fa-check"></i> Confirm hold and transfer
534
                        </button>
535
                        <button type="submit" class="btn btn-primary print" onclick="this.form.print_slip.value = 1; this.form.submit()">
536
                            <i class="fa fa-print"></i> Print slip, transfer, and confirm
537
                        </button>
538
                    [% ELSE %]
539
                        <button type="submit" class="btn approve">
540
                            <i class="fa fa-check"></i> Confirm hold
541
                        </button>
542
                        <button type="submit" class="btn btn-primary print" onclick="this.form.print_slip.value = 1; this.form.submit();">
543
                            <i class="fa fa-print"></i> Print slip and confirm
544
                        </button>
545
                    [% END %]
546
547
                    <button data-dismiss="modal" aria-hidden="true" type="submit" class="btn btn-danger deny" onclick="$('#barcode').focus(); return false;">
548
                        <i class="fa fa-times"></i> Ignore
549
                    </button>
550
                </div>
551
            </form>
552
        </div>
459
    [% END %]
553
    [% END %]
460
[% END %]
554
[% END %]
461
555
462
- 

Return to bug 11360