From: Jason Stephenson <jason@sigio.com>
Date: Tue, 21 Jan 2014 15:32:51 +0000 (-0500)
Subject: Fix reverse sort logic for generate_fines in Storage/Publisher/action.pm.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4dcde4d764fbe8bb9fe7ffb022b528ded904fed1;p=working%2FEvergreen.git

Fix reverse sort logic for generate_fines in Storage/Publisher/action.pm.

We were getting multiple overdue billings for a single period because the
@fine_map was coming up empty owing to convoluted logic.  This commit
simplifies that logic and fixes another logic bug in calculating the total
of the current fines.  In the latter case, we had a < where we needed >.

Signed-off-by: Jason Stephenson <jason@sigio.com>
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
index 234ab41737..4b8f8fced0 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
@@ -1113,9 +1113,7 @@ sub generate_fines {
             my $bill_payment_map = $CC->bill_payment_map_for_xact(undef, $c);
 
             # Pull out those entries for overdue bills in reverse date order.
-            my @fine_map = sort { $b->{bill}->billing_ts() <=> $a->{bill}->billing_ts() }
-                grep { $_->{bill}->btype() == 1 && $_->{bill}->billing_ts() > $c->$due_date_method }
-                    @{$bill_payment_map};
+            my @fine_map = reverse grep { $_->{bill}->btype() == 1 } @{$bill_payment_map};
 
             my $f_idx = 0;
             my $current_fine_total = 0;
@@ -1128,9 +1126,9 @@ sub generate_fines {
                 }
                 # Set the $fine to be used for $last_fine below.
                 $fine = $fine_map[$f_idx]->{bill} if ($fine_map[$f_idx]);
-                # Calculate the current fine total using the modified bill amounts from the bill payment map.
-                map { $current_fine_total += int($_->{bill}->amount() * 100) }
-                    grep { $_->{bill_amount} < $_->{void_amount} } @fine_map;
+                # Calculate the current fine total using the original bill amounts from the bill payment map.
+                map { $current_fine_total += int($_->{bill_amount} * 100) }
+                    grep { $_->{bill_amount} > $_->{void_amount} } @fine_map;
             }
 
             my $last_fine;