[Astpp-commit] SF.net SVN: astpp: [2155] trunk/astpp-common.pl

[<dar...@us...>]

Revision: 2155
          http://astpp.svn.sourceforge.net/astpp/?rev=2155&view=rev
Author:   darrenkw
Date:     2007-11-05 19:33:07 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
Resolve problem with packages.

Modified Paths:
--------------
    trunk/astpp-common.pl

Modified: trunk/astpp-common.pl
===================================================================
--- trunk/astpp-common.pl	2007-11-04 22:32:27 UTC (rev 2154)
+++ trunk/astpp-common.pl	2007-11-06 03:33:07 UTC (rev 2155)
@@ -3686,7 +3686,7 @@
 			print STDERR
 "pricelistData: $branddata->{name} $branddata->{markup} $branddata->{inc} $branddata->{status}\n";
 
-			my $package = &get_package( $astpp_db, $carddata, $cdrinfo->{dst} );
+			$package = &get_package( $astpp_db, $carddata, $cdrinfo->{dst} );
                         if ($package->{id}) {
                                 my $counter =
                                   &get_counter( $astpp_db, $package->{id},
@@ -3859,18 +3859,15 @@
 					print STDERR "----------------------\n";
 				}
 				elsif ( $cdrinfo->{accountcode} ) {
-					my $savedcdrinfo = $cdrinfo;
 					$status = &rating( $astpp_db, $cdr_db, $config, $cdrinfo, $carddata);
-					$cdrinfo = $savedcdrinfo;
+					$cdrinfo  = &get_cdr( $cdr_db, $uniqueid );
 					if ( $status == 1 ) {
 						my $previous_account = $carddata->{number};
 						while ( $carddata->{reseller} ne "" ) {
-#							my $cdrinfo  = &get_cdr( $cdr_db, $uniqueid );
-#							my $reseller = $carddata->{reseller};
+							$cdrinfo  = &get_cdr( $cdr_db, $uniqueid );
 							print STDERR "Charge $uniqueid to $carddata->{reseller}" if $config->{debug} == 1;
 							$carddata = &get_account( $astpp_db, $carddata->{reseller} );
 							$status = &rating( $astpp_db, $cdr_db, $config, $cdrinfo, $carddata);
-							$cdrinfo = $savedcdrinfo;
 							my $tmp = "SELECT id FROM cdrs WHERE uniqueid = '" . $uniqueid 
 								. "' AND cardnum = '" . $previous_account . "' LIMIT 1";
 							print STDERR "$tmp\n" if $config->{debug} == 1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.