bug 2473: correct display of items.content

[koha_fer] / serials / claims.pl

diff --git a/serials/claims.pl b/serials/claims.pl
index 9dbfee6..b0a1e12 100755 (executable)
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -5,79 +5,89 @@ use CGI;
 use C4::Auth;
 use C4::Serials;
 use C4::Acquisition;
-
-use C4::Interface::CGI::Output;
+use C4::Output;
+use C4::Bookseller;
 use C4::Context;
+use C4::Letters;
 
+my $input = new CGI;
 
-my $query = new CGI;
-
-my $serialid = $query->param('serialid');
-my $op = $query->param('op');
-# my $claimletter = $query->param('claimletter');
-my $supplierid = $query->param('supplierid');
+my $serialid = $input->param('serialid');
+my $op = $input->param('op');
+my $claimletter = $input->param('claimletter');
+my $supplierid = $input->param('supplierid');
+my $order = $input->param('order');
 my %supplierlist = GetSuppliersWithLateIssues;
 my @select_supplier;
 
-foreach my $supplierid (keys %supplierlist){
-        my ($count, @dummy) = GetMissingIssues($supplierid);
+# 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 @select_letter = (1,2,3,4);
-# my %letters = (1=>'Claim Form 1',2=>'Claim Form 2',3=>'Claim Form 3',4=>'Claim Form 4');
-my ($count2, @missingissues) = GetMissingIssues($supplierid,$serialid);
+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',
+                       -id        => 'supplierid',
                        -values   => \@select_supplier,
                        -default  => $supplierid,
                        -labels   => \%supplierlist,
                        -size     => 1,
                        -multiple => 0 );
 
-# my $CGIletter=CGI::scrolling_list( -name     => 'claimletter',
-#                      -values   => \@select_letter,
-#                      -default  => $claimletter,
-#                      -labels   => \%letters,
-#                      -size     => 1,
-#                      -multiple => 0 );
 my ($singlesupplier,@supplierinfo);
 if($supplierid){
-   ($singlesupplier,@supplierinfo)=bookseller($supplierid);
+   (@supplierinfo)=GetBookSeller($supplierid);
 } else { # set up supplierid for the claim links out of main table if all suppliers is chosen
    for(my $i=0; $i<@missingissues;$i++){
        $missingissues[$i]->{'supplierid'} = getsupplierbyserialid($missingissues[$i]->{'serialid'});
    }
 }
 
-
 my $preview=0;
 if($op eq 'preview'){
     $preview = 1;
 }
 
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/claims.tmpl",
-                               query => $query,
-                               type => "intranet",
-                               authnotrequired => 0,
-                               flagsrequired => {catalogue => 1},
-                               debug => 1,
-                               });
+if ($op eq "send_alert"){
+  my @serialnums=$input->param("serialid");
+  SendAlerts('claimissues',\@serialnums,$input->param("letter_code"));
+  my $cntupdate=UpdateClaimdateIssues(\@serialnums);
+  ### $cntupdate SHOULD be equal to scalar(@$serialnums)
+}
 
+$template->param('letters'=>\@letters,'letter'=>$letter);
 $template->param(
-       CGIsupplier => $CGIsupplier,
-#      CGIletter => $CGIletter,
+        order =>$order,
+        CGIsupplier => $CGIsupplier,
+        phone => $supplierinfo[0]->{phone},
+        booksellerfax => $supplierinfo[0]->{booksellerfax},
+        bookselleremail => $supplierinfo[0]->{bookselleremail},
         preview => $preview,
         missingissues => \@missingissues,
         supplierid => $supplierid,
-#       claimletter => $claimletter,
+        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 $query, $cookie, $template->output;
+        dateformat    => C4::Context->preference("dateformat"),
+        );
+output_html_with_http_headers $input, $cookie, $template->output;