#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
=head1 returns.pl
use strict;
use warnings;
-use CGI;
+use Carp 'verbose';
+$SIG{ __DIE__ } = sub { Carp::confess( @_ ) };
+
+use CGI qw ( -utf8 );
use DateTime;
use C4::Context;
use C4::Auth qw/:DEFAULT get_session/;
use C4::Biblio;
use C4::Items;
use C4::Members;
-use C4::Branch; # GetBranches GetBranchName
+use C4::Members::Messaging;
use C4::Koha; # FIXME : is it still useful ?
use C4::RotatingCollections;
+use Koha::AuthorisedValues;
use Koha::DateUtils;
use Koha::Calendar;
#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,
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();
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');
#
updateWrongTransfer ($query->param('WT-itemNumber'),$query->param('WT-waitingAt'),$query->param('WT-From'));
}
-if ( $query->param('resbarcode') ) {
+if ( $query->param('reserve_id') ) {
my $item = $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 $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({ reserve_id => $reserve_id, 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, $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 ($borr) = GetMemberDetails( $nextreservinfo, 0 );
+ my $borr = GetMember( borrowernumber => $nextreservinfo );
my $name = $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'};
if ( $messages->{'transfert'} ) {
$template->param(
itemnumber => $iteminfo->{'itemnumber'},
itembiblionumber => $iteminfo->{'biblionumber'},
iteminfo => $iteminfo->{'author'},
- tobranchname => GetBranchName($messages->{'transfert'}),
name => $name,
borrowernumber => $borrowernumber,
borcnum => $borr->{'cardnumber'},
borfirstname => $borr->{'firstname'},
borsurname => $borr->{'surname'},
+ borcategory => $borr->{'description'},
diffbranch => 1,
);
}
$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
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 {
# 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');
my $tobranch = $query->param('tobranch');
- ModItemTransfer($transferitem, $userenv_branch, $tobranch);
+ ModItemTransfer($transferitem, $userenv_branch, $tobranch);
}
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');
$itemnumber = GetItemnumberFromBarcode($barcode);
- if ( C4::Context->preference("InProcessingToShelvingCart") ) {
- my $item = GetItem( $itemnumber );
- if ( $item->{'location'} eq 'PROC' ) {
- $item->{'location'} = 'CART';
- ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} );
- }
- }
-
#
# save the return
#
- ( $returned, $messages, $issueinformation, $borrower ) =
- AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode, $return_date_override );
- my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn');
- $homeorholdingbranchreturn ||= 'homebranch';
# get biblio description
my $biblio = GetBiblioFromItemNumber($itemnumber);
# 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 $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => '', kohafield =>'items.materials', authorised_value => $materials });
+ $materials = $descriptions->{lib} // '';
+
$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'},
+ itembiblionumber => $biblio->{'biblionumber'},
+ biblionumber => $biblio->{'biblionumber'},
borrower => $borrower,
- additional_materials => $biblio->{'materials'},
+ additional_materials => $materials,
);
my %input = (
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');
$riduedate{0} = $duedate;
$input{borrowernumber} = $borrower->{'borrowernumber'};
$input{duedate} = $duedate;
- $input{return_overdue} = 1 if (DateTime->compare($issueinformation->{date_due}, $time_now) == -1);
+ unless ( $dropboxmode ) {
+ $input{return_overdue} = 1 if (DateTime->compare($issueinformation->{date_due}, DateTime->now()) == -1);
+ } else {
+ $input{return_overdue} = 1 if (DateTime->compare($issueinformation->{date_due}, $dropboxdate) == -1);
+ }
push( @inputloop, \%input );
if ( C4::Context->preference("FineNotifyAtCheckin") ) {
$template->param( fineborrowernumber => $borrower->{'borrowernumber'} );
}
}
-
+
if (C4::Context->preference("WaitingNotifyAtCheckin") ) {
#Check for waiting holds
my @reserves = GetReservesFromBorrowernumber($borrower->{'borrowernumber'});
if ( $num_res->{'found'} eq 'W' && $num_res->{'branchcode'} eq $userenv_branch) {
$waiting_holds++;
}
- }
+ }
if ($waiting_holds > 0) {
$template->param(
waiting_holds => $waiting_holds,
);
}
}
- }
- 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 );
if ( $messages->{'NeedsTransfer'} ){
$template->param(
found => 1,
- needstransfer => 1,
+ needstransfer => $messages->{'NeedsTransfer'},
itemnumber => $itemnumber,
);
}
if ( $messages->{'Wrongbranch'} ){
$template->param(
wrongbranch => 1,
+ rightbranch => $messages->{'Wrongbranch'}->{'Rightbranch'},
);
}
);
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,
wborfirstname => $borr->{'firstname'},
wborsurname => $borr->{'surname'},
+ wborcategory => $borr->{'description'},
wbortitle => $borr->{'title'},
wborphone => $borr->{'phone'},
wboremail => $borr->{'email'},
+ wborstnum => $borr->{streetnumber},
wboraddress => $borr->{'address'},
wboraddress2 => $borr->{'address2'},
wborcity => $borr->{'city'},
#
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'} );
+ 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" ) {
$template->param(
$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(
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'},
+ borcategory => $borr->{'description'},
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'},
borrowernumber => $reserve->{'borrowernumber'},
itemnumber => $reserve->{'itemnumber'},
reservenotes => $reserve->{'reservenotes'},
+ bormessagepref => $holdmsgpreferences->{'transports'},
);
} # else { ; } # error?
}
}
elsif ( $code eq 'NotIssued' ) {
$err{notissued} = 1;
- $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
+ $err{msg} = '';
+ $err{msg} = $messages->{'IsPermanent'} if $messages->{'IsPermanent'};
}
elsif ( $code eq 'LocalUse' ) {
$err{localuse} = 1;
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' ) {
$err{debarborrowernumber} = $borrower->{borrowernumber};
$err{debarname} = "$borrower->{firstname} $borrower->{surname}";
}
+ elsif ( $code eq 'PrevDebarred' ) {
+ $err{prevdebarred} = $messages->{'PrevDebarred'};
+ }
+ elsif ( $code eq 'ForeverDebarred' ) {
+ $err{foreverdebarred} = $messages->{'ForeverDebarred'};
+ }
+ 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
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 ) {
$ri{hour} = $duedate->hour();
$ri{minute} = $duedate->minute();
$ri{duedate} = output_pref($duedate);
- my ($b) = GetMemberDetails( $riborrowernumber{$_}, 0 );
- $ri{return_overdue} = 1 if (DateTime->compare($duedate, DateTime->now()) == -1 );
+ my $b = C4::Members::GetMember( borrowernumber => $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'};
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{enumchron} = $biblio->{'enumchron'};
+ $ri{itemnumber} = $biblio->{'itemnumber'};
+ $ri{barcode} = $bar_code;
+ $ri{homebranch} = $item->{'homebranch'};
+ $ri{holdingbranch} = $item->{'holdingbranch'};
$ri{location} = $biblio->{'location'};
my $shelfcode = $ri{'location'};
}
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,
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"),
);
-### Comment out rotating collections for now to allow it a little more time to bake
-### for 3.4; in particular, must ensure that it doesn't fight with transfers required
-### to fill hold requests
-### -- Galen Charlton 2010-10-06
-#my $itemnumber = GetItemnumberFromBarcode( $query->param('barcode') );
-#if ( $itemnumber ) {
-# my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
-# if ( ! ( $holdingBranch eq $collectionBranch ) ) {
-# $template->param(
-# collectionItemNeedsTransferred => 1,
-# collectionBranch => GetBranchName($collectionBranch),
-# );
-# }
-#}
+$itemnumber = GetItemnumberFromBarcode( $barcode );
+if ( $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,
+ );
+ }
+ }
+}
# actually print the page!
output_html_with_http_headers $query, $cookie, $template->output;
projects / srvgit / blobdiff