Work on Email and other major consistency work

modules/adsl/classes/Controller/Admin/Adsl.php

@@ -68,26 +68,8 @@ class Controller_Admin_Adsl extends Controller_Adsl {
 			HTTP::redirect(URL::link('admin','adsl/list'));
 
 		if ($_POST) {
-			// Entry updated
-			if ($apo->values($_POST)->check() AND $apo->changed()) {
-				try {
-					if ($apo->save())
-						SystemMessage::factory()
-							->title('Record updated')
-							->type('success')
-							->body(_('Your Charge record has been recorded/updated.'));
-
-				} catch (ORM_Validation_Exception $e) {
-					$errors = $e->errors('models');
-
-					SystemMessage::factory()
-						->title('Record NOT updated')
-						->type('error')
-						->body(join('<br/>',array_values($errors)));
-
-					$sco->reload();
-				}
-			}
+			if ($apo->values($_POST)->changed() AND (! $this->save($apo)))
+				$apo->reload();
 
 			if (isset($_POST['test'])) {
 				$charge = isset($_POST['test']['charge']) ? $_POST['test']['charge'] : FALSE;

modules/adsl/classes/Controller/Reseller/Service/Adsl.php

@@ -43,7 +43,7 @@ class Controller_Reseller_Service_Adsl extends Controller_Service {
 	public function action_list() {
 		$highchart = HighChart::factory('Combo');
 		$highchart->title(sprintf('Monthly DSL traffic usage as at %s',date('Y-m-d',strtotime('yesterday'))));
-		$highchart->xmetric('MB');
+		$highchart->ymetric('MB');
 
 		$c = 0;
 		foreach ($this->consoltraffic(time()) as $k => $details) {

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

@@ -352,9 +352,9 @@ $(document).ready(function() {
 		$highchart = HighChart::factory('Combo');
 
 		switch ($this->plan()->metric) {
-			case '1000' : $highchart->xmetric('GB'); break;
-			case '1' : $highchart->xmetric('MB'); break;
-			default: $highchart->xmetric('?');
+			case '1000' : $highchart->ymetric('GB'); break;
+			case '1' : $highchart->ymetric('MB'); break;
+			default: $highchart->ymetric('?');
 		}
 
 		$c=0;

modules/adsl/classes/Task/Adsl/Trafficalert.php

@@ -31,6 +31,8 @@ class Task_Adsl_Trafficalert extends Minion_Task {
 			// Get our variable data
 			$et->to = array('account'=>array($so->account_id));
 			$et->variables = $so->plugin()->template_variables($et->variables(),$data);
+			$et->module = $so->mid();
+			$et->module_data = $so->id;
 
 			$et->send();