Lines 49-55
use Koha::Calendar;
Link Here
|
49 |
|
49 |
|
50 |
my $query = new CGI; |
50 |
my $query = new CGI; |
51 |
|
51 |
|
52 |
if (!C4::Context->userenv){ |
52 |
my $userenv = C4::Context->userenv; |
|
|
53 |
if (!$userenv){ |
53 |
my $sessionID = $query->cookie("CGISESSID"); |
54 |
my $sessionID = $query->cookie("CGISESSID"); |
54 |
my $session = get_session($sessionID); |
55 |
my $session = get_session($sessionID); |
55 |
if ($session->param('branch') eq 'NO_LIBRARY_SET'){ |
56 |
if ($session->param('branch') eq 'NO_LIBRARY_SET'){ |
Lines 74-84
my ( $template, $librarian, $cookie ) = get_template_and_user(
Link Here
|
74 |
#Global vars |
75 |
#Global vars |
75 |
my $branches = GetBranches(); |
76 |
my $branches = GetBranches(); |
76 |
my $printers = GetPrinters(); |
77 |
my $printers = GetPrinters(); |
|
|
78 |
my $userenv_branch = $userenv->{'branch'} // ''; |
79 |
my $printer = $userenv->{'branchprinter'} // ''; |
77 |
|
80 |
|
78 |
my $printer = C4::Context->userenv ? C4::Context->userenv->{'branchprinter'} : ""; |
|
|
79 |
my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off'); |
81 |
my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off'); |
80 |
|
|
|
81 |
my $userenv_branch = C4::Context->userenv->{'branch'} || ''; |
82 |
# |
82 |
# |
83 |
# Some code to handle the error if there is no branch or printer setting..... |
83 |
# Some code to handle the error if there is no branch or printer setting..... |
84 |
# |
84 |
# |
Lines 266-272
if ($barcode) {
Link Here
|
266 |
|
266 |
|
267 |
if ( C4::Context->preference("FineNotifyAtCheckin") ) { |
267 |
if ( C4::Context->preference("FineNotifyAtCheckin") ) { |
268 |
my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrower->{'borrowernumber'} ); |
268 |
my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrower->{'borrowernumber'} ); |
269 |
if ($fines > 0) { |
269 |
if ($fines && $fines > 0) { |
270 |
$template->param( fines => sprintf("%.2f",$fines) ); |
270 |
$template->param( fines => sprintf("%.2f",$fines) ); |
271 |
$template->param( fineborrowernumber => $borrower->{'borrowernumber'} ); |
271 |
$template->param( fineborrowernumber => $borrower->{'borrowernumber'} ); |
272 |
} |
272 |
} |
Lines 536-546
foreach ( sort { $a <=> $b } keys %returneditems ) {
Link Here
|
536 |
} |
536 |
} |
537 |
push @riloop, \%ri; |
537 |
push @riloop, \%ri; |
538 |
} |
538 |
} |
|
|
539 |
my ($genbrname, $genprname); |
540 |
if (my $b = $branches->{$userenv_branch}) { |
541 |
$genbrname = $b->{'branchname'}; |
542 |
} |
543 |
if (my $p = $printers->{$printer}) { |
544 |
$genprname = $p->{'printername'}; |
545 |
} |
539 |
$template->param( |
546 |
$template->param( |
540 |
riloop => \@riloop, |
547 |
riloop => \@riloop, |
541 |
genbrname => $branches->{$userenv_branch}->{'branchname'}, |
548 |
genbrname => $genbrname, |
542 |
genprname => $printers->{$printer}->{'printername'}, |
549 |
genprname => $genprname, |
543 |
branchname => $branches->{$userenv_branch}->{'branchname'}, |
550 |
branchname => $genbrname, |
544 |
printer => $printer, |
551 |
printer => $printer, |
545 |
errmsgloop => \@errmsgloop, |
552 |
errmsgloop => \@errmsgloop, |
546 |
exemptfine => $exemptfine, |
553 |
exemptfine => $exemptfine, |
547 |
- |
|
|