Attachment #144474 for bug #32408

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

Lines 18-23 use C4::Context; Link Here

(-)a/C4/SIP/ILS/Transaction/Checkout.pm (-3 / +19 lines)
18	use C4::Circulation qw( AddIssue GetIssuingCharges CanBookBeIssued ProcessOfflineIssue );	18	use C4::Circulation qw( AddIssue GetIssuingCharges CanBookBeIssued ProcessOfflineIssue );
19	use C4::Members;	19	use C4::Members;
20	use Koha::DateUtils qw( dt_from_string );	20	use Koha::DateUtils qw( dt_from_string );
		21	use Koha::Number::Price;
		22	use Koha::Account;
21		23
22	use parent qw(C4::SIP::ILS::Transaction);	24	use parent qw(C4::SIP::ILS::Transaction);
23		25
Lines 89-97 sub do_checkout { Link Here
89	$noerror = 0;	91	$noerror = 0;
90	last;	92	last;
91	} elsif ($confirmation eq 'DEBT') {	93	} elsif ($confirmation eq 'DEBT') {
92	$self->screen_msg('Outstanding Fines block issue');	94	my $message = "";
93	$noerror = 0;	95	if ($account->{override_fine_on_checkout}) {
94	last;	96	$message = "You have outstanding fines";
		97	} else {
		98	$message = 'Outstanding fines block issue';
		99	$noerror = 0;
		100	}
		101
		102	if ($account->{show_outstanding_amount}) {
		103	my $patron_account = Koha::Account->new( { patron_id => $patron->borrowernumber });
		104	my $balance = $patron_account->balance;
		105	if ($balance) {
		106	$message .= (" - You owe " . Koha::Number::Price->new( $balance )->format({ with_symbol => 1}) . ".");
		107	}
		108	}
		109	$self->screen_msg($message);
		110	last if (!$account->{override_fine_on_checkout});
95	} elsif ($confirmation eq 'HIGHHOLDS') {	111	} elsif ($confirmation eq 'HIGHHOLDS') {
96	$overridden_duedate = $needsconfirmation->{$confirmation}->{returndate};	112	$overridden_duedate = $needsconfirmation->{$confirmation}->{returndate};
97	$self->screen_msg('Loan period reduced for high-demand item');	113	$self->screen_msg('Loan period reduced for high-demand item');

Lines 74-79 Link Here

(-)a/etc/SIPconfig.xml (+2 lines)
74	holds_get_captured="1"	74	holds_get_captured="1"
75	prevcheckout_block_checkout="0"	75	prevcheckout_block_checkout="0"
76	overdues_block_checkout="1"	76	overdues_block_checkout="1"
		77	override_fine_on_checkout="0"
		78	show_outstanding_amount="1"
77	format_due_date="0"	79	format_due_date="0"
78	inhouse_item_types=""	80	inhouse_item_types=""
79	inhouse_patron_categories="">	81	inhouse_patron_categories="">




# Current state is very rudimentary. Please help to extend it!

use Modern::Perl;
use Test::More tests => 17;

use Koha::Database;
use t::lib::TestBuilder;

    };
};

subtest do_checkout_with_fine_override => sub {
    plan tests => 5;

    my $mockILS = Test::MockObject->new;
    my $server = { ils => $mockILS };
    my $library = $builder->build_object( { class => 'Koha::Libraries' } );
    my $institution = {
        id             => $library->id,
        implementation => "ILS",
        policy         => {
            checkin  => "true",
            renewal  => "true",
            checkout => "true",
            timeout  => 100,
            retries  => 5,
        }
    };
    my $ils = C4::SIP::ILS->new($institution);
    my $item = $builder->build_sample_item(
        {
            library => $library->branchcode,
        }
    );

    my $fines_patron = $builder->build_object(
        {
            class => 'Koha::Patrons',
            value => {
                branchcode => $library->branchcode,
            }
        }
    );
    my $fee1 = $builder->build(
        {
            source => 'Accountline',
            value  => {
                borrowernumber => $fines_patron->borrowernumber,
                amountoutstanding => 4,
            }
        }
    );

    $server->{account}->{override_fine_on_checkout} = 0;
    $server->{account}->{show_outstanding_amount} = 0;
    my $circ = $ils->checkout($fines_patron->cardnumber, $item->barcode, undef, undef, $server->{account});
    is( $circ->{screen_msg}, 'Outstanding fines block issue',
        "Checkout is blocked when the amount is under noissuecharge and override_fine_on_checkout is disabled" );

    $server->{account}->{override_fine_on_checkout} = 0;
    $server->{account}->{show_outstanding_amount} = 1;
    $circ = $ils->checkout($fines_patron->cardnumber, $item->barcode, undef, undef, $server->{account});
    is( $circ->{screen_msg}, 'Outstanding fines block issue - You owe $4.00.',
        "Checkout is blocked and the amount is displayed when it is under noissuecharge and override_fine_on_checkout is disabled" );

    $server->{account}->{override_fine_on_checkout} = 1;
    $server->{account}->{show_outstanding_amount} = 0;
    $circ = $ils->checkout($fines_patron->cardnumber, $item->barcode, undef, undef, $server->{account});
    is( $circ->{screen_msg}, 'You have outstanding fines',
        "Checkout is allowed when the amount is under noissuecharge and override_fine_on_checkout is enabled" );

    $circ = $ils->checkin( $item->barcode, C4::SIP::Sip::timestamp, undef, $library->branchcode );

    $server->{account}->{override_fine_on_checkout} = 1;
    $server->{account}->{show_outstanding_amount} = 1;
    $circ = $ils->checkout($fines_patron->cardnumber, $item->barcode, undef, undef, $server->{account});
    is( $circ->{screen_msg}, 'You have outstanding fines - You owe $4.00.',
        "Checkout is allowed and the amount is displayed when it is under noissuecharge and override_fine_on_checkout is enabled" );

    $circ = $ils->checkin( $item->barcode, C4::SIP::Sip::timestamp, undef, $library->branchcode );

    $fee1 = $builder->build(
        {
            source => 'Accountline',
            value  => {
                borrowernumber => $fines_patron->borrowernumber,
                amountoutstanding => 4,
            }
        }
    );

    $server->{account}->{override_fine_on_checkout} = 1;
    $server->{account}->{show_outstanding_amount} = 0;
    $circ = $ils->checkout($fines_patron->cardnumber, $item->barcode, undef, undef, $server->{account});
    is( $circ->{screen_msg}, 'Patron has fines',
        "Checkout is blocked when amount is over noissuecharge and override_fine_on_checkout is enabled" );
};

