From 0d4ce8636ef0ebc6ef89ac05fae27eb782002a9b Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 24 Apr 2019 11:08:49 +0100 Subject: [PATCH] Bug 6759: Split account creation and renewal charges Test plan: 1. Enable charging for patron enrolement 2. Add a new patron where the category is charged for 3. Note the charge of type 'Account management fee' 4. Renew the patron 5. Note the next charge of type 'Account management fee' 6. Apply patch 7. Repeat steps 1-6 and note the first charge will be of type 'Account creation fee' and the second of type 'Account renewal fee' 8. Bonus points, enable 'FeeOnChangePatronCategory' and check that when changing a patron from a free category to a charged one that a new 'Account renewal fee' is charged. Signed-off-by: Martin Renvoize --- Koha/Account.pm | 5 ++++- Koha/Patron.pm | 15 +++++++++------ .../intranet-tmpl/prog/en/includes/accounts.inc | 3 ++- .../prog/en/modules/members/maninvoice.tt | 2 +- .../bootstrap/en/includes/account-table.inc | 3 ++- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Koha/Account.pm b/Koha/Account.pm index 453a1e4db2..8c62363456 100644 --- a/Koha/Account.pm +++ b/Koha/Account.pm @@ -441,6 +441,7 @@ $debit_type can be any of: - lost_item - new_card - account + - account_renew - sundry - processing - rent @@ -708,6 +709,7 @@ our $offset_type = { 'payment' => 'Payment', 'writeoff' => 'Writeoff', 'account' => 'Account Fee', + 'account_renew' => 'Account Fee', 'reserve' => 'Reserve Fee', 'processing' => 'Processing Fee', 'lost_item' => 'Lost Item', @@ -737,7 +739,8 @@ our $account_type_credit = { =cut our $account_type_debit = { - 'account' => 'A', + 'account' => 'ACCOUNT', + 'account_renew' => 'ACCOUNT_RENEW', 'overdue' => 'OVERDUE', 'lost_item' => 'LOST', 'new_card' => 'N', diff --git a/Koha/Patron.pm b/Koha/Patron.pm index f0ab2d4d3e..0fc0c011d3 100644 --- a/Koha/Patron.pm +++ b/Koha/Patron.pm @@ -235,7 +235,7 @@ sub store { $self = $self->SUPER::store; - $self->add_enrolment_fee_if_needed; + $self->add_enrolment_fee_if_needed(0); logaction( "MEMBERS", "CREATE", $self->borrowernumber, "" ) if C4::Context->preference("BorrowersLog"); @@ -257,7 +257,7 @@ sub store { and $self->category->categorycode ne $self_from_storage->category->categorycode ) { - $self->add_enrolment_fee_if_needed; + $self->add_enrolment_fee_if_needed(1); } # Actionlogs @@ -723,7 +723,7 @@ sub renew_account { $self->date_renewed( dt_from_string() ); $self->store(); - $self->add_enrolment_fee_if_needed; + $self->add_enrolment_fee_if_needed(1); logaction( "MEMBERS", "RENEW", $self->borrowernumber, "Membership renewed" ) if C4::Context->preference("BorrowersLog"); return dt_from_string( $expiry_date )->truncate( to => 'day' ); @@ -847,23 +847,26 @@ sub article_requests_finished { =head3 add_enrolment_fee_if_needed -my $enrolment_fee = $patron->add_enrolment_fee_if_needed; +my $enrolment_fee = $patron->add_enrolment_fee_if_needed($renewal); Add enrolment fee for a patron if needed. +$renewal - boolean denoting whether this is an account renewal or not + =cut sub add_enrolment_fee_if_needed { - my ($self) = @_; + my ($self, $renewal) = @_; my $enrolment_fee = $self->category->enrolmentfee; if ( $enrolment_fee && $enrolment_fee > 0 ) { + my $type = $renewal ? 'account_renew' : 'account'; $self->account->add_debit( { amount => $enrolment_fee, user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef, interface => C4::Context->interface, library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef, - type => 'account' + type => $type } ); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc index fb8dabda89..29ce3078bf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -6,7 +6,8 @@ [%- CASE 'Pay02' -%]Payment (credit card via SIP2) [%- CASE 'N' -%]New card [%- CASE 'OVERDUE' -%]Fine - [%- CASE 'A' -%]Account management fee + [%- CASE 'ACCOUNT' -%]Account creation fee + [%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee [%- CASE 'M' -%]Sundry [%- CASE 'LOST' -%]Lost item [%- CASE 'W' -%]Writeoff diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt index 4772da37d4..2dcb452029 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt @@ -79,7 +79,7 @@ [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %]