#!/usr/bin/perl
# Copyright 2000-2002 Katipo Communications
+# 2006 SAN-OP
+# 2007 BibLibre, Paul POULAIN
#
# This file is part of Koha.
#
script to execute returns of books
-written 11/3/2002 by Finlay
-
=cut
use strict;
use CGI;
-use C4::Circulation;
-use C4::Date;
+use C4::Context;
+use C4::Auth qw/:DEFAULT get_session/;
use C4::Output;
+use C4::Circulation;
+use C4::Dates qw/format_date/;
+use Date::Calc qw/Add_Delta_Days/;
+use C4::Calendar;
use C4::Print;
-use C4::Reserves2;
-use C4::Auth;
+use C4::Reserves;
use C4::Biblio;
+use C4::Items;
use C4::Members;
-use C4::Interface::CGI::Output;
use C4::Branch; # GetBranchName
use C4::Koha; # FIXME : is it still useful ?
-use C4::Context;
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(
{
#####################
#Global vars
-my %env;
-
my $branches = GetBranches();
-my $printers = GetPrinters( \%env );
+my $printers = GetPrinters();
#my $branch = C4::Context->userenv?C4::Context->userenv->{'branch'}:"";
my $printer = C4::Context->userenv?C4::Context->userenv->{'branchprinter'}:"";
-
+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.....
#
-#$env{'branchcode'} = $branch;
-$env{'printer'} = $printer;
-$env{'queue'} = $printer;
-
-
# Set up the item stack ....
my %returneditems;
my %riduedate;
my $borrowernumber = $query->param("bn-$counter");
$counter++;
- # decode cuecat
- $barcode = cuecatbarcodedecode($barcode);
+ # decode barcode
+ $barcode = barcodedecode($barcode) if(C4::Context->preference('itemBarcodeInputFilter'));
######################
#Are these lines still useful ?
# Deal with the requests....
if ($query->param('WT-itemNumber')){
-updateWrongTransfer ($query->param('WT-itemNumber'),$query->param('WT-waitingAt'),$query->param('WT-From'));
+ updateWrongTransfer ($query->param('WT-itemNumber'),$query->param('WT-waitingAt'),$query->param('WT-From'));
}
-
if ( $query->param('resbarcode') ) {
my $item = $query->param('itemnumber');
my $borrowernumber = $query->param('borrowernumber');
my $diffBranchReturned = $query->param('diffBranch');
# set to waiting....
my $iteminfo = GetBiblioFromItemNumber($item);
+ # fix up item type for display
+ $iteminfo->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $iteminfo->{'itype'} : $iteminfo->{'itemtype'};
my $diffBranchSend;
-# addin in ReserveWaiting the possibility to check if the document is expected in this library or not,
+# addin in ModReserveAffect the possibility to check if the document is expected in this library or not,
# if not we send a value in reserve waiting for not implementting waiting status
- if ($diffBranchReturned) {
- $diffBranchSend = $diffBranchReturned;
- }
- else {
- $diffBranchSend = undef;
- }
-
- my $tobranchcd = ReserveWaiting( $item, $borrowernumber,$diffBranchSend);
+ if ($diffBranchReturned) {
+ $diffBranchSend = $diffBranchReturned;
+ }
+ else {
+ $diffBranchSend = undef;
+ }
+ ModReserveAffect( $item, $borrowernumber,$diffBranchSend);
# check if we have other reservs for this document, if we have a return send the message of transfer
- my ( $messages, $nextreservinfo ) = OtherReserves($item);
+ my ( $messages, $nextreservinfo ) = GetOtherReserves($item);
my $branchname = GetBranchName( $messages->{'transfert'} );
my ($borr) = GetMemberDetails( $nextreservinfo, 0 );
if ( $messages->{'transfert'} ) {
$template->param(
itemtitle => $iteminfo->{'title'},
+ itembiblionumber => $iteminfo->{'biblionumber'},
iteminfo => $iteminfo->{'author'},
tobranchname => $branchname,
name => $name,
my $messages;
my $issueinformation;
my $barcode = $query->param('barcode');
+# strip whitespace
+# $barcode =~ s/\s*//g; - use barcodedecode for this; whitespace is not invalid.
+my $exemptfine = $query->param('exemptfine');
+my $dropboxmode= $query->param('dropboxmode');
+my $calendar = C4::Calendar->new( branchcode => C4::Context->userenv->{'branch'} );
+ #dropbox: get last open day (today - 1)
+my $dropboxdate = $calendar->addDate(C4::Dates->new(), -1 );
+my $dotransfer = $query->param('dotransfer');
+if ($dotransfer){
+ # An item has been returned to a branch other than the homebranch, and the librarian has choosen to initiate a transfer
+ my $transferitem=$query->param('transferitem');
+ my $tobranch=$query->param('tobranch');
+ ModItemTransfer($transferitem, C4::Context->userenv->{'branch'}, $tobranch);
+}
# actually return book and prepare item table.....
if ($barcode) {
- # decode cuecat
- $barcode = cuecatbarcodedecode($barcode);
+ $barcode = barcodedecode($barcode) if(C4::Context->preference('itemBarcodeInputFilter'));
#
# save the return
#
( $returned, $messages, $issueinformation, $borrower ) =
- AddReturn( $barcode, C4::Context->userenv->{'branch'} );
+ AddReturn( $barcode, C4::Context->userenv->{'branch'}, $exemptfine, $dropboxmode);
# get biblio description
my $biblio = GetBiblioFromItemNumber($issueinformation->{'itemnumber'});
+ # fix up item type for display
+ $biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};
+
$template->param(
title => $biblio->{'title'},
homebranch => $biblio->{'homebranch'},
found => 1,
transfer => 1,
);
+}
+if ( $messages->{'NeedsTransfer'} ){
+ $template->param(
+ found => 1,
+ needstransfer => 1,
+ itemnumber => $issueinformation->{'itemnumber'}
+ );
+}
+
+if ( $messages->{'Wrongbranch'} ){
+ $template->param(
+ wrongbranch => 1,
+ );
}
# adding a case of wrong transfert, if the document wasn't transfered in the good library (according to branchtransfer (tobranch) BDD)
wborsurname => $borr->{'surname'},
wbortitle => $borr->{'title'},
wborphone => $borr->{'phone'},
- wboremail => $borr->{'emailaddress'},
- wborstraddress => $borr->{'streetaddress'},
+ wboremail => $borr->{'email'},
+ wboraddress => $borr->{'address'},
+ wboraddress2 => $borr->{'address2'},
wborcity => $borr->{'city'},
wborzip => $borr->{'zipcode'},
wborrowernumber => $reserve->{'borrowernumber'},
#
# reserve found and item arrived at the expected branch
#
-if ( $messages->{'ResFound'} and not $messages->{'WrongTransfer'}) {
+if ( $messages->{'ResFound'}) {
my $reserve = $messages->{'ResFound'};
my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'};
my ($borr) = GetMemberDetails( $reserve->{'borrowernumber'}, 0 );
borsurname => $borr->{'surname'},
bortitle => $borr->{'title'},
borphone => $borr->{'phone'},
- boremail => $borr->{'emailaddress'},
- borstraddress => $borr->{'streetaddress'},
+ boremail => $borr->{'email'},
+ boraddress => $borr->{'address'},
+ boraddress2 => $borr->{'address2'},
borcity => $borr->{'city'},
borzip => $borr->{'zipcode'},
borrowernumber => $reserve->{'borrowernumber'},
gonenoaddress => $borr->{'gonenoaddress'},
currentbranch => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
itemnumber => $reserve->{'itemnumber'},
+ barcode => $barcode,
);
}
if ( $reserve->{'ResFound'} eq "Reserved" ) {
- my @da = localtime( time() );
- my $todaysdate =
- sprintf( "%0.2d", ( $da[3] + 1 ) ) . "/"
- . sprintf( "%0.2d", ( $da[4] + 1 ) ) . "/"
- . ( $da[5] + 1900 );
-
+ # my @da = localtime( time() );
+ # my $todaysdate = sprintf( "%0.2d/%0.2d/%0.4d", ( $datearr[3] + 1 ),( $datearr[4] + 1 ),( $datearr[5] + 1900 ) );
+ # FIXME - use Dates obj , locale. AND, why [4]+1 ??
if ( C4::Context->userenv->{'branch'} eq $reserve->{'branchcode'} ) {
$template->param( intransit => 0 );
}
destbranch => $reserve->{'branchcode'},
transfertodo => ( C4::Context->userenv->{'branch'} eq $reserve->{'branchcode'} ? 0 : 1 ),
reserved => 1,
- today => $todaysdate,
+ resbarcode => $barcode,
+ # today => $todaysdate,
itemnumber => $reserve->{'itemnumber'},
borsurname => $borr->{'surname'},
bortitle => $borr->{'title'},
borrowernumber => $reserve->{'borrowernumber'},
borcnum => $borr->{'cardnumber'},
borphone => $borr->{'phone'},
- borstraddress => $borr->{'streetaddress'},
+ boraddress => $borr->{'address'},
+ boraddress2 => $borr->{'address2'},
borsub => $borr->{'suburb'},
borcity => $borr->{'city'},
borzip => $borr->{'zipcode'},
- boremail => $borr->{'emailaddress'},
+ boremail => $borr->{'email'},
debarred => $borr->{'debarred'},
gonenoaddress => $borr->{'gonenoaddress'},
barcode => $barcode
elsif ( $code eq 'WrongTransferItem' ) {
; # FIXME... anything to do here?
}
+ elsif ( $code eq 'NeedsTransfer' ) {
+ }
+ elsif ( $code eq 'Wrongbranch' ) {
+ }
+
else {
die "Unknown error code $code"; # XXX
}
$datearr[5] . '-'
. sprintf( "%0.2d", ( $datearr[4] + 1 ) ) . '-'
. sprintf( "%0.2d", $datearr[3] );
+ # FIXME - todaysdate isn't used, and what date _is_ it ?
$ri{duedate} = format_date($duedate);
my ($borrower) =
GetMemberDetails( $riborrowernumber{$_}, 0 );
$ri{borfirstname} = $borrower->{'firstname'};
$ri{borsurname} = $borrower->{'surname'};
$ri{bortitle} = $borrower->{'title'};
+ $ri{bornote} = $borrower->{'borrowernotes'};
}
else {
$ri{borrowernumber} = $riborrowernumber{$_};
# my %ri;
my $biblio = GetBiblioFromItemNumber(GetItemnumberFromBarcode($barcode));
+ # 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'};
branchname => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
printer => $printer,
errmsgloop => \@errmsgloop,
- intranetcolorstylesheet =>
- C4::Context->preference("intranetcolorstylesheet"),
- intranetstylesheet => C4::Context->preference("intranetstylesheet"),
- IntranetNav => C4::Context->preference("IntranetNav"),
+ exemptfine => $exemptfine,
+ dropboxmode => $dropboxmode,
+ dropboxdate => $dropboxdate->output(),
+ overduecharges => $overduecharges,
);
# actually print the page!
output_html_with_http_headers $query, $cookie, $template->output;
-
-sub cuecatbarcodedecode {
- my ($barcode) = @_;
- chomp($barcode);
- my @fields = split( /\./, $barcode );
- my @results = map( decode($_), @fields[ 1 .. $#fields ] );
- if ( $#results == 2 ) {
- return $results[2];
- }
- else {
- return $barcode;
- }
-}
projects / koha.git / blobdiff