Bugzilla – Attachment 35326 Details for
Bug 13590
Add ability to charge fines at start of charge period
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13590 - Add ability to charge fines at start of charge period
Bug-13590---Add-ability-to-charge-fines-at-start-o.patch (text/plain), 20.05 KB, created by
Kyle M Hall (khall)
on 2015-01-16 14:11:41 UTC
(
hide
)
Description:
Bug 13590 - Add ability to charge fines at start of charge period
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2015-01-16 14:11:41 UTC
Size:
20.05 KB
patch
obsolete
>From 16b722d0f82a1d25df08bcb44a3abe94060c8f77 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 16 Jan 2015 09:07:48 -0500 >Subject: [PATCH] Bug 13590 - Add ability to charge fines at start of charge period > >--- > C4/Overdues.pm | 99 +++++++------ > Koha/Schema/Result/Issuingrule.pm | 12 ++- > admin/smart-rules.pl | 40 ++++-- > installer/data/mysql/updatedatabase.pl | 8 + > .../prog/en/modules/admin/smart-rules.tt | 8 + > t/db_dependent/Circulation_Issuingrule.t | 153 ++++++++++---------- > 6 files changed, 187 insertions(+), 133 deletions(-) > >diff --git a/C4/Overdues.pm b/C4/Overdues.pm >index 1797923..3a50274 100644 >--- a/C4/Overdues.pm >+++ b/C4/Overdues.pm >@@ -24,6 +24,8 @@ use strict; > use Date::Calc qw/Today Date_to_Days/; > use Date::Manip qw/UnixDate/; > use List::MoreUtils qw( uniq ); >+use POSIX qw( floor ceil ); >+use Readonly; > > use C4::Circulation; > use C4::Context; >@@ -33,46 +35,51 @@ use C4::Debug; > > use vars qw($VERSION @ISA @EXPORT); > >+Readonly::Scalar our $INTERVAL_START => 1; >+Readonly::Scalar our $INTERVAL_END => 0; >+ > BEGIN { >- # set the version for version checking >+ # set the version for version checking > $VERSION = 3.07.00.049; >- require Exporter; >- @ISA = qw(Exporter); >- # subs to rename (and maybe merge some...) >- push @EXPORT, qw( >- &CalcFine >- &Getoverdues >- &checkoverdues >- &NumberNotifyId >- &AmountNotify >- &UpdateFine >- &GetFine >- >- &CheckItemNotify >- &GetOverduesForBranch >- &RemoveNotifyLine >- &AddNotifyLine >- &GetOverdueMessageTransportTypes >- ); >- # subs to remove >- push @EXPORT, qw( >- &BorType >- ); >- >- # check that an equivalent don't exist already before moving >- >- # subs to move to Circulation.pm >- push @EXPORT, qw( >- &GetIssuesIteminfo >- ); >- >- # &GetIssuingRules - delete. >- # use C4::Circulation::GetIssuingRule instead. >- >- # subs to move to Biblio.pm >- push @EXPORT, qw( >- &GetItems >- ); >+ require Exporter; >+ @ISA = qw(Exporter); >+ >+ # subs to rename (and maybe merge some...) >+ push @EXPORT, qw( >+ &CalcFine >+ &Getoverdues >+ &checkoverdues >+ &NumberNotifyId >+ &AmountNotify >+ &UpdateFine >+ &GetFine >+ >+ &CheckItemNotify >+ &GetOverduesForBranch >+ &RemoveNotifyLine >+ &AddNotifyLine >+ &GetOverdueMessageTransportTypes >+ ); >+ >+ # subs to remove >+ push @EXPORT, qw( >+ &BorType >+ ); >+ >+ # check that an equivalent don't exist already before moving >+ >+ # subs to move to Circulation.pm >+ push @EXPORT, qw( >+ &GetIssuesIteminfo >+ ); >+ >+ # &GetIssuingRules - delete. >+ # use C4::Circulation::GetIssuingRule instead. >+ >+ # subs to move to Biblio.pm >+ push @EXPORT, qw( >+ &GetItems >+ ); > } > > =head1 NAME >@@ -251,15 +258,13 @@ sub CalcFine { > my $chargeable_units = _get_chargeable_units($fine_unit, $start_date, $end_date, $branchcode); > my $units_minus_grace = $chargeable_units - $data->{firstremind}; > my $amount = 0; >- if ($data->{'chargeperiod'} && ($units_minus_grace > 0) ) { >- if ( C4::Context->preference('FinesIncludeGracePeriod') ) { >- $amount = int($chargeable_units / $data->{'chargeperiod'}) * $data->{'fine'};# TODO fine calc should be in cents >- } else { >- $amount = int($units_minus_grace / $data->{'chargeperiod'}) * $data->{'fine'}; >- } >- } else { >- # a zero (or null) chargeperiod or negative units_minus_grace value means no charge. >- } >+ if ( $data->{'chargeperiod'} && ( $units_minus_grace > 0 ) ) { >+ my $units = C4::Context->preference('FinesIncludeGracePeriod') ? $chargeable_units : $units_minus_grace; >+ my $charge_periods = $units / $data->{'chargeperiod'}; >+ $charge_periods = $data->{'chargeperiod_charge_at'} == $INTERVAL_START ? ceil($charge_periods) : floor($charge_periods); >+ $amount = $charge_periods * $data->{'fine'}; >+ } # else { # a zero (or null) chargeperiod or negative units_minus_grace value means no charge. } >+ > $amount = $data->{overduefinescap} if $data->{overduefinescap} && $amount > $data->{overduefinescap}; > $debug and warn sprintf("CalcFine returning (%s, %s, %s, %s)", $amount, $data->{'chargename'}, $units_minus_grace, $chargeable_units); > return ($amount, $data->{'chargename'}, $units_minus_grace, $chargeable_units); >diff --git a/Koha/Schema/Result/Issuingrule.pm b/Koha/Schema/Result/Issuingrule.pm >index a8cf014..2983ad3 100644 >--- a/Koha/Schema/Result/Issuingrule.pm >+++ b/Koha/Schema/Result/Issuingrule.pm >@@ -80,6 +80,12 @@ __PACKAGE__->table("issuingrules"); > data_type: 'integer' > is_nullable: 1 > >+=head2 chargeperiod_charge_at >+ >+ data_type: 'tinyint' >+ default_value: 0 >+ is_nullable: 0 >+ > =head2 accountsent > > data_type: 'integer' >@@ -184,6 +190,8 @@ __PACKAGE__->add_columns( > { data_type => "integer", is_nullable => 1 }, > "chargeperiod", > { data_type => "integer", is_nullable => 1 }, >+ "chargeperiod_charge_at", >+ { data_type => "tinyint", default_value => 0, is_nullable => 0 }, > "accountsent", > { data_type => "integer", is_nullable => 1 }, > "chargename", >@@ -236,8 +244,8 @@ __PACKAGE__->add_columns( > __PACKAGE__->set_primary_key("branchcode", "categorycode", "itemtype"); > > >-# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-09-17 21:06:58 >-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:vmlv13CeQ99RO0VsviRABg >+# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-16 07:20:41 >+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6AKNiL/+m3EyTjvAAOz9Cw > > > # You can replace this text with custom content, and it will be preserved on regeneration >diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl >index 942e9bf..63c9919 100755 >--- a/admin/smart-rules.pl >+++ b/admin/smart-rules.pl >@@ -27,6 +27,7 @@ use C4::Koha; > use C4::Debug; > use C4::Branch; # GetBranches > use C4::Dates qw/format_date format_date_in_iso/; >+use Koha::Database; > > my $input = CGI->new; > my $dbh = C4::Context->dbh; >@@ -100,10 +101,6 @@ elsif ($op eq 'delete-branch-item') { > } > # save the values entered > elsif ($op eq 'add') { >- my $sth_search = $dbh->prepare('SELECT COUNT(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?'); >- my $sth_insert = $dbh->prepare('INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, renewalperiod, norenewalbefore, auto_renew, reservesallowed, issuelength, lengthunit, hardduedate, hardduedatecompare, fine, finedays, maxsuspensiondays, firstremind, chargeperiod,rentaldiscount, overduefinescap) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)'); >- my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, maxsuspensiondays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, renewalperiod=?, norenewalbefore=?, auto_renew=?, reservesallowed=?, issuelength=?, lengthunit = ?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, overduefinescap=? WHERE branchcode=? AND categorycode=? AND itemtype=?"); >- > my $br = $branch; # branch > my $bor = $input->param('categorycode'); # borrower category > my $cat = $input->param('itemtype'); # item type >@@ -113,6 +110,7 @@ elsif ($op eq 'add') { > $maxsuspensiondays = undef if $maxsuspensiondays eq q||; > my $firstremind = $input->param('firstremind'); > my $chargeperiod = $input->param('chargeperiod'); >+ my $chargeperiod_charge_at = $input->param('chargeperiod_charge_at'); > my $maxissueqty = $input->param('maxissueqty'); > my $renewalsallowed = $input->param('renewalsallowed'); > my $renewalperiod = $input->param('renewalperiod'); >@@ -131,13 +129,33 @@ elsif ($op eq 'add') { > my $overduefinescap = $input->param('overduefinescap') || undef; > $debug and warn "Adding $br, $bor, $cat, $fine, $maxissueqty"; > >- $sth_search->execute($br,$bor,$cat); >- my $res = $sth_search->fetchrow_hashref(); >- if ($res->{total}) { >- $sth_update->execute($fine, $finedays, $maxsuspensiondays, $firstremind, $chargeperiod, $maxissueqty, $renewalsallowed, $renewalperiod, $norenewalbefore, $auto_renew, $reservesallowed, $issuelength,$lengthunit, $hardduedate,$hardduedatecompare,$rentaldiscount,$overduefinescap, $br,$bor,$cat); >- } else { >- $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed, $renewalperiod, $norenewalbefore, $auto_renew, $reservesallowed,$issuelength,$lengthunit,$hardduedate,$hardduedatecompare,$fine,$finedays, $maxsuspensiondays, $firstremind,$chargeperiod,$rentaldiscount,$overduefinescap); >- } >+ my $rs = Koha::Database->new()->schema()->resultset('Issuingrule'); >+ >+ $rs->update_or_create( >+ { >+ branchcode => $br, >+ categorycode => $bor, >+ itemtype => $cat, >+ fine => $fine, >+ finedays => $finedays, >+ maxsuspensiondays => $maxsuspensiondays, >+ firstremind => $firstremind, >+ chargeperiod => $chargeperiod, >+ chargeperiod_charge_at => $chargeperiod_charge_at, >+ maxissueqty => $maxissueqty, >+ renewalsallowed => $renewalsallowed, >+ renewalperiod => $renewalperiod, >+ norenewalbefore => $norenewalbefore, >+ auto_renew => $auto_renew, >+ reservesallowed => $reservesallowed, >+ issuelength => $issuelength, >+ lengthunit => $lengthunit, >+ hardduedate => $hardduedate, >+ hardduedatecompare => $hardduedatecompare, >+ rentaldiscount => $rentaldiscount, >+ overduefinescap => $overduefinescap, >+ } >+ ); > } > elsif ($op eq "set-branch-defaults") { > my $categorycode = $input->param('categorycode'); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 4653c02..0c56701 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -9669,6 +9669,14 @@ if ( CheckVersion($DBversion) ) { > SetVersion ($DBversion); > } > >+$DBversion = "3.19.00.XXX"; >+if ( CheckVersion($DBversion) ) { >+ $dbh->do("ALTER TABLE issuingrules ADD chargeperiod_charge_at BOOLEAN NOT NULL DEFAULT '0' AFTER chargeperiod"); >+ >+ print "Upgrade to $DBversion done (Bug 11944 - Convert DB tables to utf8_unicode_ci)\n"; >+ SetVersion ($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >index 8bc5809..3ed1674 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >@@ -147,6 +147,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde > <th>Hard due date</th> > <th>Fine amount</th> > <th>Fine charging interval</th> >+ <th>Charge when?</th> > <th>Fine grace period (day)</th> > <th>Overdue fines cap (amount)</th> > <th>Suspension in days (day)</th> >@@ -203,6 +204,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde > </td> > <td>[% rule.fine %]</td> > <td>[% rule.chargeperiod %]</td> >+ <td>[% IF rule.chargeperiod_charge_at %]Start of interval[% ELSE %]End of interval[% END %]</td> > <td>[% rule.firstremind %]</td> > <td>[% rule.overduefinescap FILTER format("%.2f") %]</td> > <td>[% rule.finedays %]</td> >@@ -261,6 +263,12 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde > </td> > <td><input type="text" name="fine" id="fine" size="4" /></td> > <td><input type="text" name="chargeperiod" id="chargeperiod" size="2" /></td> >+ <td> >+ <select name="chargeperiod_charge_at" id="chargeperiod_charge_at"> >+ <option value="0">End of interval</option> >+ <option value="1">Start of interval</option> >+ </select> >+ </td> > <td><input type="text" name="firstremind" id="firstremind" size="2" /> </td> > <td><input type="text" name="overduefinescap" id="overduefinescap" size="6" /> </td> > <td><input type="text" name="finedays" id="fined" size="3" /> </td> >diff --git a/t/db_dependent/Circulation_Issuingrule.t b/t/db_dependent/Circulation_Issuingrule.t >index 6e4f44f..5f6623e 100644 >--- a/t/db_dependent/Circulation_Issuingrule.t >+++ b/t/db_dependent/Circulation_Issuingrule.t >@@ -108,82 +108,85 @@ $dbh->do( > > #Test GetIssuingRule > my $sampleissuingrule1 = { >- reservecharge => '0.000000', >- chargename => 'Null', >- restrictedtype => 0, >- accountsent => 0, >- maxissueqty => 5, >- finedays => 0, >- lengthunit => 'Null', >- renewalperiod => 5, >- norenewalbefore => 6, >- auto_renew => 0, >- issuelength => 5, >- chargeperiod => 0, >- rentaldiscount => '2.000000', >- reservesallowed => 0, >- hardduedate => '2013-01-01', >- branchcode => $samplebranch1->{branchcode}, >- fine => '0.000000', >- hardduedatecompare => 5, >- overduefinescap => '0.000000', >- renewalsallowed => 0, >- firstremind => 0, >- itemtype => 'BOOK', >- categorycode => $samplecat->{categorycode}, >- maxsuspensiondays => 0, >+ reservecharge => '0.000000', >+ chargename => 'Null', >+ restrictedtype => 0, >+ accountsent => 0, >+ maxissueqty => 5, >+ finedays => 0, >+ lengthunit => 'Null', >+ renewalperiod => 5, >+ norenewalbefore => 6, >+ auto_renew => 0, >+ issuelength => 5, >+ chargeperiod => 0, >+ chargeperiod_charge_at => 0, >+ rentaldiscount => '2.000000', >+ reservesallowed => 0, >+ hardduedate => '2013-01-01', >+ branchcode => $samplebranch1->{branchcode}, >+ fine => '0.000000', >+ hardduedatecompare => 5, >+ overduefinescap => '0.000000', >+ renewalsallowed => 0, >+ firstremind => 0, >+ itemtype => 'BOOK', >+ categorycode => $samplecat->{categorycode}, >+ maxsuspensiondays => 0, > }; > my $sampleissuingrule2 = { >- branchcode => $samplebranch2->{branchcode}, >- categorycode => $samplecat->{categorycode}, >- itemtype => 'BOOK', >- maxissueqty => 2, >- renewalsallowed => 'Null', >- renewalperiod => 2, >- norenewalbefore => 7, >- auto_renew => 0, >- reservesallowed => 'Null', >- issuelength => 2, >- lengthunit => 'Null', >- hardduedate => 2, >- hardduedatecompare => 'Null', >- fine => 'Null', >- finedays => 'Null', >- firstremind => 'Null', >- chargeperiod => 'Null', >- rentaldiscount => 2.00, >- overduefinescap => 'Null', >- accountsent => 'Null', >- reservecharge => 'Null', >- chargename => 'Null', >- restrictedtype => 'Null', >- maxsuspensiondays => 0, >+ branchcode => $samplebranch2->{branchcode}, >+ categorycode => $samplecat->{categorycode}, >+ itemtype => 'BOOK', >+ maxissueqty => 2, >+ renewalsallowed => 'Null', >+ renewalperiod => 2, >+ norenewalbefore => 7, >+ auto_renew => 0, >+ reservesallowed => 'Null', >+ issuelength => 2, >+ lengthunit => 'Null', >+ hardduedate => 2, >+ hardduedatecompare => 'Null', >+ fine => 'Null', >+ finedays => 'Null', >+ firstremind => 'Null', >+ chargeperiod => 'Null', >+ chargeperiod_charge_at => 0, >+ rentaldiscount => 2.00, >+ overduefinescap => 'Null', >+ accountsent => 'Null', >+ reservecharge => 'Null', >+ chargename => 'Null', >+ restrictedtype => 'Null', >+ maxsuspensiondays => 0, > }; > my $sampleissuingrule3 = { >- branchcode => $samplebranch1->{branchcode}, >- categorycode => $samplecat->{categorycode}, >- itemtype => 'DVD', >- maxissueqty => 3, >- renewalsallowed => 'Null', >- renewalperiod => 3, >- norenewalbefore => 8, >- auto_renew => 0, >- reservesallowed => 'Null', >- issuelength => 3, >- lengthunit => 'Null', >- hardduedate => 3, >- hardduedatecompare => 'Null', >- fine => 'Null', >- finedays => 'Null', >- firstremind => 'Null', >- chargeperiod => 'Null', >- rentaldiscount => 3.00, >- overduefinescap => 'Null', >- accountsent => 'Null', >- reservecharge => 'Null', >- chargename => 'Null', >- restrictedtype => 'Null', >- maxsuspensiondays => 0, >+ branchcode => $samplebranch1->{branchcode}, >+ categorycode => $samplecat->{categorycode}, >+ itemtype => 'DVD', >+ maxissueqty => 3, >+ renewalsallowed => 'Null', >+ renewalperiod => 3, >+ norenewalbefore => 8, >+ auto_renew => 0, >+ reservesallowed => 'Null', >+ issuelength => 3, >+ lengthunit => 'Null', >+ hardduedate => 3, >+ hardduedatecompare => 'Null', >+ fine => 'Null', >+ finedays => 'Null', >+ firstremind => 'Null', >+ chargeperiod => 'Null', >+ chargeperiod_charge_at => 0, >+ rentaldiscount => 3.00, >+ overduefinescap => 'Null', >+ accountsent => 'Null', >+ reservecharge => 'Null', >+ chargename => 'Null', >+ restrictedtype => 'Null', >+ maxsuspensiondays => 0, > }; > $query = 'INSERT INTO issuingrules ( > branchcode, >@@ -203,6 +206,7 @@ $query = 'INSERT INTO issuingrules ( > finedays, > firstremind, > chargeperiod, >+ chargeperiod_charge_at, > rentaldiscount, > overduefinescap, > accountsent, >@@ -210,7 +214,7 @@ $query = 'INSERT INTO issuingrules ( > chargename, > restrictedtype, > maxsuspensiondays >- ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)'; >+ ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)'; > my $sth = $dbh->prepare($query); > $sth->execute( > $sampleissuingrule1->{branchcode}, >@@ -230,6 +234,7 @@ $sth->execute( > $sampleissuingrule1->{finedays}, > $sampleissuingrule1->{firstremind}, > $sampleissuingrule1->{chargeperiod}, >+ $sampleissuingrule1->{chargeperiod_charge_at}, > $sampleissuingrule1->{rentaldiscount}, > $sampleissuingrule1->{overduefinescap}, > $sampleissuingrule1->{accountsent}, >@@ -256,6 +261,7 @@ $sth->execute( > $sampleissuingrule2->{finedays}, > $sampleissuingrule2->{firstremind}, > $sampleissuingrule2->{chargeperiod}, >+ $sampleissuingrule2->{chargeperiod_charge_at}, > $sampleissuingrule2->{rentaldiscount}, > $sampleissuingrule2->{overduefinescap}, > $sampleissuingrule2->{accountsent}, >@@ -282,6 +288,7 @@ $sth->execute( > $sampleissuingrule3->{finedays}, > $sampleissuingrule3->{firstremind}, > $sampleissuingrule3->{chargeperiod}, >+ $sampleissuingrule3->{chargeperiod_charge_at}, > $sampleissuingrule3->{rentaldiscount}, > $sampleissuingrule3->{overduefinescap}, > $sampleissuingrule3->{accountsent}, >-- >1.7.2.5
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=35326">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 13590
:
35326
|
35327
|
35328
|
35329
|
35330
|
35415
|
37909
|
38732
|
41149
|
41150
|
41151
|
43406
|
43407
|
43424
|
43425