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

(-)a/circ/circulation.pl (-19 / +2 lines)
Lines 226-250 if ($findborrower) { Link Here
226
    if ( $patron ) {
226
    if ( $patron ) {
227
        $borrowernumber = $patron->borrowernumber;
227
        $borrowernumber = $patron->borrowernumber;
228
    } else {
228
    } else {
229
        my $dt_params = { iDisplayLength => -1 };
229
        print $query->redirect( "/cgi-bin/koha/members/member.pl?quicksearch=1&circsearch=1&searchmember=" . $findborrower );
230
        my $results = C4::Utils::DataTables::Members::search(
230
        exit;
231
            {
232
                searchmember => $findborrower,
233
                searchtype   => $searchtype,
234
                dt_params    => $dt_params,
235
            }
236
        );
237
        my $borrowers = $results->{patrons};
238
        if ( scalar @$borrowers == 1 ) {
239
            $borrowernumber = $borrowers->[0]->{borrowernumber};
240
            $query->param( 'borrowernumber', $borrowernumber );
241
            $query->param( 'barcode',           '' );
242
        } elsif ( @$borrowers ) {
243
            $template->param( borrowers => $borrowers );
244
        } else {
245
            $query->param( 'findborrower', '' );
246
            $message = "'$findborrower'";
247
        }
248
    }
231
    }
249
}
232
}
250
233
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-315 / +298 lines)
Lines 562-948 Link Here
562
                        <h4>No patron matched <span class="ex">[% message | html %]</span></h4>
562
                        <h4>No patron matched <span class="ex">[% message | html %]</span></h4>
563
                    [% END %]
563
                    [% END %]
564
564
565
                    [% IF ( borrowers ) %]
565
                    <!-- BARCODE ENTRY -->
566
566
567
                        [% INCLUDE 'patron-toolbar.inc' %]
567
                    [% IF patron %]
568
                        <fieldset id="circ_circulation_selectborrower">
569
                            <legend>Patron selection</legend>
570
                            [% INCLUDE 'circ-patron-search-results.inc' destination = "circ" %]
571
                        </fieldset>
572
573
                    [% ELSE %]
574
575
                        <!-- BARCODE ENTRY -->
576
568
577
                        [% IF patron %]
