=cut
use strict;
+# use warnings; # FIXME
+
use CGI;
use C4::Context;
-use C4::Auth;
+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::Reserves;
use C4::Biblio;
+use C4::Items;
use C4::Members;
use C4::Branch; # GetBranchName
use C4::Koha; # FIXME : is it still useful ?
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(
{
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 ?
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 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) {
+ if (C4::Context->userenv->{'branch'} ne $diffBranchReturned) {
$diffBranchSend = $diffBranchReturned;
}
else {
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
# 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'}, $exemptfine );
+ 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'},
ccode => $biblio->{'ccode'},
itembiblionumber => $biblio->{'biblionumber'},
);
+
if ($returned) {
$returneditems{0} = $barcode;
$riborrowernumber{0} = $borrower->{'borrowernumber'};
$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
$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 );
}
);
}
+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)
if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) {
my ($borr) = GetMemberDetails( $reserve->{'borrowernumber'}, 0 );
my $name =
$borr->{'surname'} . " " . $borr->{'title'} . " " . $borr->{'firstname'};
- $template->param(
+ $template->param(
wname => $name,
wborfirstname => $borr->{'firstname'},
wborsurname => $borr->{'surname'},
wbortitle => $borr->{'title'},
wborphone => $borr->{'phone'},
wboremail => $borr->{'email'},
- wboraddress => $borr->{'address'},
- wboraddress2 => $borr->{'address2'},
+ wboraddress => $borr->{'address'},
+ wboraddress2 => $borr->{'address2'},
wborcity => $borr->{'city'},
wborzip => $borr->{'zipcode'},
wborrowernumber => $reserve->{'borrowernumber'},
wborcnum => $borr->{'cardnumber'},
- wtransfertFrom => C4::Context->userenv->{'branch'},
- );
+ wtransfertFrom => C4::Context->userenv->{'branch'},
+ );
}
bortitle => $borr->{'title'},
borphone => $borr->{'phone'},
boremail => $borr->{'email'},
- boraddress => $borr->{'address'},
- boraddress2 => $borr->{'address2'},
+ boraddress => $borr->{'address'},
+ boraddress2 => $borr->{'address2'},
borcity => $borr->{'city'},
borzip => $borr->{'zipcode'},
borrowernumber => $reserve->{'borrowernumber'},
debarred => $borr->{'debarred'},
gonenoaddress => $borr->{'gonenoaddress'},
currentbranch => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
- itemnumber => $reserve->{'itemnumber'},
- barcode => $barcode,
+ itemnumber => $reserve->{'itemnumber'},
+ barcode => $barcode,
+ destbranchname =>
+ $branches->{ $reserve->{'branchcode'} }->{'branchname'},
+ destbranch => $reserve->{'branchcode'},
);
}
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 $reserve->{'branchcode'} ) {
$template->param( intransit => 0 );
}
transfertodo => ( C4::Context->userenv->{'branch'} eq $reserve->{'branchcode'} ? 0 : 1 ),
reserved => 1,
resbarcode => $barcode,
- today => $todaysdate,
+ # today => $todaysdate,
itemnumber => $reserve->{'itemnumber'},
borsurname => $borr->{'surname'},
bortitle => $borr->{'title'},
borrowernumber => $reserve->{'borrowernumber'},
borcnum => $borr->{'cardnumber'},
borphone => $borr->{'phone'},
- boraddress => $borr->{'address'},
- boraddress2 => $borr->{'address2'},
+ boraddress => $borr->{'address'},
+ boraddress2 => $borr->{'address2'},
borsub => $borr->{'suburb'},
borcity => $borr->{'city'},
borzip => $borr->{'zipcode'},
}
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' ) {
foreach my $item ( sort { $a->{'date_due'} cmp $b->{'date_due'} }
@$items )
{
- my $biblio =
- GetBiblioFromItemNumber( $item->{'itemnumber'});
+ my $biblio = GetBiblioFromItemNumber( $item->{'itemnumber'});
my %overdueitem;
$overdueitem{duedate} = format_date( $item->{'date_due'} );
$overdueitem{biblionum} = $biblio->{'biblionumber'};
$overdueitem{barcode} = $biblio->{'barcode'};
$overdueitem{title} = $biblio->{'title'};
$overdueitem{brname} =
- $branches->{ $biblio->{'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) =
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 $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 );
printer => $printer,
errmsgloop => \@errmsgloop,
exemptfine => $exemptfine,
+ dropboxmode => $dropboxmode,
+ dropboxdate => $dropboxdate->output(),
overduecharges => $overduecharges,
);
projects / koha.git / blobdiff