[freeside-commits] branch FREESIDE_4_BRANCH updated. af172030b12bc994d91e02b12883d2e67151996c

[Mitch Jackson]

The branch, FREESIDE_4_BRANCH has been updated
       via  af172030b12bc994d91e02b12883d2e67151996c (commit)
       via  edef3cc1226f64506d2bbc92e2a3dc0507e77b81 (commit)
      from  5aa5b25d6149129a676daadfa39c878a1f5823bf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit af172030b12bc994d91e02b12883d2e67151996c
Author: Mitch Jackson <mitch at freeside.biz>
Date:   Thu Sep 20 14:20:47 2018 -0400

    RT# 78547 Future autobill report - report totals

diff --git a/httemplate/search/future_autobill.html b/httemplate/search/future_autobill.html
index 8f59d71db..2e723ec79 100644
--- a/httemplate/search/future_autobill.html
+++ b/httemplate/search/future_autobill.html
@@ -52,16 +52,18 @@ there will be 1,400 billing and payment cycles simulated
         </td>
       </tr>
 %   }
-%   $pmt_type_subtotal{Total} += $_ for values %pmt_type_subtotal;
-    <tr class="gridreport" style="border-top: solid 1px #999;">
-      <td class="gridreport" style="text-align: right; margin-right: 1em; border-top: solid 1px #666;">
-        <% sprintf( '$%.2f', $pmt_type_subtotal{Total} ) %>
-      </td>
-      <td class="gridreport" style="border-top: solid 1px #666;">
-        Total
-      </td>
-    </tr>
-    </table>
+%   if ( keys %pmt_type_subtotal > 1 ) {
+%     $pmt_type_subtotal{Total} += $_ for values %pmt_type_subtotal;
+      <tr class="gridreport" style="border-top: solid 1px #999;">
+        <td class="gridreport" style="text-align: right; margin-right: 1em; border-top: solid 1px #666;">
+          <% sprintf( '$%.2f', $pmt_type_subtotal{Total} ) %>
+        </td>
+        <td class="gridreport" style="border-top: solid 1px #666;">
+          Total
+        </td>
+      </tr>
+      </table>
+%   }
 % }
 
 <%init>

commit edef3cc1226f64506d2bbc92e2a3dc0507e77b81
Author: Mitch Jackson <mitch at freeside.biz>
Date:   Thu Sep 20 14:02:03 2018 -0400

    RT# 78547 Future autobill report - report totals

diff --git a/httemplate/search/future_autobill.html b/httemplate/search/future_autobill.html
index 3385dd880..8f59d71db 100644
--- a/httemplate/search/future_autobill.html
+++ b/httemplate/search/future_autobill.html
@@ -35,6 +35,34 @@ there will be 1,400 billing and payment cycles simulated
   suppress_header => $job ? 1 : 0,
   suppress_footer => $job ? 1 : 0,
 &>
+% if ( %pmt_type_subtotal ) {
+    <table class="gridreport" style="margin-left: 2em;">
+      <tr>
+        <th class="gridreport" colspan="2">
+          Summary
+        </th>
+      </tr>
+%   for my $pmt_type ( sort keys %pmt_type_subtotal ) {
+      <tr class="gridreport">
+        <td class="gridreport" style="text-align: right; margin-right: 1em;">
+          <% sprintf '$%.2f', $pmt_type_subtotal{ $pmt_type } %>
+        </td>
+        <td class="gridreport">
+          <% $pmt_type |h %>
+        </td>
+      </tr>
+%   }
+%   $pmt_type_subtotal{Total} += $_ for values %pmt_type_subtotal;
+    <tr class="gridreport" style="border-top: solid 1px #999;">
+      <td class="gridreport" style="text-align: right; margin-right: 1em; border-top: solid 1px #666;">
+        <% sprintf( '$%.2f', $pmt_type_subtotal{Total} ) %>
+      </td>
+      <td class="gridreport" style="border-top: solid 1px #666;">
+        Total
+      </td>
+    </tr>
+    </table>
+% }
 
 <%init>
   use DateTime;
@@ -134,6 +162,7 @@ there will be 1,400 billing and payment cycles simulated
   my $fakebill_time = time();
   my %abreport;
   my @rows;
+  my %pmt_type_subtotal;
 
   local $@;
   local $SIG{__DIE__};
@@ -239,6 +268,9 @@ there will be 1,400 billing and payment cycles simulated
           ]
         };
 
+        $pmt_type_subtotal{ $cust_pay->paycardtype || $cust_pay-> payby }
+          += $cust_pay->paid;
+
       } # /foreach payment
 
       # Roll back database at the end of each customer

-----------------------------------------------------------------------

Summary of changes:
 httemplate/search/future_autobill.html | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)