Added Revenue information

modules/adsl/classes/Adsl/Billing/Exetelvisp.php

@@ -13,6 +13,7 @@ class ADSL_Billing_Exetelvisp {
 	private $data = NULL;
 	private $data_exception = NULL;
 	private $exception = array();
+	private $excess = 0;
 	private $total = 0;
 
 	public function excess($service) {
@@ -56,6 +57,7 @@ class ADSL_Billing_Exetelvisp {
 			if ($cost != $this->charge($service))
 				$this->exception[$service]['info'] = 'Charging difference: '.Currency::display($cost-$this->charge($service));
 
+			$this->excess += $this->excess($service);
 			$this->total += $this->charge($service);
 		}
 	}
@@ -151,8 +153,11 @@ class ADSL_Billing_Exetelvisp {
 		return $this;
 	}
 
-	public function total($format=FALSE) {
+	public function totalcharge($format=FALSE) {
 		return $format ? Currency::display($this->total) : $this->total;
 	}
+	public function totalexcess($format=FALSE) {
+		return $format ? Currency::display($this->excess) : $this->excess;
+	}
 }
 ?>

modules/adsl/classes/Model/Product/Plugin/Adsl.php

@@ -32,12 +32,22 @@ class Model_Product_Plugin_Adsl extends Model_Product_Plugin {
 	}
 
 	// Our required abstract methods
+	public function cost($annual=FALSE) {
+		$x = $this->adsl_supplier_plan->total();
+
+		return $annual ? $x*12 : $x;
+	}
+
 	public function feature_summary() {
 		// @todo This view should render based on the the results of this::allowance();
 		return View::factory('product/plugin/adsl/feature_summary')
 			->set('po',$this);
 	}
 
+	public function supplier() {
+		return $this->adsl_supplier_plan->supplier_id;
+	}
+
 	/**
 	 * Show the ADSL allowance as a peak/offpeak metric
 	 */

modules/adsl/classes/Service/Traffic/Adsl.php

@@ -119,6 +119,8 @@ abstract class Service_Traffic_Adsl {
 					$co->sweep_type = 6;
 					$co->account_id = $so->account_id;
 					$co->service_id = $so->id;
+					// @todo This needs to be calculated.
+					$co->type = 5;
 					$co->amount = $details['rate'];
 					// @todo This needs to be calculated.
 					$co->taxable = TRUE;