subtest do_checkout_with_patron_blocked => sub {
    plan tests => 4;

- 

Return to bug 32408

Lines 4-10 Link Here

(-)a/t/db_dependent/SIP/Transaction.t (-2 / +88 lines)
4	# Current state is very rudimentary. Please help to extend it!	4	# Current state is very rudimentary. Please help to extend it!
5		5
6	use Modern::Perl;	6	use Modern::Perl;
7	use Test::More tests => 16;	7	use Test::More tests => 17;
8		8
9	use Koha::Database;	9	use Koha::Database;
10	use t::lib::TestBuilder;	10	use t::lib::TestBuilder;
Lines 439-444 subtest do_checkin => sub { Link Here
439	};	439	};
440	};	440	};
441		441
		442	subtest do_checkout_with_fine_override => sub {
		443	plan tests => 5;
		444
		445	my $mockILS = Test::MockObject->new;
		446	my $server = { ils => $mockILS };
		447	my $library = $builder->build_object( { class => 'Koha::Libraries' } );
		448	my $institution = {
		449	id => $library->id,
		450	implementation => "ILS",
		451	policy => {
		452	checkin => "true",
		453	renewal => "true",
		454	checkout => "true",
		455	timeout => 100,
		456	retries => 5,
		457	}
		458	};
		459	my $ils = C4::SIP::ILS->new($institution);
		460	my $item = $builder->build_sample_item(
		461	{
		462	library => $library->branchcode,
		463	}
		464	);
		465
		466	my $fines_patron = $builder->build_object(
		467	{
		468	class => 'Koha::Patrons',
		469	value => {
		470	branchcode => $library->branchcode,
		471	}
		472	}
		473	);
		474	my $fee1 = $builder->build(
		475	{
		476	source => 'Accountline',
		477	value => {
		478	borrowernumber => $fines_patron->borrowernumber,
		479	amountoutstanding => 4,
		480	}
		481	}
		482	);
		483
		484	$server->{account}->{override_fine_on_checkout} = 0;
		485	$server->{account}->{show_outstanding_amount} = 0;
		486	my $circ = $ils->checkout($fines_patron->cardnumber, $item->barcode, undef, undef, $server->{account});
		487	is( $circ->{screen_msg}, 'Outstanding fines block issue',
		488	"Checkout is blocked when the amount is under noissuecharge and override_fine_on_checkout is disabled" );
		489
		490	$server->{account}->{override_fine_on_checkout} = 0;
		491	$server->{account}->{show_outstanding_amount} = 1;
		492	$circ = $ils->checkout($fines_patron->cardnumber, $item->barcode, undef, undef, $server->{account});
		493	is( $circ->{screen_msg}, 'Outstanding fines block issue - You owe $4.00.',
		494	"Checkout is blocked and the amount is displayed when it is under noissuecharge and override_fine_on_checkout is disabled" );
		495
		496	$server->{account}->{override_fine_on_checkout} = 1;
		497	$server->{account}->{show_outstanding_amount} = 0;
		498	$circ = $ils->checkout($fines_patron->cardnumber, $item->barcode, undef, undef, $server->{account});
		499	is( $circ->{screen_msg}, 'You have outstanding fines',
		500	"Checkout is allowed when the amount is under noissuecharge and override_fine_on_checkout is enabled" );
		501
		502	$circ = $ils->checkin( $item->barcode, C4::SIP::Sip::timestamp, undef, $library->branchcode );
		503
		504	$server->{account}->{override_fine_on_checkout} = 1;
		505	$server->{account}->{show_outstanding_amount} = 1;
506	$circ = $ils->checkout($fines_patron->cardnumber, $item->barcode, undef, undef, $server->{account});
507	is( $circ->{screen_msg}, 'You have outstanding fines - You owe $4.00.',
508	"Checkout is allowed and the amount is displayed when it is under noissuecharge and override_fine_on_checkout is enabled" );
509
510	$circ = $ils->checkin( $item->barcode, C4::SIP::Sip::timestamp, undef, $library->branchcode );
511
512	$fee1 = $builder->build(
513	{
514	source => 'Accountline',
515	value => {
516	borrowernumber => $fines_patron->borrowernumber,
517	amountoutstanding => 4,
518	}
519	}
520	);
521
522	$server->{account}->{override_fine_on_checkout} = 1;
523	$server->{account}->{show_outstanding_amount} = 0;
524	$circ = $ils->checkout($fines_patron->cardnumber, $item->barcode, undef, undef, $server->{account});
525	is( $circ->{screen_msg}, 'Patron has fines',
526	"Checkout is blocked when amount is over noissuecharge and override_fine_on_checkout is enabled" );
527	};
528
442	subtest do_checkout_with_patron_blocked => sub {	529	subtest do_checkout_with_patron_blocked => sub {
443	plan tests => 4;	530	plan tests => 4;
444		531
445	-