use strict;
use CGI;
-use C4::Circulation::Circ2;
-use C4::Members;
use C4::Output;
use C4::Print;
-use DBI;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Koha;
-use HTML::Template;
-use C4::Date;
-use Date::Manip;
+use C4::Auth qw/:DEFAULT get_session/;
+use C4::Dates qw/format_date/;
+use C4::Branch; # GetBranches
+use C4::Koha; # GetPrinter
+use C4::Circulation;
+use C4::Members;
+use C4::Biblio;
+use C4::Reserves;
+use C4::Context;
+use CGI::Session;
+
+use Date::Calc qw(
+ Today
+ Add_Delta_YM
+ Add_Delta_Days
+ Date_to_Days
+);
+
#
# PARAMETERS READING
#
my $query = new CGI;
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+# new op dev the branch and the printer are now defined by the userenv
+# but first we have to check if someone has tried to change them
+
+my $branch = $query->param('branch');
+if ($branch){
+ # update our session so the userenv is updated
+ my $dbh=C4::Context->dbh;
+ my $sessionID = $query->cookie("CGISESSID") ;
+ my $session = get_session($sessionID);
+ $session->param('branch',$branch);
+ my $branchname = GetBranchName($branch);
+ $session->param('branchname',$branchname);
+}
+
+my $printer = $query->param('printer');
+if ($printer){
+ # update our session so the userenv is updated
+ my $dbh=C4::Context->dbh;
+ my $sessionID = $query->cookie("CGISESSID") ;
+ my $session = get_session($sessionID);
+ $session->param('branchprinter',$printer);
+
+}
+if (!C4::Context->userenv && !$branch){
+ my $sessionID = $query->cookie("CGISESSID") ;
+ my $session = get_session($sessionID);
+ if ($session->param('branch') eq 'NO_LIBRARY_SET'){
+ # no branch set we can't issue
+ print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl");
+ exit;
+ }
+}
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
{
template_name => 'circ/circulation.tmpl',
query => $query,
flagsrequired => { circulate => 1 },
}
);
-my $branches = getbranches();
-my $printers = getprinters();
-my $branch = getbranch( $query, $branches );
-my $printer = getprinter( $query, $printers );
+
+my $branches = GetBranches();
+
+my $printers = GetPrinters();
+
+my @failedrenews = $query->param('failedrenew');
+my @renew_failed;
+for (@failedrenews) { $renew_failed[$_] = 1; }
my $findborrower = $query->param('findborrower');
$findborrower =~ s|,| |g;
-$findborrower =~ s|'| |g;
-my $borrowernumber = $query->param('borrnumber');
-my $print = $query->param('print') || '';
+#$findborrower =~ s|'| |g;
+my $borrowernumber = $query->param('borrowernumber');
+
+$branch = C4::Context->userenv->{'branch'};
+$printer = C4::Context->userenv->{'branchprinter'};
+
+
+# If Autolocated is not activated, we show the Circulation Parameters to chage settings of librarian
+ if (C4::Context->preference("AutoLocation") ne 1)
+ {
+ $template->param(
+ ManualLocation => 1,
+ );
+ }
+
my $barcode = $query->param('barcode') || '';
-my $year = $query->param('year');
-my $month = $query->param('month');
-my $day = $query->param('day');
+
+$barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
my $stickyduedate = $query->param('stickyduedate');
+my $duedatespec = $query->param('duedatespec');
my $issueconfirmed = $query->param('issueconfirmed');
my $cancelreserve = $query->param('cancelreserve');
my $organisation = $query->param('organisations');
+my $print = $query->param('print');
+my $newexpiry = $query->param('dateexpiry');
+my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
#set up cookie.....
-my $branchcookie;
-my $printercookie;
-if ( $query->param('setcookies') ) {
- $branchcookie = $query->cookie(
- -name => 'branch',
- -value => "$branch",
- -expires => '+1y'
- );
- $printercookie = $query->cookie(
- -name => 'printer',
- -value => "$printer",
- -expires => '+1y'
- );
-}
-
-my %env
- ; # FIXME env is used as an "environment" variable. Could be dropped probably...
-
-$env{'branchcode'} = $branch;
-$env{'printer'} = $printer;
-$env{'queue'} = $printer;
-$env{'organisation'} = $organisation;
+# my $branchcookie;
+# my $printercookie;
+# if ($query->param('setcookies')) {
+# $branchcookie = $query->cookie(-name=>'branch', -value=>"$branch", -expires=>'+1y');
+# $printercookie = $query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
+# }
+#
-my @datearr = localtime( time() );
+my ($datedue,$invalidduedate);
+if ($duedatespec) {
+ if ($duedatespec =~ C4::Dates->regexp('syspref')) {
+ my $tempdate = C4::Dates->new($duedatespec);
+ if ($tempdate and $tempdate->output('iso') gt C4::Dates->new()->output('iso')) {
+ # i.e., it has to be later than today/now
+ $datedue = $tempdate;
+ } else {
+ $invalidduedate = 1;
+ $template->param(IMPOSSIBLE=>1, INVALID_DATE=>$duedatespec);
+ }
+ } else {
+ $invalidduedate = 1;
+ $template->param(IMPOSSIBLE=>1, INVALID_DATE=>$duedatespec);
+ }
+}
-# FIXME - Could just use POSIX::strftime("%Y%m%d", localtime);
-my $todaysdate =
- ( 1900 + $datearr[5] )
- . sprintf( "%0.2d", ( $datearr[4] + 1 ) )
- . sprintf( "%0.2d", ( $datearr[3] ) );
+my $todaysdate = C4::Dates->new->output('iso');
# check and see if we should print
if ( $barcode eq '' && $print eq 'maybe' ) {
$print = 'yes';
}
+
+my $inprocess = ($barcode eq '') ? '' : $query->param('inprocess');
+
+if ( $barcode eq '' && $query->param('charges') eq 'yes' ) {
+ $template->param(
+ PAYCHARGES => 'yes',
+ borrowernumber => $borrowernumber
+ );
+}
+
if ( $print eq 'yes' && $borrowernumber ne '' ) {
- printslip( \%env, $borrowernumber );
- $query->param( 'borrnumber', '' );
+ printslip( $borrowernumber );
+ $query->param( 'borrowernumber', '' );
$borrowernumber = '';
}
my $message;
if ($findborrower) {
my ( $count, $borrowers ) =
- BornameSearch( \%env, $findborrower, 'cardnumber', 'web' );
+ SearchMember($findborrower, 'cardnumber', 'web' );
my @borrowers = @$borrowers;
if ( $#borrowers == -1 ) {
$query->param( 'findborrower', '' );
$message = "'$findborrower'";
}
elsif ( $#borrowers == 0 ) {
- $query->param( 'borrnumber', $borrowers[0]->{'borrowernumber'} );
- $query->param( 'barcode', '' );
+ $query->param( 'borrowernumber', $borrowers[0]->{'borrowernumber'} );
+ $query->param( 'barcode', '' );
$borrowernumber = $borrowers[0]->{'borrowernumber'};
}
else {
# get the borrower information.....
my $borrower;
-my $picture;
-
+my @lines;
if ($borrowernumber) {
- $borrower = getpatroninformation( \%env, $borrowernumber, 0 );
- my ( $od, $issue, $fines ) = borrdata2( \%env, $borrowernumber );
- warn $borrower->{'expiry'};
- my $warningdate =
- DateCalc( $borrower->{'expiry'},
- "- " . C4::Context->preference('NotifyBorrowerDeparture') . " days" );
- my $warning = Date_Cmp( ParseDate("today"), $warningdate );
- if ( $warning > 0 ) {
-
- #borrowercard expired
- $template->param( warndeparture => $warning );
+ $borrower = GetMemberDetails( $borrowernumber, 0 );
+ my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
+
+ # Warningdate is the date that the warning starts appearing
+ my ( $today_year, $today_month, $today_day ) = Today();
+ my ( $warning_year, $warning_month, $warning_day ) = split /-/,
+ $borrower->{'dateexpiry'};
+ my ( $enrol_year, $enrol_month, $enrol_day ) = split /-/,
+ $borrower->{'dateenrolled'};
+ # Renew day is calculated by adding the enrolment period to today
+ my ( $renew_year, $renew_month, $renew_day ) =
+ Add_Delta_YM( $enrol_year, $enrol_month, $enrol_day,
+ 0 , $borrower->{'enrolmentperiod'}) if ($enrol_year*$enrol_month*$enrol_day>0);
+ # if the expiry date is before today ie they have expired
+ if ( $warning_year*$warning_month*$warning_day==0
+ || Date_to_Days( $today_year, $today_month, $today_day )
+ > Date_to_Days( $warning_year, $warning_month, $warning_day ) )
+ {
+ #borrowercard expired, no issues
+ $template->param(
+ flagged => "1",
+ noissues => "1",
+ expired => format_date($borrower->{dateexpiry}),
+ renewaldate => format_date("$renew_year-$renew_month-$renew_day")
+ );
+ }
+ # check for NotifyBorrowerDeparture
+ elsif ( C4::Context->preference('NotifyBorrowerDeparture') &&
+ Date_to_Days(Add_Delta_Days($warning_year,$warning_month,$warning_day,- C4::Context->preference('NotifyBorrowerDeparture'))) <
+ Date_to_Days( $today_year, $today_month, $today_day ) )
+ {
+ # borrower card soon to expire warn librarian
+ $template->param("warndeparture" => format_date($borrower->{dateexpiry}),
+ flagged => "1",);
+ if ( C4::Context->preference('ReturnBeforeExpiry')){
+ $template->param("returnbeforeexpiry" => 1);
}
+ }
$template->param(
overduecount => $od,
issuecount => $issue,
finetotal => $fines
);
- my $htdocs = C4::Context->config('intrahtdocs');
- $picture = "/borrowerimages/" . $borrowernumber . ".jpg";
- if ( -e $htdocs . "$picture" ) {
- $template->param( picture => $picture );
- }
}
#
# STEP 3 : ISSUING
#
#
-
if ($barcode) {
- $barcode = cuecatbarcodedecode($barcode);
- my ( $datedue, $invalidduedate ) = fixdate( $year, $month, $day );
- if ($issueconfirmed) {
- issuebook( \%env, $borrower, $barcode, $datedue, $cancelreserve );
- }
- else {
- my ( $error, $question ) =
- canbookbeissued( \%env, $borrower, $barcode, $year, $month, $day );
- my $noerror = 1;
- my $noquestion = 1;
- foreach my $impossible ( keys %$error ) {
+ # always check for blockers on issuing
+ my ( $error, $question ) =
+ CanBookBeIssued( $borrower, $barcode, $datedue , $inprocess );
+ my $noerror = $invalidduedate ? 0 : 1;
+
+ delete $question->{'DEBT'} if ($debt_confirmed);
+ foreach my $impossible ( keys %$error ) {
$template->param(
$impossible => $$error{$impossible},
IMPOSSIBLE => 1
);
$noerror = 0;
}
- foreach my $needsconfirmation ( keys %$question ) {
- $template->param(
- $needsconfirmation => $$question{$needsconfirmation},
- NEEDSCONFIRMATION => 1
- );
- $noquestion = 0;
- }
- $template->param(
- day => $day,
- month => $month,
- year => $year
+
+ if ($issueconfirmed && $noerror) {
+ # we have no blockers for issuing and any issues needing confirmation have been resolved
+ AddIssue( $borrower, $barcode, $datedue, $cancelreserve );
+ $inprocess = 1;
+ }
+ elsif ($issueconfirmed){ # FIXME: Do something? Or is this to *intentionally* do nothing?
+ }
+ else {
+ my $noquestion = 1;
+# Get the item title for more information
+ my $getmessageiteminfo = GetBiblioFromItemNumber(undef,$barcode);
+ if ($noerror) {
+ # only pass needsconfirmation to template if issuing is possible
+ foreach my $needsconfirmation ( keys %$question ) {
+ $template->param(
+ $needsconfirmation => $$question{$needsconfirmation},
+ getTitleMessageIteminfo => $getmessageiteminfo->{'title'},
+ NEEDSCONFIRMATION => 1
+ );
+ $noquestion = 0;
+ }
+ # Because of the weird conditional structure (empty elsif block),
+ # if we reached here, $issueconfirmed must be false.
+ # Also, since we moved inside the if ($noerror) conditional,
+ # this old chunky conditional can be simplified:
+ # if ( $noerror && ( $noquestion || $issueconfirmed ) ) {
+ if ($noquestion) {
+ AddIssue( $borrower, $barcode, $datedue );
+ $inprocess = 1;
+ }
+ }
+ $template->param(
+ itemhomebranch => $getmessageiteminfo->{'homebranch'} ,
+ duedatespec => $duedatespec,
);
- if ( $noerror && ( $noquestion || $issueconfirmed ) ) {
- issuebook( \%env, $borrower, $barcode, $datedue );
- }
}
+
+# FIXME If the issue is confirmed, we launch another time borrdata2, now display the issue count after issue
+ my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
+ $template->param(
+ issuecount => $issue,
+ );
}
# reload the borrower info for the sake of reseting the flags.....
if ($borrowernumber) {
- $borrower = getpatroninformation( \%env, $borrowernumber, 0 );
+ $borrower = GetMemberDetails( $borrowernumber, 0 );
}
##################################################################################
# BUILD HTML
+# show all reserves of this borrower, and the position of the reservation ....
+my $borrowercategory;
+my $category_type;
+if ($borrowernumber) {
+
+ # new op dev
+ # now we show the status of the borrower's reservations
+ my @borrowerreserv = GetReservesFromBorrowernumber($borrowernumber );
+ my @reservloop;
+ my @WaitingReserveLoop;
+
+ foreach my $num_res (@borrowerreserv) {
+ my %getreserv;
+ my %getWaitingReserveInfo;
+ my $getiteminfo = GetBiblioFromItemNumber( $num_res->{'itemnumber'} );
+ my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $getiteminfo->{'itype'} : $getiteminfo->{'itemtype'} );
+ my ( $transfertwhen, $transfertfrom, $transfertto ) =
+ GetTransfers( $num_res->{'itemnumber'} );
+
+ $getreserv{waiting} = 0;
+ $getreserv{transfered} = 0;
+ $getreserv{nottransfered} = 0;
+
+ $getreserv{reservedate} = format_date( $num_res->{'reservedate'} );
+ $getreserv{title} = $getiteminfo->{'title'};
+ $getreserv{itemtype} = $itemtypeinfo->{'description'};
+ $getreserv{author} = $getiteminfo->{'author'};
+ $getreserv{barcodereserv} = $getiteminfo->{'barcode'};
+ $getreserv{itemcallnumber} = $getiteminfo->{'itemcallnumber'};
+ $getreserv{biblionumber} = $getiteminfo->{'biblionumber'};
+ $getreserv{waitingat} = GetBranchName( $num_res->{'branchcode'} );
+ # check if we have a waiting status for reservations
+ if ( $num_res->{'found'} eq 'W' ) {
+ $getreserv{color} = 'reserved';
+ $getreserv{waiting} = 1;
+# genarate information displaying only waiting reserves
+ $getWaitingReserveInfo{title} = $getiteminfo->{'title'};
+ $getWaitingReserveInfo{biblionumber} = $getiteminfo->{'biblionumber'};
+ $getWaitingReserveInfo{itemtype} = $itemtypeinfo->{'description'};
+ $getWaitingReserveInfo{author} = $getiteminfo->{'author'};
+ $getWaitingReserveInfo{reservedate} = format_date( $num_res->{'reservedate'} );
+ $getWaitingReserveInfo{waitingat} = GetBranchName( $num_res->{'branchcode'} );
+ if($num_res->{'branchcode'} eq $branch){ $getWaitingReserveInfo{waitinghere} = 1; }
+ }
+ # check transfers with the itemnumber foud in th reservation loop
+ if ($transfertwhen) {
+ $getreserv{color} = 'transfered';
+ $getreserv{transfered} = 1;
+ $getreserv{datesent} = format_date($transfertwhen);
+ $getreserv{frombranch} = GetBranchName($transfertfrom);
+ }
+
+ if ( ( $getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'} )
+ and not $transfertwhen )
+ {
+ $getreserv{nottransfered} = 1;
+ $getreserv{nottransferedby} =
+ GetBranchName( $getiteminfo->{'holdingbranch'} );
+ }
-# make the issued books table.....
+# if we don't have a reserv on item, we put the biblio infos and the waiting position
+ if ( $getiteminfo->{'title'} eq '' ) {
+ my $getbibinfo = GetBiblioData( $num_res->{'biblionumber'} );
+ my $getbibtype = getitemtypeinfo( $getbibinfo->{'itemtype'} ); # fixme - we should have item-level reserves here ?
+ $getreserv{color} = 'inwait';
+ $getreserv{title} = $getbibinfo->{'title'};
+ $getreserv{nottransfered} = 0;
+ $getreserv{itemtype} = $getbibtype->{'description'};
+ $getreserv{author} = $getbibinfo->{'author'};
+ $getreserv{biblionumber} = $num_res->{'biblionumber'};
+ }
+ $getreserv{waitingposition} = $num_res->{'priority'};
+ push( @reservloop, \%getreserv );
+
+# if we have a reserve waiting, initiate waitingreserveloop
+ if ($getreserv{waiting} eq 1) {
+ push (@WaitingReserveLoop, \%getWaitingReserveInfo)
+ }
+
+ }
+
+ # return result to the template
+ $template->param(
+ countreserv => scalar @reservloop,
+ reservloop => \@reservloop ,
+ WaitingReserveLoop => \@WaitingReserveLoop,
+ );
+ $template->param( adultborrower => 1 ) if ( $borrower->{'category_type'} eq 'A' );
+}
+
+# make the issued books table.
my $todaysissues = '';
my $previssues = '';
-my @realtodayissues;
-my @realprevissues;
+my @todaysissues;
+my @previousissues;
my $allowborrow;
-if ($borrower) {
+## ADDED BY JF: new itemtype issuingrules counter stuff
+my $issued_itemtypes_loop;
+my $issued_itemtypes_count;
+my $issued_itemtypes_allowed_count; # hashref with total allowed by itemtype
+my $issued_itemtypes_remaining; # hashref with remaining
+my $issued_itemtypes_flags; #hashref that stores flags
+my @issued_itemtypes_count_loop;
+if ($borrower) {
# get each issue of the borrower & separate them in todayissues & previous issues
- my @todaysissues;
- my @previousissues;
- my $issueslist = getissues($borrower);
+ my ($countissues,$issueslist) = GetPendingIssues($borrower->{'borrowernumber'});
# split in 2 arrays for today & previous
- foreach my $it ( keys %$issueslist ) {
- my $issuedate = $issueslist->{$it}->{'timestamp'};
- $issuedate =~ s/-//g;
- $issuedate = substr( $issuedate, 0, 8 );
- if ( $todaysdate == $issuedate ) {
- push @todaysissues, $issueslist->{$it};
- }
- else {
- push @previousissues, $issueslist->{$it};
- }
- }
- my $od; # overdues
- my $i = 0;
- my $togglecolor;
+ foreach my $it ( @$issueslist ) {
+ # set itemtype per item-level_itype syspref - FIXME this is an ugly hack
+ $it->{'itemtype'} = ( C4::Context->preference( 'item-level_itypes' ) ) ? $it->{'itype'} : $it->{'itemtype'};
- # parses today & build Template array
- foreach my $book ( sort { $b->{'timestamp'} <=> $a->{'timestamp'} }
- @todaysissues )
- {
- my $dd = $book->{'date_due'};
- my $datedue = $book->{'date_due'};
- $dd = format_date($dd);
- $datedue =~ s/-//g;
- if ( $datedue < $todaysdate ) {
- $od = 1;
- }
- else {
- $od = 0;
- }
- if ( $i % 2 ) {
- $togglecolor = 0;
- }
- else {
- $togglecolor = 1;
- }
- $book->{'togglecolor'} = $togglecolor;
- $book->{'od'} = $od;
- $book->{'dd'} = $dd;
- if ( $book->{'author'} eq '' ) {
- $book->{'author'} = ' ';
+ ($it->{'charge'}, $it->{'itemtype_charge'}) = GetIssuingCharges(
+ $it->{'itemnumber'}, $borrower->{'borrowernumber'}
+ );
+ $it->{'charge'} = sprintf("%.2f", $it->{'charge'});
+ my $can_renew_error;
+ ($it->{'can_renew'}, $can_renew_error) = CanBookBeRenewed(
+ $borrower->{'borrowernumber'},$it->{'itemnumber'}
+ );
+ $it->{"renew_error_${can_renew_error}"} = 1 if defined $can_renew_error;
+ my ( $restype, $reserves ) = CheckReserves( $it->{'itemnumber'} );
+ ( $restype ) and $it->{'can_renew'} = 0;
+
+ $it->{'dd'} = format_date($it->{'date_due'});
+ $it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
+ ($it->{'author'} eq '') and $it->{'author'} = ' ';
+ $it->{'renew_failed'} = $renew_failed[$it->{'itemnumber'}];
+ # ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY
+ $issued_itemtypes_count->{ $it->{'itemtype'} }++;
+
+ if ( $todaysdate eq $it->{'issuedate'} or $todaysdate eq $it->{'lastreneweddate'} ) {
+ push @todaysissues, $it;
+ } else {
+ push @previousissues, $it;
}
- push @realtodayissues, $book;
- $i++;
}
+ if ( C4::Context->preference( "todaysIssuesDefaultSortOrder" ) eq 'asc' ) {
+ @todaysissues = sort { $a->{'timestamp'} cmp $b->{'timestamp'} } @todaysissues;
+ }
+ else {
+ @todaysissues = sort { $b->{'timestamp'} cmp $a->{'timestamp'} } @todaysissues;
+ }
+ if ( C4::Context->preference( "previousIssuesDefaultSortOrder" ) eq 'asc' ){
+ @previousissues = sort { $a->{'date_due'} cmp $b->{'date_due'} } @previousissues;
+ }
+ else {
+ @previousissues = sort { $b->{'date_due'} cmp $a->{'date_due'} } @previousissues;
+ }
+ my $i = 1;
+ foreach my $book ( @todaysissues ) {
+ $book->{'togglecolor'} = ( ++$i % 2 ) ? 0 : 1 ;
+ }
+ $i = 1;
+ foreach my $book ( @previousissues ) {
+ $book->{'togglecolor'} = ( ++$i % 2 ) ? 0 : 1 ;
+ }
+}
- # parses previous & build Template array
- $i = 0;
- foreach my $book ( sort { $a->{'date_due'} cmp $b->{'date_due'} }
- @previousissues )
+#### ADDED BY JF FOR COUNTS BY ITEMTYPE RULES
+# FIXME: This should utilize all the issuingrules options rather than just the defaults
+# and it should be moved to a module
+my $dbh = C4::Context->dbh;
+
+# how many of each is allowed?
+my $issueqty_sth = $dbh->prepare( "
+SELECT itemtypes.description AS description,issuingrules.itemtype,maxissueqty
+FROM issuingrules
+ LEFT JOIN itemtypes ON (itemtypes.itemtype=issuingrules.itemtype)
+ WHERE categorycode=?
+" );
+#my @issued_itemtypes_count; # huh?
+$issueqty_sth->execute("*"); # FIXME: Why have a WHERE clause at all with a hardcoded "*"?
+
+while ( my $data = $issueqty_sth->fetchrow_hashref() ) {
+
+ # subtract how many of each this borrower has
+ $data->{'count'} = $issued_itemtypes_count->{ $data->{'description'} };
+ $data->{'left'} =
+ ( $data->{'maxissueqty'} -
+ $issued_itemtypes_count->{ $data->{'description'} } );
+
+ # can't have a negative number of remaining
+ if ( $data->{'left'} < 0 ) { $data->{'left'} = "0" }
+ $data->{'flag'} = 1 unless ( $data->{'maxissueqty'} > $data->{'count'} );
+ unless ( ( $data->{'maxissueqty'} < 1 )
+ || ( $data->{'itemtype'} eq "*" )
+ || ( $data->{'itemtype'} eq "CIRC" ) )
{
- my $dd = $book->{'date_due'};
- my $datedue = $book->{'date_due'};
- $dd = format_date($dd);
- my $pcolor = '';
- my $od = '';
- $datedue =~ s/-//g;
- if ( $datedue < $todaysdate ) {
- $od = 1;
- }
- else {
- $od = 0;
- }
- if ( $i % 2 ) {
- $togglecolor = 0;
- }
- else {
- $togglecolor = 1;
- }
- $book->{'togglecolor'} = $togglecolor;
- $book->{'dd'} = $dd;
- $book->{'od'} = $od;
- if ( $book->{'author'} eq '' ) {
- $book->{'author'} = ' ';
- }
- push @realprevissues, $book;
- $i++;
+ push @issued_itemtypes_count_loop, $data;
}
}
+$issued_itemtypes_loop = \@issued_itemtypes_count_loop;
+
+#### / JF
my @values;
my %labels;
my $CGIselectborrower;
if ($borrowerslist) {
foreach (
- sort {
- $a->{'surname'}
- . $a->{'firstname'} cmp $b->{'surname'}
- . $b->{'firstname'}
+ sort {(lc $a->{'surname'} cmp lc $b->{'surname'} ?lc $a->{'surname'} cmp lc $b->{'surname'}:lc $a->{'firstname'} cmp lc $b->{'firstname'})
} @$borrowerslist
)
{
push @values, $_->{'borrowernumber'};
$labels{ $_->{'borrowernumber'} } =
-"$_->{'surname'}, $_->{'firstname'} ... ($_->{'cardnumber'} - $_->{'categorycode'}) ... $_->{'streetaddress'} ";
+"$_->{'surname'}, $_->{'firstname'} ... ($_->{'cardnumber'} - $_->{'categorycode'}) ... $_->{'address'} ";
}
$CGIselectborrower = CGI::scrolling_list(
- -name => 'borrnumber',
+ -name => 'borrowernumber',
+ -class => 'focus',
+ -id => 'borrowernumber',
-values => \@values,
-labels => \%labels,
-size => 7,
+ -tabindex => '',
-multiple => 0
);
}
#title
+my $flags = $borrower->{'flags'};
+my $flag;
+
+foreach $flag ( sort keys %$flags ) {
+ $template->param( flagged=> 1);
+ $flags->{$flag}->{'message'} =~ s#\n#<br />#g;
+ if ( $flags->{$flag}->{'noissues'} ) {
+ $template->param(
+ flagged => 1,
+ noissues => 'true',
+ );
+ if ( $flag eq 'GNA' ) {
+ $template->param( gna => 'true' );
+ }
+ if ( $flag eq 'LOST' ) {
+ $template->param( lost => 'true' );
+ }
+ if ( $flag eq 'DBARRED' ) {
+ $template->param( dbarred => 'true' );
+ }
+ if ( $flag eq 'CHARGES' ) {
+ $template->param(
+ charges => 'true',
+ chargesmsg => $flags->{'CHARGES'}->{'message'},
+ chargesamount => $flags->{'CHARGES'}->{'amount'},
+ charges_is_blocker => 1
+ );
+ }
+ if ( $flag eq 'CREDITS' ) {
+ $template->param(
+ credits => 'true',
+ creditsmsg => $flags->{'CREDITS'}->{'message'}
+ );
+ }
+ }
+ else {
+ if ( $flag eq 'CHARGES' ) {
+ $template->param(
+ charges => 'true',
+ flagged => 1,
+ chargesmsg => $flags->{'CHARGES'}->{'message'},
+ chargesamount => $flags->{'CHARGES'}->{'amount'},
+ );
+ }
+ if ( $flag eq 'CREDITS' ) {
+ $template->param(
+ credits => 'true',
+ creditsmsg => $flags->{'CREDITS'}->{'message'}
+ );
+ }
+ if ( $flag eq 'ODUES' ) {
+ $template->param(
+ odues => 'true',
+ flagged => 1,
+ oduesmsg => $flags->{'ODUES'}->{'message'}
+ );
+
+ my $items = $flags->{$flag}->{'itemlist'};
+# useless ???
+# {
+# my @itemswaiting;
+# foreach my $item (@$items) {
+# my ($iteminformation) =
+# getiteminformation( $item->{'itemnumber'}, 0 );
+# push @itemswaiting, $iteminformation;
+# }
+# }
+ if ( $query->param('module') ne 'returns' ) {
+ $template->param( nonreturns => 'true' );
+ }
+ }
+ if ( $flag eq 'NOTES' ) {
+ $template->param(
+ notes => 'true',
+ flagged => 1,
+ notesmsg => $flags->{'NOTES'}->{'message'}
+ );
+ }
+ }
+}
-my ( $patrontable, $flaginfotable ) = patrontable($borrower);
my $amountold = $borrower->{flags}->{'CHARGES'}->{'message'} || 0;
my @temp = split( /\$/, $amountold );
+ if ( $borrower->{'category_type'} eq 'C') {
+ my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+ my $cnt = scalar(@$catcodes);
+ $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
+ $template->param( 'catcode' => $catcodes->[0]) if $cnt == 1;
+ }
+
my $CGIorganisations;
my $member_of_institution;
if ( C4::Context->preference("memberofinstitution") ) {
$organisations->{$organisation}->{'surname'};
}
$member_of_institution = 1;
- $CGIorganisations = CGI::popup_menu(
- -id => 'organisations',
- -name => 'organisations',
- -labels => \%org_labels,
- -values => \@orgs,
-
+ $CGIorganisations = CGI::popup_menu(
+ -id => 'organisations',
+ -name => 'organisations',
+ -labels => \%org_labels,
+ -values => \@orgs,
);
}
$amountold = $temp[1];
+
+
$template->param(
- findborrower => $findborrower,
- borrower => $borrower,
- borrowernumber => $borrowernumber,
- branch => $branch,
- printer => $printer,
- branchname => $branches->{$branch}->{'branchname'},
- printername => $printers->{$printer}->{'printername'},
- firstname => $borrower->{'firstname'},
- surname => $borrower->{'surname'},
+ issued_itemtypes_count_loop => $issued_itemtypes_loop,
+ findborrower => $findborrower,
+ borrower => $borrower,
+ borrowernumber => $borrowernumber,
+ branch => $branch,
+ branchname => GetBranchName($borrower->{'branchcode'}),
+ printer => $printer,
+ printername => $printer,
+ firstname => $borrower->{'firstname'},
+ surname => $borrower->{'surname'},
+ dateexpiry => format_date($newexpiry),
+ expiry => format_date($borrower->{'dateexpiry'}),
categorycode => $borrower->{'categorycode'},
- streetaddress => $borrower->{'streetaddress'},
- emailaddress => $borrower->{'emailaddress'},
+ categoryname => $borrower->{description},
+ address => $borrower->{'address'},
+ address2 => $borrower->{'address2'},
+ email => $borrower->{'email'},
+ emailpro => $borrower->{'emailpro'},
borrowernotes => $borrower->{'borrowernotes'},
city => $borrower->{'city'},
- phone => $borrower->{'phone'},
+ zipcode => $borrower->{'zipcode'},
+ phone => $borrower->{'phone'} || $borrower->{'mobile'},
cardnumber => $borrower->{'cardnumber'},
amountold => $amountold,
barcode => $barcode,
stickyduedate => $stickyduedate,
message => $message,
CGIselectborrower => $CGIselectborrower,
- todayissues => \@realtodayissues,
- previssues => \@realprevissues,
- memberofinstution => $member_of_institution,
- CGIorganisations => $CGIorganisations,
+ todayissues => \@todaysissues,
+ previssues => \@previousissues,
+ inprocess => $inprocess,
+ memberofinstution => $member_of_institution,
+ CGIorganisations => $CGIorganisations,
+ is_child => ($borrower->{'category_type'} eq 'C'),
+ circview => 1,
+
);
# set return date if stickyduedate
if ($stickyduedate) {
- my $t_year = "year" . $year;
- my $t_month = "month" . $month;
- my $t_day = "day" . $day;
$template->param(
- $t_year => 1,
- $t_month => 1,
- $t_day => 1,
+ duedatespec => $duedatespec,
);
}
-if ($branchcookie) {
- $cookie = [ $cookie, $branchcookie, $printercookie ];
-}
-
-output_html_with_http_headers $query, $cookie, $template->output;
-
-####################################################################
-# Extra subroutines,,,
-
-sub patrontable {
- my ($borrower) = @_;
- my $flags = $borrower->{'flags'};
- my $flaginfotable = '';
- my $flaginfotext;
-
- #my $flaginfotext='';
- my $flag;
- my $color = '';
- foreach $flag ( sort keys %$flags ) {
+#if ($branchcookie) {
+#$cookie=[$cookie, $branchcookie, $printercookie];
+#}
- # my @itemswaiting='';
- $flags->{$flag}->{'message'} =~ s/\n/<br>/g;
- if ( $flags->{$flag}->{'noissues'} ) {
- $template->param(
- flagged => 1,
- noissues => 'true',
- );
- if ( $flag eq 'GNA' ) {
- $template->param( gna => 'true' );
- }
- if ( $flag eq 'LOST' ) {
- $template->param( lost => 'true' );
- }
- if ( $flag eq 'DBARRED' ) {
- $template->param( dbarred => 'true' );
- }
- if ( $flag eq 'CHARGES' ) {
- $template->param(
- charges => 'true',
- chargesmsg => $flags->{'CHARGES'}->{'message'}
- );
- }
- }
- else {
- if ( $flag eq 'CHARGES' ) {
- $template->param(
- charges => 'true',
- flagged => 1,
- chargesmsg => $flags->{'CHARGES'}->{'message'}
- );
- }
- if ( $flag eq 'WAITING' ) {
- my $items = $flags->{$flag}->{'itemlist'};
- my @itemswaiting;
- foreach my $item (@$items) {
- my ($iteminformation) =
- getiteminformation( \%env, $item->{'itemnumber'}, 0 );
- $iteminformation->{'branchname'} =
- $branches->{ $iteminformation->{'holdingbranch'} }
- ->{'branchname'};
- push @itemswaiting, $iteminformation;
- }
- $template->param(
- flagged => 1,
- waiting => 'true',
- waitingmsg => $flags->{'WAITING'}->{'message'},
- itemswaiting => \@itemswaiting,
- );
- }
- if ( $flag eq 'ODUES' ) {
- $template->param(
- odues => 'true',
- flagged => 1,
- oduesmsg => $flags->{'ODUES'}->{'message'}
- );
-
- my $items = $flags->{$flag}->{'itemlist'};
- {
- my @itemswaiting;
- foreach my $item (@$items) {
- my ($iteminformation) =
- getiteminformation( \%env, $item->{'itemnumber'}, 0 );
- push @itemswaiting, $iteminformation;
- }
- }
- if ( $query->param('module') ne 'returns' ) {
- $template->param( nonreturns => 'true' );
- }
- }
- if ( $flag eq 'NOTES' ) {
- $template->param(
- notes => 'true',
- flagged => 1,
- notesmsg => $flags->{'NOTES'}->{'message'}
- );
- }
- }
- }
- return ( $patrontable, $flaginfotext );
-}
+my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
-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;
- }
-}
-# Local Variables:
-# tab-width: 8
-# End:
+$template->param(
+ debt_confirmed => $debt_confirmed,
+ SpecifyDueDate => C4::Context->preference("SpecifyDueDate"),
+ CircAutocompl => C4::Context->preference("CircAutocompl"),
+ dateformat => C4::Context->preference("dateformat"),
+ DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+);
+output_html_with_http_headers $query, $cookie, $template->output;
projects / koha.git / blobdiff