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

(-)a/C4/SIP/ILS/Item.pm (-4 / +4 lines)
Lines 96-102 sub new { Link Here
96
    if ($issue) {
96
    if ($issue) {
97
        $self->{due_date} = dt_from_string( $issue->date_due, 'sql' )->truncate( to => 'minute' );
97
        $self->{due_date} = dt_from_string( $issue->date_due, 'sql' )->truncate( to => 'minute' );
98
        my $patron = Koha::Patrons->find( $issue->borrowernumber );
98
        my $patron = Koha::Patrons->find( $issue->borrowernumber );
99
        $self->{patron} = $patron->cardnumber;
99
        $self->{borrowernumber} = $patron->borrowernumber;
100
    }
100
    }
101
    my $biblio = Koha::Biblios->find( $self->{biblionumber} );
101
    my $biblio = Koha::Biblios->find( $self->{biblionumber} );
102
    my $holds = $biblio->current_holds->unblessed;
102
    my $holds = $biblio->current_holds->unblessed;
Lines 254-260 sub title_id { Link Here
254
254
255
sub sip_circulation_status {
255
sub sip_circulation_status {
256
    my $self = shift;
256
    my $self = shift;
257
    if ( $self->{patron} ) {
257
    if ( $self->{borrowernumber} ) {
258
        return '04';    # charged
258
        return '04';    # charged
259
    }
259
    }
260
    elsif ( grep { $_->{itemnumber} == $self->{itemnumber}  } @{ $self->{hold_shelf} } ) {
260
    elsif ( grep { $_->{itemnumber} == $self->{itemnumber}  } @{ $self->{hold_shelf} } ) {
Lines 355-362 sub available { Link Here
355
	my $count  = (defined $self->{pending_queue}) ? scalar @{$self->{pending_queue}} : 0;
355
	my $count  = (defined $self->{pending_queue}) ? scalar @{$self->{pending_queue}} : 0;
356
	my $count2 = (defined $self->{hold_shelf}   ) ? scalar @{$self->{hold_shelf}   } : 0;
356
	my $count2 = (defined $self->{hold_shelf}   ) ? scalar @{$self->{hold_shelf}   } : 0;
357
	$debug and print STDERR "availability check: pending_queue size $count, hold_shelf size $count2\n";
357
	$debug and print STDERR "availability check: pending_queue size $count, hold_shelf size $count2\n";
358
    if (defined($self->{patron_id})) {
358
    if (defined($self->{borrowernumber})) {
359
	 	($self->{patron_id} eq $for_patron) or return 0;
359
        ($self->{borrowernumber} eq $for_patron) or return 0;
360
		return ($count ? 0 : 1);
360
		return ($count ? 0 : 1);
361
	} else {	# not checked out
361
	} else {	# not checked out
362
        ($count2) and return $self->barcode_is_borrowernumber($for_patron, $self->{hold_shelf}[0]->{borrowernumber});
362
        ($count2) and return $self->barcode_is_borrowernumber($for_patron, $self->{hold_shelf}[0]->{borrowernumber});
(-)a/C4/SIP/ILS/Transaction/Checkout.pm (-13 / +9 lines)
Lines 50-61 sub do_checkout { Link Here
50
	syslog('LOG_DEBUG', "ILS::Transaction::Checkout performing checkout...");
50
	syslog('LOG_DEBUG', "ILS::Transaction::Checkout performing checkout...");
51
	my $shelf          = $self->{item}->hold_shelf;
51
	my $shelf          = $self->{item}->hold_shelf;
52
	my $barcode        = $self->{item}->id;
52
	my $barcode        = $self->{item}->id;
53
	my $patron_barcode = $self->{patron}->id;
53
    my $patron         = Koha::Patrons->find($self->{patron}->{borrowernumber});
54
        my $overridden_duedate; # usually passed as undef to AddIssue
54
    my $overridden_duedate; # usually passed as undef to AddIssue
55
	$debug and warn "do_checkout: patron (" . $patron_barcode . ")";
55
    $debug and warn "do_checkout borrower: . " . $patron->borrowernumber;
56
    my $patron = Koha::Patrons->find( { cardnumber => $patron_barcode } );
57
    my $borrower = $patron->unblessed;
58
	$debug and warn "do_checkout borrower: . " . Dumper $borrower;
59
    my ($issuingimpossible, $needsconfirmation) = _can_we_issue($patron, $barcode,
56
    my ($issuingimpossible, $needsconfirmation) = _can_we_issue($patron, $barcode,
60
        C4::Context->preference("AllowItemsOnHoldCheckoutSIP")
57
        C4::Context->preference("AllowItemsOnHoldCheckoutSIP")
61
    );
58
    );
Lines 73-79 sub do_checkout { Link Here
73
            if ($confirmation eq 'RENEW_ISSUE'){
70
            if ($confirmation eq 'RENEW_ISSUE'){
74
                $self->screen_msg("Item already checked out to you: renewing item.");
71
                $self->screen_msg("Item already checked out to you: renewing item.");
75
            } elsif ($confirmation eq 'RESERVED' or $confirmation eq 'RESERVE_WAITING') {
72
            } elsif ($confirmation eq 'RESERVED' or $confirmation eq 'RESERVE_WAITING') {
76
                my $x = $self->{item}->available($patron_barcode);
73
                my $x = $self->{item}->available($patron->borrowernumber);
77
                if ($x) {
74
                if ($x) {
78
                    $self->screen_msg("Item was reserved for you.");
75
                    $self->screen_msg("Item was reserved for you.");
79
                } else {
76
                } else {
Lines 110-124 sub do_checkout { Link Here
110
    }
107
    }
111
    my $itemnumber = $self->{item}->{itemnumber};
108
    my $itemnumber = $self->{item}->{itemnumber};
112
    foreach (@$shelf) {
109
    foreach (@$shelf) {
113
        $debug and warn "shelf has ($_->{itemnumber} for $_->{borrowernumber}). this is ($itemnumber, $self->{patron}->{borrowernumber})";
110
        $debug and warn sprintf( "shelf has (%s for %s). this is (%is, %s)", $_->{itemnumber}, $_->{borrowernumber}, $itemnumber, $patron->borrowernumber );
114
        ($_->{itemnumber} eq $itemnumber) or next;    # skip it if not this item
111
        ($_->{itemnumber} eq $itemnumber) or next;    # skip it if not this item
115
        ($_->{borrowernumber} == $self->{patron}->{borrowernumber}) and last;
112
        ($_->{borrowernumber} == $patron->borrowernumber) and last;
116
            # if item was waiting for this patron, we're done.  AddIssue takes care of the "W" hold.
113
            # if item was waiting for this patron, we're done.  AddIssue takes care of the "W" hold.
117
        $debug and warn "Item is on hold shelf for another patron.";
114
        $debug and warn "Item is on hold shelf for another patron.";
118
        $self->screen_msg("Item is on hold shelf for another patron.");
115
        $self->screen_msg("Item is on hold shelf for another patron.");
119
        $noerror = 0;
116
        $noerror = 0;
120
    }
117
    }
121
    my ($fee, undef) = GetIssuingCharges($itemnumber, $self->{patron}->{borrowernumber});
118
    my ($fee, undef) = GetIssuingCharges($itemnumber, $patron->borrowernumber);
122
    if ( $fee > 0 ) {
119
    if ( $fee > 0 ) {
123
        $self->{sip_fee_type} = '06';
120
        $self->{sip_fee_type} = '06';
124
        $self->{fee_amount} = sprintf '%.2f', $fee;
121
        $self->{fee_amount} = sprintf '%.2f', $fee;
Lines 132-141 sub do_checkout { Link Here
132
		return $self;
129
		return $self;
133
	}
130
	}
134
	# can issue
131
	# can issue
135
	$debug and warn "do_checkout: calling AddIssue(\$borrower,$barcode, $overridden_duedate, 0)\n"
132
    $debug and warn sprintf("do_checkout: calling AddIssue(%s, %s, %s, 0)\n", $patron->borrowernumber, $barcode, $overridden_duedate)
136
		# . "w/ \$borrower: " . Dumper($borrower)
137
		. "w/ C4::Context->userenv: " . Dumper(C4::Context->userenv);
133
		. "w/ C4::Context->userenv: " . Dumper(C4::Context->userenv);
138
    my $issue = AddIssue( $borrower, $barcode, $overridden_duedate, 0 );
134
    my $issue = AddIssue( $patron->unblessed, $barcode, $overridden_duedate, 0 );
139
    $self->{due} = $self->duedatefromissue($issue, $itemnumber);
135
    $self->{due} = $self->duedatefromissue($issue, $itemnumber);
140
136
141
	$self->ok(1);
137
	$self->ok(1);
(-)a/C4/SIP/ILS/Transaction/Hold.pm (-21 / +6 lines)
Lines 37-53 sub queue_position { Link Here
37
37
38
sub do_hold {
38
sub do_hold {
39
    my $self = shift;
39
    my $self = shift;
40
    unless ( $self->{patron} ) {
40
    my $patron = Koha::Patrons->find( $self->{patron}->borrowernumber );
41
    unless ( $patron ) {
41
        $self->screen_msg('do_hold called with undefined patron');
42
        $self->screen_msg('do_hold called with undefined patron');
42
        $self->ok(0);
43
        $self->ok(0);
43
        return $self;
44
        return $self;
44
    }
45
    }
45
    my $patron = Koha::Patrons->find( { cardnumber => $self->{patron}->id } );
46
    unless ($patron) {
47
        $self->screen_msg( 'No borrower matches cardnumber "' . $self->{patron}->id . '".' );
48
        $self->ok(0);
49
        return $self;
50
    }
51
    my $item = Koha::Items->find({ barcode => $self->{item}->id });
46
    my $item = Koha::Items->find({ barcode => $self->{item}->id });
52
    unless ($item) {
47
    unless ($item) {
53
        $self->screen_msg( 'No biblio record matches barcode "' . $self->{item}->id . '".' );
48
        $self->screen_msg( 'No biblio record matches barcode "' . $self->{item}->id . '".' );
Lines 83-96 sub do_hold { Link Here
83
78
84
sub drop_hold {
79
sub drop_hold {
85
	my $self = shift;
80
	my $self = shift;
86
	unless ($self->{patron}) {
81
    my $patron = Koha::Patrons->find( $self->{patron}->borrowernumber );
87
		$self->screen_msg('drop_hold called with undefined patron');
88
		$self->ok(0);
89
		return $self;
90
	}
91
    my $patron = Koha::Patrons->find( { cardnumber => $self->{patron}->id } );
92
    unless ($patron) {
82
    unless ($patron) {
93
		$self->screen_msg('No borrower matches cardnumber "' . $self->{patron}->id . '".');
83
		$self->screen_msg('drop_hold called with undefined patron');
94
		$self->ok(0);
84
		$self->ok(0);
95
		return $self;
85
		return $self;
96
	}
86
	}
Lines 108-121 sub drop_hold { Link Here
108
98
109
sub change_hold {
99
sub change_hold {
110
	my $self = shift;
100
	my $self = shift;
111
	unless ($self->{patron}) {
101
    my $patron = Koha::Patrons->find( $self->{patron}->borrowernumber );
112
		$self->screen_msg('change_hold called with undefined patron');
113
		$self->ok(0);
114
		return $self;
115
	}
116
    my $patron = Koha::Patrons->find( { cardnumber => $self->{patron}->id } );
117
    unless ($patron) {
102
    unless ($patron) {
118
		$self->screen_msg('No borrower matches cardnumber "' . $self->{patron}->id . '".');
103
		$self->screen_msg('change_hold called with undefined patron');
119
		$self->ok(0);
104
		$self->ok(0);
120
		return $self;
105
		return $self;
121
	}
106
	}
(-)a/C4/SIP/ILS/Transaction/Renew.pm (-2 / +2 lines)
Lines 61-67 sub do_renew_for { Link Here
61
61
62
sub do_renew {
62
sub do_renew {
63
    my $self = shift;
63
    my $self = shift;
64
    my $patron = Koha::Patrons->find( { cardnumber => $self->{patron}->id } );
64
    my $patron = Koha::Patrons->find( $self->{patron}->borrowernumber );
65
    $patron or return; # FIXME we should log that
65
    return $self->do_renew_for($patron->unblessed);
66
    return $self->do_renew_for($patron->unblessed);
66
}
67
}
67
68
68
- 

Return to bug 23403