Bugzilla – Attachment 81876 Details for
Bug 21753
issuingrules.chargename is unused and should be removed
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21753: Remove all reference of chargename from scripts
Bug-21753-Remove-all-reference-of-chargename-from-.patch (text/plain), 11.58 KB, created by
Martin Renvoize (ashimema)
on 2018-11-02 10:42:06 UTC
(
hide
)
Description:
Bug 21753: Remove all reference of chargename from scripts
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2018-11-02 10:42:06 UTC
Size:
11.58 KB
patch
obsolete
>From 93214769557b085bb86aaf5c3e8a31c983046da5 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Fri, 2 Nov 2018 09:42:53 +0000 >Subject: [PATCH] Bug 21753: Remove all reference of chargename from scripts > >--- > C4/Circulation.pm | 6 +--- > C4/Overdues.pm | 31 +++++++++++---------- > misc/cronjobs/fines.pl | 8 ++---- > misc/cronjobs/staticfines.pl | 5 +--- > t/db_dependent/Circulation.t | 1 - > t/db_dependent/Circulation/GetHardDueDate.t | 9 +----- > 6 files changed, 22 insertions(+), 38 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index 23d0b5fb5c..14759dc9f9 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -4089,11 +4089,9 @@ sub _CalculateAndUpdateFine { > > my $date_returned = $return_date ? dt_from_string($return_date) : dt_from_string(); > >- my ( $amount, $type, $unitcounttotal ) = >+ my ( $amount, $unitcounttotal, $unitcount ) = > C4::Overdues::CalcFine( $item, $borrower->{categorycode}, $control_branchcode, $datedue, $date_returned ); > >- $type ||= q{}; >- > if ( C4::Context->preference('finesMode') eq 'production' ) { > if ( $amount > 0 ) { > C4::Overdues::UpdateFine({ >@@ -4101,7 +4099,6 @@ sub _CalculateAndUpdateFine { > itemnumber => $issue->itemnumber, > borrowernumber => $issue->borrowernumber, > amount => $amount, >- type => $type, > due => output_pref($datedue), > }); > } >@@ -4115,7 +4112,6 @@ sub _CalculateAndUpdateFine { > itemnumber => $issue->itemnumber, > borrowernumber => $issue->borrowernumber, > amount => 0, >- type => $type, > due => output_pref($datedue), > }); > } >diff --git a/C4/Overdues.pm b/C4/Overdues.pm >index 1e67b7f437..8cb13230b0 100644 >--- a/C4/Overdues.pm >+++ b/C4/Overdues.pm >@@ -191,7 +191,7 @@ sub checkoverdues { > > =head2 CalcFine > >- ($amount, $chargename, $units_minus_grace, $chargeable_units) = &CalcFine($item, >+ ($amount, $units_minus_grace, $chargeable_units) = &CalcFine($item, > $categorycode, $branch, > $start_dt, $end_dt ); > >@@ -216,13 +216,10 @@ defining the date range over which to determine the fine. > > Fines scripts should just supply the date range over which to calculate the fine. > >-C<&CalcFine> returns four values: >+C<&CalcFine> returns three values: > > C<$amount> is the fine owed by the patron (see above). > >-C<$chargename> is the chargename field from the applicable record in >-the categoryitem table, whatever that is. >- > C<$units_minus_grace> is the number of chargeable units minus the grace period > > C<$chargeable_units> is the number of chargeable units (days between start and end dates, Calendar adjusted where needed, >@@ -268,9 +265,8 @@ sub CalcFine { > > $amount = $item->{replacementprice} if ( $issuing_rule->cap_fine_to_replacement_price && $item->{replacementprice} && $amount > $item->{replacementprice} ); > >- $debug and warn sprintf("CalcFine returning (%s, %s, %s, %s)", $amount, $issuing_rule->chargename, $units_minus_grace, $chargeable_units); >- return ($amount, $issuing_rule->chargename, $units_minus_grace, $chargeable_units); >- # FIXME: chargename is NEVER populated anywhere. >+ $debug and warn sprintf("CalcFine returning (%s, %s, %s, %s)", $amount, $units_minus_grace, $chargeable_units); >+ return ($amount, $units_minus_grace, $chargeable_units); > } > > >@@ -470,7 +466,15 @@ sub GetIssuesIteminfo { > > =head2 UpdateFine > >- &UpdateFine({ issue_id => $issue_id, itemnumber => $itemnumber, borrwernumber => $borrowernumber, amount => $amount, type => $type, $due => $date_due }); >+ &UpdateFine( >+ { >+ issue_id => $issue_id, >+ itemnumber => $itemnumber, >+ borrowernumber => $borrowernumber, >+ amount => $amount, >+ due => $date_due >+ } >+ ); > > (Note: the following is mostly conjecture and guesswork.) > >@@ -483,8 +487,6 @@ has the book on loan. > > C<$amount> is the current amount owed by the patron. > >-C<$type> will be used in the description of the fine. >- > C<$due> is the due date formatted to the currently specified date format > > C<&UpdateFine> looks up the amount currently owed on the given item >@@ -508,10 +510,9 @@ sub UpdateFine { > my $itemnum = $params->{itemnumber}; > my $borrowernumber = $params->{borrowernumber}; > my $amount = $params->{amount}; >- my $type = $params->{type}; > my $due = $params->{due}; > >- $debug and warn "UpdateFine({ itemnumber => $itemnum, borrowernumber => $borrowernumber, type => $type, due => $due, issue_id => $issue_id})"; >+ $debug and warn "UpdateFine({ itemnumber => $itemnum, borrowernumber => $borrowernumber, due => $due, issue_id => $issue_id})"; > > unless ( $issue_id ) { > carp("No issue_id passed in!"); >@@ -610,7 +611,7 @@ sub UpdateFine { > > my $nextaccntno = C4::Accounts::getnextacctno($borrowernumber); > >- my $desc = ( $type ? "$type " : '' ) . "$title $due"; # FIXEDME, avoid whitespace prefix on empty $type >+ my $desc = "$title $due"; > > my $accountline = Koha::Account::Line->new( > { >@@ -639,7 +640,7 @@ sub UpdateFine { > # logging action > &logaction( > "FINES", >- $type, >+ undef, > $borrowernumber, > "due=".$due." amount=".$amount." itemnumber=".$itemnum > ) if C4::Context->preference("FinesLog"); >diff --git a/misc/cronjobs/fines.pl b/misc/cronjobs/fines.pl >index 15689085de..89ad4a2d3c 100755 >--- a/misc/cronjobs/fines.pl >+++ b/misc/cronjobs/fines.pl >@@ -76,7 +76,7 @@ cronlogaction(); > my @borrower_fields = > qw(cardnumber categorycode surname firstname email phone address citystate); > my @item_fields = qw(itemnumber barcode date_due); >-my @other_fields = qw(type days_overdue fine); >+my @other_fields = qw(days_overdue fine); > my $libname = C4::Context->preference('LibraryName'); > my $control = C4::Context->preference('CircControl'); > my $mode = C4::Context->preference('finesMode'); >@@ -122,10 +122,9 @@ for my $overdue ( @{$overdues} ) { > } > ++$counted; > >- my ( $amount, $type, $unitcounttotal ) = >+ my ( $amount, $unitcounttotal, $unitcount ) = > CalcFine( $overdue, $borrower->{categorycode}, > $branchcode, $datedue, $today ); >- $type ||= q{}; > > # Don't update the fine if today is a holiday. > # This ensures that dropbox mode will remove the correct amount of fine. >@@ -137,7 +136,6 @@ for my $overdue ( @{$overdues} ) { > itemnumber => $overdue->{itemnumber}, > borrowernumber => $overdue->{borrowernumber}, > amount => $amount, >- type => $type, > due => output_pref($datedue), > } > ); >@@ -149,7 +147,7 @@ for my $overdue ( @{$overdues} ) { > map { defined $borrower->{$_} ? $borrower->{$_} : q{} } > @borrower_fields; > push @cells, map { $overdue->{$_} } @item_fields; >- push @cells, $type, $unitcounttotal, $amount; >+ push @cells, $unitcounttotal, $amount; > say {$fh} join $delim, @cells; > } > } >diff --git a/misc/cronjobs/staticfines.pl b/misc/cronjobs/staticfines.pl >index c57e99eb1b..bee1172482 100755 >--- a/misc/cronjobs/staticfines.pl >+++ b/misc/cronjobs/staticfines.pl >@@ -188,7 +188,7 @@ for ( my $i = 0 ; $i < scalar(@$data) ; $i++ ) { > ( $datedue_days <= $today_days ) or next; # or it's not overdue, right? > > $overdueItemsCounted++; >- my ( $amount, $type, $unitcounttotal, $unitcount ) = CalcFine( >+ my ( $amount, $unitcounttotal, $unitcount ) = CalcFine( > $data->[$i], > $borrower->{'categorycode'}, > $branchcode, >@@ -206,9 +206,6 @@ for ( my $i = 0 ; $i < scalar(@$data) ; $i++ ) { > next; > } > >- # FIXME: $type NEVER gets populated by anything. >- ( defined $type ) or $type = ''; >- > # Don't update the fine if today is a holiday. > # This ensures that dropbox mode will remove the correct amount of fine. > if ( $mode eq 'production' and !$borrowersalreadyapplied->{$data->[$i]->{'borrowernumber'}}) { >diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t >index 2d82c9ff0c..14f1d8d789 100755 >--- a/t/db_dependent/Circulation.t >+++ b/t/db_dependent/Circulation.t >@@ -491,7 +491,6 @@ C4::Context->dbh->do("DELETE FROM accountlines"); > itemnumber => $itemnumber7, > borrowernumber => $renewing_borrower->{borrowernumber}, > amount => $fine, >- type => 'FU', > due => Koha::DateUtils::output_pref($five_weeks_ago) > } > ); >diff --git a/t/db_dependent/Circulation/GetHardDueDate.t b/t/db_dependent/Circulation/GetHardDueDate.t >index a50e06bcce..2eacf04071 100644 >--- a/t/db_dependent/Circulation/GetHardDueDate.t >+++ b/t/db_dependent/Circulation/GetHardDueDate.t >@@ -114,7 +114,6 @@ my $default = { > #Test GetIssuingRule > my $sampleissuingrule1 = { > reservecharge => '0.000000', >- chargename => undef, > restrictedtype => 0, > accountsent => 0, > maxissueqty => 5, >@@ -173,7 +172,6 @@ my $sampleissuingrule2 = { > overduefinescap => undef, > accountsent => undef, > reservecharge => undef, >- chargename => undef, > restrictedtype => undef, > maxsuspensiondays => 0, > onshelfholds => 1, >@@ -206,7 +204,6 @@ my $sampleissuingrule3 = { > overduefinescap => undef, > accountsent => undef, > reservecharge => undef, >- chargename => undef, > restrictedtype => undef, > maxsuspensiondays => 0, > onshelfholds => 1, >@@ -240,14 +237,13 @@ $query = 'INSERT INTO issuingrules ( > overduefinescap, > accountsent, > reservecharge, >- chargename, > restrictedtype, > maxsuspensiondays, > onshelfholds, > opacitemholds, > cap_fine_to_replacement_price, > article_requests >- ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)'; >+ ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)'; > my $sth = $dbh->prepare($query); > $sth->execute( > $sampleissuingrule1->{branchcode}, >@@ -273,7 +269,6 @@ $sth->execute( > $sampleissuingrule1->{overduefinescap}, > $sampleissuingrule1->{accountsent}, > $sampleissuingrule1->{reservecharge}, >- $sampleissuingrule1->{chargename}, > $sampleissuingrule1->{restrictedtype}, > $sampleissuingrule1->{maxsuspensiondays}, > $sampleissuingrule1->{onshelfholds}, >@@ -305,7 +300,6 @@ $sth->execute( > $sampleissuingrule2->{overduefinescap}, > $sampleissuingrule2->{accountsent}, > $sampleissuingrule2->{reservecharge}, >- $sampleissuingrule2->{chargename}, > $sampleissuingrule2->{restrictedtype}, > $sampleissuingrule2->{maxsuspensiondays}, > $sampleissuingrule2->{onshelfholds}, >@@ -337,7 +331,6 @@ $sth->execute( > $sampleissuingrule3->{overduefinescap}, > $sampleissuingrule3->{accountsent}, > $sampleissuingrule3->{reservecharge}, >- $sampleissuingrule3->{chargename}, > $sampleissuingrule3->{restrictedtype}, > $sampleissuingrule3->{maxsuspensiondays}, > $sampleissuingrule3->{onshelfholds}, >-- >2.19.1
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=81876">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 21753
:
81876
|
81877
|
82715
|
82716
|
82730
|
82731
|
82732