Porting SimpleSearch return changes to all code calling it.

[koha.git] / serials / claims.pl

diff --git a/serials/claims.pl b/serials/claims.pl
index db08e23..ab53e50 100755 (executable)
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -7,7 +7,6 @@ use C4::Serials;
 use C4::Acquisition;
 use C4::Output;
 use C4::Bookseller;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use C4::Letters;
 
@@ -18,20 +17,34 @@ my $op = $input->param('op');
 my $claimletter = $input->param('claimletter');
 my $supplierid = $input->param('supplierid');
 my $order = $input->param('order');
-warn "order :$order";
 my %supplierlist = GetSuppliersWithLateIssues;
 my @select_supplier;
 
-foreach my $supplierid (keys %supplierlist){
+# open template first (security & userenv set here)
+my ($template, $loggedinuser, $cookie)
+= get_template_and_user({template_name => "serials/claims.tmpl",
+            query => $input,
+            type => "intranet",
+            authnotrequired => 0,
+            flagsrequired => {serials => 1},
+            debug => 1,
+            });
+
+foreach my $supplierid (sort {$supplierlist{$a} cmp $supplierlist{$b} } keys %supplierlist){
         my ($count, @dummy) = GetLateOrMissingIssues($supplierid,"",$order);
         my $counting = $count;
         $supplierlist{$supplierid} = $supplierlist{$supplierid}." ($counting)";
        push @select_supplier, $supplierid
 }
 
-my @letters = GetLetters("claimissues");
-my $letter=((scalar(@letters)>1)||($letters[0]->{name}||$letters[0]->{code}));
-my ($count2, @missingissues) = GetLateOrMissingIssues($supplierid,$serialid,$order);
+my $letters = GetLetters("claimissues");
+my @letters;
+foreach (keys %$letters){
+    push @letters ,{code=>$_,name=> $letters->{$_}};
+}
+
+my $letter=((scalar(@letters)>1) || ($letters[0]->{name}||$letters[0]->{code}));
+my ($count2, @missingissues) = GetLateOrMissingIssues($supplierid,$serialid,$order) if $supplierid;
 
 my $CGIsupplier=CGI::scrolling_list( -name     => 'supplierid',
                        -values   => \@select_supplier,
@@ -50,7 +63,6 @@ if($supplierid){
    }
 }
 
-
 my $preview=0;
 if($op eq 'preview'){
     $preview = 1;
@@ -63,30 +75,18 @@ if ($op eq "send_alert"){
   ### $cntupdate SHOULD be equal to scalar(@$serialnums)
 }
 
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/claims.tmpl",
-                               query => $input,
-                               type => "intranet",
-                               authnotrequired => 0,
-                               flagsrequired => {serials => 1},
-                               debug => 1,
-                               });
-
 $template->param('letters'=>\@letters,'letter'=>$letter);
 $template->param(
-    order =>$order,
-       CGIsupplier => $CGIsupplier,
-    phone => $supplierinfo[0]->{phone},
-    booksellerfax => $supplierinfo[0]->{booksellerfax},
-    bookselleremail => $supplierinfo[0]->{bookselleremail},
+        order =>$order,
+        CGIsupplier => $CGIsupplier,
+        phone => $supplierinfo[0]->{phone},
+        booksellerfax => $supplierinfo[0]->{booksellerfax},
+        bookselleremail => $supplierinfo[0]->{bookselleremail},
         preview => $preview,
         missingissues => \@missingissues,
         supplierid => $supplierid,
         claimletter => $claimletter,
         singlesupplier => $singlesupplier,
         supplierloop => \@supplierinfo,
-       intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-               intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-               IntranetNav => C4::Context->preference("IntranetNav"),
-       );
+        );
 output_html_with_http_headers $input, $cookie, $template->output;