#!/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;
use C4::Output;
+use C4::Circulation;
+use C4::Dates qw/format_date/;
use C4::Print;
-use C4::Reserves2;
-use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Reserves;
+use C4::Biblio;
+use C4::Members;
use C4::Branch; # GetBranchName
use C4::Koha; # FIXME : is it still useful ?
-use C4::Context;
my $query = new CGI;
#####################
#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'}:"";
# 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;
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 $iteminfo = GetBiblioFromItemNumber($item);
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 $iteminformation;
my $borrower;
my $returned = 0;
my $messages;
+my $issueinformation;
my $barcode = $query->param('barcode');
# actually return book and prepare item table.....
if ($barcode) {
# decode cuecat
$barcode = cuecatbarcodedecode($barcode);
- ( $returned, $messages, $iteminformation, $borrower ) =
+#
+# save the return
+#
+ ( $returned, $messages, $issueinformation, $borrower ) =
AddReturn( $barcode, C4::Context->userenv->{'branch'} );
+ # get biblio description
+ my $biblio = GetBiblioFromItemNumber($issueinformation->{'itemnumber'});
+ $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;
# 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'} ) {
}
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 = GetBiblioFromItemNumber( 0, $barcode );
-
$template->param(
found => 1,
transfer => 1,
- itemhomebranch =>
- $branches->{ $iteminfo->{'homebranch'} }->{'branchname'}
);
}
WrongTransferItem => $messages->{'WrongTransferItem'},
);
- my $res = $messages->{'ResFound'};
- my $branchname = $branches->{ $res->{'branchcode'} }->{'branchname'};
- my ($borr) = GetMemberDetails( $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 = GetBiblioFromItemNumber( 0, $barcode );
-
$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'},
);
}
+#
+# reserve found and item arrived at the expected branch
+#
if ( $messages->{'ResFound'} and not $messages->{'WrongTransfer'}) {
- my $res = $messages->{'ResFound'};
- my $branchname = $branches->{ $res->{'branchcode'} }->{'branchname'};
- my ($borr) = GetMemberDetails( $res->{'borrowernumber'}, 0 );
- my $name =
- $borr->{'surname'} . " " . $borr->{'title'} . " " . $borr->{'firstname'};
- my $iteminfo = GetBiblioFromItemNumber( 0, $barcode );
-
- if ( $res->{'ResFound'} eq "Waiting" ) {
- if ( C4::Context->userenv->{'branch'} eq $res->{'branchcode'} ) {
+ 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,
);
}
- if ( $res->{'ResFound'} eq "Reserved" ) {
+ 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 );
- if ( C4::Context->userenv->{'branch'} eq $res->{'branchcode'} ) {
+ 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,
+ resbarcode => $barcode,
today => $todaysdate,
- itemnumber => $res->{'itemnumber'},
- itemtitle => $iteminfo->{'title'},
- itemauthor => $iteminfo->{'author'},
- itembarcode => $iteminfo->{'barcode'},
- itemtype => $iteminfo->{'itemtype'},
- ccode => $iteminfo->{'ccode'},
- itembiblionumber => $iteminfo->{'biblionumber'},
+ 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
my @waitingitemloop;
my $items = $flags->{$flag}->{'itemlist'};
foreach my $item (@$items) {
- my $iteminformation =
+ 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 =
- GetBiblioFromItemNumber( $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'} }
+ $branches->{ $biblio->{'holdingbranch'} }
->{'branchname'};
push( @itemloop, \%overdueitem );
}
}
# my %ri;
- my $iteminformation = GetBiblioFromItemNumber( 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));
+ $ri{itembiblionumber} = $biblio->{'biblionumber'};
+ $ri{itemtitle} = $biblio->{'title'};
+ $ri{itemauthor} = $biblio->{'author'};
+ $ri{itemtype} = $biblio->{'itemtype'};
+ $ri{ccode} = $biblio->{'ccode'};
$ri{barcode} = $barcode;
}
else {
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"),
);
# 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_fer / blobdiff