569
                        [% IF patron.privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
570
                            <div class="dialog alert">
571
                                <strong>Error:</strong> This patron has requested their circulation history be anonymized on check-in, but the AnonymousPatron system preference is empty or incorrect.
572
                            </div>
573
                        [% END %]
578
574
579
                            [% IF patron.privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
575
                        <div class="row">
580
                                <div class="dialog alert">
576
                            [% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%]
581
                                    <strong>Error:</strong> This patron has requested their circulation history be anonymized on check-in, but the AnonymousPatron system preference is empty or incorrect.
577
                                <div class="col-sm-6">
582
                                </div>
578
                                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
583
                            [% END %]
579
                                        <input type="hidden" name="restoreduedatespec" />
580
                                        [% IF ( issue ) %]
581
                                            <fieldset id="circ_circulation_issue" class="lastchecked">
582
                                        [% ELSE %]
583
                                            <fieldset id="circ_circulation_issue">
584
                                        [% END %]
584
585
585
                            <div class="row">
586
                                        [% IF ( DisplayClearScreenButton ) %]
586
                                [% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%]
587
                                            <span id="clearscreen"><a href="/cgi-bin/koha/circ/circulation.pl" title="Clear screen">x</a></span>
587
                                    <div class="col-sm-6">
588
                                            <span id="printclearscreen"><a href="#" title="Print slip and clear screen"><i class="fa fa-print"></i></a></span>
588
                                        <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
589
                                        [% END %]
589
                                            <input type="hidden" name="restoreduedatespec" />
590
                                            [% IF ( issue ) %]
591
                                                <fieldset id="circ_circulation_issue" class="lastchecked">
592
                                            [% ELSE %]
593
                                                <fieldset id="circ_circulation_issue">
594
                                            [% END %]
595
590
596
                                            [% IF ( DisplayClearScreenButton ) %]
591
                                        [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
597
                                                <span id="clearscreen"><a href="/cgi-bin/koha/circ/circulation.pl" title="Clear screen">x</a></span>
598
                                                <span id="printclearscreen"><a href="#" title="Print slip and clear screen"><i class="fa fa-print"></i></a></span>
599
                                            [% END %]
600
592
601
                                            [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
593
                                        <label class="circ_barcode" for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
602
594
603
                                            <label class="circ_barcode" for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
595
                                        [% IF Koha.Preference('itemBarcodeFallbackSearch') %]
596
                                            <div class="hint">Enter item barcode or keyword:</div>
597
                                        [% ELSE %]
598
                                            <div class="hint">Enter item barcode:</div>
599
                                        [% END %]
604
600
605
                                            [% IF Koha.Preference('itemBarcodeFallbackSearch') %]
601
                                        [% IF NEEDSCONFIRMATION %]
606
                                                <div class="hint">Enter item barcode or keyword:</div>
602
                                            <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" disabled="disabled" />
607
                                            [% ELSE %]
603
                                        [% ELSE %]
608
                                                <div class="hint">Enter item barcode:</div>
604
                                            <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />
609
                                            [% END %]
605
                                        [% END %]
610
606
611
                                            [% IF NEEDSCONFIRMATION %]
607
                                        <button type="submit" class="btn btn-default">Check out</button>
612
                                                <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" disabled="disabled" />
613
                                            [% ELSE %]
614
                                                <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />
615
                                            [% END %]
616
608
617
                                            <button type="submit" class="btn btn-default">Check out</button>
609
                                        <div id="show-circ-settings">
610
                                            <a href="#"><i class="fa fa-caret-right circ-settings-icon"></i> Checkout settings</a>
611
                                        </div>
618
612
619
                                            <div id="show-circ-settings">
613
                                        <div class="circ-settings">
620
                                                <a href="#"><i class="fa fa-caret-right circ-settings-icon"></i> Checkout settings</a>
621
                                            </div>
622
614
623
                                            <div class="circ-settings">
615
                                                [% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %]
616
                                                    [% IF ( SpecifyDueDate ) %]
617
                                                        <div id="specify-due-date" class="circ-setting">
618
                                                            <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
619
                                                            [% IF ( duedatespec ) %]
620
                                                                <input type="text" size="20" id="duedatespec" name="duedatespec" value="[% duedatespec | $KohaDates with_hours => 1 %]" />
621
                                                            [% ELSE %]
622
                                                                <input type="text" size="20" id="duedatespec" name="duedatespec" value="" />
623
                                                            [% END %]
624
                                                            <label for="stickyduedate"> Remember for session:</label>
625
                                                            [% IF ( stickyduedate ) %]
626
                                                                <input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" checked="checked" />
627
                                                            [% ELSE %]
628
                                                                <input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" />
629
                                                            [% END %]
630
                                                        </div>
631
                                                    [% END %]
632
                                                [% END %]
624
633
625
                                                    [% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %]
634
                                                [% UNLESS ( noissues ) %]
626
                                                        [% IF ( SpecifyDueDate ) %]
635
                                                    <div id="set-automatic-renewal" class="circ-setting">
627
                                                            <div id="specify-due-date" class="circ-setting">
636
                                                        [% IF NEEDSCONFIRMATION %]
628
                                                                <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
637
                                                            [% IF auto_renew %]
629
                                                                [% IF ( duedatespec ) %]
638
                                                                [% IF patron.autorenew_checkouts %]
630
                                                                    <input type="text" size="20" id="duedatespec" name="duedatespec" value="[% duedatespec | $KohaDates with_hours => 1 %]" />
639
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
631
                                                                [% ELSE %]
640
                                                                    title="Patron has opted out of auto-renewal"/>
632
                                                                    <input type="text" size="20" id="duedatespec" name="duedatespec" value="" />
633
                                                                [% END %]
634
                                                                <label for="stickyduedate"> Remember for session:</label>
635
                                                                [% IF ( stickyduedate ) %]
636
                                                                    <input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" checked="checked" />
637
                                                                [% ELSE %]
641
                                                                [% ELSE %]
638
                                                                    <input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" />
642
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" checked="checked" />
639
                                                                [% END %]
643
                                                                [% END %]
640
                                                            </div>
644
                                                            [% ELSE %]
645
                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
646
                                                            [% END %]
647
                                                        [% ELSE %]
648
                                                            [% IF ( auto_renew && patron.autorenew_checkouts ) %]
649
                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" checked="checked" />
650
                                                            [% ELSIF patron.autorenew_checkouts %]
651
                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" />
652
                                                            [% ELSE %]
653
                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
654
                                                                title="Patron has opted out of auto-renewal"/>
655
                                                            [% END %]
641
                                                        [% END %]
656
                                                        [% END %]
642
                                                    [% END %]
643
657
644
                                                    [% UNLESS ( noissues ) %]
658
                                                        <label for="auto_renew">Automatic renewal</label>
645
                                                        <div id="set-automatic-renewal" class="circ-setting">
659
                                                    </div>
660
                                                    [% IF Koha.Preference('decreaseLoanHighHolds') %]
661
                                                        <div id="set_high_holds_overrride" class="circ-setting">
646
                                                            [% IF NEEDSCONFIRMATION %]
662
                                                            [% IF NEEDSCONFIRMATION %]
647
                                                                [% IF auto_renew %]
663
                                                                [% IF override_high_holds %]
648
                                                                    [% IF patron.autorenew_checkouts %]
664
                                                                    <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" disabled="disabled" checked="checked"/>
649
                                                                        <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
650
                                                                        title="Patron has opted out of auto-renewal"/>
651
                                                                    [% ELSE %]
652
                                                                        <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" checked="checked" />
653
                                                                    [% END %]
654
                                                                [% ELSE %]
665
                                                                [% ELSE %]
655
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
666
                                                                    <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" disabled="disabled"/>
656
                                                                [% END %]
667
                                                                [% END %]
657
                                                            [% ELSE %]
668
                                                            [% ELSE %]
658
                                                                [% IF ( auto_renew && patron.autorenew_checkouts ) %]
669
                                                                [% IF override_high_holds %]
659
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" checked="checked" />
670
                                                                    <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" class="circ_setting" checked="checked" />
660
                                                                [% ELSIF patron.autorenew_checkouts %]
661
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" />
662
                                                                [% ELSE %]
671
                                                                [% ELSE %]
663
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
672
                                                                    <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" class="circ_setting" />
664
                                                                    title="Patron has opted out of auto-renewal"/>
665
                                                                [% END %]
673
                                                                [% END %]
666
                                                            [% END %]
674
                                                            [% END %]
667
675
                                                            <label for="override_high_holds">Don't decrease checkout length based on holds</label>
668
                                                            <label for="auto_renew">Automatic renewal</label>
669
                                                        </div>
676
                                                        </div>
670
                                                        [% IF Koha.Preference('decreaseLoanHighHolds') %]
671
                                                            <div id="set_high_holds_overrride" class="circ-setting">
672
                                                                [% IF NEEDSCONFIRMATION %]
673
                                                                    [% IF override_high_holds %]
674
                                                                        <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" disabled="disabled" checked="checked"/>
675
                                                                    [% ELSE %]
676
                                                                        <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" disabled="disabled"/>
677
                                                                    [% END %]
678
                                                                [% ELSE %]
679
                                                                    [% IF override_high_holds %]
680
                                                                        <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" class="circ_setting" checked="checked" />
681
                                                                    [% ELSE %]
682
                                                                        <input type="checkbox" name="override_high_holds" id="override_high_holds" value="1" class="circ_setting" />
683
                                                                    [% END %]
684
                                                                [% END %]
685
                                                                <label for="override_high_holds">Don't decrease checkout length based on holds</label>
686
                                                            </div>
687
                                                        [% END %]
688
                                                    [% END %]
677
                                                    [% END %]
678
                                                [% END %]
689
679
690
                                                    [% IF Koha.Preference('OnSiteCheckouts') %]
680
                                                [% IF Koha.Preference('OnSiteCheckouts') %]
691
                                                        <div id="onsite_checkout-select" class="circ-setting">
681
                                                    <div id="onsite_checkout-select" class="circ-setting">
692
                                                            [% IF noissues %]
682
                                                        [% IF noissues %]
693
                                                                <div class="onsite-checkout-only">
683
                                                            <div class="onsite-checkout-only">
694
                                                                    <input type="checkbox" id="onsite_checkout" name="onsite_checkout_forced" checked="checked" disabled="disabled" /> <label for="onsite_checkout">On-site checkouts only. Automatic due date: </label>
684
                                                                <input type="checkbox" id="onsite_checkout" name="onsite_checkout_forced" checked="checked" disabled="disabled" /> <label for="onsite_checkout">On-site checkouts only. Automatic due date: </label>
695
                                                                    <input type="text" name="duedatespec" id="duedatespec" />
685
                                                                <input type="text" name="duedatespec" id="duedatespec" />
696
                                                                    <input type="hidden" name="onsite_checkout" checked="checked" value="1" />
686
                                                                <input type="hidden" name="onsite_checkout" checked="checked" value="1" />
697
                                                                </div>
687
                                                            </div>
688
                                                        [% ELSE %]
689
                                                            [% IF Koha.Preference('OnSiteCheckoutAutoCheck') && onsite_checkout == "on" %]
690
                                                            <input type="checkbox" id="onsite_checkout" name="onsite_checkout" class="circ_setting" checked="checked" /> <label for="onsite_checkout">On-site checkout</label>
698
                                                            [% ELSE %]
691
                                                            [% ELSE %]
699
                                                                [% IF Koha.Preference('OnSiteCheckoutAutoCheck') && onsite_checkout == "on" %]
692
                                                            <input type="checkbox" id="onsite_checkout" name="onsite_checkout" class="circ_setting" /> <label for="onsite_checkout">On-site checkout</label>
700
                                                                <input type="checkbox" id="onsite_checkout" name="onsite_checkout" class="circ_setting" checked="checked" /> <label for="onsite_checkout">On-site checkout</label>
701
                                                                [% ELSE %]
702
                                                                <input type="checkbox" id="onsite_checkout" name="onsite_checkout" class="circ_setting" /> <label for="onsite_checkout">On-site checkout</label>
703
                                                                [% END %]
704
                                                            [% END %]
693
                                                            [% END %]
705
                                                        </div>
694
                                                        [% END %]
706
                                                    [% END %]
695
                                                    </div>
707
708
                                                </div> <!-- /.circ-settings -->
709
710
                                                <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" />
711
                                                <input type="hidden" name="branch" value="[% branch | html %]" />
712
                                                <input type="hidden" name="debt_confirmed" value="[% debt_confirmed | html %]" />
713
                                                [% IF ( CHARGES ) %]
714
                                                        <input type="hidden" name="charges" value="yes" />
715
                                                [% END %]
696
                                                [% END %]
716
                                            </fieldset> <!-- /#circ_circulation_issue -->
717
718
                                            [% IF ( issue ) %]
719
                                                <div class="lastchecked">
720
                                                    <p><strong>Checked out: </strong>[% issue.item.biblio.title | html %] ([% issue.item.barcode | html %]). Due on [% issue.date_due | $KohaDates as_due_date => 1 %]</p>
721
                                                </div>
722
                                            [% END %]
723
                                        </form> <!-- /#mainform -->
724
                                    </div> <!-- /.col-sm-6 -->
725
697
726
                                [% END #/IF !noissues %]
698
                                            </div> <!-- /.circ-settings -->
727
699
728
                                [% IF ( noissues ) %]
700
                                            <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" />
729
                                    [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
701
                                            <input type="hidden" name="branch" value="[% branch | html %]" />
730
                                        <div class="col-sm-6">
702
                                            <input type="hidden" name="debt_confirmed" value="[% debt_confirmed | html %]" />
731
                                    [% ELSE %]
703
                                            [% IF ( CHARGES ) %]
732
                                        <div>
704
                                                    <input type="hidden" name="charges" value="yes" />
733
                                    [% END %]
705
                                            [% END %]
734
                                [% ELSE %]
706
                                        </fieldset> <!-- /#circ_circulation_issue -->
735
                                    <div class="col-sm-6">
736
                                [% END %]
737
707
738
                                [% IF ( noissues ) %]
708
                                        [% IF ( issue ) %]
739
                                    [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
709
                                            <div class="lastchecked">
740
                                        <div id="circmessages" class="circmessage attention">
710
                                                <p><strong>Checked out: </strong>[% issue.item.biblio.title | html %] ([% issue.item.barcode | html %]). Due on [% issue.date_due | $KohaDates as_due_date => 1 %]</p>
741
                                    [% ELSE %]
711
                                            </div>
742
                                        <h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4>
743
                                        <div id="circmessages" class="circmessage warning">
744
                                    [% END %]
745
                                    <h3>
746
                                        Cannot check out!
747
                                        [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
748
                                            <span class="circ-hlt">Only on-site checkouts are allowed</span>
749
                                        [% END %]
712
                                        [% END %]
750
                                    </h3>
713
                                    </form> <!-- /#mainform -->
751
                                [% ELSE %]
714
                                </div> <!-- /.col-sm-6 -->
752
                                    <div id="circmessages" class="circmessage attention">
753
                                [% END %]
754
755
                                [% INCLUDE 'patron_messages.inc' %]
756
715
757
                            </div> <!-- /#circmessages -->
716
                            [% END #/IF !noissues %]
758
                        </div> <!-- /div or div.col-sm-6 -->
759
                    </div> <!-- /.row -->
760
717
761
                    <div id="patronlists" class="toptabs">
718
                            [% IF ( noissues ) %]
762
                        <ul>
719
                                [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
763
                            <li>
720
                                    <div class="col-sm-6">
764
                                [% IF ( issuecount ) %]
765
                                    <a href="#checkouts">[% issuecount | html %] Checkout(s)</a>
766
                                [% ELSE %]
721
                                [% ELSE %]
767
                                    <a href="#checkouts">0 Checkouts</a>
722
                                    <div>
768
                                [% END %]
723
                                [% END %]
769
                            </li>
724
                            [% ELSE %]
770
725
                                <div class="col-sm-6">
771
                            [% IF relatives_issues_count %]
772
                                <li><a id="relatives-issues-tab" href="#relatives-issues">[% relatives_issues_count | html %] Relatives' checkouts</a></li>
773
                            [% END %]
726
                            [% END %]
774
727
775
                            <li>
728
                            [% IF ( noissues ) %]
776
                                [% IF ( holds_count ) %]
729
                                [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
777
                                    <a href="#reserves" id="holds-tab">[% holds_count | html %] Hold(s)</a>
730
                                    <div id="circmessages" class="circmessage attention">
778
                                [% ELSE %]
731
                                [% ELSE %]
779
                                    <a href="#reserves" id="holds-tab">0 Holds</a>
732
                                    <h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4>
733
                                    <div id="circmessages" class="circmessage warning">
780
                                [% END %]
734
                                [% END %]
781
                            </li>
735
                                <h3>
782
736
                                    Cannot check out!
783
                            [% IF Koha.Preference('ArticleRequests') %]
737
                                    [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
784
                                [% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
738
                                        <span class="circ-hlt">Only on-site checkouts are allowed</span>
785
                                <li>
739
                                    [% END %]
786
                                    <a href="#article-requests" id="article-requests-tab"> [% current_article_requests.count | html %] Article requests</a>
740
                                </h3>
787
                                </li>
741
                            [% ELSE %]
742
                                <div id="circmessages" class="circmessage attention">
788
                            [% END %]
743
                            [% END %]
789
744
790
                            [% IF Koha.Preference('ClaimReturnedLostValue') %]
745
                            [% INCLUDE 'patron_messages.inc' %]
791
                                <li>
746
792
                                    [% IF ( patron.return_claims.count ) %]
747
                        </div> <!-- /#circmessages -->
793
                                        <a href="#return-claims" id="return-claims-tab">
748
                    </div> <!-- /div or div.col-sm-6 -->
794
                                            Claim(s)
749
                </div> <!-- /.row -->
795
                                            [% IF patron.return_claims.resolved.count == 0 %]
750
796
                                                <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
751
                <div id="patronlists" class="toptabs">
797
                                            [% ELSE %]
752
                    <ul>
798
                                                <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
753
                        <li>
799
                                            [% END %]
754
                            [% IF ( issuecount ) %]
800
                                            [% IF patron.return_claims.unresolved.count == 0 %]
755
                                <a href="#checkouts">[% issuecount | html %] Checkout(s)</a>
801
                                                <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
756
                            [% ELSE %]
802
                                            [% ELSE %]
757
                                <a href="#checkouts">0 Checkouts</a>
803
                                                <span title="Unresolved claims" class="label label-warning" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
804
                                            [% END %]
805
                                        </a>
806
                                    [% ELSE %]
807
                                        <a href="#return-claims" id="return-claims-tab">
808
                                            Claim(s)
809
                                            <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
810
                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>
811
                                        </a>
812
                                    [% END %]
813
                                </li>
814
                            [% END %]
758
                            [% END %]
759
                        </li>
815
760
816
                            <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.count | html %] Restrictions</a></li>
761
                        [% IF relatives_issues_count %]
762
                            <li><a id="relatives-issues-tab" href="#relatives-issues">[% relatives_issues_count | html %] Relatives' checkouts</a></li>
763
                        [% END %]
817
764
818
                            [% SET enrollments = patron.get_club_enrollments(1) %]
765
                        <li>
819
                            [% SET enrollable  = patron.get_enrollable_clubs(0,1) %]
766
                            [% IF ( holds_count ) %]
820
                            [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
767
                                <a href="#reserves" id="holds-tab">[% holds_count | html %] Hold(s)</a>
821
                                <li>
768
                            [% ELSE %]
822
                                    <a id="clubs-tab-link" href="#clubs-tab">
769
                                <a href="#reserves" id="holds-tab">0 Holds</a>
823
                                        Clubs ([% enrollments.count | html %]/[% enrollable.count | html %])
824
                                    </a>
825
                                </li>
826
                            [% END %]
770
                            [% END %]
827
                        </ul>
771
                        </li>
828
772
829
                        <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
773
                        [% IF Koha.Preference('ArticleRequests') %]
774
                            [% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
775
                            <li>
776
                                <a href="#article-requests" id="article-requests-tab"> [% current_article_requests.count | html %] Article requests</a>
777
                            </li>
778
                        [% END %]
830
779
831
                        [% INCLUDE "checkouts-table.inc" %]
780
                        [% IF Koha.Preference('ClaimReturnedLostValue') %]
781
                            <li>
782
                                [% IF ( patron.return_claims.count ) %]
783
                                    <a href="#return-claims" id="return-claims-tab">
784
                                        Claim(s)
785
                                        [% IF patron.return_claims.resolved.count == 0 %]
786
                                            <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
787
                                        [% ELSE %]
788
                                            <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
789
                                        [% END %]
790
                                        [% IF patron.return_claims.unresolved.count == 0 %]
791
                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
792
                                        [% ELSE %]
793
                                            <span title="Unresolved claims" class="label label-warning" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
794
                                        [% END %]
795
                                    </a>
796
                                [% ELSE %]
797
                                    <a href="#return-claims" id="return-claims-tab">
798
                                        Claim(s)
799
                                        <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
800
                                        <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>
801
                                    </a>
802
                                [% END %]
803
                            </li>
804
                        [% END %]
832
805
833
                        [% INCLUDE "relatives-issues-table.inc" %]
806
                        <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.count | html %] Restrictions</a></li>
834
807
808
                        [% SET enrollments = patron.get_club_enrollments(1) %]
809
                        [% SET enrollable  = patron.get_enrollable_clubs(0,1) %]
835
                        [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
810
                        [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
836
                            <div id="clubs-tab">
811
                            <li>
837
                                Loading...
812
                                <a id="clubs-tab-link" href="#clubs-tab">
838
                            </div> <!-- /#clubs-tab -->
813
                                    Clubs ([% enrollments.count | html %]/[% enrollable.count | html %])
814
                                </a>
815
                            </li>
839
                        [% END %]
816
                        [% END %]
817
                    </ul>
840
818
841
                        [% INCLUDE borrower_debarments.inc %]
819
                    <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
842
820
843
                        <div id="reserves">
821
                    [% INCLUDE "checkouts-table.inc" %]
844
                            [% IF ( holds_count ) %]
845
                                <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
846
                                    <input type="hidden" name="from" value="circ" />
847
                                    <table id="holds-table" style="width: 100% !Important;">
848
                                        <thead>
849
                                            <tr>
850
                                                <th>Hold date</th>
851
                                                <th>Title</th>
852
                                                <th>Call number</th>
853
                                                <th>Barcode</th>
854
                                                <th>Pickup at</th>
855
                                                <th>Expiration</th>
856
                                                <th>Priority</th>
857
                                                <th>Cancel?</th>
858
                                                <th>Suspend?</th>
859
                                                <th>Status</th>
860
                                            </tr>
861
                                        </thead>
862
                                    </table>
863
864
                                    <fieldset class="action">
865
                                        <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
866
867
                                        [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
868
                                        [% IF hold_cancellation %]
869
                                            <select name="cancellation-reason">
870
                                                <option value="">No reason given</option>
871
                                                [% FOREACH reason IN hold_cancellation %]
872
                                                    <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
873
                                                [% END %]
874
                                            </select>
875
                                        [% END %]
876
                                    </fieldset>
877
                                </form>
878
822
879
                                [% IF Koha.Preference('SuspendHoldsIntranet') %]
823
                    [% INCLUDE "relatives-issues-table.inc" %]
880
                                    <fieldset class="action">
881
                                        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
882
                                            <input type="hidden" name="from" value="circ" />
883
                                            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
884
                                            <input type="submit" value="Suspend all holds" />
885
886
                                            [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
887
                                            <label for="suspend_until">until</label>
888
                                            <input type="text" size="10" id="suspend_until" name="suspend_until" class="flatpickr futuredate"/>
889
                                            <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
890
                                             [% END %]
891
                                        </form>
892
                                    </fieldset>
893
894
                                    <fieldset class="action">
895
                                        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
896
                                            <input type="hidden" name="from" value="circ" />
897
                                            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
898
                                            <input type="hidden" name="suspend" value="0" />
899
                                            <input type="submit" value="Resume all suspended holds" />
900
                                        </form>
901
                                    </fieldset>
902
                                [% END # /IF SuspendHoldsIntranet %]
903
904
                            [% ELSE # IF holds_count %]
905
                                <p>Patron has nothing on hold.</p>
906
                            [% END # /IF holds_count %]
907
                        </div> <!-- /#reserves -->
908
824
909
                        [% IF Koha.Preference('ClaimReturnedLostValue') %]
825
                    [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
910
                            [% INCLUDE 'patron-return-claims.inc' %]
826
                        <div id="clubs-tab">
911
                        [% END %]
827
                            Loading...
828
                        </div> <!-- /#clubs-tab -->
829
                    [% END %]
912
830
913
                        [% IF Koha.Preference('ArticleRequests') %]
831
                    [% INCLUDE borrower_debarments.inc %]
914
                            [% INCLUDE 'patron-article-requests.inc' %]
832
915
                        [% END %]
833
                    <div id="reserves">
834
                        [% IF ( holds_count ) %]
835
                            <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
836
                                <input type="hidden" name="from" value="circ" />
837
                                <table id="holds-table" style="width: 100% !Important;">
838
                                    <thead>
839
                                        <tr>
840
                                            <th>Hold date</th>
841
                                            <th>Title</th>
842
                                            <th>Call number</th>
843
                                            <th>Barcode</th>
844
                                            <th>Pickup at</th>
845
                                            <th>Expiration</th>
846
                                            <th>Priority</th>
847
                                            <th>Cancel?</th>
848
                                            <th>Suspend?</th>
849
                                            <th>Status</th>
850
                                        </tr>
851
                                    </thead>
852
                                </table>
853
854
                                <fieldset class="action">
855
                                    <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
856
857
                                    [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
858
                                    [% IF hold_cancellation %]
859
                                        <select name="cancellation-reason">
860
                                            <option value="">No reason given</option>
861
                                            [% FOREACH reason IN hold_cancellation %]
862
                                                <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
863
                                            [% END %]
864
                                        </select>
865
                                    [% END %]
866
                                </fieldset>
867
                            </form>
868
869
                            [% IF Koha.Preference('SuspendHoldsIntranet') %]
870
                                <fieldset class="action">
871
                                    <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
872
                                        <input type="hidden" name="from" value="circ" />
873
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
874
                                        <input type="submit" value="Suspend all holds" />
875
876
                                        [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
877
                                        <label for="suspend_until">until</label>
878
                                        <input type="text" size="10" id="suspend_until" name="suspend_until" class="flatpickr futuredate"/>
879
                                        <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
880
                                         [% END %]
881
                                    </form>
882
                                </fieldset>
883
884
                                <fieldset class="action">
885
                                    <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
886
                                        <input type="hidden" name="from" value="circ" />
887
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
888
                                        <input type="hidden" name="suspend" value="0" />
889
                                        <input type="submit" value="Resume all suspended holds" />
890
                                    </form>
891
                                </fieldset>
892
                            [% END # /IF SuspendHoldsIntranet %]
893
894
                        [% ELSE # IF holds_count %]
895
                            <p>Patron has nothing on hold.</p>
896
                        [% END # /IF holds_count %]
897
                    </div> <!-- /#reserves -->
898
899
                    [% IF Koha.Preference('ClaimReturnedLostValue') %]
900
                        [% INCLUDE 'patron-return-claims.inc' %]
901
                    [% END %]
916
902
917
                    </div> <!-- /#patronlists -->
903
                    [% IF Koha.Preference('ArticleRequests') %]
918
                    [% ELSIF borrowernumber # IF patron %]
904
                        [% INCLUDE 'patron-article-requests.inc' %]
919
                        <div class="dialog message">Patron not found. <a href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
905
                    [% END %]
920
                    [% END # /IF patron %]
921
906
922
                [% END #/IF borrowers %]
907
                </div> <!-- /#patronlists -->
908
                [% ELSIF borrowernumber # IF patron %]
909
                    <div class="dialog message">Patron not found. <a href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
910
                [% END # /IF patron %]
923
911
924
                </div> <!-- /.col-sm-10.col-sm-push-2 -->
912
                </div> <!-- /.col-sm-10.col-sm-push-2 -->
925
913
926
                [% IF Koha.Preference('CircSidebar') %]
914
                [% IF Koha.Preference('CircSidebar') %]
927
                    [% UNLESS ( borrowers ) %]
915
                    [% IF not( borrowernumber and patron ) %]
928
                        [% IF not( borrowernumber and patron ) %]
916
                        <div class="col-sm-2 col-sm-pull-10">
929
                            <div class="col-sm-2 col-sm-pull-10">
917
                            <aside>
930
                                <aside>
918
                                [% INCLUDE 'circ-nav.inc' %]
931
                                    [% INCLUDE 'circ-nav.inc' %]
919
                            </aside>
932
                                </aside>
920
                        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
933
                            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
934
                        [% END %]
935
                    [% END %]
921
                    [% END %]
936
                [% END %]
922
                [% END %]
937
923
938
                [% UNLESS ( borrowers ) %]
924
                [% IF borrowernumber and patron %]
939
                    [% IF borrowernumber and patron %]
925
                        <div class="col-sm-2 col-sm-pull-10">
940
                            <div class="col-sm-2 col-sm-pull-10">
926
                            <aside>
941
                                <aside>
927
                        [% INCLUDE 'circ-menu.inc' %]
942
                            [% INCLUDE 'circ-menu.inc' %]
928
                            </aside>
943
                                </aside>
929
                        </div> <!-- /.col-sm-2 col-sm-pull-10 -->
944
                            </div> <!-- /.col-sm-2 col-sm-pull-10 -->
945
                    [% END %]
946
                [% END %]
930
                [% END %]
947
931
948
            </div> <!-- /.row -->
932
            </div> <!-- /.row -->
Lines 995-1001 Link Here
995
    [% Asset.js("js/pages/circulation.js") | $raw %]
979
    [% Asset.js("js/pages/circulation.js") | $raw %]
996
    [% Asset.js("js/checkouts.js") | $raw %]
980
    [% Asset.js("js/checkouts.js") | $raw %]
997
    [% Asset.js("js/holds.js") | $raw %]
981
    [% Asset.js("js/holds.js") | $raw %]
998
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
999
    <script>
982
    <script>
1000
        columns_settings_issues_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
983
        columns_settings_issues_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
1001
        columns_settings_borrowers_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
984
        columns_settings_borrowers_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
Lines 1008-1014 Link Here
1008
            Cookies.remove("holdfor", { path: '/' });
991
            Cookies.remove("holdfor", { path: '/' });
1009
        [% END %]
992
        [% END %]
1010
993
1011
        [% UNLESS ( patron.borrowernumber ) %][% UNLESS ( borrowers ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
994
        [% UNLESS ( patron.borrowernumber ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %]
1012
995
1013
        // On-site checkout
996
        // On-site checkout
1014
        function toggle_onsite_checkout(){
997
        function toggle_onsite_checkout(){
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt (-1 / +1 lines)
Lines 16-22 Link Here
16
                    "<input type='checkbox' id='check[% data.borrowernumber | html %]' class='selection' name='borrowernumber' value='[% data.borrowernumber | html %]' />",
16
                    "<input type='checkbox' id='check[% data.borrowernumber | html %]' class='selection' name='borrowernumber' value='[% data.borrowernumber | html %]' />",
17
                [% END %]
17
                [% END %]
18
                "dt_cardnumber":
18
                "dt_cardnumber":
19
                    "<label for='check[% data.borrowernumber | html %]'>[% data.cardnumber | html | $To %]</label>",
19
                "<label for='check[% data.borrowernumber | html %]'>[% data.cardnumber | html | $To %]</br><a class='btn' href='/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | html %]'>Check out</a></label>",
20
                "dt_name":
20
                "dt_name":
21
                    "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 | $To %]</a><br /><div class='address'><ul>[%~ INCLUDE 'display-address-style' patron=data no_line_break=1 | $To ~%][% IF data.email %]<li>Email: <a href='mailto:[% data.email | html | $To %]'>[% data.email | html | $To %]</a></li>[% END %]</ul></div>",
21
                    "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 | $To %]</a><br /><div class='address'><ul>[%~ INCLUDE 'display-address-style' patron=data no_line_break=1 | $To ~%][% IF data.email %]<li>Email: <a href='mailto:[% data.email | html | $To %]'>[% data.email | html | $To %]</a></li>[% END %]</ul></div>",
22
    "dt_dateofbirth":
22
    "dt_dateofbirth":
(-)a/members/member.pl (-3 / +4 lines)
Lines 43-50 my $theme = $input->param('theme') || "default"; Link Here
43
43
44
my $searchmember = $input->param('searchmember');
44
my $searchmember = $input->param('searchmember');
45
my $quicksearch = $input->param('quicksearch') // 0;
45
my $quicksearch = $input->param('quicksearch') // 0;
46
my $circsearch = $input->param('circsearch') // 0;
46
47
47
if ( $quicksearch and $searchmember ) {
48
if ( $quicksearch and $searchmember && !$circsearch ) {
48
    my $branchcode;
49
    my $branchcode;
49
    if ( C4::Context::only_my_library ) {
50
    if ( C4::Context::only_my_library ) {
50
        my $userenv = C4::Context->userenv;
51
        my $userenv = C4::Context->userenv;
Lines 66-72 my $searchfieldstype = $input->param('searchfieldstype') || 'standard'; Link Here
66
67
67
$template->param( 'alphabet' => C4::Context->preference('alphabet') || join ' ', 'A' .. 'Z' );
68
$template->param( 'alphabet' => C4::Context->preference('alphabet') || join ' ', 'A' .. 'Z' );
68
69
69
my $view = $input->request_method() eq "GET" ? "show_form" : "show_results";
70
my $view = $input->request_method() eq "GET"  && !$circsearch ? "show_form" : "show_results";
70
71
71
$template->param(
72
$template->param(
72
    patron_lists => [ GetPatronLists() ],
73
    patron_lists => [ GetPatronLists() ],
Lines 77-82 $template->param( Link Here
77
    searchfieldstype    => $searchfieldstype,
78
    searchfieldstype    => $searchfieldstype,
78
    PatronsPerPage      => C4::Context->preference("PatronsPerPage") || 20,
79
    PatronsPerPage      => C4::Context->preference("PatronsPerPage") || 20,
79
    view                => $view,
80
    view                => $view,
81
    circsearch          => $circsearch,
80
);
82
);
81
83
82
output_html_with_http_headers $input, $cookie, $template->output;
84
output_html_with_http_headers $input, $cookie, $template->output;
83
- 

Return to bug 15812