X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=serials%2Frouting-preview.pl;h=7ddbfe5054dcd64cf06cf7aaead9d8af24454b06;hb=e7a1a3444b2d9a1c616766aeb38f34009f2e9527;hp=5b9b5b0de9f4b4622f8c1b603f0fb88dd3849154;hpb=6b29bb866b938643c446fdc398826c16ddb2eea3;p=koha.git

diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl
index 5b9b5b0de9..7ddbfe5054 100755
--- a/serials/routing-preview.pl
+++ b/serials/routing-preview.pl
@@ -1,14 +1,27 @@
 #!/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 3 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, see <http://www.gnu.org/licenses>.
+
 # 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
+# lets one print out routing slip and create (in this instance) the hierarchy
 # of reserves for the serial
-use strict;
-use warnings;
-use CGI;
+use Modern::Perl;
+use CGI qw ( -utf8 );
 use C4::Koha;
 use C4::Auth;
-use C4::Dates;
 use C4::Output;
 use C4::Acquisition;
 use C4::Reserves;
@@ -19,7 +32,10 @@ use C4::Biblio;
 use C4::Items;
 use C4::Serials;
 use URI::Escape;
-use C4::Branch;
+
+use Koha::Biblios;
+use Koha::Libraries;
+use Koha::Patrons;
 
 my $query = new CGI;
 my $subscriptionid = $query->param('subscriptionid');
@@ -41,74 +57,74 @@ if($edit){
     print $query->redirect("routing.pl?subscriptionid=$subscriptionid");
 }
 
-my ($routing, @routinglist) = getroutinglist($subscriptionid);
+my @routinglist = getroutinglist($subscriptionid);
 my $subs = GetSubscription($subscriptionid);
-my ($count,@serials) = GetSerials($subscriptionid);
+my ($tmp ,@serials) = GetSerials($subscriptionid);
 my ($template, $loggedinuser, $cookie);
 
+my $library;
 if($ok){
     # get biblio information....
-    my $biblio = $subs->{'biblionumber'};
-	my ($count2,@bibitems) = GetBiblioItemByBiblioNumber($biblio);
-	my @itemresults = GetItemsInfo($subs->{'biblionumber'}, 'intra');
-	my $branch = $itemresults[0]->{'holdingbranch'};
-	my $branchname = GetBranchName($branch);
+    my $biblionumber = $subs->{'bibnum'};
+    my @itemresults = GetItemsInfo( $biblionumber );
+    my $branch = @itemresults ? $itemresults[0]->{'holdingbranch'} : $subs->{branchcode};
+    $library = Koha::Libraries->find($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 $biblio = Koha::Biblios->find( $biblionumber );
+        my $holds = $biblio->current_holds;
+        my $count = $holds->count;
+        while ( my $hold = $holds->next ) {
+            $count-- if $hold->is_waiting;
+        }
 		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);
-			}
-    	}
+        for my $routing ( @routinglist ) {
+            my $sth = $dbh->prepare('SELECT * FROM reserves WHERE biblionumber = ? AND borrowernumber = ? LIMIT 1');
+            $sth->execute($biblionumber,$routing->{borrowernumber});
+            my $reserve = $sth->fetchrow_hashref;
+
+            if($routing->{borrowernumber} == $reserve->{borrowernumber}){
+                ModReserve({
+                    rank           => $routing->{ranking},
+                    biblionumber   => $biblionumber,
+                    borrowernumber => $routing->{borrowernumber},
+                    branchcode     => $branch
+                });
+            } else {
+                AddReserve($branch,$routing->{borrowernumber},$biblionumber,undef,$routing->{ranking}, undef, undef, $notes,$title);
+        }
+    }
 	}
 
     ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/routing-preview-slip.tmpl",
+= get_template_and_user({template_name => "serials/routing-preview-slip.tt",
 				query => $query,
 				type => "intranet",
 				authnotrequired => 0,
-				flagsrequired => {serials => 1},
+				flagsrequired => {serials => '*'},
 				debug => 1,
 				});
-    $template->param("libraryname"=>$branchname);
 } else {
     ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/routing-preview.tmpl",
+= get_template_and_user({template_name => "serials/routing-preview.tt",
 				query => $query,
 				type => "intranet",
 				authnotrequired => 0,
-				flagsrequired => {serials => 1},
+				flagsrequired => {serials => '*'},
 				debug => 1,
 				});
 }
 
-my @results;
-my $data;
-for(my $i=0;$i<$routing;$i++){
-    $data=GetMember($routinglist[$i]->{'borrowernumber'},'borrowernumber');
-    $data->{'location'}=$data->{'branchcode'};
-    $data->{'name'}="$data->{'firstname'} $data->{'surname'}";
-    $data->{'routingid'}=$routinglist[$i]->{'routingid'};
-    $data->{'subscriptionid'}=$subscriptionid;
-    push(@results, $data);
+$template->param( libraryname => $library->branchname ) if $library;
+
+my $memberloop = [];
+for my $routing (@routinglist) {
+    my $member = Koha::Patrons->find( $routing->{borrowernumber} )->unblessed;
+    $member->{name}           = "$member->{firstname} $member->{surname}";
+    push @{$memberloop}, $member;
 }
 
 my $routingnotes = $serials[0]->{'routingnotes'};
@@ -117,10 +133,12 @@ $routingnotes =~ s/\n/\<br \/\>/g;
 $template->param(
     title => $subs->{'bibliotitle'},
     issue => $issue,
-    issue_escaped => URI::Escape::uri_escape($issue),
+    issue_escaped => URI::Escape::uri_escape_utf8($issue),
     subscriptionid => $subscriptionid,
-    memberloop => \@results,
+    memberloop => $memberloop,
     routingnotes => $routingnotes,
+    hasRouting => check_routing($subscriptionid),
+    (uc(C4::Context->preference("marcflavour"))) => 1
     );
 
 output_html_with_http_headers $query, $cookie, $template->output;