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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-6 / +8 lines)
Lines 36-41 Link Here
36
function Dopop(link) {
36
function Dopop(link) {
37
    var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
37
    var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
38
    $("#barcode").focus();
38
    $("#barcode").focus();
39
    $(".btn btn-default approve").onClickConfirm();
39
}
40
}
40
$(document).ready(function () {
41
$(document).ready(function () {
41
    $(".modal").modal({ backdrop: 'static' }).on('shown', function() {
42
    $(".modal").modal({ backdrop: 'static' }).on('shown', function() {
Lines 47-52 $(document).ready(function () { Link Here
47
    [% IF print_slip %]
48
    [% IF print_slip %]
48
        Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&biblionumber=[% biblionumber %]');
49
        Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&biblionumber=[% biblionumber %]');
49
    [% END %]
50
    [% END %]
51
    [% IF confirm %]
52
        $(".modal").modal().off;
53
    [% END %]
54
50
55
51
    var columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'returns', 'checkedintable', 'json' ) %]
56
    var columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'returns', 'checkedintable', 'json' ) %]
52
    var returns_table = KohaTable("#checkedintable", {
57
    var returns_table = KohaTable("#checkedintable", {
Lines 330-336 $(document).ready(function () { Link Here
330
                <div class="modal-footer">
335
                <div class="modal-footer">
331
                    <input type="hidden" name="cancel_reserve" value="0" />
336
                    <input type="hidden" name="cancel_reserve" value="0" />
332
337
333
                    <button type="submit" class="btn btn-default approve">
338
                    <button data-dismiss="modal" type="submit" class="btn btn-default approve">
334
                        <i class="fa fa-check"></i> Confirm
339
                        <i class="fa fa-check"></i> Confirm
335
                    </button>
340
                    </button>
336
341
Lines 534-540 $(document).ready(function () { Link Here
534
                        <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
539
                        <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
535
                        <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
540
                        <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
536
                    [% END %]
541
                    [% END %]
537
538
                    <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
542
                    <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
539
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
543
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
540
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
544
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
Lines 546-562 $(document).ready(function () { Link Here
546
                    <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
550
                    <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
547
                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
551
                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
548
                </div>
552
                </div>
549
550
                <div class="modal-footer">
553
                <div class="modal-footer">
551
                    [% IF ( transfertodo ) %]
554
                    [% IF ( transfertodo ) %]
552
                        <button type="submit" class="btn btn-default approve">
555
                        <button data-dismiss="modal" type="submit" class="btn btn-default approve">
553
                            <i class="fa fa-check"></i> Confirm hold and transfer
556
                            <i class="fa fa-check"></i> Confirm hold and transfer
554
                        </button>
557
                        </button>
555
                        <button type="submit" class="btn btn-default print" onclick="this.form.print_slip.value = 1; this.form.submit()">
558
                        <button type="submit" class="btn btn-default print" onclick="this.form.print_slip.value = 1; this.form.submit()">
556
                            <i class="fa fa-print"></i> Print slip, transfer, and confirm
559
                            <i class="fa fa-print"></i> Print slip, transfer, and confirm
557
                        </button>
560
                        </button>
558
                    [% ELSE %]
561
                    [% ELSE %]
559
                        <button type="submit" class="btn btn-default approve">
562
                        <button data-dismiss="modal" type="submit" class="btn btn-default approve" onclick="this.form.submit();">
560
                            <i class="fa fa-check"></i> Confirm hold
563
                            <i class="fa fa-check"></i> Confirm hold
561
                        </button>
564
                        </button>
562
                        <button type="submit" class="btn btn-default print" onclick="this.form.print_slip.value = 1; this.form.submit();">
565
                        <button type="submit" class="btn btn-default print" onclick="this.form.print_slip.value = 1; this.form.submit();">
563
- 

Return to bug 18438