[Asterisk-cvs] astcc astcc.agi,1.14,1.15

[kpfleming]

Update of /usr/cvsroot/astcc
In directory mongoose.digium.com:/tmp/cvs-serv10825

Modified Files:
	astcc.agi 
Log Message:
correct billing cost calculations (issue #4479)


Index: astcc.agi
===================================================================
RCS file: /usr/cvsroot/astcc/astcc.agi,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- astcc.agi	19 May 2005 04:53:13 -0000	1.14
+++ astcc.agi	23 Aug 2005 00:55:38 -0000	1.15
@@ -45,6 +45,7 @@
 
 use DBI;
 use Asterisk::AGI;
+use POSIX qw(ceil floor);
 
 sub load_config() {
 	open(CFG, "</var/lib/astcc/astcc-config.conf");
@@ -329,15 +330,17 @@
 
 sub calccost() {
 	my ($adjconn, $adjcost, $answeredtime, $increment) = @_;
-	eval { my $adjtime = int(($answeredtime + $increment - 1) / $increment) * $increment };
 	my $cost;
+	my $adjtime = eval { $adjtime = int((($answeredtime - $numdata->{includedseconds}) + $increment - 1) / $increment) * $increment;
+		return $adjtime };
+	if ($adjtime < 0) {
+		$adjtime = 0;
+	}	
 	print STDERR "Adjusted time is $adjtime, cost is $adjcost with $adjconn fee\n";
 	eval { $cost = int($adjcost * $adjtime / 60) };
 	$cost += $adjconn;
 	print STDERR "Total cost is $cost\n";
 	return $cost;
-	
-	
 }
 
 sub checkinuse() {
@@ -651,4 +654,4 @@
 #$res = &mystreamfile("astcc-unavail");
 &savecdr($cardno, $callerid, $phoneno, $trunk, $res, 0, 0);
 &setinuse($carddata->{number}, 0);
-exit(0);
+exit(0);
\ No newline at end of file