use strict;
use CGI;
-use C4::Circulation::Circ2;
-use C4::Search;
-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::Interface::CGI::Output;
+use C4::Branch; # GetBranches
+use C4::Koha; # GetPrinter
+use Date::Calc qw(
+ Today
+ Today_and_Now
+ Add_Delta_YM
+ Add_Delta_Days
+ Date_to_Days
+);
+
+use C4::Circulation;
+use C4::Members;
use C4::Biblio;
use C4::Reserves2;
-use C4::Circulation::Date;
#
# PARAMETERS READING
#
my $query = new CGI;
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+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 $printer = getprinter($query, $printers);
+my $branches = GetBranches();
+
+my $printers = GetPrinters();
+my $printer = GetPrinter($query, $printers);
my $findborrower = $query->param('findborrower');
$findborrower =~ s|,| |g;
-$findborrower =~ s|'| |g;
-my $borrowernumber = $query->param('borrnumber');
+#$findborrower =~ s|'| |g;
+my $borrowernumber = $query->param('borrowernumber');
+
# new op dev the branch and the printer are now defined by the userenv
-my $branch = C4::Context->userenv->{'branch'};
-my $printer=C4::Context->userenv->{'branchprinter'};
-
-my $barcode = $query->param('barcode') || '';
-my $year=$query->param('year');
-my $month=$query->param('month');
-my $day=$query->param('day');
-my $stickyduedate=$query->param('stickyduedate');
+my $branch = C4::Context->userenv->{'branch'};
+my $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');
+my $stickyduedate = $query->param('stickyduedate');
my $issueconfirmed = $query->param('issueconfirmed');
my $cancelreserve = $query->param('cancelreserve');
my $organisation = $query->param('organisations');
-my $print = $query->param('print');
+my $print = $query->param('print');
#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');
+# $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...
#
-my $print;
-$env{'branchcode'}= $branch;
-$env{'printer'}= $printer;
-# $env{'queue'}=$printer;
-my @datearr = localtime(time());
+
+my @datearr = localtime( time() );
+
# FIXME - Could just use POSIX::strftime("%Y%m%d", localtime);
my $todaysdate =
( 1900 + $datearr[5] )
}
my $inprocess = $query->param('inprocess');
-if ($barcode eq ''){
- $inprocess='';
+if ( $barcode eq '' ) {
+ $inprocess = '';
}
else {
}
-if ($barcode eq '' && $query->param('charges') eq 'yes'){
- $template->param( PAYCHARGES=>'yes',
- bornum=>$borrowernumber);
- }
+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' );
+ SearchBorrower($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 );
- 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 );
- }
- my ($reserved_num,$reserved_waiting) = CheckWaiting($borrowernumber);
- if ($reserved_num > 0) {
- for (my $i = 0; $i < $reserved_num; $i++) {
- my ($count,$line) = getbiblio($reserved_waiting->[$i]->{'biblionumber'});
- push(@lines, $line);
- }
- # warn Dumper(@lines);
+ $borrower = GetMemberDetails( $borrowernumber, 0 );
+ my ( $od, $issue, $fines ) = GetBorrowerIssuesAndFines( $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'};
+
+ # Renew day is calculated by adding the enrolment period to today
+ my ( $renew_year, $renew_month, $renew_day ) =
+ Add_Delta_YM( $today_year, $today_month, $today_day,
+ $borrower->{'enrolmentperiod'}, 0 );
+ # if the expiry date is before today
+ if ( Date_to_Days( $today_year, $today_month, $today_day ) >
+ Date_to_Days( $warning_year, $warning_month, $warning_day ) )
+ {
+
+ #borrowercard expired or nearly expired, warn the librarian
+ $template->param(
+ flagged => "1",
+ warndeparture => "1",
+ renewaldate => "$renew_year-$renew_month-$renew_day"
+ );
}
-
+ # check for NotifyBorrowerDeparture
+ if (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 ) )
+ {
+ $template->param("warndeparture" => 1);
+ }
$template->param(
overduecount => $od,
issuecount => $issue,
- finetotal => $fines,
- returned_reserve => \@lines,
+ finetotal => $fines
);
- my $htdocs = C4::Context->config('intrahtdocs');
- $picture = "/borrowerimages/" . $borrowernumber . ".jpg";
- if ( -e $htdocs . "$picture" ) {
- $template->param( picture => $picture );
- }
}
#
$barcode = cuecatbarcodedecode($barcode);
my ( $datedue, $invalidduedate ) = fixdate( $year, $month, $day );
if ($issueconfirmed) {
- issuebook( \%env, $borrower, $barcode, $datedue, $cancelreserve );
- $inprocess=1;
+ AddIssue( $borrower, $barcode, $datedue, $cancelreserve );
+ $inprocess = 1;
}
else {
my ( $error, $question ) =
- canbookbeissued( \%env, $borrower, $barcode, $year, $month, $day, $inprocess );
+ CanBookBeIssued( $borrower, $barcode, $year, $month, $day,
+ $inprocess );
my $noerror = 1;
my $noquestion = 1;
+# Get the item title for more information
+ my $getmessageiteminfo = GetBiblioFromItemNumber( undef, $barcode );
+
foreach my $impossible ( keys %$error ) {
$template->param(
$impossible => $$error{$impossible},
foreach my $needsconfirmation ( keys %$question ) {
$template->param(
$needsconfirmation => $$question{$needsconfirmation},
+ getTitleMessageIteminfo => $getmessageiteminfo->{'title'},
NEEDSCONFIRMATION => 1
);
$noquestion = 0;
year => $year
);
if ( $noerror && ( $noquestion || $issueconfirmed ) ) {
- issuebook( \%env, $borrower, $barcode, $datedue );
- $inprocess=1;
+ AddIssue( $borrower, $barcode, $datedue );
+ $inprocess = 1;
}
}
+
+# FIXME If the issue is confirmed, we launch another time borrdata2, now display the issue count after issue
+ my ( $od, $issue, $fines ) = GetBorrowerIssuesAndFines( $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 ....
if ($borrowernumber) {
-# new op dev
-# now we show the status of the borrower's reservations
- my @borrowerreserv = FastFindReserves(0,$borrowernumber);
- my @reservloop;
- foreach my $num_res (@borrowerreserv) {
- my %getreserv;
- my %env;
- my $getiteminfo = getiteminformation(\%env,$num_res->{'itemnumber'});
- my $itemtypeinfo = getitemtypeinfo($getiteminfo->{'itemtype'});
- my ($transfertwhen,$transfertfrom,$transfertto) = checktransferts($num_res->{'itemnumber'});
-
- $getreserv{waiting} = 0;
- $getreserv{transfered} = 0;
- $getreserv{nottransfered} = 0;
-
- $getreserv{reservedate} = format_date($num_res->{'reservedate'});
- $getreserv{biblionumber} = $getiteminfo->{'biblionumber'};
- $getreserv{title} = $getiteminfo->{'title'};
- $getreserv{itemtype} = $itemtypeinfo->{'description'};
- $getreserv{author} = $getiteminfo->{'author'};
- $getreserv{barcodereserv} = $getiteminfo->{'barcode'};
- $getreserv{itemcallnumber} = $getiteminfo->{'itemcallnumber'};
-# check if we have a waitin status for reservations
- if ($num_res->{'found'} eq 'W'){
- $getreserv{color} = 'reserved';
- $getreserv{waiting} = 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'});
- }
-
-# if we don't have a reserv on item, we put the biblio infos and the waiting position
- if ($getiteminfo->{'title'} eq '' ){
- my $getbibinfo = bibitemdata($num_res->{'biblionumber'});
- my $getbibtype = getitemtypeinfo($getbibinfo->{'itemtype'});
- $getreserv{color} = 'inwait';
- $getreserv{title} = $getbibinfo->{'title'};
- $getreserv{waitingposition} = $num_res->{'priority'};
- $getreserv{nottransfered} = 0;
- $getreserv{itemtype} = $getbibtype->{'description'};
- $getreserv{author} = $getbibinfo->{'author'};
- $getreserv{itemcallnumber} = '----------';
-
- }
-
- push(@reservloop, \%getreserv);
- }
- # return result to the template
- $template->param(reservloop => \@reservloop);
-}
+ # new op dev
+ # now we show the status of the borrower's reservations
+ my @borrowerreserv = GetReservations( 0, $borrowernumber );
+ my @reservloop;
+ my @WaitingReserveLoop;
+
+ foreach my $num_res (@borrowerreserv) {
+ my %getreserv;
+ my %getWaitingReserveInfo;
+ my $getiteminfo = GetBiblioFromItemNumber( $num_res->{'itemnumber'} );
+ my $itemtypeinfo = getitemtypeinfo( $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{biblionumber} = $getiteminfo->{'biblionumber'};
+ $getreserv{title} = $getiteminfo->{'title'};
+ $getreserv{itemtype} = $itemtypeinfo->{'description'};
+ $getreserv{author} = $getiteminfo->{'author'};
+ $getreserv{barcodereserv} = $getiteminfo->{'barcode'};
+ $getreserv{itemcallnumber} = $getiteminfo->{'itemcallnumber'};
+
+ # 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{itemtype} = $itemtypeinfo->{'description'};
+ $getWaitingReserveInfo{author} = $getiteminfo->{'author'};
+ $getWaitingReserveInfo{reservedate} = format_date( $num_res->{'reservedate'} );
+ if ($getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'} ) {
+ $getWaitingReserveInfo{waitingat} = GetBranchName( $num_res->{'branchcode'} );
+ }
+
+ }
+ # 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'} );
+ }
+
+# if we don't have a reserv on item, we put the biblio infos and the waiting position
+ if ( $getiteminfo->{'title'} eq '' ) {
+ my $getbibinfo = GetBiblioItemData( $num_res->{'biblionumber'} );
+ my $getbibtype = getitemtypeinfo( $getbibinfo->{'itemtype'} );
+ $getreserv{color} = 'inwait';
+ $getreserv{title} = $getbibinfo->{'title'};
+ $getreserv{waitingposition} = $num_res->{'priority'};
+ $getreserv{nottransfered} = 0;
+ $getreserv{itemtype} = $getbibtype->{'description'};
+ $getreserv{author} = $getbibinfo->{'author'};
+ $getreserv{itemcallnumber} = '----------';
+
+ }
+ 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,
+ );
+}
-# make the issued books table.....
+# make the issued books table.
my $todaysissues = '';
my $previssues = '';
my @realtodayissues;
my @realprevissues;
my $allowborrow;
+## 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
+
if ($borrower) {
# get each issue of the borrower & separate them in todayissues & previous issues
my @todaysissues;
my @previousissues;
- my $issueslist = getissues($borrower);
+ my $issueslist = GetBorrowerIssues($borrower);
# split in 2 arrays for today & previous
my $dbh = C4::Context->dbh;
- foreach my $it ( keys %$issueslist ) {
- my $issuedate = $issueslist->{$it}->{'timestamp'};
+ foreach my $it ( @$issueslist ) {
+ my $issuedate = $it->{'timestamp'};
$issuedate =~ s/-//g;
$issuedate = substr( $issuedate, 0, 8 );
+
+ # to let perl sort this correctly
+ $it->{'timestamp'} =~ s/(-|\:| )//g;
+
if ( $todaysdate == $issuedate ) {
- ($issueslist->{$it}->{'charge'}, $issueslist->{$it}->{'itemtype_charge'})=calc_charges($dbh,$issueslist->{$it}->{'itemnumber'},$borrower->{'borrowernumber'});
- $issueslist->{$it}->{'charge'} = sprintf("%.2f",$issueslist->{$it}->{'charge'});
- ($issueslist->{$it}->{'can_renew'}, $issueslist->{$it}->{'can_renew_error'}) =renewstatus(\%env,$borrower->{'borrowernumber'}, $issueslist->{$it}->{'itemnumber'});
- my ($restype,$reserves)=CheckReserves($issueslist->{$it}->{'itemnumber'});
- if ($restype){
- $issueslist->{$it}->{'can_renew'}=0;
- }
- push @todaysissues, $issueslist->{$it};
+ (
+ $it->{'charge'},
+ $it->{'itemtype_charge'}
+ )
+ = GetIssuingCharges(
+ $it->{'itemnumber'},
+ $borrower->{'borrowernumber'}
+ );
+ $it->{'charge'} =
+ sprintf( "%.2f", $it->{'charge'} );
+ (
+ $it->{'can_renew'},
+ $it->{'can_renew_error'}
+ )
+ = CanBookBeRenewed(
+ $borrower->{'borrowernumber'},
+ $it->{'itemnumber'}
+ );
+ my ( $restype, $reserves ) =
+ CheckReserves( $it->{'itemnumber'} );
+ if ($restype) {
+ $it->{'can_renew'} = 0;
+ }
+ push @todaysissues, $it;
}
else {
- ($issueslist->{$it}->{'charge'}, $issueslist->{$it}->{'itemtype_charge'})=calc_charges($dbh,$issueslist->{$it}->{'itemnumber'},$borrower->{'borrowernumber'});
- $issueslist->{$it}->{'charge'} = sprintf("%.2f",$issueslist->{$it}->{'charge'});
- ($issueslist->{$it}->{'can_renew'}, $issueslist->{$it}->{'can_renew_error'}) =renewstatus(\%env,$borrower->{'borrowernumber'}, $issueslist->{$it}->{'itemnumber'});
- my ($restype,$reserves)=CheckReserves($issueslist->{$it}->{'itemnumber'});
- if ($restype){
- $issueslist->{$it}->{'can_renew'}=0;
- }
- push @previousissues, $issueslist->{$it};
+ (
+ $it->{'charge'},
+ $it->{'itemtype_charge'}
+ )
+ = GetIssuingCharges(
+ $it->{'itemnumber'},
+ $borrower->{'borrowernumber'}
+ );
+ $it->{'charge'} =
+ sprintf( "%.2f", $it->{'charge'} );
+ (
+ $it->{'can_renew'},
+ $it->{'can_renew_error'}
+ )
+ = CanBookBeRenewed(
+ $borrower->{'borrowernumber'},
+ $it->{'itemnumber'}
+ );
+ my ( $restype, $reserves ) =
+ CheckReserves( $it->{'itemnumber'} );
+ if ($restype) {
+ $it->{'can_renew'} = 0;
+ }
+ push @previousissues, $it;
}
}
my $od; # overdues
foreach my $book ( sort { $b->{'timestamp'} <=> $a->{'timestamp'} }
@todaysissues )
{
+ #warn "TIMESTAMP".$book->{'timestamp'};
+ # ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY
+ $issued_itemtypes_count->{ $book->{'itemtype'} }++;
+
my $dd = $book->{'date_due'};
my $datedue = $book->{'date_due'};
- $dd = format_date($dd);
+
+ #$dd=format_date($dd);
$datedue =~ s/-//g;
if ( $datedue < $todaysdate ) {
$od = 1;
$togglecolor = 1;
}
$book->{'togglecolor'} = $togglecolor;
- $book->{'od'} = $od;
- $book->{'dd'} = $dd;
+ $book->{'od'} = format_date($od);
+ $book->{'dd'} = format_date($dd);
if ( $book->{'author'} eq '' ) {
$book->{'author'} = ' ';
}
foreach my $book ( sort { $a->{'date_due'} cmp $b->{'date_due'} }
@previousissues )
{
- my $dd = $book->{'date_due'};
- my $datedue = $book->{'date_due'};
- $dd = format_date($dd);
+
+ # ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY
+ $issued_itemtypes_count->{ $book->{'itemtype'} }++;
+
+ my $dd = format_date($book->{'date_due'});
+ my $datedue = format_date($book->{'date_due'});
+
+ #$dd=format_date($dd);
my $pcolor = '';
my $od = '';
$datedue =~ s/-//g;
}
}
+#### 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;
+$issueqty_sth->execute("*");
+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" ) )
+ {
+ push @issued_itemtypes_count, $data;
+ }
+}
+$issued_itemtypes_loop = \@issued_itemtypes_count;
+
+#### / JF
+
my @values;
my %labels;
my $CGIselectborrower;
if ($borrowerslist) {
foreach (
sort {
- $a->{'surname'}
+ $a->{'surname'}
. $a->{'firstname'} cmp $b->{'surname'}
. $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',
-values => \@values,
-labels => \%labels,
-size => 7,
+ -tabindex => '',
-multiple => 0
);
}
#title
+my $flags = $borrower->{'flags'};
+my $flag;
+
+foreach $flag ( sort keys %$flags ) {
+
+ $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'}
+ );
+ }
+ 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'}
+ );
+ }
+ 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 );
$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,
- printername => $printer,
- firstname => $borrower->{'firstname'},
- surname => $borrower->{'surname'},
+ issued_itemtypes_count_loop => $issued_itemtypes_loop,
+ findborrower => $findborrower,
+ borrower => $borrower,
+ borrowernumber => $borrowernumber,
+ branch => $branch,
+ printer => $printer,
+ printername => $printer,
+ firstname => $borrower->{'firstname'},
+ surname => $borrower->{'surname'},
+ expiry =>
+ $borrower->{'dateexpiry'}, #format_date($borrower->{'dateexpiry'}),
categorycode => $borrower->{'categorycode'},
- streetaddress => $borrower->{'streetaddress'},
+ streetaddress => $borrower->{'address'},
emailaddress => $borrower->{'emailaddress'},
borrowernotes => $borrower->{'borrowernotes'},
city => $borrower->{'city'},
todayissues => \@realtodayissues,
previssues => \@realprevissues,
inprocess => $inprocess,
- memberofinstution => $member_of_institution,
- CGIorganisations => $CGIorganisations,
+ memberofinstution => $member_of_institution,
+ CGIorganisations => $CGIorganisations,
);
# set return date if stickyduedate
);
}
+#if ($branchcookie) {
+#$cookie=[$cookie, $branchcookie, $printercookie];
+#}
-# if ($branchcookie) {
-# $cookie=[$cookie, $branchcookie, $printercookie];
-# }
-
+$template->param(
+ SpecifyDueDate => C4::Context->preference("SpecifyDueDate")
+);
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 ) {
-
- # 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'}
- );
- }
- 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'}
- );
- }
- if ($flag eq 'CREDITS') {
- $template->param(
- credits => 'true',
- creditsmsg => $flags->{'CREDITS'}->{'message'}
- );
- }
-
-# FIXME this part can be removed if we keep new display of reserves "reservloop"
-# 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 );
-}
-
sub cuecatbarcodedecode {
my ($barcode) = @_;
chomp($barcode);
return $barcode;
}
}
-
-# Local Variables:
-# tab-width: 8
-# End:
projects / koha-ffzg.git / blobdiff