@@ -, +, @@ --- t/db_dependent/Overdues.t | 65 +++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 12 deletions(-) --- a/t/db_dependent/Overdues.t +++ a/t/db_dependent/Overdues.t @@ -144,13 +144,13 @@ subtest 'UpdateFine tests' => sub { my $checkout1 = $builder->build_object( { class => 'Koha::Checkouts', - value => { itemnumber => $item1->itemnumber } + value => { itemnumber => $item1->itemnumber, borrowernumber => $patron->id } } ); my $checkout2 = $builder->build_object( { class => 'Koha::Checkouts', - value => { itemnumber => $item2->itemnumber } + value => { itemnumber => $item2->itemnumber, borrowernumber => $patron->id } } ); @@ -431,26 +431,67 @@ subtest 'UpdateFine tests' => sub { is( $fine3->amountoutstanding+0, 10, "Third fine amount outstanding is reduced" ); t::lib::Mocks::mock_preference( 'MaxFine', '7.2' ); - my $patron_1 = $builder->build_object( { class => 'Koha::Patrons' } ); - my $account = $patron_1->account; - $account->add_debit({ type => 'OVERDUE', amount => '6.99', interface => 'TEST'}); - $account->add_debit({ type => 'OVERDUE', amount => '.10', interface => 'TEST'}); - $account->add_debit({ type => 'OVERDUE', amount => '.10', interface => 'TEST'}); - $account->add_debit({ type => 'OVERDUE', amount => '.01', interface => 'TEST'}); + my $patron_1 = $builder->build_object( { class => 'Koha::Patrons' } ); my $item_1 = $builder->build_sample_item(); + my $item_2 = $builder->build_sample_item(); my $checkout_1 = $builder->build_object( { class => 'Koha::Checkouts', - value => { itemnumber => $item_1->itemnumber, borrowernumber => $patron_1->id } + value => { + itemnumber => $item_1->itemnumber, + borrowernumber => $patron_1->id + } + } + ); + my $checkout_2 = $builder->build_object( + { + class => 'Koha::Checkouts', + value => { + itemnumber => $item_2->itemnumber, + borrowernumber => $patron->id + } + } + ); + my $account = $patron_1->account; + $account->add_debit( + { + type => 'OVERDUE', + amount => '6.99', + issue_id => $checkout_1->issue_id, + interface => 'TEST' + } + ); + $account->add_debit( + { + type => 'OVERDUE', + amount => '.10', + issue_id => $checkout_1->issue_id, + interface => 'TEST' + } + ); + $account->add_debit( + { + type => 'OVERDUE', + amount => '.10', + issue_id => $checkout_1->issue_id, + interface => 'TEST' + } + ); + $account->add_debit( + { + type => 'OVERDUE', + amount => '.01', + issue_id => $checkout_1->issue_id, + interface => 'TEST' } ); UpdateFine( { - issue_id => $checkout_1->issue_id, - itemnumber => $item_1->itemnumber, + issue_id => $checkout_2->issue_id, + itemnumber => $item_2->itemnumber, borrowernumber => $patron_1->borrowernumber, amount => '.1', - due => $checkout_1->date_due + due => $checkout_2->date_due } ); $fines = Koha::Account::Lines->search( --