Lines 136-141
my $organisation = $query->param('organisations');
Link Here
|
136 |
my $print = $query->param('print') || q{}; |
136 |
my $print = $query->param('print') || q{}; |
137 |
my $newexpiry = $query->param('dateexpiry'); |
137 |
my $newexpiry = $query->param('dateexpiry'); |
138 |
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice |
138 |
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice |
|
|
139 |
my $charges = $query->param('charges') || q{}; |
139 |
|
140 |
|
140 |
# Check if stickyduedate is turned off |
141 |
# Check if stickyduedate is turned off |
141 |
if ( $barcode ) { |
142 |
if ( $barcode ) { |
Lines 169-175
if ( $barcode eq '' && $print eq 'maybe' ) {
Link Here
|
169 |
} |
170 |
} |
170 |
|
171 |
|
171 |
my $inprocess = ($barcode eq '') ? '' : $query->param('inprocess'); |
172 |
my $inprocess = ($barcode eq '') ? '' : $query->param('inprocess'); |
172 |
if ( $barcode eq '' && $query->param('charges') eq 'yes' ) { |
173 |
if ( $barcode eq '' && $charges eq 'yes' ) { |
173 |
$template->param( |
174 |
$template->param( |
174 |
PAYCHARGES => 'yes', |
175 |
PAYCHARGES => 'yes', |
175 |
borrowernumber => $borrowernumber |
176 |
borrowernumber => $borrowernumber |
Lines 372-378
if ($borrowernumber) {
Link Here
|
372 |
$getreserv{suspend} = $num_res->{'suspend'}; |
373 |
$getreserv{suspend} = $num_res->{'suspend'}; |
373 |
$getreserv{suspend_until} = $num_res->{'suspend_until'}; |
374 |
$getreserv{suspend_until} = $num_res->{'suspend_until'}; |
374 |
# check if we have a waiting status for reservations |
375 |
# check if we have a waiting status for reservations |
375 |
if ( $num_res->{'found'} eq 'W' ) { |
376 |
if ( $num_res->{'found'} && $num_res->{'found'} eq 'W' ) { |
376 |
$getreserv{color} = 'reserved'; |
377 |
$getreserv{color} = 'reserved'; |
377 |
$getreserv{waiting} = 1; |
378 |
$getreserv{waiting} = 1; |
378 |
# genarate information displaying only waiting reserves |
379 |
# genarate information displaying only waiting reserves |
Lines 463-480
sub build_issue_data {
Link Here
|
463 |
$it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref'); |
464 |
$it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref'); |
464 |
$it->{'issuingbranchname'} = GetBranchName($it->{'branchcode'}); |
465 |
$it->{'issuingbranchname'} = GetBranchName($it->{'branchcode'}); |
465 |
|
466 |
|
466 |
$totalprice += $it->{'replacementprice'}; |
467 |
$totalprice += $it->{'replacementprice'} || 0; |
467 |
$it->{'itemtype'} = $itemtypeinfo->{'description'}; |
468 |
$it->{'itemtype'} = $itemtypeinfo->{'description'}; |
468 |
$it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'}; |
469 |
$it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'}; |
469 |
$it->{'dd'} = output_pref($it->{'date_due'}); |
470 |
$it->{'dd'} = output_pref($it->{'date_due'}); |
470 |
$it->{'displaydate'} = output_pref($it->{'issuedate'}); |
471 |
$it->{'displaydate'} = output_pref($it->{'issuedate'}); |
471 |
#$it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ; |
472 |
#$it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ; |
472 |
$it->{'od'} = $it->{'overdue'}; |
473 |
$it->{'od'} = $it->{'overdue'}; |
473 |
($it->{'author'} eq '') and $it->{'author'} = ' '; |
474 |
$it->{'author'} ||= ' '; |
474 |
$it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}}; |
475 |
$it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}}; |
475 |
$it->{'return_failed'} = $return_failed{$it->{'barcode'}}; |
476 |
$it->{'return_failed'} = $return_failed{$it->{'barcode'}}; |
476 |
|
477 |
|
477 |
if ( $it->{'issuedate'}."" gt $todaysdate or $it->{'lastreneweddate'} gt $todaysdate ) { |
478 |
if ( ( $it->{'issuedate'} && $it->{'issuedate'} gt $todaysdate ) |
|
|
479 |
|| ( $it->{'lastreneweddate'} && $it->{'lastreneweddate'} gt $todaysdate ) ) { |
478 |
(!$relatives) ? push @todaysissues, $it : push @relissues, $it; |
480 |
(!$relatives) ? push @todaysissues, $it : push @relissues, $it; |
479 |
} else { |
481 |
} else { |
480 |
(!$relatives) ? push @previousissues, $it : push @relprevissues, $it; |
482 |
(!$relatives) ? push @previousissues, $it : push @relprevissues, $it; |
Lines 649-656
my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch );
Link Here
|
649 |
if($bor_messages_loop){ $template->param(flagged => 1 ); } |
651 |
if($bor_messages_loop){ $template->param(flagged => 1 ); } |
650 |
|
652 |
|
651 |
# Computes full borrower address |
653 |
# Computes full borrower address |
652 |
my (undef, $roadttype_hashref) = &GetRoadTypes(); |
654 |
my @fulladdress; |
653 |
my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'}; |
655 |
push @fulladdress, $borrower->{'streetnumber'} if ( $borrower->{'streetnumber'} ); |
|
|
656 |
push @fulladdress, &GetRoadTypeDetails( $borrower->{'streettype'} ) if ( $borrower->{'streettype'} ); |
657 |
push @fulladdress, $borrower->{'address'} if ( $borrower->{'address'} ); |
654 |
|
658 |
|
655 |
my $fast_cataloging = 0; |
659 |
my $fast_cataloging = 0; |
656 |
if (defined getframeworkinfo('FA')) { |
660 |
if (defined getframeworkinfo('FA')) { |
Lines 684-690
$template->param(
Link Here
|
684 |
expiry => format_date($borrower->{'dateexpiry'}), |
688 |
expiry => format_date($borrower->{'dateexpiry'}), |
685 |
categorycode => $borrower->{'categorycode'}, |
689 |
categorycode => $borrower->{'categorycode'}, |
686 |
categoryname => $borrower->{description}, |
690 |
categoryname => $borrower->{description}, |
687 |
address => $address, |
691 |
address => join(' ', @fulladdress), |
688 |
address2 => $borrower->{'address2'}, |
692 |
address2 => $borrower->{'address2'}, |
689 |
email => $borrower->{'email'}, |
693 |
email => $borrower->{'email'}, |
690 |
emailpro => $borrower->{'emailpro'}, |
694 |
emailpro => $borrower->{'emailpro'}, |
691 |
- |
|
|