[Astpp-commit] SF.net SVN: astpp: [2147] trunk
Brought to you by:
darrenkw
Menu
▾
▴
[Astpp-commit] SF.net SVN: astpp: [2147] trunk
|
From: <dar...@us...> - 2007-11-02 05:13:05
|
Revision: 2147
http://astpp.svn.sourceforge.net/astpp/?rev=2147&view=rev
Author: darrenkw
Date: 2007-11-01 22:13:00 -0700 (Thu, 01 Nov 2007)
Log Message:
-----------
Resolve issues with Packages and Counters. Also fixed incorrect formatting of "template_die_on_bad_param" variable.
Modified Paths:
--------------
trunk/astpp-admin.cgi
trunk/astpp-common.pl
trunk/astpp-users.cgi
trunk/templates/counters-list.tpl
Modified: trunk/astpp-admin.cgi
===================================================================
--- trunk/astpp-admin.cgi 2007-11-02 04:25:04 UTC (rev 2146)
+++ trunk/astpp-admin.cgi 2007-11-02 05:13:00 UTC (rev 2147)
@@ -1470,7 +1470,7 @@
sub build_homepage() {
my $template =
- HTML::Template->new( filename => '/var/lib/astpp/templates/home.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ HTML::Template->new( filename => '/var/lib/astpp/templates/home.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
if ( $params->{logintype} == 1
|| $params->{logintype} == 5
@@ -1560,7 +1560,7 @@
);
my $template =
HTML::Template->new(
- filename => '/var/lib/astpp/templates/account-info.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ filename => '/var/lib/astpp/templates/account-info.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
return gettext("Cannot view account until database is configured")
unless $astpp_db;
if ( $params->{logintype} == 1 || $params->{logintype} == 5 ) {
@@ -2039,7 +2039,7 @@
my ( $body, $total, $count, $reseller, @accountdetaillist );
my $template =
HTML::Template->new(
- filename => '/var/lib/astpp/templates/account-list.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ filename => '/var/lib/astpp/templates/account-list.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
my $yes = gettext("YES");
my $no = gettext("NO");
return gettext("Cannot view account until database is configured")
@@ -2216,7 +2216,7 @@
my ( @pricelists, $status, $body );
my $template =
HTML::Template->new(
- filename => '/var/lib/astpp/templates/account-create.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ filename => '/var/lib/astpp/templates/account-create.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
return gettext("Database is NOT configured!") . " \n"
unless $astpp_db;
if ( $params->{logintype} == 1 || $params->{logintype} == 5 ) {
@@ -5442,7 +5442,7 @@
$accountinfo );
my $template =
HTML::Template->new(
- filename => '/var/lib/astpp/templates/account-remove.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ filename => '/var/lib/astpp/templates/account-remove.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
if ( $params->{action} eq gettext("Deactivate...") ) {
if ( $params->{number} ne "" ) {
$number = $params->{number};
@@ -5501,7 +5501,7 @@
my ( $status, $body, $number, $reseller );
my $template =
HTML::Template->new(
- filename => '/var/lib/astpp/templates/account-process-payment.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ filename => '/var/lib/astpp/templates/account-process-payment.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
return gettext("Database not configured!") unless $astpp_db;
if ( $params->{logintype} == 1 || $params->{logintype} == 5 ) {
$reseller = $params->{username};
@@ -7904,7 +7904,7 @@
my (@counter_list);
my $template =
HTML::Template->new(
- filename => '/var/lib/astpp/templates/counters-list.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ filename => '/var/lib/astpp/templates/counters-list.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
my $results_per_page = $config->{results_per_page};
if ( $results_per_page eq "" || $results_per_page < 2 ) {
$results_per_page = 25;
@@ -7960,7 +7960,7 @@
# END OF PAGINATION CODE
while ( my $counterinfo = $sql->fetchrow_hashref ) {
print STDERR "COUNTER: " . $counterinfo->{id} if $config->{debug} == 1;
- my ($row);
+ my (%row);
# $row{} = $name;
# $row{balance} = $balance / 10000;
@@ -7969,7 +7969,7 @@
$row{package} = $counterinfo->{package};
$row{account} = $counterinfo->{account};
$row{seconds} = $counterinfo->{seconds};
- push( @counter_list, $counterinfo );
+ push( @counter_list, \%row );
}
if ( $total_entries >= 1 )
{ #This section only applies if we have more than 1 page.
@@ -9485,7 +9485,7 @@
my ( $tmp, $template, @configuration_list );
$template =
HTML::Template->new(
- filename => '/var/lib/astpp/templates/configuration-list.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ filename => '/var/lib/astpp/templates/configuration-list.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
if ( $params->{logintype} == 2 ) {
$tmp = "SELECT * FROM system";
}
@@ -10755,7 +10755,7 @@
sub build_add_callshop() {
my $template =
HTML::Template->new(
- filename => '/var/lib/astpp/templates/callshop-create.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ filename => '/var/lib/astpp/templates/callshop-create.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
if ( $params->{action} eq gettext("Add...") ) {
if ( $params->{logintype} == 1 || $params->{logintype} == 5 ) {
$params->{pricelist} = $params->{username};
@@ -10813,7 +10813,7 @@
sub build_remove_callshop() {
my $template =
HTML::Template->new(
- filename => '/var/lib/astpp/templates/callshop-remove.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ filename => '/var/lib/astpp/templates/callshop-remove.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
my ( @callshops, $tmp );
if ( $params->{logintype} == 1 ) {
@callshops = &list_callshops_reseller( $astpp_db, $params->{username} );
@@ -10868,7 +10868,7 @@
my ( $template, $currency, $pricelist, $language, $status );
$template =
HTML::Template->new(
- filename => '/var/lib/astpp/templates/booth-create.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ filename => '/var/lib/astpp/templates/booth-create.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
$params->{reseller} = $params->{username};
$currency = popup_menu(
-name => "currency",
@@ -11046,7 +11046,7 @@
sub build_remove_booth() {
my $template =
HTML::Template->new(
- filename => '/var/lib/astpp/templates/booth-remove.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ filename => '/var/lib/astpp/templates/booth-remove.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
my ( @booth_list, $accountinfo );
########
# Decide which booth name to use. The one in the box has priority over the selected list one.
@@ -11293,7 +11293,7 @@
my $template =
HTML::Template::Expr->new(
- filename => '/var/lib/astpp/templates/booths-list.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ filename => '/var/lib/astpp/templates/booths-list.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
$template->param( booth_list => \@booths );
return $template->output;
}
@@ -11443,7 +11443,7 @@
}
my $template =
HTML::Template->new(
- filename => '/var/lib/astpp/templates/booth-view.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ filename => '/var/lib/astpp/templates/booth-view.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
$template->param( booth_name => $params->{booth_name} );
my $balance = &accountbalance( $astpp_db, $params->{booth_name} ) / 10000;
my $unrated = &count_unrated_cdrs_account( $cdr_db, $accountinfo->{number},
@@ -11463,7 +11463,7 @@
###################Start of Application ###################
&initialize();
my $template =
- HTML::Template->new( filename => '/var/lib/astpp/templates/main.tpl', die_on_bad_params => '$config->{template_die_on_bad_params' );
+ HTML::Template->new( filename => '/var/lib/astpp/templates/main.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}' );
foreach my $param ( param() ) {
$params->{$param} = param($param);
print STDERR "$param $params->{$param}\n" if $config->{debug} == 1;
Modified: trunk/astpp-common.pl
===================================================================
--- trunk/astpp-common.pl 2007-11-02 04:25:04 UTC (rev 2146)
+++ trunk/astpp-common.pl 2007-11-02 05:13:00 UTC (rev 2147)
@@ -1036,6 +1036,7 @@
my ( $connect, $cost, $answeredtime, $increment, $inc_seconds ) = @_;
print STDERR "Connect: $connect Cost: $cost Answered: $answeredtime \n";
print STDERR " Inc: $increment included: $inc_seconds \n";
+ if ($answeredtime > 0) {
my ($total_seconds);
$total_seconds = ( $answeredtime - $inc_seconds ) / $increment if $inc_seconds;
$total_seconds = ( $answeredtime ) / $increment if !$inc_seconds;
@@ -1049,6 +1050,10 @@
print STDERR "Increment: $increment Total Increments: $total_seconds\n";
print STDERR "Bill Seconds: $billseconds Total cost is $cost\n";
return $cost;
+ } else {
+ print STDERR "NO CHARGE - ANSWEREDTIME = 0\n";
+ return 0;
+ }
}
# Return a list of all trunk names. Used mostly for menus.
@@ -3686,28 +3691,35 @@
my $counter =
&get_counter( $astpp_db, $package->{name},
$carddata->{number} );
- my $difference;
+ my $difference;
if ( !$counter->{id}) {
my $tmp =
"INSERT INTO counters (package,account) VALUES ("
. $astpp_db->quote( $package->{name} ) . ", "
. $astpp_db->quote( $carddata->{number} ) . ")";
- print STDERR $tmp . "/n";
+ print STDERR $tmp . "/n" if $config->{debug} == 1;
$astpp_db->do($tmp);
$counter =
&get_counter( $astpp_db, $package->{name},
$carddata->{number} );
}
if ( $package->{includedseconds} > $counter->{seconds}) {
- $cdrinfo->{billsec} = $cdrinfo->{billsec} - ($package->{includedseconds} - $counter
-->{seconds});
+ my $availableseconds = $package->{includedseconds} - $counter->{seconds};
+ my $freeseconds;
+ if ($availableseconds >= $cdrinfo->{billsec}) {
+ $freeseconds = $cdrinfo->{billsec};
+ $cdrinfo->{billsec} = 0;
+ } else {
+ $freeseconds = $availableseconds;
+ $cdrinfo->{billsec} = $cdrinfo->{billsec} - $availableseconds;
+ }
my $tmp =
"UPDATE counters SET seconds = "
. $astpp_db->quote(
- $counter->{seconds} + $difference )
+ $counter->{seconds} + $freeseconds )
. " WHERE id = "
. $astpp_db->quote( $counter->{id} );
- print STDERR $tmp . "/n";
+ print STDERR $tmp . "/n" if $config->{debug} == 1;
$astpp_db->do($tmp);
}
}
Modified: trunk/astpp-users.cgi
===================================================================
--- trunk/astpp-users.cgi 2007-11-02 04:25:04 UTC (rev 2146)
+++ trunk/astpp-users.cgi 2007-11-02 05:13:00 UTC (rev 2147)
@@ -226,7 +226,7 @@
$cost, $pagesrequired, $record, $debit,
$credit, $pageno, $credit_limit
);
- my $template = HTML::Template->new(filename => '/var/lib/astpp/templates/users-account-info.tpl', die_on_bad_params => '$config->{template_die_on_bad_params');
+ my $template = HTML::Template->new(filename => '/var/lib/astpp/templates/users-account-info.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}');
return gettext("Cannot view account until database is configured")
unless $astpp_db;
if ( $params->{limit} < 1 ) { $params->{limit} = 0 }
@@ -421,7 +421,7 @@
$cardstat, $cardinfo, $count, $sql, $value,
$used, $pageno, $pagesrequired);
my (@cdr_list, @card_list);
- my $template = HTML::Template->new(filename => '/var/lib/astpp/templates/users-list-callingcards.tpl', die_on_bad_params => '$config->{template_die_on_bad_params');
+ my $template = HTML::Template->new(filename => '/var/lib/astpp/templates/users-list-callingcards.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}');
my $no = gettext("NO");
my $yes = gettext("YES");
my $active = gettext("ACTIVE");
@@ -587,7 +587,7 @@
sub build_dids() {
my ( $total, $body, $status, $description, $pricelist, $pageno, $pagesrequired );
- my $template = HTML::Template->new(filename => '/var/lib/astpp/templates/users-dids.tpl', die_on_bad_params => '$config->{template_die_on_bad_params');
+ my $template = HTML::Template->new(filename => '/var/lib/astpp/templates/users-dids.tpl', die_on_bad_params => '$config->{template_die_on_bad_params'});
return gettext("Cannot view DIDs until database is configured")
unless $astpp_db;
if ( $params->{limit} < 1 ) { $params->{limit} = 0 }
@@ -783,7 +783,7 @@
sub build_ani_map() {
my ( @ani_list,$total, $body, $status, $description, $pricelist, $pageno,
$pagesrequired );
- my $template = HTML::Template->new(filename => '/var/lib/astpp/templates/users-map-ani.tpl', die_on_bad_params => '$config->{template_die_on_bad_params');
+ my $template = HTML::Template->new(filename => '/var/lib/astpp/templates/users-map-ani.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}');
return gettext("Not available until database is configured")
unless $astpp_db;
if ( $params->{limit} < 1 ) { $params->{limit} = 0 }
@@ -881,7 +881,7 @@
$ENV{LANGUAGE} = $cardinfo->{language};
print STDERR gettext("Interface language is set to:") . " $ENV{LANGUAGE}\n" if $config->{debug} == 1;
-my $template = HTML::Template->new(filename => '/var/lib/astpp/templates/users-main.tpl', die_on_bad_params => '$config->{template_die_on_bad_params');
+my $template = HTML::Template->new(filename => '/var/lib/astpp/templates/users-main.tpl', die_on_bad_params => '$config->{template_die_on_bad_params}');
my ($body, $menu);
if ( $loginstat == 1 && $params->{mode} ne gettext("Download")) {
$params->{mode} = gettext("Home")
Modified: trunk/templates/counters-list.tpl
===================================================================
--- trunk/templates/counters-list.tpl 2007-11-02 04:25:04 UTC (rev 2146)
+++ trunk/templates/counters-list.tpl 2007-11-02 05:13:00 UTC (rev 2147)
@@ -22,5 +22,10 @@
<tr>
<td><TMPL_VAR NAME="pagination"></td>
</tr>
+<tr>
+ <td>
+ <TMPL_VAR NAME="status">
+ </td>
+</tr>
</table>
</form>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
