X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=circ%2Fcirculation.pl;h=8cd9fa91d94a2864bdd95631ea771ebc4f3314fd;hb=bfcb2fff456aa3c9c3d160fba39dd09e40341122;hp=ed42e63827e20a2dd23276e89a595ff96b9057d4;hpb=c70cd87d549d71229c1f80d9f1af3db8c68636f5;p=koha.git diff --git a/circ/circulation.pl b/circ/circulation.pl index ed42e63827..8cd9fa91d9 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -16,12 +16,12 @@ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use strict; -# use warnings; # FIXME +#use warnings; FIXME - Bug 2505 use CGI; use C4::Output; use C4::Print; @@ -49,35 +49,31 @@ use Date::Calc qw( # my $query = new CGI; -# new op dev the branch and the printer are now defined by the userenv +my $sessionID = $query->cookie("CGISESSID") ; +my $session = get_session($sessionID); + +# branch and 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 $sessionID = $query->cookie("CGISESSID") ; - my $session = get_session($sessionID); - $session->param('branch',$branch); - my $branchname = GetBranchName($branch); - $session->param('branchname',$branchname); + $session->param('branch', $branch); + $session->param('branchname', GetBranchName($branch)); } my $printer = $query->param('printer'); if ($printer){ # update our session so the userenv is updated - my $sessionID = $query->cookie("CGISESSID") ; - my $session = get_session($sessionID); - $session->param('branchprinter',$printer); - + $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; - } + 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 ( @@ -91,31 +87,38 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user ( ); my $branches = GetBranches(); -my $printers = GetPrinters(); -my @failedrenews = $query->param('failedrenew'); -my @renew_failed; -for (@failedrenews) { $renew_failed[$_] = 1; } +my @failedrenews = $query->param('failedrenew'); # expected to be itemnumbers +my %renew_failed; +for (@failedrenews) { $renew_failed{$_} = 1; } my $findborrower = $query->param('findborrower'); $findborrower =~ s|,| |g; -#$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) { # FIXME: string comparison to number +# If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian +if (C4::Context->preference("AutoLocation") != 1) { $template->param(ManualLocation => 1); } +if (C4::Context->preference("DisplayClearScreenButton")) { + $template->param(DisplayClearScreenButton => 1); +} + +if (C4::Context->preference("UseTablesortForCirc")) { + $template->param(UseTablesortForCirc => 1); +} + my $barcode = $query->param('barcode') || ''; +$barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace $barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter')); -my $stickyduedate = $query->param('stickyduedate'); -my $duedatespec = $query->param('duedatespec'); +my $stickyduedate = $query->param('stickyduedate') || $session->param('stickyduedate'); +my $duedatespec = $query->param('duedatespec') || $session->param('stickyduedate'); my $issueconfirmed = $query->param('issueconfirmed'); my $cancelreserve = $query->param('cancelreserve'); my $organisation = $query->param('organisations'); @@ -123,14 +126,15 @@ 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'); -# } -# +# Check if stickyduedate is turned off +if ( $barcode ) { + # was stickyduedate loaded from session? + if ( $stickyduedate && ! $query->param("stickyduedate") ) { + $session->clear( 'stickyduedate' ); + $stickyduedate = $query->param('stickyduedate'); + $duedatespec = $query->param('duedatespec'); + } +} my ($datedue,$invalidduedate,$globalduedate); @@ -140,19 +144,19 @@ if(C4::Context->preference('globalDueDate') && (C4::Context->preference('globalD my $duedatespec_allow = C4::Context->preference('SpecifyDueDate'); if($duedatespec_allow){ 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); - } + 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); + } } else { # pass global due date to tmpl if specifyduedate is true # and we have no barcode (loading circ page but not checking out) @@ -162,7 +166,7 @@ if($duedatespec_allow){ } } } else { - $datedue = $globalduedate if($globalduedate); + $datedue = $globalduedate if ($globalduedate); } my $todaysdate = C4::Dates->new->output('iso'); @@ -193,9 +197,18 @@ if ( $print eq 'yes' && $borrowernumber ne '' ) { my $borrowerslist; my $message; if ($findborrower) { - my ( $count, $borrowers ) = - SearchMember($findborrower, 'cardnumber', 'web' ); + my ($count, $borrowers) = SearchMember($findborrower, 'cardnumber', 'web'); my @borrowers = @$borrowers; + if (C4::Context->preference("AddPatronLists")) { + $template->param( + "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1", + ); + if (C4::Context->preference("AddPatronLists")=~/code/){ + my $categories = GetBorrowercategoryList; + $categories->[0]->{'first'} = 1; + $template->param(categories=>$categories); + } + } if ( $#borrowers == -1 ) { $query->param( 'findborrower', '' ); $message = "'$findborrower'"; @@ -212,46 +225,46 @@ if ($findborrower) { # get the borrower information..... my $borrower; -my @lines; if ($borrowernumber) { $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'}; + 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); + my ( $renew_year, $renew_month, $renew_day); + if ($enrol_year*$enrol_month*$enrol_day>0) { + ( $renew_year, $renew_month, $renew_day) = + Add_Delta_YM( $enrol_year, $enrol_month, $enrol_day, + 0 , $borrower->{'enrolmentperiod'}); + } # 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 ) ) + || 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") + 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); + 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, @@ -264,44 +277,45 @@ if ($borrowernumber) { # # if ($barcode) { - # always check for blockers on issuing - my ( $error, $question ) = + # always check for blockers on issuing + my ( $error, $question ) = CanBookBeIssued( $borrower, $barcode, $datedue , $inprocess ); - my $blocker = $invalidduedate ? 1 : 0; + my $blocker = $invalidduedate ? 1 : 0; - delete $question->{'DEBT'} if ($debt_confirmed); - foreach my $impossible ( keys %$error ) { - $template->param( - $impossible => $$error{$impossible}, - IMPOSSIBLE => 1 - ); - $blocker = 1; - } + delete $question->{'DEBT'} if ($debt_confirmed); + foreach my $impossible ( keys %$error ) { + $template->param( + $impossible => $$error{$impossible}, + IMPOSSIBLE => 1 + ); + $blocker = 1; + } if( !$blocker ){ my $confirm_required = 0; - unless($issueconfirmed){ + unless($issueconfirmed){ # Get the item title for more information my $getmessageiteminfo = GetBiblioFromItemNumber(undef,$barcode); - $template->param( itemhomebranch => $getmessageiteminfo->{'homebranch'} ); - - # pass needsconfirmation to template if issuing is possible and user hasn't yet confirmed. - foreach my $needsconfirmation ( keys %$question ) { - $template->param( - $needsconfirmation => $$question{$needsconfirmation}, - getTitleMessageIteminfo => $getmessageiteminfo->{'title'}, - NEEDSCONFIRMATION => 1 - ); - $confirm_required = 1; - } - } + $template->param( itemhomebranch => $getmessageiteminfo->{'homebranch'} ); + + # pass needsconfirmation to template if issuing is possible and user hasn't yet confirmed. + foreach my $needsconfirmation ( keys %$question ) { + $template->param( + $needsconfirmation => $$question{$needsconfirmation}, + getTitleMessageIteminfo => $getmessageiteminfo->{'title'}, + getBarcodeMessageIteminfo => $getmessageiteminfo->{'barcode'}, + NEEDSCONFIRMATION => 1 + ); + $confirm_required = 1; + } + } unless($confirm_required) { AddIssue( $borrower, $barcode, $datedue, $cancelreserve ); - $inprocess = 1; + $inprocess = 1; if($globalduedate && ! $stickyduedate && $duedatespec_allow ){ $duedatespec = $globalduedate->output(); $stickyduedate = 1; } - } + } } # FIXME If the issue is confirmed, we launch another time GetMemberIssuesAndFines, now display the issue count after issue @@ -317,8 +331,6 @@ 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 @@ -346,7 +358,7 @@ if ($borrowernumber) { $getreserv{barcodereserv} = $getiteminfo->{'barcode'}; $getreserv{itemcallnumber} = $getiteminfo->{'itemcallnumber'}; $getreserv{biblionumber} = $getiteminfo->{'biblionumber'}; - $getreserv{waitingat} = GetBranchName( $num_res->{'branchcode'} ); + $getreserv{waitingat} = GetBranchName( $num_res->{'branchcode'} ); # check if we have a waiting status for reservations if ( $num_res->{'found'} eq 'W' ) { $getreserv{color} = 'reserved'; @@ -358,7 +370,7 @@ if ($borrowernumber) { $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; } + $getWaitingReserveInfo{waitinghere} = 1 if $num_res->{'branchcode'} eq $branch; } # check transfers with the itemnumber foud in th reservation loop if ($transfertwhen) { @@ -366,32 +378,27 @@ if ($borrowernumber) { $getreserv{transfered} = 1; $getreserv{datesent} = format_date($transfertwhen); $getreserv{frombranch} = GetBranchName($transfertfrom); - } - - if ( ( $getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'} ) - and not $transfertwhen ) - { + } elsif ($getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'}) { $getreserv{nottransfered} = 1; - $getreserv{nottransferedby} = - GetBranchName( $getiteminfo->{'holdingbranch'} ); + $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 = 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{itemtype} = $itemtypeinfo->{'description'}; $getreserv{author} = $getbibinfo->{'author'}; - $getreserv{biblionumber} = $num_res->{'biblionumber'}; + $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) { + if ($getreserv{waiting} == 1) { push (@WaitingReserveLoop, \%getWaitingReserveInfo) } @@ -411,21 +418,15 @@ my $todaysissues = ''; my $previssues = ''; my @todaysissues; my @previousissues; -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 -my @issued_itemtypes_count_loop; + +my $totalprice = 0; if ($borrower) { # get each issue of the borrower & separate them in todayissues & previous issues my ($issueslist) = GetPendingIssues($borrower->{'borrowernumber'}); - # split in 2 arrays for today & previous foreach my $it ( @$issueslist ) { + my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $it->{'itype'} : $it->{'itemtype'} ); # 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'}; @@ -438,16 +439,19 @@ if ($borrower) { ); $it->{"renew_error_${can_renew_error}"} = 1 if defined $can_renew_error; my ( $restype, $reserves ) = CheckReserves( $it->{'itemnumber'} ); - $it->{'can_renew'} = $can_renew; - $it->{'can_confirm'} = !$can_renew && !$restype; - $it->{'renew_error'} = $restype; - + $it->{'can_renew'} = $can_renew; + $it->{'can_confirm'} = !$can_renew && !$restype; + $it->{'renew_error'} = $restype; + $it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref'); + + $totalprice += $it->{'replacementprice'}; + $it->{'itemtype'} = $itemtypeinfo->{'description'}; + $it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'}; $it->{'dd'} = format_date($it->{'date_due'}); + $it->{'displaydate'} = format_date($it->{'issuedate'}); $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'} }++; + $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}}; if ( $todaysdate eq $it->{'issuedate'} or $todaysdate eq $it->{'lastreneweddate'} ) { push @todaysissues, $it; @@ -469,42 +473,6 @@ if ($borrower) { } } -#### 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("*"); # This is a literal asterisk, not a wildcard. - -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_loop, $data; - } -} -$issued_itemtypes_loop = \@issued_itemtypes_count_loop; - -#### / JF my @values; my %labels; @@ -525,7 +493,6 @@ if ($borrowerslist) { -id => 'borrowernumber', -values => \@values, -labels => \%labels, - -onclick => "window.location = '/cgi-bin/koha/circ/circulation.pl?borrowernumber=' + this.value;", -size => 7, -tabindex => '', -multiple => 0 @@ -534,9 +501,7 @@ if ($borrowerslist) { #title my $flags = $borrower->{'flags'}; -my $flag; - -foreach $flag ( sort keys %$flags ) { +foreach my $flag ( sort keys %$flags ) { $template->param( flagged=> 1); $flags->{$flag}->{'message'} =~ s#\n#
#g; if ( $flags->{$flag}->{'noissues'} ) { @@ -547,13 +512,13 @@ foreach $flag ( sort keys %$flags ) { if ( $flag eq 'GNA' ) { $template->param( gna => 'true' ); } - if ( $flag eq 'LOST' ) { + elsif ( $flag eq 'LOST' ) { $template->param( lost => 'true' ); } - if ( $flag eq 'DBARRED' ) { + elsif ( $flag eq 'DBARRED' ) { $template->param( dbarred => 'true' ); } - if ( $flag eq 'CHARGES' ) { + elsif ( $flag eq 'CHARGES' ) { $template->param( charges => 'true', chargesmsg => $flags->{'CHARGES'}->{'message'}, @@ -561,10 +526,11 @@ foreach $flag ( sort keys %$flags ) { charges_is_blocker => 1 ); } - if ( $flag eq 'CREDITS' ) { + elsif ( $flag eq 'CREDITS' ) { $template->param( credits => 'true', - creditsmsg => $flags->{'CREDITS'}->{'message'} + creditsmsg => $flags->{'CREDITS'}->{'message'}, + creditsamount => sprintf("%.02f", -($flags->{'CREDITS'}->{'amount'})), # from patron's pov ); } } @@ -577,13 +543,14 @@ foreach $flag ( sort keys %$flags ) { chargesamount => $flags->{'CHARGES'}->{'amount'}, ); } - if ( $flag eq 'CREDITS' ) { + elsif ( $flag eq 'CREDITS' ) { $template->param( credits => 'true', - creditsmsg => $flags->{'CREDITS'}->{'message'} + creditsmsg => $flags->{'CREDITS'}->{'message'}, + creditsamount => sprintf("%.02f", -($flags->{'CREDITS'}->{'amount'})), # from patron's pov ); } - if ( $flag eq 'ODUES' ) { + elsif ( $flag eq 'ODUES' ) { $template->param( odues => 'true', flagged => 1, @@ -591,20 +558,11 @@ foreach $flag ( sort keys %$flags ) { ); 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' ) { + if ( ! $query->param('module') || $query->param('module') ne 'returns' ) { $template->param( nonreturns => 'true' ); } } - if ( $flag eq 'NOTES' ) { + elsif ( $flag eq 'NOTES' ) { $template->param( notes => 'true', flagged => 1, @@ -615,7 +573,9 @@ foreach $flag ( sort keys %$flags ) { } my $amountold = $borrower->{flags}->{'CHARGES'}->{'message'} || 0; -my @temp = split( /\$/, $amountold ); +$amountold =~ s/^.*\$//; # remove upto the $, if any + +my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber ); if ( $borrower->{'category_type'} eq 'C') { my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE category_type = ?' ); @@ -632,8 +592,7 @@ if ( C4::Context->preference("memberofinstitution") ) { my %org_labels; foreach my $organisation ( keys %$organisations ) { push @orgs, $organisation; - $org_labels{$organisation} = - $organisations->{$organisation}->{'surname'}; + $org_labels{$organisation} = $organisations->{$organisation}->{'surname'}; } $member_of_institution = 1; $CGIorganisations = CGI::popup_menu( @@ -644,30 +603,41 @@ if ( C4::Context->preference("memberofinstitution") ) { ); } -$amountold = $temp[1]; +my $lib_messages_loop = GetMessages( $borrowernumber, 'L', $branch ); +if($lib_messages_loop){ $template->param(flagged => 1 ); } + +my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch ); +if($bor_messages_loop){ $template->param(flagged => 1 ); } + +# Computes full borrower address +my (undef, $roadttype_hashref) = &GetRoadTypes(); +my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'}; $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'}, + lib_messages_loop => $lib_messages_loop, + bor_messages_loop => $bor_messages_loop, + all_messages_del => C4::Context->preference('AllowAllMessageDeletion'), + 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'}, categoryname => $borrower->{description}, - address => $borrower->{'address'}, + address => $address, address2 => $borrower->{'address2'}, email => $borrower->{'email'}, emailpro => $borrower->{'emailpro'}, borrowernotes => $borrower->{'borrowernotes'}, city => $borrower->{'city'}, - zipcode => $borrower->{'zipcode'}, + zipcode => $borrower->{'zipcode'}, + country => $borrower->{'country'}, phone => $borrower->{'phone'} || $borrower->{'mobile'}, cardnumber => $borrower->{'cardnumber'}, amountold => $amountold, @@ -676,23 +646,29 @@ $template->param( duedatespec => $duedatespec, message => $message, CGIselectborrower => $CGIselectborrower, + totalprice => sprintf('%.2f', $totalprice), + totaldue => sprintf('%.2f', $total), todayissues => \@todaysissues, previssues => \@previousissues, inprocess => $inprocess, memberofinstution => $member_of_institution, CGIorganisations => $CGIorganisations, - is_child => ($borrower->{'category_type'} eq 'C'), + is_child => ($borrower->{'category_type'} eq 'C'), circview => 1, + soundon => C4::Context->preference("SoundOn"), ); - -#if ($branchcookie) { -#$cookie=[$cookie, $branchcookie, $printercookie]; -#} +# save stickyduedate to session +if ($stickyduedate) { + $session->param( 'stickyduedate', $duedatespec ); +} my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'}); $template->param( picture => 1 ) if $picture; +# get authorised values with type of BOR_NOTES + +my $canned_notes = GetAuthorisedValues("BOR_NOTES"); $template->param( debt_confirmed => $debt_confirmed, @@ -701,5 +677,6 @@ $template->param( AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"), dateformat => C4::Context->preference("dateformat"), DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), + canned_bor_notes_loop => $canned_notes, ); output_html_with_http_headers $query, $cookie, $template->output;