X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=circ%2Freturns.pl;h=49899f0c4b8dda0ad73d09ecc65bbff8bbb05e6f;hb=7dfc64022b8be63a10cb4c3f802d45a0b0f99973;hp=af01428531dfb8cd0b3ec0a0a4a96fd040f2dfe3;hpb=a6c9bd0eb55c32d5632625144775271f20aa15f7;p=koha.git diff --git a/circ/returns.pl b/circ/returns.pl index af01428531..49899f0c4b 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -30,6 +30,9 @@ script to execute returns of books use strict; use warnings; +use Carp 'verbose'; +$SIG{ __DIE__ } = sub { Carp::confess( @_ ) }; + use CGI qw ( -utf8 ); use DateTime; use C4::Context; @@ -68,6 +71,15 @@ if ($session->param('branch') eq 'NO_LIBRARY_SET'){ exit; } +# Print a reserve slip on this page +if ( $query->param('print_slip') ) { + $template->param( + print_slip => 1, + borrowernumber => scalar $query->param('borrowernumber'), + biblionumber => scalar $query->param('biblionumber'), + ); +} + ##################### #Global vars my $branches = GetBranches(); @@ -75,6 +87,7 @@ my $printers = GetPrinters(); my $userenv = C4::Context->userenv; my $userenv_branch = $userenv->{'branch'} // ''; my $printer = $userenv->{'branchprinter'} // ''; +my $forgivemanualholdsexpire = $query->param('forgivemanualholdsexpire'); my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off'); # @@ -135,16 +148,22 @@ if ( $query->param('resbarcode') ) { my $resbarcode = $query->param('resbarcode'); my $diffBranchReturned = $query->param('diffBranch'); my $iteminfo = GetBiblioFromItemNumber($item); + my $cancel_reserve = $query->param('cancel_reserve'); # fix up item type for display $iteminfo->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $iteminfo->{'itype'} : $iteminfo->{'itemtype'}; - my $diffBranchSend = ($userenv_branch ne $diffBranchReturned) ? $diffBranchReturned : undef; -# diffBranchSend tells ModReserveAffect whether document is expected in this library or not, -# i.e., whether to apply waiting status - ModReserveAffect( $item, $borrowernumber, $diffBranchSend); + + if ( $cancel_reserve ) { + CancelReserve({ borrowernumber => $borrowernumber, itemnumber => $item, charge_cancel_fee => !$forgivemanualholdsexpire }); + } else { + my $diffBranchSend = ($userenv_branch ne $diffBranchReturned) ? $diffBranchReturned : undef; + # diffBranchSend tells ModReserveAffect whether document is expected in this library or not, + # i.e., whether to apply waiting status + ModReserveAffect( $item, $borrowernumber, $diffBranchSend); + } # check if we have other reserves for this document, if we have a return send the message of transfer my ( $messages, $nextreservinfo ) = GetOtherReserves($item); - my ($borr) = GetMemberDetails( $nextreservinfo, 0 ); + my $borr = GetMember( borrowernumber => $nextreservinfo ); my $name = $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'}; if ( $messages->{'transfert'} ) { $template->param( @@ -192,9 +211,8 @@ 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') ) { - + my $return_date_override_dt = eval {dt_from_string( $return_date_override ) }; + if ( $return_date_override_dt ) { # 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 @@ -203,9 +221,8 @@ if ($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); + DateTime::Format::MySQL->format_datetime( $return_date_override_dt ); } } else { @@ -232,6 +249,7 @@ if ($canceltransfer){ } # actually return book and prepare item table..... +my $returnbranch; if ($barcode) { $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace $barcode = barcodedecode($barcode) if C4::Context->preference('itemBarcodeInputFilter'); @@ -240,10 +258,6 @@ if ($barcode) { # # save the return # - ( $returned, $messages, $issueinformation, $borrower ) = - AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode, $return_date_override, $dropboxdate ); - my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn'); - $homeorholdingbranchreturn ||= 'homebranch'; # get biblio description my $biblio = GetBiblioFromItemNumber($itemnumber); @@ -252,25 +266,37 @@ if ($barcode) { # 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'} ) { + my $itemtype = Koha::ItemTypes->find( $biblio->{'itemtype'} ); + if ( $itemtype && $itemtype->checkinmsg ) { $template->param( - checkinmsg => $itemtype->{'checkinmsg'}, - checkinmsgtype => $itemtype->{'checkinmsgtype'}, + checkinmsg => $itemtype->checkinmsg, + checkinmsgtype => $itemtype->checkinmsgtype, ); } + # make sure return branch respects home branch circulation rules, default to homebranch + my $hbr = GetBranchItemRule($biblio->{'homebranch'}, $itemtype ? $itemtype->itemtype : undef )->{'returnbranch'} || "homebranch"; + $returnbranch = $biblio->{$hbr}; + + my $materials = $biblio->{'materials'}; + my $avcode = GetAuthValCode('items.materials'); + if ($avcode) { + $materials = GetKohaAuthorisedValueLib($avcode, $materials); + } + $template->param( title => $biblio->{'title'}, homebranch => $biblio->{'homebranch'}, - homebranchname => GetBranchName( $biblio->{$homeorholdingbranchreturn} ), + holdingbranch => $biblio->{'holdingbranch'}, + returnbranch => $returnbranch, author => $biblio->{'author'}, itembarcode => $biblio->{'barcode'}, itemtype => $biblio->{'itemtype'}, ccode => $biblio->{'ccode'}, itembiblionumber => $biblio->{'biblionumber'}, + biblionumber => $biblio->{'biblionumber'}, borrower => $borrower, - additional_materials => $biblio->{'materials'}, + additional_materials => $materials, ); my %input = ( @@ -279,6 +305,10 @@ if ($barcode) { barcode => $barcode, ); + # do the return + ( $returned, $messages, $issueinformation, $borrower ) = + AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode, $return_date_override, $dropboxdate ); + if ($returned) { my $time_now = DateTime->now( time_zone => C4::Context->tz )->truncate( to => 'minute'); my $duedate = $issueinformation->{date_due}->strftime('%Y-%m-%d %H:%M'); @@ -320,13 +350,13 @@ if ($barcode) { ); } } - } - elsif ( !$messages->{'BadBarcode'} ) { + } elsif ( C4::Context->preference('ShowAllCheckins') and !$messages->{'BadBarcode'} ) { $input{duedate} = 0; $returneditems{0} = $barcode; $riduedate{0} = 0; push( @inputloop, \%input ); } + $template->param( privacy => $borrower->{privacy} ); } $template->param( inputloop => \@inputloop ); @@ -348,7 +378,7 @@ if ( $messages->{'WasTransfered'} ) { if ( $messages->{'NeedsTransfer'} ){ $template->param( found => 1, - needstransfer => 1, + needstransfer => $messages->{'NeedsTransfer'}, itemnumber => $itemnumber, ); } @@ -356,6 +386,7 @@ if ( $messages->{'NeedsTransfer'} ){ if ( $messages->{'Wrongbranch'} ){ $template->param( wrongbranch => 1, + rightbranch => $messages->{'Wrongbranch'}->{'Rightbranch'}, ); } @@ -371,7 +402,7 @@ if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { my $reserve = $messages->{'ResFound'}; my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'}; - my ($borr) = GetMemberDetails( $reserve->{'borrowernumber'}, 0 ); + my $borr = C4::Members::GetMember( borrowernumber => $reserve->{'borrowernumber'} ); my $name = $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'}; $template->param( wname => $name, @@ -397,7 +428,7 @@ if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { if ( $messages->{'ResFound'}) { my $reserve = $messages->{'ResFound'}; my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'}; - my ($borr) = GetMemberDetails( $reserve->{'borrowernumber'}, 0 ); + my $borr = C4::Members::GetMember( borrowernumber => $reserve->{'borrowernumber'} ); if ( $reserve->{'ResFound'} eq "Waiting" or $reserve->{'ResFound'} eq "Reserved" ) { if ( $reserve->{'ResFound'} eq "Waiting" ) { @@ -452,7 +483,8 @@ foreach my $code ( keys %$messages ) { } elsif ( $code eq 'NotIssued' ) { $err{notissued} = 1; - $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'}; + $err{msg} = ''; + $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'} if $messages->{'IsPermanent'}; } elsif ( $code eq 'LocalUse' ) { $err{localuse} = 1; @@ -536,7 +568,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) { $ri{hour} = $duedate->hour(); $ri{minute} = $duedate->minute(); $ri{duedate} = output_pref($duedate); - my ($b) = GetMemberDetails( $riborrowernumber{$_}, 0 ); + my $b = C4::Members::GetMember( borrowernumber => $riborrowernumber{$_} ); unless ( $dropboxmode ) { $ri{return_overdue} = 1 if (DateTime->compare($duedate, DateTime->now()) == -1); } else { @@ -559,17 +591,19 @@ foreach ( sort { $a <=> $b } keys %returneditems ) { my $item = GetItem( GetItemnumberFromBarcode($bar_code) ); # fix up item type for display $biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'}; - $ri{itembiblionumber} = $biblio->{'biblionumber'}; - $ri{itemtitle} = $biblio->{'title'}; - $ri{itemauthor} = $biblio->{'author'}; - $ri{itemcallnumber} = $biblio->{'itemcallnumber'}; - $ri{itemtype} = $biblio->{'itemtype'}; - $ri{itemnote} = $biblio->{'itemnotes'}; - $ri{ccode} = $biblio->{'ccode'}; - $ri{itemnumber} = $biblio->{'itemnumber'}; - $ri{barcode} = $bar_code; - $ri{homebranch} = $item->{'homebranch'}; - $ri{holdingbranch} = $item->{'holdingbranch'}; + $ri{itembiblionumber} = $biblio->{'biblionumber'}; + $ri{itemtitle} = $biblio->{'title'}; + $ri{itemauthor} = $biblio->{'author'}; + $ri{itemcallnumber} = $biblio->{'itemcallnumber'}; + $ri{dateaccessioned} = $item->{dateaccessioned}; + $ri{itemtype} = $biblio->{'itemtype'}; + $ri{itemnote} = $biblio->{'itemnotes'}; + $ri{itemnotes_nonpublic} = $item->{'itemnotes_nonpublic'}; + $ri{ccode} = $biblio->{'ccode'}; + $ri{itemnumber} = $biblio->{'itemnumber'}; + $ri{barcode} = $bar_code; + $ri{homebranch} = $item->{'homebranch'}; + $ri{holdingbranch} = $item->{'holdingbranch'}; $ri{location} = $biblio->{'location'}; my $shelfcode = $ri{'location'}; @@ -598,18 +632,23 @@ $template->param( exemptfine => $exemptfine, dropboxmode => $dropboxmode, dropboxdate => output_pref($dropboxdate), + forgivemanualholdsexpire => $forgivemanualholdsexpire, overduecharges => $overduecharges, - soundon => C4::Context->preference("SoundOn"), + AudioAlerts => C4::Context->preference("AudioAlerts"), BlockReturnOfWithdrawnItems => C4::Context->preference("BlockReturnOfWithdrawnItems"), ); -$itemnumber = GetItemnumberFromBarcode( $query->param('barcode') ); +$itemnumber = GetItemnumberFromBarcode( $barcode ); if ( $itemnumber ) { my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber ); + $holdingBranch //= ''; + $collectionBranch //= $returnbranch; if ( ! ( $holdingBranch eq $collectionBranch ) ) { $template->param( collectionItemNeedsTransferred => 1, - collectionBranch => GetBranchName($collectionBranch), + collectionBranchName => GetBranchName($collectionBranch), + collectionBranch => $collectionBranch, + itemnumber => $itemnumber, ); } }