Navigation

← Previous Changeset
Next Changeset →

Changeset 619

Timestamp:

03/16/08 14:17:39 (8 months ago)

Author:

areski

Message:

UPDATE : consolidate classes

Files:

branches/1.3/A2BCustomer_UI/lib/Class.A2Billing.php (modified) (4 diffs)
branches/1.3/A2Billing_AGI/libs_a2billing/Class.A2Billing.php (modified) (1 diff)
branches/1.3/A2Billing_UI/lib/Class.A2Billing.php (modified) (4 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

branches/1.3/A2BCustomer_UI/lib/Class.A2Billing.php

r574	r619
462	462	if(isset($this->config["agi-conf$idconfig"]['extracharge_did'])) $this->config["agi-conf$idconfig"]['extracharge_did'] = explode(",",$this->config["agi-conf$idconfig"]['extracharge_did']);
463	463	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	}
464	469
465	470	if(isset($this->config["agi-conf$idconfig"]['international_prefixes'])) {
…	…
1478	1483	// typepaid, creditlimit, inuse) VALUES ('123444','123444','123444','10.00','en','1','t','1','0','0');
1479	1484	//CREATE A CARD AND AN INSTANCE IN CC_CARD
1480		$QUERY_FIELS = 'username, useralias, userpass, credit, language, tariff, activated, typepaid, creditlimit, inuse';
1481		$QUERY_VALUES = "'$card_gen', '$card_gen', '$card_gen', '".$this->agiconfig['cid_auto_create_card_credit']."', 'en', '".$this->agiconfig['cid_auto_create_card_tariffgroup']."', 't','$ttcard', '".$this->agiconfig['cid_auto_create_card_credit_limit']."', '0'";
	1485	$QUERY_FIELS = 'username, useralias, userpass, credit, language, tariff, activated, typepaid, creditlimit, inuse, currency';
	1486	$QUERY_VALUES = "'$card_gen', '$card_gen', '$card_gen', '".$this->agiconfig['cid_auto_create_card_credit']."', 'en', '".$this->agiconfig['cid_auto_create_card_tariffgroup']."', 't','$ttcard', '".$this->agiconfig['cid_auto_create_card_credit_limit']."', '0', '".$this->config['global']['base_currency']."'";
1482	1487	$result = $this->instance_table -> Add_table ($this->DBHandle, $QUERY_VALUES, $QUERY_FIELS, 'cc_card', 'id');
1483	1488	$this -> debug( VERBOSE \| WRITELOG, $agi, __FILE__, __LINE__, "[CARDNUMBER: $card_gen]:[CARDID CREATED : $result]");
…	…
1588	1593
1589	1594	$this -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[ERROR CHECK CARD : $prompt (cardnumber:".$this->cardnumber.")]");
1590		~~$this -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[NOTENOUGHCREDIT - Refill with vouchert]");~~
1591	1595
1592	1596	if ($this->agiconfig['jump_voucher_if_min_credit']==1 && $prompt == "prepaid-zero-balance"){
…	…
1743	1747
1744	1748	if (strlen($prompt)>0){
	1749	$agi-> stream_file($prompt, '#'); // Added because was missing the prompt
	1750	$this -> debug( WRITELOG, $agi, __FILE__, __LINE__, 'prompt:'.strtoupper($prompt));
	1751
1745	1752	$this -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[ERROR CHECK CARD : $prompt (cardnumber:".$this->cardnumber.")]");
1746		$res = -2;
1747		break;
1748		}
	1753
	1754	if ($this->agiconfig['jump_voucher_if_min_credit']==1 && $prompt == "prepaid-zero-balance"){
	1755
	1756	$this -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[NOTENOUGHCREDIT - refill_card_withvoucher] ");
	1757	$vou_res = $this -> refill_card_with_voucher($agi,2);
	1758	if ($vou_res==1){
	1759	return 0;
	1760	}else {
	1761	$this -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[NOTENOUGHCREDIT - refill_card_withvoucher fail] ");
	1762	}
	1763	}
	1764	if ($prompt == "prepaid-zero-balance" && $this->agiconfig['notenoughcredit_cardnumber']==1) {
	1765	$this->accountcode='';
	1766	$this->agiconfig['cid_auto_assign_card_to_cid']=0;
	1767	if ($this->agiconfig['notenoughcredit_assign_newcardnumber_cid']==1) $this -> ask_other_cardnumber=1;
	1768	}else{
	1769	return -2;
	1770	}
	1771	}
1749	1772
1750	1773	} // For end

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

