diff --git a/modules/adsl/classes/Adsl/Billing/Exetelvisp.php b/modules/adsl/classes/Adsl/Billing/Exetelvisp.php index 2f12b831..eb8fa6a6 100644 --- a/modules/adsl/classes/Adsl/Billing/Exetelvisp.php +++ b/modules/adsl/classes/Adsl/Billing/Exetelvisp.php @@ -110,26 +110,26 @@ class ADSL_Billing_Exetelvisp { if (! count($record) >= 7) throw HTTP_Exception::factory(501,'Format of CSV file changed? (:record)',array(':record'=>$record)); - if (preg_match('/Monthly Internet Charge On Plan /',$record[3])) { - list($service,$description) = explode(':',(preg_replace('/([0-9]+)\s+-\s+(.*)$/',"$1:$2",$record[3]))); + if (preg_match('/Monthly Internet Charge On Plan /',$record[4])) { + list($service,$description) = explode(':',(preg_replace('/([0-9]+)\s+-\s+(.*)$/',"$1:$2",$record[4]))); $result[$service]['cost'] = str_replace('$','',$record[6]); - } elseif (preg_match('/([0-9]+)\s+-\s+Monthly Charge On Plan /',$record[3])) { - list($service,$description) = explode(':',(preg_replace('/([0-9]+)\s+-\s+(.*)$/',"$1:$2",$record[3]))); + } elseif (preg_match('/([0-9]+)\s+-\s+Monthly Internet Charge On Plan /',$record[4])) { + list($service,$description) = explode(':',(preg_replace('/([0-9]+)\s+-\s+(.*)$/',"$1:$2",$record[4]))); $result[$service]['cost'] = str_replace('$','',$record[6]); $result[$service]['info'] = 'Other Service'; - } elseif (preg_match('/VOIP Monthly Charges /',$record[3])) { + } elseif (preg_match('/VOIP Monthly Charges/',$record[3])) { list($service,$description) = explode(':',(preg_replace('/([0-9]+)\s+-\s+(.*)$/',"$1:$2",$record[3]))); $result[$service]['cost'] = str_replace('$','',$record[6]); $result[$service]['info'] = 'VOIP Service'; - } elseif (preg_match('/VISP Credit/',$record[3])) { - list($service,$description) = explode(':',(preg_replace('/([0-9]+)\s+-\s+(.*)$/',"$1:$2",$record[3]))); + } elseif (preg_match('/VISP Credit/',$record[4])) { + list($service,$description) = explode(':',(preg_replace('/([0-9]+)\s+-\s+(.*)$/',"$1:$2",$record[4]))); $result[$service]['credit'] = str_replace('$','',$record[6]); - } elseif (preg_match('/Excess usage charges/',$record[3])) { - list($service,$description) = explode(':',(preg_replace('/([0-9]+)\s+-\s+(.*)$/',"$1:$2",$record[3]))); + } elseif (preg_match('/Excess usage charges/',$record[4])) { + list($service,$description) = explode(':',(preg_replace('/([0-9]+)\s+-\s+(.*)$/',"$1:$2",$record[4]))); $result[$service]['excess'] = str_replace('$','',$record[7]); // Ignore Payment For Invoice lines