[Koha-cvs] koha/misc fines.pl [rel_3_0]

[Bruno Toumi]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Bruno Toumi <btoumi>    06/10/20 15:14:14

Modified files:
        misc           : fines.pl 

Log message:
        add test for overdue delays when not define 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/misc/fines.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2

Patches:
Index: fines.pl
===================================================================
RCS file: /sources/koha/koha/misc/Attic/fines.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- fines.pl    9 Oct 2006 12:33:08 -0000       1.1.2.1
+++ fines.pl    20 Oct 2006 15:14:13 -0000      1.1.2.2
@@ -25,7 +25,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: fines.pl,v 1.1.2.1 2006/10/09 12:33:08 btoumi Exp $
+# $Id: fines.pl,v 1.1.2.2 2006/10/20 15:14:13 btoumi Exp $
 
 use C4::Context;
 use C4::Search;
@@ -75,15 +75,19 @@
                $borrower->{'categorycode'},
                $difference,
                $datedue);
+       
        my 
($delays1,$delays2,$delays3)=GetOverdueDelays($borrower->{'categorycode'});
        my 
$issuingrules=GetIssuingRules($data->[$i]->{'itemnumber'},$borrower->{'categorycode'});
-       ;
 
-       if (borrowers->{'category_type'} ne 'I'){
+if($delays1  and $delays2  and $delays3)  {    
+       if (($issuingrules->{'fine'} > 0) || ($issuingrules->{'fine'} ne '' )){
+
        #DELAYS 1##########################################
        if ($amount > 0 && $daycount >= $delays1 && $daycount < $delays2){
+               warn"je rentre dans cette boucle car j'ai $daycount >= $delays1 
et $daycount <= $delays2";
        
UpdateFine($data->[$i]->{'itemnumber'},$data->[$i]->{'borrowernumber'},$amount,$type,$due);
        my 
$getnotifyid=CheckExistantNotifyid($borrower->{'borrowernumber'},$datedue);
+               warn"getnotifyid est = $getnotifyid";
        my 
$update=CheckAccountLineLevelInfo($borrower->{'borrowernumber'},$data->[$i]->{'itemnumber'},1);
                if ($update eq '0'){                            
                                        if ($getnotifyid eq '0'){
@@ -100,6 +104,7 @@
        ###############################################
        
        if ($daycount>=$delays2) {
+                       warn"je rentre dans cette boucle car j'ai $daycount >= 
$delays2";
                $amount=$issuingrules->{'fine'} * ($delays2);
                
UpdateFine($data->[$i]->{'itemnumber'},$data->[$i]->{'borrowernumber'},$amount,$type,$due);
    
        
@@ -108,6 +113,7 @@
        #DELAYS 2#################################
        
        if ($daycount >= $delays2 && $daycount <= $delays3){
+               warn"je rentre dans cette boucle car j'ai $daycount >= $delays2 
et $daycount <= $delays3";
        my 
$update=CheckAccountLineLevelInfo($borrower->{'borrowernumber'},$data->[$i]->{'itemnumber'},2);
        if ($update eq '0'){
        
UpdateAccountLines(undef,2,$borrower->{'borrowernumber'},$data->[$i]->{'itemnumber'});
@@ -116,7 +122,8 @@
        ###############################################
        
        #DELAYS 3###################################
-       if ($daycount >= $delays3){
+               if ($daycount >= $delays3  ){
+                       warn"je rentre dans cette boucle car j'ai $daycount >=  
$delays3";
                my 
$update=CheckAccountLineLevelInfo($borrower->{'borrowernumber'},$data->[$i]->{'itemnumber'},3);
                if ($update eq '0'){
                                
UpdateAccountLines(undef,3,$borrower->{'borrowernumber'},$data->[$i]->{'itemnumber'});
 
@@ -130,12 +137,14 @@
                my $timestamp=$todaydate." ".$hour."\:".$min."\:".$sec; 
                my 
$create=CheckAccountLineItemInfo($borrower->{'borrowernumber'},$data->[$i]->{'itemnumber'},$typeaccount,$notifyid);
                if ($create eq '0'){
+                       warn"je ne doit rentre la que si je suis bien arrive au 
$delays3";
                
CreateItemAccountLine($borrower->{'borrowernumber'},$data->[$i]->{'itemnumber'},$todaydate,$items->{'price'},$description,$typeaccount,
                $items->{'price'},$timestamp,$notifyid,$level);
                }
        } 
        ###############################################
        }
+}