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

Return to bug 11360