View | Details | Raw Unified | Return to bug 14673
Collapse All | Expand All

(-)a/C4/SIP/ILS/Transaction/Checkout.pm (-6 / +17 lines)
Lines 140-156 sub do_checkout { Link Here
140
		# . "w/ \$borrower: " . Dumper($borrower)
140
		# . "w/ \$borrower: " . Dumper($borrower)
141
		. "w/ C4::Context->userenv: " . Dumper(C4::Context->userenv);
141
		. "w/ C4::Context->userenv: " . Dumper(C4::Context->userenv);
142
    my $issue = AddIssue( $borrower, $barcode, $overridden_duedate, 0 );
142
    my $issue = AddIssue( $borrower, $barcode, $overridden_duedate, 0 );
143
    my $due_dt = dt_from_string( $issue->date_due() );
143
    $self->{due} = duedatefromissue($issue, $itemnumber);
144
    if ($due_dt) {
145
        $self->{due} = $due_dt->clone();
146
    } else {
147
        $self->{due} = undef;
148
    }
149
144
150
    #$self->{item}->due_date($due);
145
    #$self->{item}->due_date($due);
151
	$self->ok(1);
146
	$self->ok(1);
152
	return $self;
147
	return $self;
153
}
148
}
154
149
150
sub duedatefromissue {
151
    my ($iss, $itemnum) = @_;
152
    my $due_dt;
153
    if (defined $iss ) {
154
        $due_dt = dt_from_string( $iss->date_due() );
155
    } # renew from AddIssue ??
156
    else {
157
        # need to reread the issue to get due date
158
        $iss = C4::Circulation::GetItemIssue($itemnum);
159
        if ($iss && $iss->{date_due} ) {
160
            $due_dt = dt_from_string( $iss->{date_due} );
161
        }
162
    }
163
    return $due_dt;
164
}
165
155
1;
166
1;
156
__END__
167
__END__
(-)a/C4/SIP/ILS/Transaction/Renew.pm (-1 / +19 lines)
Lines 47-52 sub do_renew_for { Link Here
47
    if ($renewokay){
47
    if ($renewokay){
48
        $self->{due} = undef;
48
        $self->{due} = undef;
49
        my $issue = AddIssue( $borrower, $self->{item}->id, undef, 0 );
49
        my $issue = AddIssue( $borrower, $self->{item}->id, undef, 0 );
50
        $self->{due} = duedatefromissue($issue, $self->{item}->{itemnumber});
50
        my $due_date = dt_from_string( $issue->date_due() );
51
        my $due_date = dt_from_string( $issue->date_due() );
51
        if ($due_date) {
52
        if ($due_date) {
52
            $self->{due} = $due_date;
53
            $self->{due} = $due_date;
Lines 68-71 sub do_renew { Link Here
68
    return $self->do_renew_for($borrower);
69
    return $self->do_renew_for($borrower);
69
}
70
}
70
71
72
73
sub duedatefromissue {
74
    my ($iss, $itemnum) = @_;
75
    my $due_dt;
76
    if (defined $iss ) {
77
        $due_dt = dt_from_string( $iss->date_due() );
78
    } # renew from AddIssue ??
79
    else {
80
        # need to reread the issue to get due date
81
        $iss = C4::Circulation::GetItemIssue($itemnum);
82
        if ($iss && $iss->{date_due} ) {
83
            $due_dt = dt_from_string( $iss->{date_due} );
84
        }
85
    }
86
    return $due_dt;
87
}
88
89
71
1;
90
1;
72
- 

Return to bug 14673