Attachment #132652 for bug #25815

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




sub checkout {
    my ( $self, $patron_id, $item_id, $sc_renew, $fee_ack, $account ) = @_;
    my ( $patron, $item, $circ );

    $circ = C4::SIP::ILS::Transaction::Checkout->new();

    # BEGIN TRANSACTION

    if ($fee_ack) {
        $circ->fee_ack($fee_ack);
    }

    if ( !$patron ) {
        $circ->screen_msg("Invalid Patron");
    }
    elsif ( !$patron->charge_ok ) {
        if ($patron->expired) {
            $circ->screen_msg("Patron expired");
        } elsif ($patron->debarred) {
            $circ->screen_msg("Patron debarred");
        } elsif ($patron->fine_blocked) {
            $circ->screen_msg("Patron has fines");
        } else {
            $circ->screen_msg("Patron blocked");
        }
    }
    elsif ( !$item ) {
        $circ->screen_msg("Invalid Item");

Lines 126-132 sub new { Link Here

(-)a/C4/SIP/ILS/Patron.pm (-1 / +4 lines)
126	recall_items => [],	126	recall_items => [],
127	unavail_holds => [],	127	unavail_holds => [],
128	inet => ( !$debarred && !$expired ),	128	inet => ( !$debarred && !$expired ),
		129	debarred => $debarred,
129	expired => $expired,	130	expired => $expired,
		131	fine_blocked => $fine_blocked,
130	fee_limit => $fee_limit,	132	fee_limit => $fee_limit,
131	userid => $kp->{userid},	133	userid => $kp->{userid},
132	);	134	);
Lines 181-186 my %fields = ( Link Here
181	birthdate_iso => 0,	183	birthdate_iso => 0,
182	dateexpiry => 0,	184	dateexpiry => 0,
183	dateexpiry_iso => 0,	185	dateexpiry_iso => 0,
		186	debarred => 0,
		187	fine_blocked => 0,
184	ptype => 0,	188	ptype => 0,
185	charge_ok => 0, # for patron_status[0] (inverted)	189	charge_ok => 0, # for patron_status[0] (inverted)
186	renew_ok => 0, # for patron_status[1] (inverted)	190	renew_ok => 0, # for patron_status[1] (inverted)
187	-

Return to bug 25815

Lines 123-129 sub offline_ok { Link Here

(-)a/C4/SIP/ILS.pm (-3 / +9 lines)
123	sub checkout {	123	sub checkout {
124	my ( $self, $patron_id, $item_id, $sc_renew, $fee_ack, $account ) = @_;	124	my ( $self, $patron_id, $item_id, $sc_renew, $fee_ack, $account ) = @_;
125	my ( $patron, $item, $circ );	125	my ( $patron, $item, $circ );
126
127	$circ = C4::SIP::ILS::Transaction::Checkout->new();	126	$circ = C4::SIP::ILS::Transaction::Checkout->new();
128		127
129	# BEGIN TRANSACTION	128	# BEGIN TRANSACTION
Lines 132-143 sub checkout { Link Here
132	if ($fee_ack) {	131	if ($fee_ack) {
133	$circ->fee_ack($fee_ack);	132	$circ->fee_ack($fee_ack);
134	}	133	}
135
136	if ( !$patron ) {	134	if ( !$patron ) {
137	$circ->screen_msg("Invalid Patron");	135	$circ->screen_msg("Invalid Patron");
138	}	136	}
139	elsif ( !$patron->charge_ok ) {	137	elsif ( !$patron->charge_ok ) {
140	$circ->screen_msg("Patron Blocked");	138	if ($patron->expired) {
		139	$circ->screen_msg("Patron expired");
		140	} elsif ($patron->debarred) {
		141	$circ->screen_msg("Patron debarred");
		142	} elsif ($patron->fine_blocked) {
		143	$circ->screen_msg("Patron has fines");
		144	} else {
		145	$circ->screen_msg("Patron blocked");
		146	}
141	}	147	}
142	elsif ( !$item ) {	148	elsif ( !$item ) {
143	$circ->screen_msg("Invalid Item");	149	$circ->screen_msg("Invalid Item");