X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Fcirculation.pl;h=e521e19f2a12545450b00411b901065670844501;hb=e57dadf762101cfb7371c3d2c93e8163a2ace69f;hp=de6013a09e4248bbba71ca3f357ddf2f8b3097fc;hpb=e50bc421c44a909c94143418d1c7328109b3be05;p=koha_gimpoz

diff --git a/circ/circulation.pl b/circ/circulation.pl
index de6013a09e..e521e19f2a 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
 
-# written 8/5/2002 by Finlay
 # script to execute issuing of books
 
 # Copyright 2000-2002 Katipo Communications
+# copyright 2010 BibLibre
 #
 # This file is part of Koha.
 #
@@ -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;
@@ -94,7 +94,6 @@ 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'};  
@@ -102,7 +101,7 @@ $printer = C4::Context->userenv->{'branchprinter'};
 
 
 # If AutoLocation 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 (C4::Context->preference("AutoLocation") != 1) {
     $template->param(ManualLocation => 1);
 }
 
@@ -110,6 +109,10 @@ 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
 
@@ -133,46 +136,25 @@ if ( $barcode ) {
     }
 }
 
-#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 ($datedue,$invalidduedate,$globalduedate);
+my ($datedue,$invalidduedate);
 
-if(C4::Context->preference('globalDueDate') && (C4::Context->preference('globalDueDate') =~ C4::Dates->regexp('syspref'))){
-        $globalduedate = C4::Dates->new(C4::Context->preference('globalDueDate'));
-}
 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);
-    	}
-    } else {
-        # pass global due date to tmpl if specifyduedate is true 
-        # and we have no barcode (loading circ page but not checking out)
-        if($globalduedate &&  ! $barcode ){
-            $duedatespec = $globalduedate->output();
-            $stickyduedate = 1;
+        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 {
-    $datedue = $globalduedate if ($globalduedate);
 }
 
 my $todaysdate = C4::Dates->new->output('iso');
@@ -240,9 +222,12 @@ if ($borrowernumber) {
     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  ) 
@@ -280,44 +265,41 @@ 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;
-            if($globalduedate && ! $stickyduedate && $duedatespec_allow ){
-                $duedatespec = $globalduedate->output();
-                $stickyduedate = 1;
-            }
-		}
+            $inprocess = 1;
+        }
     }
     
     # FIXME If the issue is confirmed, we launch another time GetMemberIssuesAndFines, now display the issue count after issue 
@@ -333,8 +315,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
@@ -356,6 +336,7 @@ if ($borrowernumber) {
         $getreserv{nottransfered} = 0;
 
         $getreserv{reservedate}    = format_date( $num_res->{'reservedate'} );
+        $getreserv{reservenumber}  = $num_res->{'reservenumber'};
         $getreserv{title}          = $getiteminfo->{'title'};
         $getreserv{itemtype}       = $itemtypeinfo->{'description'};
         $getreserv{author}         = $getiteminfo->{'author'};
@@ -390,11 +371,11 @@ 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 = 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'};
         }
@@ -402,7 +383,7 @@ if ($borrowernumber) {
         push( @reservloop, \%getreserv );
 
 #         if we have a reserve waiting, initiate waitingreserveloop
-        if ($getreserv{waiting} eq 1) {
+        if ($getreserv{waiting} == 1) {
         push (@WaitingReserveLoop, \%getWaitingReserveInfo)
         }
       
@@ -422,9 +403,7 @@ my $todaysissues = '';
 my $previssues   = '';
 my @todaysissues;
 my @previousissues;
-## ADDED BY JF: new itemtype issuingrules counter stuff
-my $issued_itemtypes_count;
-my @issued_itemtypes_count_loop;
+
 my $totalprice = 0;
 
 if ($borrower) {
@@ -445,21 +424,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->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref');
-
-	    $totalprice += $it->{'replacementprice'};
-		$it->{'itemtype'} = $itemtypeinfo->{'description'};
-		$it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'};
+        $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->{'issuedate'} = format_date($it->{'issuedate'});
+        $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'} }++;
 
         if ( $todaysdate eq $it->{'issuedate'} or $todaysdate eq $it->{'lastreneweddate'} ) {
             push @todaysissues, $it;
@@ -481,40 +458,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=?
-" );
-$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;
-    }
-}
-
-#### / JF
 
 my @values;
 my %labels;
@@ -535,7 +478,7 @@ if ($borrowerslist) {
         -id       => 'borrowernumber',
         -values   => \@values,
         -labels   => \%labels,
-	-onclick  => "window.location = '/cgi-bin/koha/circ/circulation.pl?borrowernumber=' + this.value;",
+        -ondblclick => 'document.forms[\'mainform\'].submit()',
         -size     => 7,
         -tabindex => '',
         -multiple => 0
@@ -572,7 +515,8 @@ foreach my $flag ( sort keys %$flags ) {
         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
             );
         }
     }
@@ -588,7 +532,8 @@ foreach my $flag ( sort keys %$flags ) {
         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
             );
         }
         elsif ( $flag eq 'ODUES' ) {
@@ -599,16 +544,7 @@ foreach my $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') or $query->param('module') ne 'returns' ) {
+            if ( ! $query->param('module') || $query->param('module') ne 'returns' ) {
                 $template->param( nonreturns => 'true' );
             }
         }
@@ -653,29 +589,46 @@ if ( C4::Context->preference("memberofinstitution") ) {
     );
 }
 
+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'};
+
+my $fast_cataloging = 0;
+    if (defined getframeworkinfo('FA')) {
+    $fast_cataloging = 1 
+    }
+
 $template->param(
-    issued_itemtypes_count_loop => \@issued_itemtypes_count_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'},
-    country	          => $borrower->{'country'},
+    zipcode           => $borrower->{'zipcode'},
+    country           => $borrower->{'country'},
     phone             => $borrower->{'phone'} || $borrower->{'mobile'},
     cardnumber        => $borrower->{'cardnumber'},
     amountold         => $amountold,
@@ -684,15 +637,17 @@ $template->param(
     duedatespec       => $duedatespec,
     message           => $message,
     CGIselectborrower => $CGIselectborrower,
-	totalprice => sprintf("%.2f", $totalprice),
-    totaldue        => sprintf("%.2f", $total),
+    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"),
+    fast_cataloging   => $fast_cataloging,
 );
 
 # save stickyduedate to session
@@ -700,13 +655,12 @@ if ($stickyduedate) {
     $session->param( 'stickyduedate', $duedatespec );
 }
 
-#if ($branchcookie) {
-#$cookie=[$cookie, $branchcookie, $printercookie];
-#}
-
 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,
@@ -715,5 +669,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;