X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=circ%2Freturns.pl;h=80f228ae0b14e3f709346ff0bf5d944f0e36f163;hb=4a4b3aa9486e97cd247042d0e13e418570719be0;hp=380454367c801d94a47b3492bfb466a54a4fdc5f;hpb=46607f1098153008698023b538ab1391e782a6fc;p=koha.git diff --git a/circ/returns.pl b/circ/returns.pl index 380454367c..80f228ae0b 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -30,6 +30,8 @@ script to execute returns of books use strict; use warnings; +# FIXME There are weird things going on with $patron and $borrowernumber in this script + use Carp 'verbose'; $SIG{ __DIE__ } = sub { Carp::confess( @_ ) }; @@ -45,16 +47,21 @@ use C4::Biblio; use C4::Items; use C4::Members; use C4::Members::Messaging; -use C4::Branch; # GetBranches GetBranchName use C4::Koha; # FIXME : is it still useful ? use C4::RotatingCollections; +use Koha::AuthorisedValues; use Koha::DateUtils; use Koha::Calendar; +use Koha::BiblioFrameworks; +use Koha::Checkouts; +use Koha::Holds; +use Koha::Items; +use Koha::Patrons; my $query = new CGI; #getting the template -my ( $template, $librarian, $cookie ) = get_template_and_user( +my ( $template, $librarian, $cookie, $flags ) = get_template_and_user( { template_name => "circ/returns.tt", query => $query, @@ -83,7 +90,6 @@ if ( $query->param('print_slip') ) { ##################### #Global vars -my $branches = GetBranches(); my $printers = GetPrinters(); my $userenv = C4::Context->userenv; my $userenv_branch = $userenv->{'branch'} // ''; @@ -91,7 +97,7 @@ my $printer = $userenv->{'branchprinter'} // ''; my $forgivemanualholdsexpire = $query->param('forgivemanualholdsexpire'); my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off'); -# + # # Some code to handle the error if there is no branch or printer setting..... # @@ -143,41 +149,44 @@ if ($query->param('WT-itemNumber')){ updateWrongTransfer ($query->param('WT-itemNumber'),$query->param('WT-waitingAt'),$query->param('WT-From')); } -if ( $query->param('resbarcode') ) { - my $item = $query->param('itemnumber'); +if ( $query->param('reserve_id') ) { + my $itemnumber = $query->param('itemnumber'); my $borrowernumber = $query->param('borrowernumber'); - my $resbarcode = $query->param('resbarcode'); + my $reserve_id = $query->param('reserve_id'); 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 $item = Koha::Items->find( $itemnumber ); + my $biblio = $item->biblio; if ( $cancel_reserve ) { - CancelReserve({ borrowernumber => $borrowernumber, itemnumber => $item, charge_cancel_fee => !$forgivemanualholdsexpire }); + my $hold = Koha::Holds->find( $reserve_id ); + if ( $hold ) { + $hold->cancel( { charge_cancel_fee => !$forgivemanualholdsexpire } ); + } # FIXME else? } 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); + ModReserveAffect( $itemnumber, $borrowernumber, $diffBranchSend, $reserve_id ); } # 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 ( $messages, $nextreservinfo ) = GetOtherReserves($itemnumber); - my $borr = GetMember( borrowernumber => $nextreservinfo ); - my $name = $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'}; + my $patron = Koha::Patrons->find( $nextreservinfo ); + my $name = $patron ? $patron->surname . ", " . $patron->title . " " . $patron->firstname : ''; if ( $messages->{'transfert'} ) { $template->param( - itemtitle => $iteminfo->{'title'}, - itemnumber => $iteminfo->{'itemnumber'}, - itembiblionumber => $iteminfo->{'biblionumber'}, - iteminfo => $iteminfo->{'author'}, - tobranchname => GetBranchName($messages->{'transfert'}), + itemtitle => $biblio->title, + itemnumber => $item->itemnumber, + itembiblionumber => $biblio->biblionumber, + iteminfo => $biblio->author, name => $name, borrowernumber => $borrowernumber, - borcnum => $borr->{'cardnumber'}, - borfirstname => $borr->{'firstname'}, - borsurname => $borr->{'surname'}, + borcnum => $patron->cardnumber, + borfirstname => $patron->firstname, + borsurname => $patron->surname, + borcategory => $patron->category->description, diffbranch => 1, ); } @@ -186,7 +195,7 @@ if ( $query->param('resbarcode') ) { my $borrower; my $returned = 0; my $messages; -my $issueinformation; +my $issue; my $itemnumber; my $barcode = $query->param('barcode'); my $exemptfine = $query->param('exemptfine'); @@ -254,51 +263,46 @@ my $returnbranch; if ($barcode) { $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace $barcode = barcodedecode($barcode) if C4::Context->preference('itemBarcodeInputFilter'); - $itemnumber = GetItemnumberFromBarcode($barcode); + my $item = Koha::Items->find({ barcode => $barcode }); -# -# save the return -# + if ( $item ) { + # Check if we should display a checkin message, based on the the item + # type of the checked in item + my $itemtype = Koha::ItemTypes->find( $item->effective_itemtype ); + if ( $itemtype && $itemtype->checkinmsg ) { + $template->param( + checkinmsg => $itemtype->checkinmsg, + checkinmsgtype => $itemtype->checkinmsgtype, + ); + } - # get biblio description - my $biblio = GetBiblioFromItemNumber($itemnumber); - # fix up item type for display - $biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'}; + # make sure return branch respects home branch circulation rules, default to homebranch + my $hbr = GetBranchItemRule($item->homebranch, $itemtype ? $itemtype->itemtype : undef )->{'returnbranch'} || "homebranch"; + $returnbranch = $item->$hbr; - # Check if we should display a checkin message, based on the the item - # type of the checked in item - my $itemtype = Koha::ItemTypes->find( $biblio->{'itemtype'} ); - if ( $itemtype && $itemtype->checkinmsg ) { - $template->param( - checkinmsg => $itemtype->checkinmsg, - checkinmsgtype => $itemtype->checkinmsgtype, - ); - } + my $materials = $item->materials; + my $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => '', kohafield =>'items.materials', authorised_value => $materials }); + $materials = $descriptions->{lib} // $materials; - # 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); - } + my $issue = Koha::Checkouts->find( { itemnumber => $itemnumber } ); - $template->param( - title => $biblio->{'title'}, - homebranch => $biblio->{'homebranch'}, - 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 => $materials, - ); + my $biblio = $item->biblio; + $template->param( + title => $biblio->title, + homebranch => $item->homebranch, + holdingbranch => $item->holdingbranch, + returnbranch => $returnbranch, + author => $biblio->author, + itembarcode => $item->barcode, + itemtype => $item->effective_itemtype, + ccode => $item->ccode, + itembiblionumber => $biblio->biblionumber, + biblionumber => $biblio->biblionumber, + borrower => $borrower, + additional_materials => $materials, + issue => $issue, + ); + } # FIXME else we should not call AddReturn but set BadBarcode directly instead my %input = ( counter => 0, @@ -306,42 +310,41 @@ if ($barcode) { barcode => $barcode, ); + # do the return - ( $returned, $messages, $issueinformation, $borrower ) = + ( $returned, $messages, $issue, $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'); + my $date_due_dt = dt_from_string( $issue->date_due, 'sql' ); + my $duedate = $date_due_dt->strftime('%Y-%m-%d %H:%M'); $returneditems{0} = $barcode; $riborrowernumber{0} = $borrower->{'borrowernumber'}; $riduedate{0} = $duedate; $input{borrowernumber} = $borrower->{'borrowernumber'}; $input{duedate} = $duedate; unless ( $dropboxmode ) { - $input{return_overdue} = 1 if (DateTime->compare($issueinformation->{date_due}, DateTime->now()) == -1); + $input{return_overdue} = 1 if (DateTime->compare($date_due_dt, DateTime->now()) == -1); } else { - $input{return_overdue} = 1 if (DateTime->compare($issueinformation->{date_due}, $dropboxdate) == -1); + $input{return_overdue} = 1 if (DateTime->compare($date_due_dt, $dropboxdate) == -1); } push( @inputloop, \%input ); if ( C4::Context->preference("FineNotifyAtCheckin") ) { - my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrower->{'borrowernumber'} ); - if ($fines && $fines > 0) { - $template->param( fines => sprintf("%.2f",$fines) ); + my $patron = Koha::Patrons->find( $borrower->{borrowernumber} ); + my $balance = $patron->account->balance; + + if ($balance > 0) { + $template->param( fines => sprintf("%.2f", $balance) ); $template->param( fineborrowernumber => $borrower->{'borrowernumber'} ); } } if (C4::Context->preference("WaitingNotifyAtCheckin") ) { #Check for waiting holds - my @reserves = GetReservesFromBorrowernumber($borrower->{'borrowernumber'}); - my $waiting_holds = 0; - foreach my $num_res (@reserves) { - if ( $num_res->{'found'} eq 'W' && $num_res->{'branchcode'} eq $userenv_branch) { - $waiting_holds++; - } - } + my $patron = Koha::Patrons->find( $borrower->{borrowernumber} ); + my $waiting_holds = $patron->holds->search({ found => 'W', branchcode => $userenv_branch })->count; if ($waiting_holds > 0) { $template->param( waiting_holds => $waiting_holds, @@ -402,24 +405,31 @@ if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { ); my $reserve = $messages->{'ResFound'}; - my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'}; - my $borr = C4::Members::GetMember( borrowernumber => $reserve->{'borrowernumber'} ); - my $name = $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'}; + if ( $reserve ) { + my $patron = Koha::Patrons->find( $reserve->{'borrowernumber'} ); + my $name = $patron->surname . ", " . $patron->title . " " . $patron->firstname; + $template->param( + # FIXME The full patron object should be passed to the template + wname => $name, + wborfirstname => $patron->firstname, + wborsurname => $patron->surname, + wborcategory => $patron->category->description, + wbortitle => $patron->title, + wborphone => $patron->phone, + wboremail => $patron->email, + streetnumber => $patron->streetnumber, + address => $patron->address, + address2 => $patron->address2, + city => $patron->city, + zipcode => $patron->zipcode, + state => $patron->state, + country => $patron->country, + wborrowernumber => $reserve->{'borrowernumber'}, + wborcnum => $patron->cardnumber, + ); + } $template->param( - wname => $name, - wborfirstname => $borr->{'firstname'}, - wborsurname => $borr->{'surname'}, - wbortitle => $borr->{'title'}, - wborphone => $borr->{'phone'}, - wboremail => $borr->{'email'}, - wborstnum => $borr->{streetnumber}, - wboraddress => $borr->{'address'}, - wboraddress2 => $borr->{'address2'}, - wborcity => $borr->{'city'}, - wborzip => $borr->{'zipcode'}, - wborrowernumber => $reserve->{'borrowernumber'}, - wborcnum => $borr->{'cardnumber'}, - wtransfertFrom => $userenv_branch, + wtransfertFrom => $userenv_branch, ); } @@ -428,8 +438,7 @@ if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { # if ( $messages->{'ResFound'}) { my $reserve = $messages->{'ResFound'}; - my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'}; - my $borr = C4::Members::GetMember( borrowernumber => $reserve->{'borrowernumber'} ); + my $patron = Koha::Patrons->find( $reserve->{borrowernumber} ); my $holdmsgpreferences = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $reserve->{'borrowernumber'}, message_name => 'Hold_Filled' } ); if ( $reserve->{'ResFound'} eq "Waiting" or $reserve->{'ResFound'} eq "Reserved" ) { if ( $reserve->{'ResFound'} eq "Waiting" ) { @@ -440,35 +449,38 @@ if ( $messages->{'ResFound'}) { $template->param( intransit => ($userenv_branch eq $reserve->{'branchcode'} ? 0 : 1 ), transfertodo => ($userenv_branch eq $reserve->{'branchcode'} ? 0 : 1 ), - resbarcode => $barcode, + reserve_id => $reserve->{reserve_id}, reserved => 1, ); } # same params for Waiting or Reserved $template->param( + # FIXME The full patron object should be passed to the template found => 1, - currentbranch => $branches->{$userenv_branch}->{'branchname'}, - destbranchname => $branches->{ $reserve->{'branchcode'} }->{'branchname'}, - name => $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'}, - borfirstname => $borr->{'firstname'}, - borsurname => $borr->{'surname'}, - bortitle => $borr->{'title'}, - borphone => $borr->{'phone'}, - boremail => $borr->{'email'}, - boraddress => $borr->{'address'}, - boraddress2 => $borr->{'address2'}, - borstnum => $borr->{streetnumber}, - borcity => $borr->{'city'}, - borzip => $borr->{'zipcode'}, - borcnum => $borr->{'cardnumber'}, - debarred => $borr->{'debarred'}, - gonenoaddress => $borr->{'gonenoaddress'}, + name => $patron->surname . ", " . $patron->title . " " . $patron->firstname, + borfirstname => $patron->firstname, + borsurname => $patron->surname, + borcategory => $patron->category->description, + bortitle => $patron->title, + borphone => $patron->phone, + boremail => $patron->email, + boraddress => $patron->address, + boraddress2 => $patron->address2, + streetnumber => $patron->streetnumber, + city => $patron->city, + zipcode => $patron->zipcode, + state => $patron->state, + country => $patron->country, + borcnum => $patron->cardnumber, + debarred => $patron->debarred, + gonenoaddress => $patron->gonenoaddress, barcode => $barcode, destbranch => $reserve->{'branchcode'}, borrowernumber => $reserve->{'borrowernumber'}, itemnumber => $reserve->{'itemnumber'}, reservenotes => $reserve->{'reservenotes'}, + reserve_id => $reserve->{reserve_id}, bormessagepref => $holdmsgpreferences->{'transports'}, ); } # else { ; } # error? @@ -486,7 +498,7 @@ foreach my $code ( keys %$messages ) { elsif ( $code eq 'NotIssued' ) { $err{notissued} = 1; $err{msg} = ''; - $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'} if $messages->{'IsPermanent'}; + $err{msg} = $messages->{'IsPermanent'} if $messages->{'IsPermanent'}; } elsif ( $code eq 'LocalUse' ) { $err{localuse} = 1; @@ -513,8 +525,7 @@ foreach my $code ( keys %$messages ) { elsif ( ( $code eq 'IsPermanent' ) && ( not $messages->{'ResFound'} ) ) { if ( $messages->{'IsPermanent'} ne $userenv_branch ) { $err{ispermanent} = 1; - $err{msg} = - $branches->{ $messages->{'IsPermanent'} }->{'branchname'}; + $err{msg} = $messages->{'IsPermanent'}; } } elsif ( $code eq 'WrongTransfer' ) { @@ -542,6 +553,9 @@ foreach my $code ( keys %$messages ) { elsif ( $code eq 'NotForLoanStatusUpdated' ) { $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated}; } + elsif ( $code eq 'DataCorrupted' ) { + $err{data_corrupted} = 1; + } 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 @@ -557,7 +571,8 @@ $template->param( errmsgloop => \@errmsgloop ); my $returned_counter = ( C4::Context->preference('numReturnedItemsToShow') ) ? C4::Context->preference('numReturnedItemsToShow') : 8; my $count = 0; my @riloop; -my $shelflocations = GetKohaAuthorisedValues('items.location',''); +my $shelflocations = + { map { $_->{authorised_value} => $_->{lib} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.location' } ) }; foreach ( sort { $a <=> $b } keys %returneditems ) { my %ri; if ( $count++ < $returned_counter ) { @@ -570,42 +585,42 @@ foreach ( sort { $a <=> $b } keys %returneditems ) { $ri{hour} = $duedate->hour(); $ri{minute} = $duedate->minute(); $ri{duedate} = output_pref($duedate); - my $b = C4::Members::GetMember( borrowernumber => $riborrowernumber{$_} ); + my $patron = Koha::Patrons->find( $riborrowernumber{$_} ); unless ( $dropboxmode ) { $ri{return_overdue} = 1 if (DateTime->compare($duedate, DateTime->now()) == -1); } else { $ri{return_overdue} = 1 if (DateTime->compare($duedate, $dropboxdate) == -1); } - $ri{borrowernumber} = $b->{'borrowernumber'}; - $ri{borcnum} = $b->{'cardnumber'}; - $ri{borfirstname} = $b->{'firstname'}; - $ri{borsurname} = $b->{'surname'}; - $ri{bortitle} = $b->{'title'}; - $ri{bornote} = $b->{'borrowernotes'}; - $ri{borcategorycode}= $b->{'categorycode'}; + $ri{borrowernumber} = $patron->borrowernumber; + $ri{borcnum} = $patron->cardnumber; + $ri{borfirstname} = $patron->firstname; + $ri{borsurname} = $patron->surname; + $ri{bortitle} = $patron->title; + $ri{bornote} = $patron->borrowernotes; + $ri{borcategorycode}= $patron->categorycode; + $ri{borissuescount} = Koha::Checkouts->count( { borrowernumber => $b->{'borrowernumber'} } ); } else { $ri{borrowernumber} = $riborrowernumber{$_}; } - # my %ri; - my $biblio = GetBiblioFromItemNumber(GetItemnumberFromBarcode($bar_code)); - 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{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'}; + my $item = Koha::Items->find({ barcode => $bar_code }); + my $biblio = $item->biblio; + # FIXME pass $item to the template and we are done here... + $ri{itembiblionumber} = $biblio->biblionumber; + $ri{itemtitle} = $biblio->title; + $ri{itemauthor} = $biblio->author; + $ri{itemcallnumber} = $item->itemcallnumber; + $ri{dateaccessioned} = $item->dateaccessioned; + $ri{itemtype} = $item->effective_itemtype; + $ri{itemnote} = $item->itemnotes; + $ri{itemnotes_nonpublic} = $item->itemnotes_nonpublic; + $ri{ccode} = $item->ccode; + $ri{enumchron} = $item->enumchron; + $ri{itemnumber} = $item->itemnumber; $ri{barcode} = $bar_code; - $ri{homebranch} = $item->{'homebranch'}; - $ri{holdingbranch} = $item->{'holdingbranch'}; + $ri{homebranch} = $item->homebranch; + $ri{holdingbranch} = $item->holdingbranch; $ri{location} = $biblio->{'location'}; my $shelfcode = $ri{'location'}; @@ -617,18 +632,9 @@ 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 => $genbrname, - genprname => $genprname, - branchname => $genbrname, printer => $printer, errmsgloop => \@errmsgloop, exemptfine => $exemptfine, @@ -642,18 +648,22 @@ $template->param( $itemnumber = GetItemnumberFromBarcode( $barcode ); if ( $itemnumber ) { - my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber ); - $holdingBranch //= ''; - $collectionBranch //= $returnbranch; - if ( ! ( $holdingBranch eq $collectionBranch ) ) { - $template->param( - collectionItemNeedsTransferred => 1, - collectionBranchName => GetBranchName($collectionBranch), - collectionBranch => $collectionBranch, - itemnumber => $itemnumber, - ); + my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber ); + if ( $holdingBranch and $collectionBranch ) { + $holdingBranch //= ''; + $collectionBranch //= $returnbranch; + if ( ! ( $holdingBranch eq $collectionBranch ) ) { + $template->param( + collectionItemNeedsTransferred => 1, + collectionBranch => $collectionBranch, + itemnumber => $itemnumber, + ); + } } } +# Checking if there is a Fast Cataloging Framework +$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' ); + # actually print the page! output_html_with_http_headers $query, $cookie, $template->output;