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

(-)a/circ/circulation.pl (-7 lines)
Lines 288-294 if ($borrowernumber) { Link Here
288
    {
288
    {
289
        #borrowercard expired, no issues
289
        #borrowercard expired, no issues
290
        $template->param(
290
        $template->param(
291
            flagged  => "1",
292
            noissues => ($force_allow_issue) ? 0 : "1",
291
            noissues => ($force_allow_issue) ? 0 : "1",
293
            forceallow => $force_allow_issue,
292
            forceallow => $force_allow_issue,
294
            expired => "1",
293
            expired => "1",
Lines 301-307 if ($borrowernumber) { Link Here
301
    {
300
    {
302
        # borrower card soon to expire warn librarian
301
        # borrower card soon to expire warn librarian
303
        $template->param( "warndeparture" => $borrower->{dateexpiry} ,
302
        $template->param( "warndeparture" => $borrower->{dateexpiry} ,
304
                          flagged         => "1"
305
                        );
303
                        );
306
        if (C4::Context->preference('ReturnBeforeExpiry')){
304
        if (C4::Context->preference('ReturnBeforeExpiry')){
307
            $template->param("returnbeforeexpiry" => 1);
305
            $template->param("returnbeforeexpiry" => 1);
Lines 470-476 if ($borrowernumber) { Link Here
470
#title
468
#title
471
my $flags = $borrower->{'flags'};
469
my $flags = $borrower->{'flags'};
472
foreach my $flag ( sort keys %$flags ) {
470
foreach my $flag ( sort keys %$flags ) {
473
    $template->param( flagged=> 1);
474
    $flags->{$flag}->{'message'} =~ s#\n#<br />#g;
471
    $flags->{$flag}->{'message'} =~ s#\n#<br />#g;
475
    if ( $flags->{$flag}->{'noissues'} ) {
472
    if ( $flags->{$flag}->{'noissues'} ) {
476
        $template->param(
473
        $template->param(
Lines 563-572 my $patron_messages = Koha::Patron::Messages->search( Link Here
563
    }
560
    }
564
);
561
);
565
562
566
if( $librarian_messages->count or $patron_messages->count ) {
567
    $template->param(flagged => 1)
568
}
569
570
my $fast_cataloging = 0;
563
my $fast_cataloging = 0;
571
if (defined getframeworkinfo('FA')) {
564
if (defined getframeworkinfo('FA')) {
572
    $fast_cataloging = 1 
565
    $fast_cataloging = 1 
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-12 / +2 lines)
Lines 409-415 $(document).ready(function() { Link Here
409
</form>
409
</form>
410
410
411
[% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]
411
[% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]
412
    [% UNLESS flagged && noissues %]
412
    [% UNLESS noissues %]
413
        <button type="submit" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% borrowernumber %]'"><i class="fa fa-times-circle"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>
413
        <button type="submit" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% borrowernumber %]'"><i class="fa fa-times-circle"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>
414
    [% END %]
414
    [% END %]
415
[% END %]
415
[% END %]
Lines 607-618 No patron matched <span class="ex">[% message %]</span> Link Here
607
[% END %]
607
[% END %]
608
608
609
[% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%]
609
[% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%]
610
[% IF ( flagged ) %]
611
<div class="yui-u first">
610
<div class="yui-u first">
612
[% ELSE %]
613
<div>
614
615
[% END %]
616
611
617
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
612
<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
618
    <input type="hidden" name="restoreduedatespec" />
613
    <input type="hidden" name="restoreduedatespec" />
Lines 638-644 No patron matched <span class="ex">[% message %]</span> Link Here
638
    [% END %]
633
    [% END %]
639
    <button type="submit" class="btn">Check out</button>
634
    <button type="submit" class="btn">Check out</button>
640
635
641
    [% UNLESS flagged and noissues %]
636
    [% UNLESS noissues %]
642
        <div class="date-select">
637
        <div class="date-select">
643
            [% IF NEEDSCONFIRMATION %]
638
            [% IF NEEDSCONFIRMATION %]
644
                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
639
                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
Lines 713-719 No patron matched <span class="ex">[% message %]</span> Link Here
713
    <div class="yui-u">
708
    <div class="yui-u">
714
[% END %]
709
[% END %]
715
710
716
    [% IF flagged %]
717
        [% IF ( noissues ) %]
711
        [% IF ( noissues ) %]
718
            [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
712
            [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
719
                <div id="circmessages" class="circmessage attention">
713
                <div id="circmessages" class="circmessage attention">
Lines 862-870 No patron matched <span class="ex">[% message %]</span> Link Here
862
        </ul>
856
        </ul>
863
    </div>
857
    </div>
864
858
865
     <!-- /If flagged -->[% END %]
866
867
	
868
</div>
859
</div>
869
</div>
860
</div>
870
861
871
- 

Return to bug 16125