X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=circ%2Freturns.pl;h=d99f58c0e11d4e6ffbbd867385d0c71a406cda0d;hb=207756c00107360c207b893a6ae13e940195b6b3;hp=94727977b6103497fd3f97ba9d8de9d0ff8018db;hpb=ea1aa7a0d906d583375618e37be60e9f0d62d939;p=koha.git diff --git a/circ/returns.pl b/circ/returns.pl index 94727977b6..d99f58c0e1 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -49,20 +49,10 @@ use Koha::Calendar; my $query = new CGI; -if (!C4::Context->userenv){ - my $sessionID = $query->cookie("CGISESSID"); - my $session = get_session($sessionID); - if ($session->param('branch') eq 'NO_LIBRARY_SET'){ - # no branch set we can't return - print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl"); - exit; - } -} - #getting the template my ( $template, $librarian, $cookie ) = get_template_and_user( { - template_name => "circ/returns.tmpl", + template_name => "circ/returns.tt", query => $query, type => "intranet", authnotrequired => 0, @@ -70,15 +60,23 @@ my ( $template, $librarian, $cookie ) = get_template_and_user( } ); +my $sessionID = $query->cookie("CGISESSID"); +my $session = get_session($sessionID); +if ($session->param('branch') eq 'NO_LIBRARY_SET'){ + # no branch set we can't return + print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl"); + exit; +} + ##################### #Global vars my $branches = GetBranches(); my $printers = GetPrinters(); +my $userenv = C4::Context->userenv; +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..... # @@ -172,6 +170,14 @@ my $issueinformation; my $itemnumber; my $barcode = $query->param('barcode'); my $exemptfine = $query->param('exemptfine'); +if ( + $exemptfine && + !C4::Auth::haspermission(C4::Context->userenv->{'id'}, {'updatecharges' => 'writeoff'}) +) { + # silently prevent unauthorized operator from forgiving overdue + # fines by manually tweaking form parameters + undef $exemptfine; +} my $dropboxmode = $query->param('dropboxmode'); my $dotransfer = $query->param('dotransfer'); my $canceltransfer = $query->param('canceltransfer'); @@ -180,6 +186,33 @@ my $calendar = Koha::Calendar->new( branchcode => $userenv_branch ); #dropbox: get last open day (today - 1) my $today = DateTime->now( time_zone => C4::Context->tz()); my $dropboxdate = $calendar->addDate($today, -1); + +my $return_date_override = $query->param('return_date_override'); +my $return_date_override_remember = + $query->param('return_date_override_remember'); +if ($return_date_override) { + if ( C4::Context->preference('SpecifyReturnDate') ) { + # FIXME we really need to stop adding more uses of C4::Dates + if ( $return_date_override =~ C4::Dates->regexp('syspref') ) { + + # note that we've overriden the return date + $template->param( return_date_was_overriden => 1); + # Save the original format if we are remembering for this series + $template->param( + return_date_override => $return_date_override, + return_date_override_remember => 1 + ) if ($return_date_override_remember); + + my $dt = dt_from_string($return_date_override); + $return_date_override = + DateTime::Format::MySQL->format_datetime($dt); + } + } + else { + $return_date_override = q{}; + } +} + if ($dotransfer){ # An item has been returned to a branch other than the homebranch, and the librarian has chosen to initiate a transfer my $transferitem = $query->param('transferitem'); @@ -216,7 +249,7 @@ if ($barcode) { # save the return # ( $returned, $messages, $issueinformation, $borrower ) = - AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode); # do the return + AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode, $return_date_override ); my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn'); $homeorholdingbranchreturn ||= 'homebranch'; @@ -225,6 +258,16 @@ if ($barcode) { # fix up item type for display $biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'}; + # Check if we should display a checkin message, based on the the item + # type of the checked in item + my $itemtype = C4::ItemType->get( $biblio->{'itemtype'} ); + if ( $itemtype->{'checkinmsg'} ) { + $template->param( + checkinmsg => $itemtype->{'checkinmsg'}, + checkinmsgtype => $itemtype->{'checkinmsgtype'}, + ); + } + $template->param( title => $biblio->{'title'}, homebranch => $biblio->{'homebranch'}, @@ -234,7 +277,8 @@ if ($barcode) { itemtype => $biblio->{'itemtype'}, ccode => $biblio->{'ccode'}, itembiblionumber => $biblio->{'biblionumber'}, - additional_materials => $biblio->{'materials'} + borrower => $borrower, + additional_materials => $biblio->{'materials'}, ); my %input = ( @@ -256,7 +300,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'} ); } @@ -265,7 +309,7 @@ if ($barcode) { if (C4::Context->preference("WaitingNotifyAtCheckin") ) { #Check for waiting holds my @reserves = GetReservesFromBorrowernumber($borrower->{'borrowernumber'}); - my $waiting_holds; + my $waiting_holds = 0; foreach my $num_res (@reserves) { if ( $num_res->{'found'} eq 'W' && $num_res->{'branchcode'} eq $userenv_branch) { $waiting_holds++; @@ -340,6 +384,7 @@ if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { wbortitle => $borr->{'title'}, wborphone => $borr->{'phone'}, wboremail => $borr->{'email'}, + wborstnum => $borr->{streetnumber}, wboraddress => $borr->{'address'}, wboraddress2 => $borr->{'address2'}, wborcity => $borr->{'city'}, @@ -385,6 +430,7 @@ if ( $messages->{'ResFound'}) { boremail => $borr->{'email'}, boraddress => $borr->{'address'}, boraddress2 => $borr->{'address2'}, + borstnum => $borr->{streetnumber}, borcity => $borr->{'city'}, borzip => $borr->{'zipcode'}, borcnum => $borr->{'cardnumber'}, @@ -430,7 +476,7 @@ foreach my $code ( keys %$messages ) { elsif ( $code eq 'WasTransfered' ) { ; # FIXME... anything to do here? } - elsif ( $code eq 'wthdrawn' ) { + elsif ( $code eq 'withdrawn' ) { $err{withdrawn} = 1; $exit_required_p = 1 if C4::Context->preference("BlockReturnOfWithdrawnItems"); } @@ -457,6 +503,12 @@ foreach my $code ( keys %$messages ) { $err{debarborrowernumber} = $borrower->{borrowernumber}; $err{debarname} = "$borrower->{firstname} $borrower->{surname}"; } + elsif ( $code eq 'PrevDebarred' ) { + $err{prevdebarred} = $messages->{'PrevDebarred'}; + } + elsif ( $code eq 'NotForLoanStatusUpdated' ) { + $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated}; + } else { die "Unknown error code $code"; # note we need all the (empty) elsif's above, or we die. # This forces the issue of staying in sync w/ Circulation.pm @@ -526,11 +578,18 @@ foreach ( sort { $a <=> $b } keys %returneditems ) { } push @riloop, \%ri; } +my ($genbrname, $genprname); +if (my $b = $branches->{$userenv_branch}) { + $genbrname = $b->{'branchname'}; +} +if (my $p = $printers->{$printer}) { + $genprname = $p->{'printername'}; +} $template->param( riloop => \@riloop, - genbrname => $branches->{$userenv_branch}->{'branchname'}, - genprname => $printers->{$printer}->{'printername'}, - branchname => $branches->{$userenv_branch}->{'branchname'}, + genbrname => $genbrname, + genprname => $genprname, + branchname => $genbrname, printer => $printer, errmsgloop => \@errmsgloop, exemptfine => $exemptfine,