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 331-337 $(document).ready(function () { Link Here
331
                <div class="modal-footer">
336
                <div class="modal-footer">
332
                    <input type="hidden" name="cancel_reserve" value="0" />
337
                    <input type="hidden" name="cancel_reserve" value="0" />
333
338
334
                    <button type="submit" class="btn btn-default approve">
339
                    <button data-dismiss="modal" type="submit" class="btn btn-default approve">
335
                        <i class="fa fa-check"></i> Confirm
340
                        <i class="fa fa-check"></i> Confirm
336
                    </button>
341
                    </button>
337
342
Lines 535-541 $(document).ready(function () { Link Here
535
                        <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
540
                        <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
536
                        <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
541
                        <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
537
                    [% END %]
542
                    [% END %]
538
539
                    <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
543
                    <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
540
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
544
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
541
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
545
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
Lines 547-563 $(document).ready(function () { Link Here
547
                    <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
551
                    <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
548
                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
552
                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
549
                </div>
553
                </div>
550
551
                <div class="modal-footer">
554
                <div class="modal-footer">
552
                    [% IF ( transfertodo ) %]
555
                    [% IF ( transfertodo ) %]
553
                        <button type="submit" class="btn btn-default approve">
556
                        <button data-dismiss="modal" type="submit" class="btn btn-default approve">
554
                            <i class="fa fa-check"></i> Confirm hold and transfer
557
                            <i class="fa fa-check"></i> Confirm hold and transfer
555
                        </button>
558
                        </button>
556
                        <button type="submit" class="btn btn-default print" onclick="this.form.print_slip.value = 1; this.form.submit()">
559
                        <button type="submit" class="btn btn-default print" onclick="this.form.print_slip.value = 1; this.form.submit()">
557
                            <i class="fa fa-print"></i> Print slip, transfer, and confirm
560
                            <i class="fa fa-print"></i> Print slip, transfer, and confirm
558
                        </button>
561
                        </button>
559
                    [% ELSE %]
562
                    [% ELSE %]
560
                        <button type="submit" class="btn btn-default approve">
563
                        <button data-dismiss="modal" type="submit" class="btn btn-default approve" onclick="this.form.submit();">
561
                            <i class="fa fa-check"></i> Confirm hold
564
                            <i class="fa fa-check"></i> Confirm hold
562
                        </button>
565
                        </button>
563
                        <button type="submit" class="btn btn-default print" onclick="this.form.print_slip.value = 1; this.form.submit();">
566
                        <button type="submit" class="btn btn-default print" onclick="this.form.print_slip.value = 1; this.form.submit();">
564
- 

Return to bug 18438