Bug 17600: Standardize our EXPORT_OK

[srvgit] / C4 / SIP / ILS / Transaction / RenewAll.pm

diff --git a/C4/SIP/ILS/Transaction/RenewAll.pm b/C4/SIP/ILS/Transaction/RenewAll.pm
index 10fb27d..5acd53e 100644 (file)
--- a/C4/SIP/ILS/Transaction/RenewAll.pm
+++ b/C4/SIP/ILS/Transaction/RenewAll.pm
@@ -1,66 +1,71 @@
-# 
+#
 # RenewAll: class to manage status of "Renew All" transaction
 
-package ILS::Transaction::RenewAll;
+package C4::SIP::ILS::Transaction::RenewAll;
 
 use strict;
 use warnings;
 
-use Sys::Syslog qw(syslog);
+use C4::SIP::Sip qw( siplog );
 
-use ILS::Item;
-use ILS::Transaction::Renew;
+use C4::SIP::ILS::Item;
 
-use C4::Members;       # GetMember
+use Koha::Patrons;
 
-our @ISA = qw(ILS::Transaction::Renew);
+use parent qw(C4::SIP::ILS::Transaction::Renew);
 
 my %fields = (
-         renewed => [],
-       unrenewed => [],
+    renewed   => [],
+    unrenewed => [],
 );
 
 sub new {
-       my $class = shift;
-       my $self = $class->SUPER::new();
-       my $element;
+    my $class = shift;
+    my $self  = $class->SUPER::new();
 
-       foreach $element (keys %fields) {
-               $self->{_permitted}->{$element} = $fields{$element};
-       }
+    foreach my $element ( keys %fields ) {
+        $self->{_permitted}->{$element} = $fields{$element};
+    }
 
-       @{$self}{keys %fields} = values %fields;
-       return bless $self, $class;
+    @{$self}{ keys %fields } = values %fields;
+    return bless $self, $class;
 }
 
 sub do_renew_all {
-       my $self = shift;
-       my $patron = $self->{patron};                                                   # SIP's  patron
-       my $borrower = GetMember('cardnumber'=>$patron->id);    # Koha's patron
-       my $all_ok = 1;
-    $self->{renewed} = [];
+    my $self     = shift;
+    my $patron   = $self->{patron};                           # SIP's  patron
+    my $borrower = Koha::Patrons->find( { cardnumber => $patron->id } )->unblessed;    # Koha's patron
+    my $all_ok   = 1;
+    $self->{renewed}   = [];
     $self->{unrenewed} = [];
-       foreach my $itemx (@{$patron->{items}}) {
-               my $item_id = $itemx->{barcode};
-               my $item = new ILS::Item $item_id;
-               if (!defined($item)) {
-                       syslog("LOG_WARNING",
-                               "renew_all: Invalid item id '%s' associated with patron '%s'",
-                               $item_id, $patron->id);
-                       $all_ok = 0;
-                       next;
-               }
-               $self->{item} = $item;
-               $self->do_renew_for($borrower);
-               if ($self->ok) {
-                   $item->{due_date} = $self->{due}->clone();
-                   push @{$self->renewed  }, $item_id;
-               } else {
-            push @{$self->{unrenewed}}, $item_id;
-               }
-       }
-       $self->ok($all_ok);
-       return $self;
+    foreach my $itemx ( @{ $patron->{items} } ) {
+        my $item_id = $itemx->{barcode};
+        my $item    = C4::SIP::ILS::Item->new($item_id);
+        if ( !defined($item) ) {
+            siplog(
+                'LOG_WARNING',
+                q|renew_all: Invalid item id '%s' associated with patron '%s'|,
+                $item_id,
+                $patron->id
+            );
+
+            # $all_ok = 0; Do net set as still ok
+            push @{ $self->unrenewed }, $item_id;
+            next;
+        }
+        $self->{item} = $item;
+        $self->do_renew_for($borrower);
+        if ( $self->renewal_ok ) {
+            $item->{due_date} = $self->{due};
+            push @{ $self->{renewed} }, $item_id;
+        }
+        else {
+            push @{ $self->{unrenewed} }, $item_id;
+        }
+        $self->screen_msg(q{});    # clear indiv message
+    }
+    $self->ok($all_ok);
+    return $self;
 }
 
 1;