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

(-)a/circ/returns.pl (-66 lines)
Lines 474-545 foreach my $code ( keys %$messages ) { Link Here
474
}
474
}
475
$template->param( errmsgloop => \@errmsgloop );
475
$template->param( errmsgloop => \@errmsgloop );
476
476
477
# patrontable ....
478
if ($borrower) {
479
    my $flags = $borrower->{'flags'};
480
    my @flagloop;
481
    my $flagset;
482
    foreach my $flag ( sort keys %$flags ) {
483
        my %flaginfo;
484
        unless ($flagset) { $flagset = 1; }
485
        $flaginfo{redfont} = ( $flags->{$flag}->{'noissues'} );
486
        $flaginfo{flag}    = $flag;
487
        if ( $flag eq 'CHARGES' ) {
488
            $flaginfo{msg}            = $flag;
489
            $flaginfo{charges}        = 1;
490
            $flaginfo{chargeamount}   = $flags->{$flag}->{amount};
491
            $flaginfo{borrowernumber} = $borrower->{borrowernumber};
492
        }
493
        elsif ( $flag eq 'WAITING' ) {
494
            $flaginfo{msg}     = $flag;
495
            $flaginfo{waiting} = 1;
496
            my @waitingitemloop;
497
            my $items = $flags->{$flag}->{'itemlist'};
498
            foreach my $item (@$items) {
499
                my $biblio = GetBiblioFromItemNumber( $item->{'itemnumber'});
500
                push @waitingitemloop, {
501
                    biblionum => $biblio->{'biblionumber'},
502
                    barcode   => $biblio->{'barcode'},
503
                    title     => $biblio->{'title'},
504
                    brname    => $branches->{ $biblio->{'holdingbranch'} }->{'branchname'},
505
                };
506
            }
507
            $flaginfo{itemloop} = \@waitingitemloop;
508
        }
509
        elsif ( $flag eq 'ODUES' ) {
510
            my $items = $flags->{$flag}->{'itemlist'};
511
            my @itemloop;
512
            foreach my $item ( sort { $a->{'date_due'} cmp $b->{'date_due'} }
513
                @$items )
514
            {
515
                my $biblio = GetBiblioFromItemNumber( $item->{'itemnumber'});
516
                push @itemloop, {
517
                    duedate   => format_sqldatetime($item->{date_due}),
518
                    biblionum => $biblio->{'biblionumber'},
519
                    barcode   => $biblio->{'barcode'},
520
                    title     => $biblio->{'title'},
521
                    brname    => $branches->{ $biblio->{'holdingbranch'} }->{'branchname'},
522
                };
523
            }
524
            $flaginfo{itemloop} = \@itemloop;
525
            $flaginfo{overdue}  = 1;
526
        }
527
        else {
528
            $flaginfo{other} = 1;
529
            $flaginfo{msg}   = $flags->{$flag}->{'message'};
530
        }
531
        push( @flagloop, \%flaginfo );
532
    }
533
    $template->param(
534
        flagset          => $flagset,
535
        flagloop         => \@flagloop,
536
        riborrowernumber => $borrower->{'borrowernumber'},
537
        riborcnum        => $borrower->{'cardnumber'},
538
        riborsurname     => $borrower->{'surname'},
539
        ribortitle       => $borrower->{'title'},
540
        riborfirstname   => $borrower->{'firstname'}
541
    );
542
}
543
#set up so only the last 8 returned items display (make for faster loading pages)
477
#set up so only the last 8 returned items display (make for faster loading pages)
544
my $returned_counter = ( C4::Context->preference('numReturnedItemsToShow') ) ? C4::Context->preference('numReturnedItemsToShow') : 8;
478
my $returned_counter = ( C4::Context->preference('numReturnedItemsToShow') ) ? C4::Context->preference('numReturnedItemsToShow') : 8;
545
my $count = 0;
479
my $count = 0;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-19 lines)
Lines 407-430 $(document).ready(function () { Link Here
407
    </form>
407
    </form>
408
</div>
408
</div>
409
409
410
[% IF ( returned ) %]
411
<div class="yui-g">    <table>
412
        <tr><th>Item information</th><th>Patron information</th></tr>
413
        <tr>
414
            <td>[% title |html %]</td>
415
            <td>
416
417
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riborrowernumber %]">[% riborsurname %], [% ribortitle %] [% riborfirstname %]</a> ([% riborcnum %])
418
                [% IF ( flagset ) %]
419
                ([% FOREACH flagloo IN flagloop %]
420
                [% flagloo.flag %]
421
		[% IF ( flagloo.charges ) %] of [% flagloo.chargeamount %] [% END %]
422
		,
423
                [% END %])[% END %]
424
            </td>
425
        </tr>
426
    </table>
427
[% END %]
428
[% IF ( riloop ) %]
410
[% IF ( riloop ) %]
429
    <h2>Checked-in items</h2>
411
    <h2>Checked-in items</h2>
430
    <table>
412
    <table>
431
- 

Return to bug 8758