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

Return to bug 11360