Bugzilla – Attachment 121307 Details for
Bug 28424
POST /patrons/:patron_id/account/credits return value wrong
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28424: (follow-up) Do not create account lines manually
Bug-28424-follow-up-Do-not-create-account-lines-ma.patch (text/plain), 6.89 KB, created by
David Nind
on 2021-05-23 21:05:30 UTC
(
hide
)
Description:
Bug 28424: (follow-up) Do not create account lines manually
Filename:
MIME Type:
Creator:
David Nind
Created:
2021-05-23 21:05:30 UTC
Size:
6.89 KB
patch
obsolete
>From eb29896a5532a6a6f5d8fa2f8e645c1c2e06293a Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Sat, 22 May 2021 18:03:25 -0300 >Subject: [PATCH] Bug 28424: (follow-up) Do not create account lines manually > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> > >Signed-off-by: David Nind <david@davidnind.com> >--- > t/db_dependent/api/v1/patrons_accounts.t | 108 +++++++++++++------------------ > 1 file changed, 45 insertions(+), 63 deletions(-) > >diff --git a/t/db_dependent/api/v1/patrons_accounts.t b/t/db_dependent/api/v1/patrons_accounts.t >index 68ca9386eb..c470337403 100755 >--- a/t/db_dependent/api/v1/patrons_accounts.t >+++ b/t/db_dependent/api/v1/patrons_accounts.t >@@ -63,35 +63,29 @@ subtest 'get_balance() tests' => sub { > } > ); > >- my $account_line_1 = Koha::Account::Line->new( >+ my $debit_1 = $account->add_debit( > { >- borrowernumber => $patron->borrowernumber, >- date => \'NOW()', >- amount => 50, >- description => "A description", >- debit_type_code => "NEW_CARD", # New card >- amountoutstanding => 50, >- manager_id => $patron->borrowernumber, >- branchcode => $library->id, >- interface => 'test', >+ amount => 50, >+ description => "A description", >+ type => "NEW_CARD", >+ user_id => $patron->borrowernumber, >+ library_id => $library->id, >+ interface => 'test', > } > )->store(); >- $account_line_1->discard_changes; >+ $debit_1->discard_changes; > >- my $account_line_2 = Koha::Account::Line->new( >+ my $debit_2 = $account->add_debit( > { >- borrowernumber => $patron->borrowernumber, >- date => \'NOW()', >- amount => 50.01, >- description => "A description", >- debit_type_code => "NEW_CARD", # New card >- amountoutstanding => 50.01, >- manager_id => $patron->borrowernumber, >- branchcode => $library->id, >- interface => 'test', >+ amount => 50.01, >+ description => "A description", >+ type => "NEW_CARD", # New card >+ user_id => $patron->borrowernumber, >+ library_id => $library->id, >+ interface => 'test', > } > )->store(); >- $account_line_2->discard_changes; >+ $debit_2->discard_changes; > > $t->get_ok("//$userid:$password@/api/v1/patrons/$patron_id/account") > ->status_is(200) >@@ -100,8 +94,8 @@ subtest 'get_balance() tests' => sub { > outstanding_debits => { > total => 100.01, > lines => [ >- $account_line_1->to_api, >- $account_line_2->to_api >+ $debit_1->to_api, >+ $debit_2->to_api > ] > }, > outstanding_credits => { >@@ -152,20 +146,17 @@ subtest 'get_balance() tests' => sub { > ); > > # Accountline without manager_id (happens with fines.pl cron for example) >- my $account_line_3 = Koha::Account::Line->new( >+ my $debit_3 = $account->add_debit( > { >- borrowernumber => $patron->borrowernumber, >- date => \'NOW()', >- amount => 50, >- description => "A description", >- debit_type_code => "NEW_CARD", # New card >- amountoutstanding => 50, >- manager_id => undef, >- branchcode => $library->id, >- interface => 'test', >+ amount => 50, >+ description => "A description", >+ type => "NEW_CARD", # New card >+ user_id => undef, >+ library_id => $library->id, >+ interface => 'test', > } > )->store(); >- $account_line_3->discard_changes; >+ $debit_3->discard_changes; > > $t->get_ok("//$userid:$password@/api/v1/patrons/$patron_id/account") > ->status_is(200) >@@ -174,7 +165,7 @@ subtest 'get_balance() tests' => sub { > outstanding_debits => { > total => 50.00, > lines => [ >- $account_line_3->to_api >+ $debit_3->to_api > ] > }, > outstanding_credits => { >@@ -219,26 +210,20 @@ subtest 'add_credit() tests' => sub { > is( $outstanding_credits->count, 1 ); > is( $outstanding_credits->total_outstanding, -100 ); > >- my $debit_1 = Koha::Account::Line->new( >- { borrowernumber => $patron->borrowernumber, >- date => \'NOW()', >- amount => 10, >- description => "A description", >- debit_type_code => "NEW_CARD", # New card >- amountoutstanding => 10, >- manager_id => $patron->borrowernumber, >- interface => 'test', >+ my $debit_1 = $account->add_debit( >+ { amount => 10, >+ description => "A description", >+ type => "NEW_CARD", >+ user_id => $patron->borrowernumber, >+ interface => 'test', > } > )->store(); >- my $debit_2 = Koha::Account::Line->new( >- { borrowernumber => $patron->borrowernumber, >- date => \'NOW()', >- amount => 15, >- description => "A description", >- debit_type_code => "NEW_CARD", # New card >- amountoutstanding => 15, >- manager_id => $patron->borrowernumber, >- interface => 'test', >+ my $debit_2 = $account->add_debit( >+ { amount => 15, >+ description => "A description", >+ type => "NEW_CARD", >+ user_id => $patron->borrowernumber, >+ interface => 'test', > } > )->store(); > >@@ -258,15 +243,12 @@ subtest 'add_credit() tests' => sub { > is( $account->outstanding_debits->total_outstanding, > 0, "Debits have been cancelled automatically" ); > >- my $debit_3 = Koha::Account::Line->new( >- { borrowernumber => $patron->borrowernumber, >- date => \'NOW()', >- amount => 100, >- description => "A description", >- debit_type_code => "NEW_CARD", # New card >- amountoutstanding => 100, >- manager_id => $patron->borrowernumber, >- interface => 'test', >+ my $debit_3 = $account->add_debit( >+ { amount => 100, >+ description => "A description", >+ type => "NEW_CARD", >+ user_id => $patron->borrowernumber, >+ interface => 'test', > } > )->store(); > >-- >2.11.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=121307">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 28424
:
121292
|
121293
|
121294
|
121295
|
121304
|
121305
|
121306
| 121307