X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=serials%2Frouting-preview.pl;h=64849b573a79f065b5b67eebfcb5d1394f616690;hb=d83a71d8e61fa8ef8a165f903d37efbc1bcb873d;hp=06fa34cbadb35c7d02653b93a023a54f7a72b6aa;hpb=fb143b71bad78a63baa961fc6fd607543958843f;p=koha.git

diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl
index 06fa34cbad..64849b573a 100755
--- a/serials/routing-preview.pl
+++ b/serials/routing-preview.pl
@@ -1,13 +1,29 @@
 #!/usr/bin/perl
 
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# 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.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 # Routing Preview.pl script used to view a routing list after creation
 # lets one print out routing slip and create (in this instance) the heirarchy
 # of reserves for the serial
 use strict;
+use warnings;
 use CGI;
 use C4::Koha;
 use C4::Auth;
-use C4::Date;
+use C4::Dates;
 use C4::Output;
 use C4::Acquisition;
 use C4::Reserves;
@@ -15,7 +31,10 @@ use C4::Circulation;
 use C4::Context;
 use C4::Members;
 use C4::Biblio;
+use C4::Items;
 use C4::Serials;
+use URI::Escape;
+use C4::Branch;
 
 my $query = new CGI;
 my $subscriptionid = $query->param('subscriptionid');
@@ -29,78 +48,78 @@ my $dbh = C4::Context->dbh;
 if($delete){
     delroutingmember($routingid,$subscriptionid);
     my $sth = $dbh->prepare("UPDATE serial SET routingnotes = NULL WHERE subscriptionid = ?");
-    $sth->execute($subscriptionid);    
-    print $query->redirect("routing.pl?subscriptionid=$subscriptionid&op=new");    
+    $sth->execute($subscriptionid);
+    print $query->redirect("routing.pl?subscriptionid=$subscriptionid&op=new");
 }
 
 if($edit){
     print $query->redirect("routing.pl?subscriptionid=$subscriptionid");
 }
-    
+
 my ($routing, @routinglist) = getroutinglist($subscriptionid);
 my $subs = GetSubscription($subscriptionid);