r618	r619
1747	1747
1748	1748	if (strlen($prompt)>0){
1749		~~$this -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[ERROR CHECK CARD : $prompt (cardnumber:".$this->cardnumber.")]");~~
1750		~~$res = -2;~~
1751		~~break;~~
1752		}
1753
1754		~~if (strlen($prompt)>0){~~
1755	1749	$agi-> stream_file($prompt, '#'); // Added because was missing the prompt
1756	1750	$this -> debug( WRITELOG, $agi, __FILE__, __LINE__, 'prompt:'.strtoupper($prompt));

branches/1.3/A2Billing_UI/lib/Class.A2Billing.php

r574	r619
462	462	if(isset($this->config["agi-conf$idconfig"]['extracharge_did'])) $this->config["agi-conf$idconfig"]['extracharge_did'] = explode(",",$this->config["agi-conf$idconfig"]['extracharge_did']);
463	463	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	}
464	469
465	470	if(isset($this->config["agi-conf$idconfig"]['international_prefixes'])) {
…	…
1478	1483	// typepaid, creditlimit, inuse) VALUES ('123444','123444','123444','10.00','en','1','t','1','0','0');
1479	1484	//CREATE A CARD AND AN INSTANCE IN CC_CARD
1480		$QUERY_FIELS = 'username, useralias, userpass, credit, language, tariff, activated, typepaid, creditlimit, inuse';
1481		$QUERY_VALUES = "'$card_gen', '$card_gen', '$card_gen', '".$this->agiconfig['cid_auto_create_card_credit']."', 'en', '".$this->agiconfig['cid_auto_create_card_tariffgroup']."', 't','$ttcard', '".$this->agiconfig['cid_auto_create_card_credit_limit']."', '0'";
	1485	$QUERY_FIELS = 'username, useralias, userpass, credit, language, tariff, activated, typepaid, creditlimit, inuse, currency';
	1486	$QUERY_VALUES = "'$card_gen', '$card_gen', '$card_gen', '".$this->agiconfig['cid_auto_create_card_credit']."', 'en', '".$this->agiconfig['cid_auto_create_card_tariffgroup']."', 't','$ttcard', '".$this->agiconfig['cid_auto_create_card_credit_limit']."', '0', '".$this->config['global']['base_currency']."'";
1482	1487	$result = $this->instance_table -> Add_table ($this->DBHandle, $QUERY_VALUES, $QUERY_FIELS, 'cc_card', 'id');
1483	1488	$this -> debug( VERBOSE \| WRITELOG, $agi, __FILE__, __LINE__, "[CARDNUMBER: $card_gen]:[CARDID CREATED : $result]");
…	…
1588	1593
1589	1594	$this -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[ERROR CHECK CARD : $prompt (cardnumber:".$this->cardnumber.")]");
1590		~~$this -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[NOTENOUGHCREDIT - Refill with vouchert]");~~
1591	1595
1592	1596	if ($this->agiconfig['jump_voucher_if_min_credit']==1 && $prompt == "prepaid-zero-balance"){
…	…
1743	1747
1744	1748	if (strlen($prompt)>0){
	1749	$agi-> stream_file($prompt, '#'); // Added because was missing the prompt
	1750	$this -> debug( WRITELOG, $agi, __FILE__, __LINE__, 'prompt:'.strtoupper($prompt));
	1751
1745	1752	$this -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[ERROR CHECK CARD : $prompt (cardnumber:".$this->cardnumber.")]");
1746		$res = -2;
1747		break;
1748		}
	1753
	1754	if ($this->agiconfig['jump_voucher_if_min_credit']==1 && $prompt == "prepaid-zero-balance"){
	1755
	1756	$this -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[NOTENOUGHCREDIT - refill_card_withvoucher] ");
	1757	$vou_res = $this -> refill_card_with_voucher($agi,2);
	1758	if ($vou_res==1){
	1759	return 0;
	1760	}else {
	1761	$this -> debug( WRITELOG, $agi, __FILE__, __LINE__, "[NOTENOUGHCREDIT - refill_card_withvoucher fail] ");
	1762	}
	1763	}
	1764	if ($prompt == "prepaid-zero-balance" && $this->agiconfig['notenoughcredit_cardnumber']==1) {
	1765	$this->accountcode='';
	1766	$this->agiconfig['cid_auto_assign_card_to_cid']=0;
	1767	if ($this->agiconfig['notenoughcredit_assign_newcardnumber_cid']==1) $this -> ask_other_cardnumber=1;
	1768	}else{
	1769	return -2;
	1770	}
	1771	}
1749	1772
1750	1773	} // For end

Navigation

Changeset 619

Legend:

branches/1.3/A2BCustomer_UI/lib/Class.A2Billing.php

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

branches/1.3/A2Billing_UI/lib/Class.A2Billing.php

Download in other formats: