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

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

Return to bug 11360