Bug 17829: Move GetMember to Koha::Patron

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

diff --git a/C4/SIP/ILS/Transaction/Renew.pm b/C4/SIP/ILS/Transaction/Renew.pm
index aa300d4..7e1e9b7 100644 (file)
--- a/C4/SIP/ILS/Transaction/Renew.pm
+++ b/C4/SIP/ILS/Transaction/Renew.pm
@@ -2,17 +2,16 @@
 # Status of a Renew Transaction
 #
 
-package ILS::Transaction::Renew;
+package C4::SIP::ILS::Transaction::Renew;
 
 use warnings;
 use strict;
 
-use ILS;
-
 use C4::Circulation;
-use C4::Members;
+use Koha::Patrons;
+use Koha::DateUtils;
 
-use parent qw(ILS::Transaction);
+use parent qw(C4::SIP::ILS::Transaction);
 
 my %fields = (
     renewal_ok => 0,
@@ -34,12 +33,20 @@ 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;
+    if ($renewokay) { # ok so far check charges
+        my ($fee, undef) = GetIssuingCharges($self->{item}->{itemnumber}, $self->{patron}->{borrowernumber});
+        if ($fee > 0) {
+            $self->{sip_fee_type} = '06';
+            $self->{fee_amount} = sprintf '%.2f',$fee;
+            if ($self->{fee_ack} eq 'N') {
+                $renewokay = 0;
+            }
         }
+
+    }
+    if ($renewokay){
+        my $issue = AddIssue( $borrower, $self->{item}->id, undef, 0 );
+        $self->{due} = $self->duedatefromissue($issue, $self->{item}->{itemnumber});
         $self->renewal_ok(1);
     } else {
         $renewerror=~s/on_reserve/Item unavailable due to outstanding holds/;
@@ -53,8 +60,8 @@ sub do_renew_for  {
 
 sub do_renew {
     my $self = shift;
-    my $borrower = GetMember( cardnumber => $self->{patron}->id );
-    return $self->do_renew_for($borrower);
+    my $patron = Koha::Patrons->find( { cardnumber => $self->{patron}->id } );
+    return $self->do_renew_for($patron->unblessed);
 }
 
 1;