Some updates after changing to KH335 and updating submodules

application/classes/Controller/User/Welcome.php

@@ -16,59 +16,7 @@ class Controller_User_Welcome extends Controller_Welcome {
 	);
 
 	public function action_index() {
-		Block::factory()
-			->title(sprintf('Active Service for Account: %s',$this->ao->accnum()))
-			->title_icon('icon-info-sign')
-			->span(6)
-			->body(Table::factory()
-				->data($this->ao->service->list_active())
-				->columns(array(
-					'id'=>'ID',
-					'service_name()'=>'Service',
-				))
-				->prepend(array(
-					'id'=>array('url'=>URL::link('user','service/view/')),
-				))
-			);
-
-		Block::factory()
-			->title('Quick Shortcuts')
-			->title_icon('icon-bookmark')
-			->span(6)
-			->body(View::factory('welcome/user/shortcuts'));
-
-		Block::factory()
-			->title(sprintf('Invoices Due Account: %s (%s)',$this->ao->accnum(),$this->ao->invoice->list_due_total(TRUE)))
-			->title_icon('icon-info-sign')
-			->span(6)
-			->body(Table::factory()
-				->data($this->ao->invoice->list_due())
-				->columns(array(
-					'id'=>'ID',
-					'due_date'=>'Date Due',
-					'total(TRUE)'=>'Invoice Total',
-					'due(TRUE)'=>'Amount Due',
-				))
-				->prepend(array(
-					'id'=>array('url'=>URL::link('user','invoice/view/')),
-				))
-			);
-
-		Block::factory()
-			->title(sprintf('Services Expiring for Account: %s',$this->ao->accnum()))
-			->title_icon('icon-info-sign')
-			->span(6)
-			->body(Table::factory()
-				->data($this->ao->service->list_expiring())
-				->columns(array(
-					'id'=>'ID',
-					'service_name()'=>'Service',
-					'expire(TRUE)'=>'Date',
-				))
-				->prepend(array(
-					'id'=>array('url'=>URL::link('user','service/view/')),
-				))
-			);
+		$this->template->content = View::factory('welcome/user/view')->set('o',$this->ao);
 	}
 }
 ?>