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

(-)a/circ/circulation.pl (-9 / +12 lines)
Lines 134-139 my $organisation = $query->param('organisations'); Link Here
134
my $print          = $query->param('print') || q{};
134
my $print          = $query->param('print') || q{};
135
my $newexpiry      = $query->param('dateexpiry');
135
my $newexpiry      = $query->param('dateexpiry');
136
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
136
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
137
my $charges        = $query->param('charges') || q{};
137
138
138
# Check if stickyduedate is turned off
139
# Check if stickyduedate is turned off
139
if ( $barcode ) {
140
if ( $barcode ) {
Lines 167-173 if ( $barcode eq '' && $print eq 'maybe' ) { Link Here
167
}
168
}
168
169
169
my $inprocess = ($barcode eq '') ? '' : $query->param('inprocess');
170
my $inprocess = ($barcode eq '') ? '' : $query->param('inprocess');
170
if ( $barcode eq '' && $query->param('charges') eq 'yes' ) {
171
if ( $barcode eq '' && $charges eq 'yes' ) {
171
    $template->param(
172
    $template->param(
172
        PAYCHARGES     => 'yes',
173
        PAYCHARGES     => 'yes',
173
        borrowernumber => $borrowernumber
174
        borrowernumber => $borrowernumber
Lines 364-370 if ($borrowernumber) { Link Here
364
        $getreserv{suspend}        = $num_res->{'suspend'};
365
        $getreserv{suspend}        = $num_res->{'suspend'};
365
        $getreserv{suspend_until}  = $num_res->{'suspend_until'};
366
        $getreserv{suspend_until}  = $num_res->{'suspend_until'};
366
        #         check if we have a waiting status for reservations
367
        #         check if we have a waiting status for reservations
367
        if ( $num_res->{'found'} eq 'W' ) {
368
        if ( $num_res->{'found'} && $num_res->{'found'} eq 'W' ) {
368
            $getreserv{color}   = 'reserved';
369
            $getreserv{color}   = 'reserved';
369
            $getreserv{waiting} = 1;
370
            $getreserv{waiting} = 1;
370
#     genarate information displaying only waiting reserves
371
#     genarate information displaying only waiting reserves
Lines 455-472 sub build_issue_data { Link Here
455
        $it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref');
456
        $it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref');
456
        $it->{'issuingbranchname'} = GetBranchName($it->{'branchcode'});
457
        $it->{'issuingbranchname'} = GetBranchName($it->{'branchcode'});
457
458
458
        $totalprice += $it->{'replacementprice'};
459
        $totalprice += $it->{'replacementprice'} || 0;
459
        $it->{'itemtype'} = $itemtypeinfo->{'description'};
460
        $it->{'itemtype'} = $itemtypeinfo->{'description'};
460
        $it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'};
461
        $it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'};
461
        $it->{'dd'} = output_pref($it->{'date_due'});
462
        $it->{'dd'} = output_pref($it->{'date_due'});
462
        $it->{'displaydate'} = output_pref($it->{'issuedate'});
463
        $it->{'displaydate'} = output_pref($it->{'issuedate'});
463
        #$it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
464
        #$it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
464
        $it->{'od'} = $it->{'overdue'};
465
        $it->{'od'} = $it->{'overdue'};
465
        ($it->{'author'} eq '') and $it->{'author'} = ' ';
466
        $it->{'author'} ||= ' ';
466
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
467
        $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
467
        $it->{'return_failed'} = $return_failed{$it->{'barcode'}};
468
        $it->{'return_failed'} = $return_failed{$it->{'barcode'}};
468
469
469
        if ( $it->{'issuedate'}."" gt $todaysdate or $it->{'lastreneweddate'} gt $todaysdate ) {
470
        if ( ( $it->{'issuedate'} && $it->{'issuedate'} gt $todaysdate )
471
          || ( $it->{'lastreneweddate'} && $it->{'lastreneweddate'} gt $todaysdate ) ) {
470
            (!$relatives) ? push @todaysissues, $it : push @relissues, $it;
472
            (!$relatives) ? push @todaysissues, $it : push @relissues, $it;
471
        } else {
473
        } else {
472
            (!$relatives) ? push @previousissues, $it : push @relprevissues, $it;
474
            (!$relatives) ? push @previousissues, $it : push @relprevissues, $it;
Lines 641-648 my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch ); Link Here
641
if($bor_messages_loop){ $template->param(flagged => 1 ); }
643
if($bor_messages_loop){ $template->param(flagged => 1 ); }
642
644
643
# Computes full borrower address
645
# Computes full borrower address
644
my (undef, $roadttype_hashref) = &GetRoadTypes();
646
my @fulladdress;
645
my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'};
647
push @fulladdress, $borrower->{'streetnumber'} if ( $borrower->{'streetnumber'} );
648
push @fulladdress, &GetRoadTypeDetails( $borrower->{'streettype'} ) if ( $borrower->{'streettype'} );
649
push @fulladdress, $borrower->{'address'} if ( $borrower->{'address'} );
646
650
647
my $fast_cataloging = 0;
651
my $fast_cataloging = 0;
648
if (defined getframeworkinfo('FA')) {
652
if (defined getframeworkinfo('FA')) {
Lines 676-682 $template->param( Link Here
676
    expiry            => format_date($borrower->{'dateexpiry'}),
680
    expiry            => format_date($borrower->{'dateexpiry'}),
677
    categorycode      => $borrower->{'categorycode'},
681
    categorycode      => $borrower->{'categorycode'},
678
    categoryname      => $borrower->{description},
682
    categoryname      => $borrower->{description},
679
    address           => $address,
683
    address           => join(' ', @fulladdress),
680
    address2          => $borrower->{'address2'},
684
    address2          => $borrower->{'address2'},
681
    email             => $borrower->{'email'},
685
    email             => $borrower->{'email'},
682
    emailpro          => $borrower->{'emailpro'},
686
    emailpro          => $borrower->{'emailpro'},
683
- 

Return to bug 9720