-my ($count,@serials) = GetSerials($subscriptionid);
+my ($tmp ,@serials) = GetSerials($subscriptionid);
 my ($template, $loggedinuser, $cookie);
 
 if($ok){
     # get biblio information....
     my $biblio = $subs->{'biblionumber'};
-    
-    # get existing reserves .....
-    my ($count,$reserves) = GetReservesFromBiblionumber($biblio);
-    my $totalcount = $count;
-    foreach my $res (@$reserves) {
-        if ($res->{'found'} eq 'W') {
-	    $count--;
-        }
-    }
-    my ($count2,@bibitems) = GetBiblioItemByBiblioNumber($biblio);
-    my @itemresults = GetItemsInfo($subs->{'biblionumber'}, 'intra');
-    my $branch = $itemresults[0]->{'holdingbranch'};
-    my $const = 'o';
-    my $notes;
-    my $title = $subs->{'bibliotitle'};
-    for(my $i=0;$i<$routing;$i++){
-	my $sth = $dbh->prepare("SELECT * FROM reserves WHERE biblionumber = ? AND borrowernumber = ? 
-                                 AND cancellationdate is NULL AND (found <> 'F' or found is NULL)");
-        $sth->execute($biblio,$routinglist[$i]->{'borrowernumber'});
-        my $data = $sth->fetchrow_hashref;
+	my ($count2,@bibitems) = GetBiblioItemByBiblioNumber($biblio);
+	my @itemresults = GetItemsInfo( $subs->{biblionumber} );
+	my $branch = $itemresults[0]->{'holdingbranch'};
+	my $branchname = GetBranchName($branch);
+
+	if (C4::Context->preference('RoutingListAddReserves')){
+		# get existing reserves .....
+		my ($count,$reserves) = GetReservesFromBiblionumber($biblio);
+		my $totalcount = $count;
+		foreach my $res (@$reserves) {
+			if ($res->{'found'} eq 'W') {
+				$count--;
+			}
+		}
+		my $const = 'o';
+		my $notes;
+		my $title = $subs->{'bibliotitle'};
+		for(my $i=0;$i<$routing;$i++){
+			my $sth = $dbh->prepare("SELECT * FROM reserves WHERE biblionumber = ? AND borrowernumber = ?");
+				$sth->execute($biblio,$routinglist[$i]->{'borrowernumber'});
+				my $data = $sth->fetchrow_hashref;
 
-#       warn "$routinglist[$i]->{'borrowernumber'} is the same as $data->{'borrowernumber'}";
-	if($routinglist[$i]->{'borrowernumber'} == $data->{'borrowernumber'}){
-	    ModReserve($routinglist[$i]->{'ranking'},$biblio,$routinglist[$i]->{'borrowernumber'},$branch);
-        } else {
-        AddReserve($branch,$routinglist[$i]->{'borrowernumber'},$biblio,$const,\@bibitems,$routinglist[$i]->{'ranking'},$notes,$title);
+		#       warn "$routinglist[$i]->{'borrowernumber'} is the same as $data->{'borrowernumber'}";
+			if($routinglist[$i]->{'borrowernumber'} == $data->{'borrowernumber'}){
+				ModReserve($routinglist[$i]->{'ranking'},$biblio,$routinglist[$i]->{'borrowernumber'},$branch);
+				} else {
+				AddReserve($branch,$routinglist[$i]->{'borrowernumber'},$biblio,$const,\@bibitems,$routinglist[$i]->{'ranking'},'',$notes,$title);
+			}
+    	}
 	}
-    }
-    
-    
+
     ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/routing-preview-slip.tmpl",
 				query => $query,
 				type => "intranet",
 				authnotrequired => 0,
-				flagsrequired => {serials => 1},
+				flagsrequired => {serials => 'routing'},
 				debug => 1,
 				});
-    $template->param("libraryname"=>C4::Context->preference("LibraryName"));
+    $template->param("libraryname"=>$branchname);
 } else {
     ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/routing-preview.tmpl",
 				query => $query,
 				type => "intranet",
 				authnotrequired => 0,
-				flagsrequired => {serials => 1},
+				flagsrequired => {serials => 'routing'},
 				debug => 1,
 				});
-}    
+}
 
-# my $firstdate = "$serials[0]->{'serialseq'} ($serials[0]->{'planneddate'})";
 my @results;
 my $data;
 for(my $i=0;$i<$routing;$i++){
-    $data=GetMember($routinglist[$i]->{'borrowernumber'},'borrowernumber');
-    $data->{'location'}=$data->{'streetaddress'};
+    $data=GetMember('borrowernumber' => $routinglist[$i]->{'borrowernumber'});
+    $data->{'location'}=$data->{'branchcode'};
     $data->{'name'}="$data->{'firstname'} $data->{'surname'}";
     $data->{'routingid'}=$routinglist[$i]->{'routingid'};
     $data->{'subscriptionid'}=$subscriptionid;
@@ -109,13 +128,15 @@ for(my $i=0;$i<$routing;$i++){
 
 my $routingnotes = $serials[0]->{'routingnotes'};
 $routingnotes =~ s/\n/\<br \/\>/g;
-  
+
 $template->param(
     title => $subs->{'bibliotitle'},
     issue => $issue,
+    issue_escaped => URI::Escape::uri_escape($issue),
     subscriptionid => $subscriptionid,
-    memberloop => \@results,    
+    memberloop => \@results,
     routingnotes => $routingnotes,
+    hasRouting => check_routing($subscriptionid),
     );
 
-        output_html_with_http_headers $query, $cookie, $template->output;
+output_html_with_http_headers $query, $cookie, $template->output;