#!/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 warnings; # FIXME
+
use CGI;
-use C4::Circulation::Circ2;
-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::Interface::CGI::Output;
+use C4::Reserves;
+use C4::Biblio;
+use C4::Items;
+use C4::Members;
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 $resbarcode = $query->param('resbarcode');
my $diffBranchReturned = $query->param('diffBranch');
# set to waiting....
- my $iteminfo = getiteminformation($item);
+ 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 (C4::Context->userenv->{'branch'} ne $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) = getpatroninformation( \%env, $nextreservinfo, 0 );
+ my ($borr) = GetMemberDetails( $nextreservinfo, 0 );
my $borcnum = $borr->{'cardnumber'};
my $name =
$borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'};
if ( $messages->{'transfert'} ) {
$template->param(
itemtitle => $iteminfo->{'title'},
+ itembiblionumber => $iteminfo->{'biblionumber'},
iteminfo => $iteminfo->{'author'},
tobranchname => $branchname,
name => $name,
}
}
-my $iteminformation;
my $borrower;
my $returned = 0;
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 $today = C4::Dates->new();
+my $today_iso = $today->output('iso');
+my $dropboxdate = $calendar->addDate($today, -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);
- ( $returned, $messages, $iteminformation, $borrower ) =
- returnbook( $barcode, C4::Context->userenv->{'branch'} );
+ $barcode = barcodedecode($barcode) if(C4::Context->preference('itemBarcodeInputFilter'));
+#
+# save the return
+#
+ ( $returned, $messages, $issueinformation, $borrower ) =
+ 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'},
+ author => $biblio->{'author'},
+ itembarcode => $biblio->{'barcode'},
+ itemtype => $biblio->{'itemtype'},
+ ccode => $biblio->{'ccode'},
+ itembiblionumber => $biblio->{'biblionumber'},
+ );
+
if ($returned) {
$returneditems{0} = $barcode;
$riborrowernumber{0} = $borrower->{'borrowernumber'};
- $riduedate{0} = $iteminformation->{'date_due'};
+ $riduedate{0} = $issueinformation->{'date_due'};
my %input;
$input{counter} = 0;
$input{first} = 1;
$input{barcode} = $barcode;
- $input{duedate} = $riduedate{0};
- $input{borrowernumber} = $riborrowernumber{0};
+ $input{borrowernumber} = $borrower->{'borrowernumber'};
+ $input{duedate} = $issueinformation->{'date_due'};
+ $input{return_overdue} = 1 if ($issueinformation->{'date_due'} lt $today->output('iso'));
push( @inputloop, \%input );
# check if the branch is the same as homebranch
# if not, we want to put a message
- if ( $iteminformation->{'homebranch'} ne C4::Context->userenv->{'branch'} ) {
- $template->param( homebranch => $iteminformation->{'homebranch'} );
+ if ( $biblio->{'homebranch'} ne C4::Context->userenv->{'branch'} ) {
+ $template->param( homebranch => $biblio->{'homebranch'} );
}
}
elsif ( !$messages->{'BadBarcode'} ) {
$riduedate{0} = 0;
if ( $messages->{'wthdrawn'} ) {
$input{withdrawn} = 1;
- $input{borrowernumber} = "Item Cancelled";
+ $input{borrowernumber} = 'Item Cancelled';
$riborrowernumber{0} = 'Item Cancelled';
}
else {
- $input{borrowernumber} = " ";
- $riborrowernumber{0} = ' ';
+ $input{borrowernumber} = ' ';
+ $riborrowernumber{0} = ' ';
}
push( @inputloop, \%input );
}
- $template->param(
- returned => $returned,
- itemtitle => $iteminformation->{'title'},
-
- # itembc => $iteminformation->{'barcode'},
- # itemdatedue => $iteminformation->{'datedue'},
- itemauthor => $iteminformation->{'author'}
- );
}
$template->param( inputloop => \@inputloop );
# if the document is transfered, we have warning message .
if ( $messages->{'WasTransfered'} ) {
-
- my ($iteminfo) = getiteminformation( 0, $barcode );
-
$template->param(
found => 1,
transfer => 1,
- itemhomebranch =>
- $branches->{ $iteminfo->{'homebranch'} }->{'branchname'}
);
+}
+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)
WrongTransferItem => $messages->{'WrongTransferItem'},
);
- my $res = $messages->{'ResFound'};
- my $branchname = $branches->{ $res->{'branchcode'} }->{'branchname'};
- my ($borr) = getpatroninformation( \%env, $res->{'borrowernumber'}, 0 );
+ my $reserve = $messages->{'ResFound'};
+ my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'};
+ my ($borr) = GetMemberDetails( $reserve->{'borrowernumber'}, 0 );
my $name =
$borr->{'surname'} . " " . $borr->{'title'} . " " . $borr->{'firstname'};
- my ($iteminfo) = getiteminformation( 0, $barcode );
-
- $template->param(
+ $template->param(
wname => $name,
wborfirstname => $borr->{'firstname'},
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 => $res->{'borrowernumber'},
+ wborrowernumber => $reserve->{'borrowernumber'},
wborcnum => $borr->{'cardnumber'},
- witemtitle => $iteminfo->{'title'},
- witemauthor => $iteminfo->{'author'},
- witembarcode => $iteminfo->{'barcode'},
- witemtype => $iteminfo->{'itemtype'},
- wccode => $iteminfo->{'ccode'},
- witembiblionumber => $iteminfo->{'biblionumber'},
- wtransfertFrom => C4::Context->userenv->{'branch'},
- );
+ wtransfertFrom => C4::Context->userenv->{'branch'},
+ );
}
-if ( $messages->{'ResFound'} and not $messages->{'WrongTransfer'}) {
- my $res = $messages->{'ResFound'};
- my $branchname = $branches->{ $res->{'branchcode'} }->{'branchname'};
- my ($borr) = getpatroninformation( \%env, $res->{'borrowernumber'}, 0 );
- my $name =
- $borr->{'surname'} . " " . $borr->{'title'} . " " . $borr->{'firstname'};
- my ($iteminfo) = getiteminformation( 0, $barcode );
-
- if ( $res->{'ResFound'} eq "Waiting" ) {
- if ( C4::Context->userenv->{'branch'} eq $res->{'branchcode'} ) {
+#
+# reserve found and item arrived at the expected branch
+#
+if ( $messages->{'ResFound'}) {
+ my $reserve = $messages->{'ResFound'};
+ my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'};
+ my ($borr) = GetMemberDetails( $reserve->{'borrowernumber'}, 0 );
+ if ( $reserve->{'ResFound'} eq "Waiting" ) {
+ if ( C4::Context->userenv->{'branch'} eq $reserve->{'branchcode'} ) {
$template->param( waiting => 1 );
}
else {
$template->param(
found => 1,
- name => $name,
+ name => $borr->{'surname'} . " " . $borr->{'title'} . " " . $borr->{'firstname'},
borfirstname => $borr->{'firstname'},
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 => $res->{'borrowernumber'},
+ borrowernumber => $reserve->{'borrowernumber'},
borcnum => $borr->{'cardnumber'},
debarred => $borr->{'debarred'},
gonenoaddress => $borr->{'gonenoaddress'},
currentbranch => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
- itemnumber => $res->{'itemnumber'},
- itemtitle => $iteminfo->{'title'},
- itemauthor => $iteminfo->{'author'},
- itembarcode => $iteminfo->{'barcode'},
- itemtype => $iteminfo->{'itemtype'},
- ccode => $iteminfo->{'ccode'},
- itembiblionumber => $iteminfo->{'biblionumber'}
+ itemnumber => $reserve->{'itemnumber'},
+ barcode => $barcode,
+ destbranchname =>
+ $branches->{ $reserve->{'branchcode'} }->{'branchname'},
+ destbranch => $reserve->{'branchcode'},
);
}
- if ( $res->{'ResFound'} eq "Reserved" ) {
- my @da = localtime( time() );
- my $todaysdate =
- sprintf( "%0.2d", ( $da[3] + 1 ) ) . "/"
- . sprintf( "%0.2d", ( $da[4] + 1 ) ) . "/"
- . ( $da[5] + 1900 );
-
- if ( C4::Context->userenv->{'branch'} eq $res->{'branchcode'} ) {
+ if ( $reserve->{'ResFound'} eq "Reserved" ) {
+ if ( C4::Context->userenv->{'branch'} eq $reserve->{'branchcode'} ) {
$template->param( intransit => 0 );
}
else {
$template->param(
found => 1,
currentbranch => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
- name => $name,
destbranchname =>
- $branches->{ $res->{'branchcode'} }->{'branchname'},
- destbranch => $res->{'branchcode'},
- transfertodo => ( C4::Context->userenv->{'branch'} eq $res->{'branchcode'} ? 0 : 1 ),
+ $branches->{ $reserve->{'branchcode'} }->{'branchname'},
+ destbranch => $reserve->{'branchcode'},
+ transfertodo => ( C4::Context->userenv->{'branch'} eq $reserve->{'branchcode'} ? 0 : 1 ),
reserved => 1,
- today => $todaysdate,
- itemnumber => $res->{'itemnumber'},
- itemtitle => $iteminfo->{'title'},
- itemauthor => $iteminfo->{'author'},
- itembarcode => $iteminfo->{'barcode'},
- itemtype => $iteminfo->{'itemtype'},
- ccode => $iteminfo->{'ccode'},
- itembiblionumber => $iteminfo->{'biblionumber'},
+ resbarcode => $barcode,
+ # today => $todaysdate,
+ itemnumber => $reserve->{'itemnumber'},
borsurname => $borr->{'surname'},
bortitle => $borr->{'title'},
borfirstname => $borr->{'firstname'},
- borrowernumber => $res->{'borrowernumber'},
+ 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
}
if ( $flag eq 'CHARGES' ) {
$flaginfo{msg} = $flag;
$flaginfo{charges} = 1;
+ $flaginfo{chargeamount} = $flags->{$flag}->{amount};
$flaginfo{borrowernumber} = $borrower->{borrowernumber};
}
elsif ( $flag eq 'WAITING' ) {
my @waitingitemloop;
my $items = $flags->{$flag}->{'itemlist'};
foreach my $item (@$items) {
- my ($iteminformation) =
- getiteminformation( $item->{'itemnumber'}, 0 );
+ my $biblio =
+ GetBiblioFromItemNumber( $item->{'itemnumber'});
my %waitingitem;
- $waitingitem{biblionum} = $iteminformation->{'biblionumber'};
- $waitingitem{barcode} = $iteminformation->{'barcode'};
- $waitingitem{title} = $iteminformation->{'title'};
+ $waitingitem{biblionum} = $biblio->{'biblionumber'};
+ $waitingitem{barcode} = $biblio->{'barcode'};
+ $waitingitem{title} = $biblio->{'title'};
$waitingitem{brname} =
- $branches->{ $iteminformation->{'holdingbranch'} }
+ $branches->{ $biblio->{'holdingbranch'} }
->{'branchname'};
push( @waitingitemloop, \%waitingitem );
}
foreach my $item ( sort { $a->{'date_due'} cmp $b->{'date_due'} }
@$items )
{
- my ($iteminformation) =
- getiteminformation( $item->{'itemnumber'}, 0 );
+ my $biblio = GetBiblioFromItemNumber( $item->{'itemnumber'});
my %overdueitem;
$overdueitem{duedate} = format_date( $item->{'date_due'} );
- $overdueitem{biblionum} = $iteminformation->{'biblionumber'};
- $overdueitem{barcode} = $iteminformation->{'barcode'};
- $overdueitem{title} = $iteminformation->{'title'};
+ $overdueitem{biblionum} = $biblio->{'biblionumber'};
+ $overdueitem{barcode} = $biblio->{'barcode'};
+ $overdueitem{title} = $biblio->{'title'};
$overdueitem{brname} =
- $branches->{ $iteminformation->{'holdingbranch'} }
- ->{'branchname'};
+ $branches->{ $biblio->{'holdingbranch'}} ->{'branchname'};
push( @itemloop, \%overdueitem );
}
$flaginfo{itemloop} = \@itemloop;
my @riloop;
foreach ( sort { $a <=> $b } keys %returneditems ) {
my %ri;
- if ( $count < 8 ) {
+ if ( $count++ < 8 ) {
my $barcode = $returneditems{$_};
my $duedate = $riduedate{$_};
my $overduetext;
$ri{year} = $tempdate[0];
$ri{month} = $tempdate[1];
$ri{day} = $tempdate[2];
- my $duedatenz = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
- my @datearr = localtime( time() );
- my $todaysdate =
- $datearr[5] . '-'
- . sprintf( "%0.2d", ( $datearr[4] + 1 ) ) . '-'
- . sprintf( "%0.2d", $datearr[3] );
$ri{duedate} = format_date($duedate);
my ($borrower) =
- getpatroninformation( \%env, $riborrowernumber{$_}, 0 );
+ GetMemberDetails( $riborrowernumber{$_}, 0 );
+ $ri{return_overdue} = 1 if ($duedate lt $today->output('iso'));
$ri{borrowernumber} = $borrower->{'borrowernumber'};
$ri{borcnum} = $borrower->{'cardnumber'};
$ri{borfirstname} = $borrower->{'firstname'};
$ri{borsurname} = $borrower->{'surname'};
$ri{bortitle} = $borrower->{'title'};
+ $ri{bornote} = $borrower->{'borrowernotes'};
+ $ri{borcategorycode} = $borrower->{'categorycode'};
}
else {
$ri{borrowernumber} = $riborrowernumber{$_};
}
# my %ri;
- my ($iteminformation) = getiteminformation( 0, $barcode );
- $ri{itembiblionumber} = $iteminformation->{'biblionumber'};
- $ri{itemtitle} = $iteminformation->{'title'};
- $ri{itemauthor} = $iteminformation->{'author'};
- $ri{itemtype} = $iteminformation->{'itemtype'};
- $ri{ccode} = $iteminformation->{'ccode'};
+ 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'};
+ $ri{itemtype} = $biblio->{'itemtype'};
+ $ri{itemnote} = $biblio->{'itemnotes'};
+ $ri{ccode} = $biblio->{'ccode'};
+ $ri{itemnumber} = $biblio->{'itemnumber'};
$ri{barcode} = $barcode;
}
else {
last;
}
- $count++;
push( @riloop, \%ri );
}
$template->param( riloop => \@riloop );
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