gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 23049: Drop type lookup as it's now a foreign key 

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Martin Renvoize 2019-10-10 16:58:23 +01:00
parent 7f0cdb83cf
commit 6d4ae2d47e
No known key found for this signature in database
GPG Key ID: 422B469130441A0F
2 changed files with 72 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
Koha/Account.pm
View File

@ -22,6 +22,7 @@ use Modern::Perl;
use Carp;
use Data::Dumper;
use List::MoreUtils qw( uniq );
use Try::Tiny;
use C4::Circulation qw( ReturnLostItem );
use C4::Letters;
@ -477,7 +478,7 @@ sub add_debit {
my $user_id = $params->{user_id};
my $interface = $params->{interface};
my $library_id = $params->{library_id};
my $type = $params->{type};
my $debit_type = $params->{type};
my $item_id = $params->{item_id};
my $issue_id = $params->{issue_id};
@ -488,69 +489,80 @@ sub add_debit {
my $schema = Koha::Database->new->schema;
unless ( exists($Koha::Account::account_type_debit->{$type}) ) {
Koha::Exceptions::Account::UnrecognisedType->throw(
error => 'Type of debit not recognised'
);
}
my $debit_type_code = $Koha::Account::account_type_debit->{$type};
my $offset_type = $Koha::Account::offset_type->{$debit_type} // 'Manual Debit';
my $line;
$schema->txn_do(
sub {
try {
$schema->txn_do(
sub {
# Insert the account line
$line = Koha::Account::Line->new(
{
borrowernumber => $self->{patron_id},
date => \'NOW()',
amount => $amount,
description => $description,
debit_type_code => $debit_type_code,
amountoutstanding => $amount,
payment_type => undef,
note => $note,
manager_id => $user_id,
interface => $interface,
itemnumber => $item_id,
issue_id => $issue_id,
branchcode => $library_id,
( $type eq 'OVERDUE' ? ( status => 'UNRETURNED' ) : () ),
# Insert the account line
$line = Koha::Account::Line->new(
{
borrowernumber => $self->{patron_id},
date => \'NOW()',
amount => $amount,
description => $description,
debit_type_code => $debit_type,
amountoutstanding => $amount,
payment_type => undef,
note => $note,
manager_id => $user_id,
interface => $interface,
itemnumber => $item_id,
issue_id => $issue_id,
branchcode => $library_id,
(
$debit_type eq 'OVERDUE'
? ( status => 'UNRETURNED' )
: ()
),
}
)->store();
# Record the account offset
my $account_offset = Koha::Account::Offset->new(
{
debit_id => $line->id,
type => $offset_type,
amount => $amount
}
)->store();
if ( C4::Context->preference("FinesLog") ) {
logaction(
"FINES", 'CREATE',
$self->{patron_id},
Dumper(
{
action => "create_$debit_type",
borrowernumber => $self->{patron_id},
amount => $amount,
description => $description,
amountoutstanding => $amount,
debit_type_code => $debit_type,
note => $note,
itemnumber => $item_id,
manager_id => $user_id,
}
),
$interface
);
}
)->store();
# Record the account offset
my $account_offset = Koha::Account::Offset->new(
{
debit_id => $line->id,
type => $Koha::Account::offset_type->{$type},
amount => $amount
}
)->store();
if ( C4::Context->preference("FinesLog") ) {
logaction(
"FINES", 'CREATE',
$self->{patron_id},
Dumper(
{
action => "create_$type",
borrowernumber => $self->{patron_id},
amount => $amount,
description => $description,
amountoutstanding => $amount,
debit_type_code => $debit_type_code,
note => $note,
itemnumber => $item_id,
manager_id => $user_id,
}
),
$interface
);
}
);
}
catch {
if ( ref($_) eq 'Koha::Exceptions::Object::FKConstraint' ) {
if ( $_->broken_fk eq 'debit_type_code' ) {
Koha::Exceptions::Account::UnrecognisedType->throw(
error => 'Type of debit not recognised' );
}
else {
$_->rethrow;
}
}
);
};
return $line;
}
@ -733,25 +745,6 @@ our $account_type_credit = {
'writeoff' => 'W'
};
=head3 $account_type_debit
=cut
our $account_type_debit = {
'ACCOUNT' => 'ACCOUNT',
'ACCOUNT_RENEW' => 'ACCOUNT_RENEW',
'RESERVE_EXPIRED' => 'RESERVE_EXPIRED',
'LOST_ITEM' => 'LOST',
'NEW_CARD' => 'NEW_CARD',
'OVERDUE' => 'OVERDUE',
'PROCESSING' => 'PROCESSING',
'RENT' => 'RENT',
'RENT_DAILY' => 'RENT_DAILY',
'RENT_RENEW' => 'RENT_RENEW',
'RENT_DAILY_RENEW' => 'RENT_DAILY_RENEW',
'RESERVE' => 'RESERVE',
};
=head1 AUTHORS
=encoding utf8

4
t/db_dependent/Koha/Account.t
View File

@ -344,7 +344,7 @@ subtest 'add_debit() tests' => sub {
);
is(
$line_1->debit_type_code,
$Koha::Account::account_type_debit->{'RENT'},
'RENT',
'Account type is correctly set'
);
@ -371,7 +371,7 @@ subtest 'add_debit() tests' => sub {
);
is(
$line_2->debit_type_code,
$Koha::Account::account_type_debit->{'RENT'},
'RENT',
'Account type is correctly set'
);