X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=circ%2Fcirculation.pl;h=b165d68369915a7437b9900597361317bedbe32e;hb=36b2897430b27a6b8a12f6684d32bc64e026073f;hp=a0108f865add99732bd5bcd879fd06c773682406;hpb=3967fa9c79ce7af585ecba6b6bcebcc17b27061b;p=koha.git
diff --git a/circ/circulation.pl b/circ/circulation.pl
index a0108f865a..b165d68369 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -26,8 +26,8 @@ use strict;
use CGI;
use C4::Output;
use C4::Print;
-use C4::Auth;
-use C4::Date;
+use C4::Auth qw/:DEFAULT get_session/;
+use C4::Dates qw/format_date/;
use C4::Branch; # GetBranches
use C4::Koha; # GetPrinter
use C4::Circulation;
@@ -39,12 +39,15 @@ use CGI::Session;
use Date::Calc qw(
Today
- Today_and_Now
Add_Delta_YM
Add_Delta_Days
Date_to_Days
);
+use Date::Manip qw(
+ Date_Cmp
+);
+
#
# PARAMETERS READING
@@ -59,7 +62,7 @@ if ($branch){
# update our session so the userenv is updated
my $dbh=C4::Context->dbh;
my $sessionID = $query->cookie("CGISESSID") ;
- my $session = new CGI::Session("driver:MySQL", $sessionID, {Handle=>$dbh});
+ my $session = get_session($sessionID);
$session->param('branch',$branch);
my $branchname = GetBranchName($branch);
$session->param('branchname',$branchname);
@@ -68,13 +71,21 @@ if ($branch){
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 = new CGI::Session("driver:MySQL", $sessionID, {Handle=>$dbh});
- $session->param('branchprinter',$printer);
+ 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 (
{
@@ -98,7 +109,7 @@ $findborrower =~ s|,| |g;
#$findborrower =~ s|'| |g;
my $borrowernumber = $query->param('borrowernumber');
-$branch = C4::Context->userenv->{'branch'};
+$branch = C4::Context->userenv->{'branch'};
$printer = C4::Context->userenv->{'branchprinter'};
@@ -111,14 +122,18 @@ $printer = C4::Context->userenv->{'branchprinter'};
}
my $barcode = $query->param('barcode') || '';
+
+$barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
my $year = $query->param('year');
my $month = $query->param('month');
my $day = $query->param('day');
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');
#set up cookie.....
# my $branchcookie;
@@ -129,14 +144,24 @@ my $print = $query->param('print');
# }
#
+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);
+ }
+}
-my @datearr = localtime( time() );
-
-# 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' ) {
@@ -185,7 +210,6 @@ if ($findborrower) {
# get the borrower information.....
my $borrower;
my @lines;
-
if ($borrowernumber) {
$borrower = GetMemberDetails( $borrowernumber, 0 );
my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
@@ -200,27 +224,31 @@ if ($borrowernumber) {
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
+ # 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 or nearly expired, warn the librarian
+ #borrowercard expired, no issues
$template->param(
- flagged => "1",
- warndeparture => format_date($borrower->{dateexpiry}),
+ flagged => "1",
+ noissues => "1",
+ expired => format_date($borrower->{dateexpiry}),
renewaldate => format_date("$renew_year-$renew_month-$renew_day")
);
}
# check for NotifyBorrowerDeparture
- if ($warning_year*$warning_month*$warning_day==0
- || (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" => format_date($borrower->{dateexpiry}));
- }
+ 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,
@@ -232,47 +260,54 @@ if ($borrowernumber) {
# STEP 3 : ISSUING
#
#
-
if ($barcode) {
- $barcode = cuecatbarcodedecode($barcode);
- my ( $datedue, $invalidduedate ) = fixdate( $year, $month, $day );
- if ($issueconfirmed) {
- AddIssue( $borrower, $barcode, $datedue, $cancelreserve );
- $inprocess = 1;
- }
- else {
- my ( $error, $question ) =
- CanBookBeIssued( $borrower, $barcode, $year, $month, $day,
- $inprocess );
- my $noerror = 1;
- my $noquestion = 1;
-# Get the item title for more information
- my $getmessageiteminfo = GetBiblioFromItemNumber($barcode);
-
- foreach my $impossible ( keys %$error ) {
+ # always check for blockers on issuing
+ my ( $error, $question ) =
+ CanBookBeIssued( $borrower, $barcode, $datedue , $inprocess );
+ my $noerror = $invalidduedate ? 0 : 1;
+ foreach my $impossible ( keys %$error ) {
$template->param(
$impossible => $$error{$impossible},
IMPOSSIBLE => 1
);
$noerror = 0;
}
- foreach my $needsconfirmation ( keys %$question ) {
- $template->param(
- $needsconfirmation => $$question{$needsconfirmation},
- getTitleMessageIteminfo => $getmessageiteminfo->{'title'},
- 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 ) ) {
- AddIssue( $borrower, $barcode, $datedue );
- $inprocess = 1;
- }
}
# FIXME If the issue is confirmed, we launch another time borrdata2, now display the issue count after issue
@@ -290,6 +325,8 @@ if ($borrowernumber) {
##################################################################################
# BUILD HTML
# show all reserves of this borrower, and the position of the reservation ....
+my $borrowercategory;
+my $category_type;
if ($borrowernumber) {
# new op dev
@@ -302,7 +339,7 @@ if ($borrowernumber) {
my %getreserv;
my %getWaitingReserveInfo;
my $getiteminfo = GetBiblioFromItemNumber( $num_res->{'itemnumber'} );
- my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itype')) ? $getiteminfo->{'itype'} : $getiteminfo->{'itemtype'} );
+ my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $getiteminfo->{'itype'} : $getiteminfo->{'itemtype'} );
my ( $transfertwhen, $transfertfrom, $transfertto ) =
GetTransfers( $num_res->{'itemnumber'} );
@@ -316,7 +353,8 @@ if ($borrowernumber) {
$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';
@@ -327,10 +365,8 @@ if ($borrowernumber) {
$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'} );
- }
-
+ if($num_res->{'branchcode'} eq $branch){ $getWaitingReserveInfo{waitinghere} = 1; }
}
# check transfers with the itemnumber foud in th reservation loop
if ($transfertwhen) {
@@ -350,7 +386,7 @@ if ($borrowernumber) {
# 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 $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'};
@@ -358,8 +394,7 @@ if ($borrowernumber) {
$getreserv{nottransfered} = 0;
$getreserv{itemtype} = $getbibtype->{'description'};
$getreserv{author} = $getbibinfo->{'author'};
- $getreserv{itemcallnumber} = '----------';
-
+ $getreserv{biblionumber} = $num_res->{'biblionumber'};
}
push( @reservloop, \%getreserv );
@@ -376,6 +411,7 @@ if ($borrowernumber) {
reservloop => \@reservloop ,
WaitingReserveLoop => \@WaitingReserveLoop,
);
+ $template->param( adultborrower => 1 ) if ( $borrower->{'category_type'} eq 'A' );
}
# make the issued books table.
@@ -399,23 +435,26 @@ if ($borrower) {
# split in 2 arrays for today & previous
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'};
+
my $issuedate = $it->{'issuedate'};
$issuedate =~ s/-//g;
$issuedate = substr( $issuedate, 0, 8 );
- ($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'});
- ($restype) and $it->{'can_renew'} = 0;
-
- $it->{'dd'} = format_date($it->{'date_due'});
- my $datedue = $it->{'date_due'};
- $datedue =~ s/-//g;
- $it->{'od'} = ($datedue < $todaysdate) ? 1 : 0 ;
+ ($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'} = Date_Cmp($todaysdate, $it->{'date_due'}) == 1 ? 1 : 0 ;
($it->{'author'} eq '') and $it->{'author'} = ' ';
$it->{'renew_failed'} = $renew_failed[$it->{'itemnumber'}];
# ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY
@@ -427,14 +466,24 @@ if ($borrower) {
push @previousissues, $it;
}
}
- @todaysissues = sort { $b->{'timestamp'} <=> $a->{'timestamp'} } @todaysissues;
- @previousissues = sort { $b->{'date_due' } <=> $a->{'date_due' } } @previousissues;
+ 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) {
+ foreach my $book (@todaysissues) {
$book->{'togglecolor'} = (++$i % 2) ? 0 : 1 ;
}
$i = 1;
- foreach my $book (@previousissues) {
+ foreach my $book (@previousissues) {
$book->{'togglecolor'} = (++$i % 2) ? 0 : 1 ;
}
}
@@ -452,7 +501,7 @@ FROM issuingrules
WHERE categorycode=?
" );
#my @issued_itemtypes_count; # huh?
-$issueqty_sth->execute("*");
+$issueqty_sth->execute("*"); # FIXME: Why have a WHERE clause at all with a hardcoded "*"?
while ( my $data = $issueqty_sth->fetchrow_hashref() ) {
@@ -482,9 +531,9 @@ my $CGIselectborrower;
if ($borrowerslist) {
foreach (
sort {
- $a->{'surname'}
- . $a->{'firstname'} cmp $b->{'surname'}
- . $b->{'firstname'}
+ lc $a->{'surname'}
+ . lc $a->{'firstname'} cmp lc $b->{'surname'}
+ . lc $b->{'firstname'}
} @$borrowerslist
)
{
@@ -494,8 +543,8 @@ if ($borrowerslist) {
}
$CGIselectborrower = CGI::scrolling_list(
-name => 'borrowernumber',
- -class => 'focus',
- -id => 'borrowernumber',
+ -class => 'focus',
+ -id => 'borrowernumber',
-values => \@values,
-labels => \%labels,
-size => 7,
@@ -509,8 +558,8 @@ my $flags = $borrower->{'flags'};
my $flag;
foreach $flag ( sort keys %$flags ) {
-
- $flags->{$flag}->{'message'} =~ s/\n/
/g;
+ $template->param( flagged=> 1);
+ $flags->{$flag}->{'message'} =~ s#\n#
#g;
if ( $flags->{$flag}->{'noissues'} ) {
$template->param(
flagged => 1,
@@ -528,7 +577,8 @@ foreach $flag ( sort keys %$flags ) {
if ( $flag eq 'CHARGES' ) {
$template->param(
charges => 'true',
- chargesmsg => $flags->{'CHARGES'}->{'message'}
+ chargesmsg => $flags->{'CHARGES'}->{'message'},
+ charges_is_blocker => 1
);
}
if ( $flag eq 'CREDITS' ) {
@@ -586,6 +636,13 @@ foreach $flag ( sort keys %$flags ) {
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") ) {
@@ -608,23 +665,26 @@ if ( C4::Context->preference("memberofinstitution") ) {
$amountold = $temp[1];
+
$template->param(
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'},
- expiry =>
- $borrower->{'dateexpiry'}, #format_date($borrower->{'dateexpiry'}),
+ dateexpiry => format_date($newexpiry),
+ expiry => format_date($borrower->{'dateexpiry'}),
categorycode => $borrower->{'categorycode'},
- address => $borrower->{'address'},
- address2 => $borrower->{'address2'},
- email => $borrower->{'email'},
- emailpro => $borrower->{'emailpro'},
+ categoryname => $borrowercategory->{description},
+ address => $borrower->{'address'},
+ address2 => $borrower->{'address2'},
+ email => $borrower->{'email'},
+ emailpro => $borrower->{'emailpro'},
borrowernotes => $borrower->{'borrowernotes'},
city => $borrower->{'city'},
phone => $borrower->{'phone'} || $borrower->{'mobile'},
@@ -639,17 +699,15 @@ $template->param(
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,
);
}
@@ -657,8 +715,14 @@ if ($stickyduedate) {
#$cookie=[$cookie, $branchcookie, $printercookie];
#}
+my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
+
+
$template->param(
- SpecifyDueDate => C4::Context->preference("SpecifyDueDate")
+ SpecifyDueDate => C4::Context->preference("SpecifyDueDate"),
+ CircAutocompl => C4::Context->preference("CircAutocompl"),
+ dateformat => C4::Context->preference("dateformat"),
+ DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
);
-$template->param( CircAutocompl => C4::Context->preference("CircAutocompl") );
output_html_with_http_headers $query, $cookie, $template->output;