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;
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,
# 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
# 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'},
}
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 );
}
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'},
$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'};
$ri{itemtype} = $biblio->{'itemtype'};
+ $ri{itemnote} = $biblio->{'itemnotes'};
$ri{ccode} = $biblio->{'ccode'};
$ri{barcode} = $barcode;
}
printer => $printer,
errmsgloop => \@errmsgloop,
exemptfine => $exemptfine,
+ dropboxmode => $dropboxmode,
+ dropboxdate => $dropboxdate->output(),
overduecharges => $overduecharges,
);