[freeside-commits] branch master updated. 267020ff22d48bb82a02a13525f0e0844ef4d6bd

Mark Wells mark at 420.am
Tue Aug 27 14:17:38 PDT 2013


The branch, master has been updated
       via  267020ff22d48bb82a02a13525f0e0844ef4d6bd (commit)
      from  199c1be96793535a390acac0c4116a2e111fa380 (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 267020ff22d48bb82a02a13525f0e0844ef4d6bd
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Aug 27 14:16:36 2013 -0700

    fix for flat-rate prefix rating, #24716, from #5738

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 3ebe6c4..de9cf12 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -932,8 +932,12 @@ sub rate_prefix {
       }
 
                            #should preserve (display?) this
-      my $charge_min = ( $charge_sec - $conn_seconds ) / 60;
-      $charge += ($rate_detail->min_charge * $charge_min) if $charge_min > 0; #still not rounded
+      if ( $granularity == 0 ) { # per call rate
+        $charge += $rate_detail->min_charge;
+      } else {
+        my $charge_min = ( $charge_sec - $conn_seconds ) / 60;
+        $charge += ($rate_detail->min_charge * $charge_min) if $charge_min > 0; #still not rounded
+      }
 
     }
 

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

Summary of changes:
 FS/FS/cdr.pm |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)




More information about the freeside-commits mailing list