From ae72afdcfdc4d68b8b93b834dd72af89467bdaf6 Mon Sep 17 00:00:00 2001 From: Srdjan Date: Fri, 1 Nov 2013 20:17:40 +1300 Subject: [PATCH] bug_11182: get rid of some warnings To test - circulation: * For a child patron, check that "Upgrade to adult" link on the "More" drop-down is clickable * Set sys pref FineNotifyAtCheckin to yes (Notify), and check in an overdue item that attracts fine. Fine amount should be displayed. --- circ/circulation.pl | 2 +- circ/returns.pl | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 9769731..8f7068a 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -482,7 +482,7 @@ sub build_issue_data { ($it->{'charge'}, $it->{'itemtype_charge'}) = GetIssuingCharges( $it->{'itemnumber'}, $it->{'borrowernumber'} ); - $it->{'charge'} = sprintf("%.2f", $it->{'charge'}); + $it->{'charge'} = sprintf("%.2f", $it->{'charge'}) if defined $it->{'charge'}; my ($can_renew, $can_renew_error) = CanBookBeRenewed( $it->{'borrowernumber'},$it->{'itemnumber'} ); diff --git a/circ/returns.pl b/circ/returns.pl index 93f36f2..fb1ca40 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -49,7 +49,8 @@ use Koha::Calendar; my $query = new CGI; -if (!C4::Context->userenv){ +my $userenv = C4::Context->userenv; +if (!$userenv){ my $sessionID = $query->cookie("CGISESSID"); my $session = get_session($sessionID); if ($session->param('branch') eq 'NO_LIBRARY_SET'){ @@ -74,11 +75,10 @@ my ( $template, $librarian, $cookie ) = get_template_and_user( #Global vars my $branches = GetBranches(); my $printers = GetPrinters(); +my $userenv_branch = $userenv->{'branch'} // ''; +my $printer = $userenv->{'branchprinter'} // ''; -my $printer = C4::Context->userenv ? C4::Context->userenv->{'branchprinter'} : ""; my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off'); - -my $userenv_branch = C4::Context->userenv->{'branch'} || ''; # # Some code to handle the error if there is no branch or printer setting..... # @@ -266,7 +266,7 @@ if ($barcode) { if ( C4::Context->preference("FineNotifyAtCheckin") ) { my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrower->{'borrowernumber'} ); - if ($fines > 0) { + if ($fines && $fines > 0) { $template->param( fines => sprintf("%.2f",$fines) ); $template->param( fineborrowernumber => $borrower->{'borrowernumber'} ); } -- 1.8.1.2