Bug 32336: (QA follow-up) Use $metadata->schema

[srvgit] / serials / claims.pl

diff --git a/serials/claims.pl b/serials/claims.pl
index 1a0c5cf..5b5479f 100755 (executable)
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -17,19 +17,16 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Serials;
-use C4::Acquisition;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Serials qw( GetSuppliersWithLateIssues GetLateOrMissingIssues updateClaim can_claim_subscription );
+use C4::Output qw( output_html_with_http_headers );
 use C4::Context;
-use C4::Letters;
-use C4::Branch;    # GetBranches GetBranchesLoop
-use C4::Koha qw( GetAuthorisedValues );
-use Koha::AdditionalField;
-use C4::Csv qw( GetCsvProfiles );
+use C4::Letters qw( GetLetters SendAlerts );
+
+use Koha::AdditionalFields;
+use Koha::CsvProfiles;
 
 my $input = CGI->new;
 
@@ -44,9 +41,7 @@ my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => 'serials/claims.tt',
             query => $input,
             type => 'intranet',
-            authnotrequired => 0,
             flagsrequired => {serials => 'claim_serials'},
-            debug => 1,
             });
 
 # supplierlist is returned in name order
@@ -58,22 +53,15 @@ for my $s (@{$supplierlist} ) {
     }
 }
 
-my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription', searchable => 1 } );
-for my $field ( @$additional_fields ) {
-    if ( $field->{authorised_value_category} ) {
-        $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
-    }
-}
-
-my $branchloop = GetBranchesLoop();
+my $additional_fields = Koha::AdditionalFields->search( { tablename => 'subscription', searchable => 1 } );
 
 my @serialnums=$input->multi_param('serialid');
 if (@serialnums) { # i.e. they have been flagged to generate claims
     my $err;
     eval {
-        $err = SendAlerts('claimissues',\@serialnums,$input->param("letter_code"));
+        $err = SendAlerts( 'claimissues', \@serialnums, scalar $input->param("letter_code") );
         if ( not ref $err or not exists $err->{error} ) {
-           UpdateClaimdateIssues(\@serialnums);
+            C4::Serials::updateClaim( \@serialnums );
         }
     };
     if ( $@ ) {
@@ -82,7 +70,7 @@ if (@serialnums) { # i.e. they have been flagged to generate claims
         if ( $err->{error} eq "no_email" ) {
             $template->param( error_claim => 'no_vendor_email' );
         } elsif ( $err->{error} =~ m|Bad or missing From address| ) {
-            $template->param( error_claim => 'no_loggedin_user_email' );
+            $template->param( error_claim => 'bad_or_missing_sender' );
         }
     } else {
         $template->param( info_claim => 1 );
@@ -93,11 +81,13 @@ my $letters = GetLetters({ module => 'claimissues' });
 
 my @missingissues;
 if ($supplierid) {
+    my $supplier = Koha::Acquisition::Booksellers->find( $supplierid );
     @missingissues = GetLateOrMissingIssues($supplierid);
     foreach my $issue (@missingissues) {
         $issue->{cannot_claim} = 1
           unless C4::Serials::can_claim_subscription($issue);
     }
+    $template->param( suppliername => $supplier->name );
 }
 
 $template->param(
@@ -105,9 +95,8 @@ $template->param(
         missingissues => \@missingissues,
         supplierid => $supplierid,
         claimletter => $claimletter,
-        branchloop   => $branchloop,
         additional_fields_for_subscription => $additional_fields,
-        csv_profiles => C4::Csv::GetCsvProfiles( "sql" ),
+        csv_profiles => Koha::CsvProfiles->search({ type => 'sql', used_for => 'late_issues' }),
         letters => $letters,
         (uc(C4::Context->preference("marcflavour"))) => 1
         );