Minor work on ADSL/Domain/Hosting and other minor fixes

modules/service/classes/controller/admin/service.php

@@ -19,6 +19,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
 		'listdomainservices'=>TRUE,
 		'listhostservices'=>TRUE,
 		'listhspaservices'=>TRUE,
+		'listinvoicesoon'=>TRUE,
 		'update'=>TRUE,
 	);
 
@@ -434,6 +435,33 @@ ORDER BY c.id,s.recur_schedule,c.name,a.company,a.last_name,a.first_name
 		return $return;
 	}
 
+	/**
+	 * List services that need to be invoiced.
+	 */
+	public function action_listinvoicesoon() {
+		Block::add(array(
+			'title'=>_('Services to Invoice'),
+			'body'=>Table::display(
+				ORM::factory('service')->list_invoicesoon(),
+				25,
+				array(
+					'id'=>array('label'=>'ID','url'=>'user/service/view/'),
+					'service_name()'=>array('label'=>'Details'),
+					'recur_schedule'=>array('label'=>'Billing'),
+					'date_next_invoice'=>array('label'=>'Next Invoice'),
+					'price'=>array('label'=>'Price','class'=>'right'),
+					'active'=>array('label'=>'Active'),
+					'account->accnum()'=>array('label'=>'Cust ID'),
+					'account->name()'=>array('label'=>'Customer'),
+				),
+				array(
+					'page'=>TRUE,
+					'type'=>'select',
+					'form'=>'user/service/view',
+				)),
+			));
+	}
+
 	public function action_update($id) {
 		$so = ORM::factory('service',$id);