Merge branch 'bug_8641' into 3.12-master

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

diff --git a/C4/SIP/ILS/Transaction/Renew.pm b/C4/SIP/ILS/Transaction/Renew.pm
index 40c9ae4..aa300d4 100644 (file)
--- a/C4/SIP/ILS/Transaction/Renew.pm
+++ b/C4/SIP/ILS/Transaction/Renew.pm
@@ -8,26 +8,53 @@ use warnings;
 use strict;
 
 use ILS;
-use ILS::Transaction;
 
-our @ISA = qw(ILS::Transaction);
+use C4::Circulation;
+use C4::Members;
+
+use parent qw(ILS::Transaction);
 
 my %fields = (
-             renewal_ok => 0,
-             );
+    renewal_ok => 0,
+);
 
 sub new {
-    my $class = shift;;
+    my $class = shift;
     my $self = $class->SUPER::new();
-    my $element;
 
-    foreach $element (keys %fields) {
-       $self->{_permitted}->{$element} = $fields{$element};
+    foreach my $element (keys %fields) {
+        $self->{_permitted}->{$element} = $fields{$element};
     }
 
-    @{$self}{keys %fields} = values %fields;
-
+    @{$self}{keys %fields} = values %fields;   # overkill?
     return bless $self, $class;
 }
 
+sub do_renew_for  {
+    my $self = shift;
+    my $borrower = shift;
+    my ($renewokay,$renewerror) = CanBookBeRenewed($borrower->{borrowernumber},$self->{item}->{itemnumber});
+    if ($renewokay){
+        $self->{due} = undef;
+        my $due_date = AddIssue( $borrower, $self->{item}->id, undef, 0 );
+        if ($due_date) {
+            $self->{due} = $due_date;
+        }
+        $self->renewal_ok(1);
+    } else {
+        $renewerror=~s/on_reserve/Item unavailable due to outstanding holds/;
+        $renewerror=~s/too_many/Item has reached maximum renewals/;
+        $self->screen_msg($renewerror);
+        $self->renewal_ok(0);
+    }
+    $self->ok(1);
+    return;
+}
+
+sub do_renew {
+    my $self = shift;
+    my $borrower = GetMember( cardnumber => $self->{patron}->id );
+    return $self->do_renew_for($borrower);
+}
+
 1;