[Koha-cvs] koha/circ returns.pl [dev_week]

[Cindy Murdock]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Cindy Murdock <clm>     07/05/18 20:02:12

Modified files:
        circ           : returns.pl 

Log message:
        Removing calls to $library_name and replacing them with new system 
preferences:
        calcFineOnReturn and useRotatingCollections

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/returns.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.37.2.6.2.13&r2=1.37.2.6.2.14

Patches:
Index: returns.pl
===================================================================
RCS file: /sources/koha/koha/circ/returns.pl,v
retrieving revision 1.37.2.6.2.13
retrieving revision 1.37.2.6.2.14
diff -u -b -r1.37.2.6.2.13 -r1.37.2.6.2.14
--- returns.pl  15 May 2007 20:31:59 -0000      1.37.2.6.2.13
+++ returns.pl  18 May 2007 20:02:12 -0000      1.37.2.6.2.14
@@ -64,8 +64,9 @@
 
 my $branch  = getbranch( $query,  $branches );
 my $printer = getprinter( $query, $printers );
-my $library_name =  C4::Context->preference("LibraryName");
-
+#my $library_name =  C4::Context->preference("LibraryName");
+my $calcFineOnReturn = C4::Context->preference("calcFineOnReturn");
+my $useRotatingCollections = C4::Context->preference("useRotatingCollections");
 
 #
 # Today's date in format YYYY-MM-DD
@@ -159,7 +160,7 @@
 if ($barcode) {
 
     #CCFLS ONLY
-    if ( $library_name =~ m/CCFLS/ ) {
+    if ( $calcFineOnReturn =~ m/Yes/ ) {
         system "php /usr/local/koha/intranet/htdocs/ccflsFines/createFine.php 
$barcode";
     }
 
@@ -500,7 +501,8 @@
        IntranetNav => C4::Context->preference("IntranetNav"),
 );
 
-if ( $library_name =~ m/CCFLS/ ) {
+#if ( $library_name =~ m/CCFLS/ ) {
+if ( $useRotatingCollections =~ m/Yes/ ) {
 ## Check to see if returned item is a rotating collection item returned to the 
wrong branch
     my $itemnumber = getItemnumberByBarcode( $query->param('barcode') );
     if ( $itemnumber ) {