# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
-use strict;
-use warnings;
+use Modern::Perl;
use CGI qw ( -utf8 );
-use C4::Circulation;
-use C4::Output;
-use C4::Reserves;
-use C4::Biblio;
-use C4::Items;
-use C4::Auth qw/:DEFAULT get_session/;
-use C4::Koha;
+use C4::Circulation qw( transferbook );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Reserves qw( ModReserve ModReserveAffect );
+use C4::Auth qw( get_session get_template_and_user );
use C4::Members;
use Koha::BiblioFrameworks;
use Koha::AuthorisedValues;
###############################################
# Getting state
-my $query = new CGI;
+my $query = CGI->new;
if (!C4::Context->userenv){
my $sessionID = $query->cookie("CGISESSID");
my $session;
$session = get_session($sessionID) if $sessionID;
- if (!$session or $session->param('branch') eq 'NO_LIBRARY_SET'){
+ if (!$session){
# no branch set we can't transfer
- print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl");
+ print $query->redirect("/cgi-bin/koha/circ/set-library.pl");
exit;
}
}
template_name => "circ/branchtransfers.tt",
query => $query,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { circulate => "circulate_remaining_permissions" },
}
);
+# Check transfers is allowed from system preference
+if ( C4::Context->preference("IndependentBranchesTransfers") && !C4::Context->IsSuperLibrarian() ) {
+ print $query->redirect("/cgi-bin/koha/errors/403.pl");
+ exit;
+}
+
my $messages;
my $found;
my $reserved;
my $waiting;
+my $hold_transferred;
+my $hold_processed;
my $reqmessage;
my $cancelled;
-my $setwaiting;
+my $settransit;
my $request = $query->param('request') || '';
my $borrowernumber = $query->param('borrowernumber') || 0;
my $tobranchcd = $query->param('tobranchcd') || '';
+my $trigger = 'Manual';
my $ignoreRs = 0;
############
$reqmessage = 1;
} # FIXME else?
}
-elsif ( $request eq "SetWaiting" ) {
+elsif ( $request eq "SetTransit" ) {
my $item = $query->param('itemnumber');
- ModReserveAffect( $item, $borrowernumber );
+ my $reserve_id = $query->param('reserve_id');
+ ModReserveAffect( $item, $borrowernumber, 1, $reserve_id );
$ignoreRs = 1;
- $setwaiting = 1;
+ $settransit = 1;
$reqmessage = 1;
+ $trigger = 'Reserve';
}
elsif ( $request eq 'KillReserved' ) {
my $biblionumber = $query->param('biblionumber');
- my $holds = Koha::Holds->search({
- biblionumber => $biblionumber,
- borrowernumber => $borrowernumber
- });
- if ( $holds->count ) {
- $holds->next->cancel;
+ my $reserve_id = $query->param('reserve_id');
+ my $hold = Koha::Holds->find({ reserve_id => $reserve_id });
+ if ( $hold ) {
+ $hold->cancel;
$cancelled = 1;
$reqmessage = 1;
} # FIXME else?
}
-# collect the stack of books already transfered so they can printed...
+# collect the stack of books already transferred so they can printed...
my @trsfitemloop;
-my $transfered;
+my $transferred;
my $barcode = $query->param('barcode');
# remove leading/trailing whitespace
defined $barcode and $barcode =~ s/^\s*|\s*$//g; # FIXME: barcodeInputFilter
# warn "barcode : $barcode";
if ($barcode) {
- ( $transfered, $messages ) =
- transferbook( $tobranchcd, $barcode, $ignoreRs );
+ ( $transferred, $messages ) =
+ transferbook({
+ from_branch => C4::Context->userenv->{'branch'},
+ to_branch => $tobranchcd,
+ barcode => $barcode,
+ ignore_reserves => $ignoreRs,
+ trigger => $trigger
+ });
my $item = Koha::Items->find({ barcode => $barcode });
- $found = $messages->{'ResFound'};
- if ($transfered) {
- my %item;
- my $biblio = $item->biblio;
+ $found = $messages->{'ResFound'} unless $settransit;
+ if ($transferred) {
+ my %trsfitem;
my $frbranchcd = C4::Context->userenv->{'branch'};
- $item{'biblionumber'} = $item->biblionumber;
- $item{'itemnumber'} = $item->itemnumber;
- $item{'title'} = $biblio->title;
- $item{'author'} = $biblio->author;
- $item{'itemtype'} = $biblio->biblioitem->itemtype;
- $item{'ccode'} = $item->ccode;
- $item{'itemcallnumber'} = $item->itemcallnumber;
- my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $item->location });
- $item{'location'} = $av->count ? $av->next->lib : '';
- $item{counter} = 0;
- $item{barcode} = $barcode;
- $item{frombrcd} = $frbranchcd;
- $item{tobrcd} = $tobranchcd;
- push( @trsfitemloop, \%item );
+ $trsfitem{item} = $item;
+ $trsfitem{counter} = 0;
+ $trsfitem{frombrcd} = $frbranchcd;
+ $trsfitem{tobrcd} = $tobranchcd;
+ push( @trsfitemloop, \%trsfitem );
}
}
foreach ( $query->param ) {
(next) unless (/bc-(\d*)/);
my $counter = $1;
- my %item;
+ my %trsfitem;
my $bc = $query->param("bc-$counter");
my $frbcd = $query->param("fb-$counter");
my $tobcd = $query->param("tb-$counter");
$counter++;
- $item{counter} = $counter;
- $item{barcode} = $bc;
- $item{frombrcd} = $frbcd;
- $item{tobrcd} = $tobcd;
+ $trsfitem{counter} = $counter;
+ $trsfitem{frombrcd} = $frbcd;
+ $trsfitem{tobrcd} = $tobcd;
my $item = Koha::Items->find({ barcode => $bc });
- my $biblio = $item->biblio;
- $item{'biblionumber'} = $item->biblionumber;
- $item{'itemnumber'} = $item->itemnumber;
- $item{'title'} = $biblio->title;
- $item{'author'} = $biblio->author;
- $item{'itemtype'} = $biblio->biblioitem->itemtype;
- $item{'ccode'} = $item->ccode;
- $item{'itemcallnumber'} = $item->itemcallnumber;
- my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $item->location });
- $item{'location'} = $av->count ? $av->next->lib : '';
- push( @trsfitemloop, \%item );
+ $trsfitem{item} = $item;
+ push( @trsfitemloop, \%trsfitem );
}
my $itemnumber;
#####################
-if ($found) {
- my $res = $messages->{'ResFound'};
- $itemnumber = $res->{'itemnumber'};
+my $hold;
+if ($found){
+ $hold = Koha::Holds->find(
+ { reserve_id => $found->{reserve_id} },
+ { prefetch => ['item','patron'] }
+ );
+ $itemnumber = $found->{'itemnumber'};
+ $borrowernumber = $found->{'borrowernumber'};
- if ( $res->{'ResFound'} eq "Waiting" ) {
+ if ( $found->{'ResFound'} eq "Waiting" ) {
$waiting = 1;
- }
- elsif ( $res->{'ResFound'} eq "Reserved" ) {
+ } elsif ( $found->{'ResFound'} eq "Transferred" ) {
+ $hold_transferred = 1;
+ } elsif ( $found->{'ResFound'} eq "Processing" ) {
+ $hold_processed = 1;
+ } elsif ( $found->{'ResFound'} eq "Reserved" ) {
$reserved = 1;
- $biblionumber = $res->{'biblionumber'};
+ $biblionumber = $found->{'biblionumber'};
}
}
$err{tbr} = $tbr;
$err{code} = $typecode;
}
- elsif ( $code eq 'IsPermanent' ) {
- $err{errispermanent} = 1;
- $err{msg} = $messages->{'IsPermanent'};
- }
elsif ( $code eq 'WasReturned' ) {
$err{errwasreturned} = 1;
$err{borrowernumber} = $messages->{'WasReturned'};
my $patron = Koha::Patrons->find( $messages->{'WasReturned'} );
if ( $patron ) { # Just in case...
- $err{title} = $patron->title;
- $err{firstname} = $patron->firstname;
- $err{surname} = $patron->surname;
- $err{cardnumber} = $patron->cardnumber;
+ $err{patron} = $patron;
}
}
- $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );
- push( @errmsgloop, \%err );
+ elsif ( $code eq 'DestinationEqualsHolding' ) {
+ $err{errdesteqholding} = 1;
+ }
+ push( @errmsgloop, \%err ) if (keys %err);
}
}
# use Data::Dumper;
# warn "FINAL ============= ".Dumper(@trsfitemloop);
+
$template->param(
found => $found,
+ hold => $hold,
reserved => $reserved,
waiting => $waiting,
+ transferred => $hold_transferred,
+ processing => $hold_processed,
borrowernumber => $borrowernumber,
itemnumber => $itemnumber,
barcode => $barcode,
tobranchcd => $tobranchcd,
reqmessage => $reqmessage,
cancelled => $cancelled,
- setwaiting => $setwaiting,
+ settransit => $settransit,
trsfitemloop => \@trsfitemloop,
errmsgloop => \@errmsgloop,
- CircAutocompl => C4::Context->preference("CircAutocompl")
+ PatronAutoComplete => C4::Context->preference("PatronAutoComplete"),
);
# Checking if there is a Fast Cataloging Framework
projects / srvgit / blobdiff