Changeset 602

Show
Ignore:
Timestamp:
02/28/08 10:15:51 (9 months ago)
Author:
stavros
Message:

BUG: Profit/loss reports were inaccurate due to extracharge_did adjusting the sell-rate without an accompanying adjustment to the buy-rate.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.3/A2Billing_AGI/libs_a2billing/Class.A2Billing.php

    r574 r602  
    462462                if(isset($this->config["agi-conf$idconfig"]['extracharge_did'])) $this->config["agi-conf$idconfig"]['extracharge_did'] = explode(",",$this->config["agi-conf$idconfig"]['extracharge_did']); 
    463463                if(isset($this->config["agi-conf$idconfig"]['extracharge_fee'])) $this->config["agi-conf$idconfig"]['extracharge_fee'] = explode(",",$this->config["agi-conf$idconfig"]['extracharge_fee']); 
     464                if(isset($this->config["agi-conf$idconfig"]['extracharge_buyfee'])) { 
     465                        $this->config["agi-conf$idconfig"]['extracharge_buyfee'] = explode(',',$this->config["agi-conf$idconfig"]['extracharge_buyfee']); 
     466                } else { 
     467                        if(isset($this->config["agi-conf$idconfig"]['extracharge_fee'])) $this->config["agi-conf$idconfig"]['extracharge_buyfee'] = explode(',',$this->config["agi-conf$idconfig"]['extracharge_fee']); 
     468                } 
    464469 
    465470                if(isset($this->config["agi-conf$idconfig"]['international_prefixes'])) { 

  • branches/1.3/A2Billing_AGI/libs_a2billing/Class.RateEngine.php

    r507 r602  
    270270                { 
    271271                        $fee=$A2B->agiconfig['extracharge_fee'][array_search($A2B->dnid, $A2B->agiconfig['extracharge_did'])]; 
    272                         $A2B -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[CC_asterisk_rate-engine: Extracharge DID found: ".$A2B->dnid.", extra fee: ".$fee."]"); 
     272                        $buyfee=$A2B->agiconfig['extracharge_buyfee'][array_search($A2B->dnid, $A2B->agiconfig['extracharge_did'])]; 
     273                        $A2B -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[CC_asterisk_rate-engine: Extracharge DID found: ".$A2B->dnid.", extra fee: ".$fee.", extra buy fee: ".$buyfee."]"); 
    273274                        for ($i=0; $i<count($this->ratecard_obj); $i++) 
    274275                        { 
    275                                 $this->ratecard_obj[$i][9] +=$fee; 
     276                                $this->ratecard_obj[$i][9] +=$buyfee; 
    276277                                $this->ratecard_obj[$i][12]+=$fee; 
    277278                        } 

  • branches/1.3/a2billing.conf

    r530 r602  
    604604;extracharge_fee = 0.02,0.03 
    605605extracharge_fee =  
     606;extracharge_buyfee = 0.015,0.025 
     607extracharge_buyfee =  
    606608 
    607609; List the prefixes that will be stripped off if the call plan requires it 


Google