Improvements to invoice display and other misc items

modules/invoice/classes/Controller/User/Invoice.php

@@ -12,6 +12,7 @@
 class Controller_User_Invoice extends Controller_Invoice {
 	protected $secure_actions = array(
 		'download'=>TRUE,
+		'email'=>TRUE,
 		'list'=>TRUE,
 		'view'=>TRUE,
 	);
@@ -33,11 +34,41 @@ class Controller_User_Invoice extends Controller_Invoice {
 		$imo->memo = 'Invoice Downloaded.';
 		$imo->save();
 
-		$this->response->body(Invoice::instance($io)->pdf()->Output(sprintf('%s.pdf',$io->refnum()),'D'));
+		$this->response->body(Invoice::instance($io)->render('pdf','all',array('download'=>sprintf('%s.pdf',$io->refnum()))));
 		$this->response->headers(array('Content-Type' => 'application/pdf'));
 		$this->auto_render = FALSE;
 	}
 
+	/**
+	 * Email an invoice
+	 */
+	public function action_email() {
+		$io = ORM::factory('Invoice',$this->request->param('id'));
+
+		if (! $io->loaded() OR ! Auth::instance()->authorised($io->account))
+			throw HTTP_Exception::factory(403,'Service either doesnt exist, or you are not authorised to see it');
+
+		if ($x=Invoice::instance($io)->render('email','all')) {
+			// Log the emailling
+			$imo = $io->invoice_memo;
+			$imo->invoice_id = $io->id;
+			$imo->account_id = $this->ao->id;
+			$imo->type = 'email';
+			$imo->memo = 'Invoice Emailed.';
+			$imo->save();
+
+			SystemMessage::factory()
+				->title('Invoice')
+				->type('success')
+				->body(sprintf('Invoice :%s sent via email',$io->refnum()));
+
+			HTTP::redirect(URL::link('user','email/view/'.$x));
+
+		} else {
+			HTTP::redirect(URL::link('user','invoice/view/'.$io->id));
+		}
+	}
+
 	/**
 	 * Show a list of invoices
 	 */
@@ -74,8 +105,12 @@ class Controller_User_Invoice extends Controller_Invoice {
 		if (! $io->loaded() OR ! Auth::instance()->authorised($io->account))
 			throw HTTP_Exception::factory(403,'Service either doesnt exist, or you are not authorised to see it');
 
-		$output .= View::factory('invoice/user/view')
-			->set('o',$io);
+		$output .= Invoice::instance($io)->render('html','all');
+
+		$output .= '<br>';
+
+		$output .= HTML::anchor(URL::link('user','invoice/email/'.$io->id),'Email',array('class'=>'btn pull-right'));
+		$output .= HTML::anchor(URL::link('user','invoice/download/'.$io->id),'Download',array('class'=>'btn pull-right'));
 
 		if ($io->due() AND ! $io->cart_exists())
 			$output .= View::factory('invoice/user/view/pay')
@@ -100,6 +135,7 @@ class Controller_User_Invoice extends Controller_Invoice {
 			Block::factory()
 				->title('Invoice Memos')
 				->title_icon('icon-list-alt')
+				->span(6)
 				->body(Table::factory()
 					->data($x)
 					->columns(array(
@@ -108,6 +144,27 @@ class Controller_User_Invoice extends Controller_Invoice {
 						'account->name()'=>'Account',
 						'memo'=>'Memo',
 				)));
+
+		$x = $io->email()->find_all();
+		if ($x->count())
+			Block::factory()
+				->title('Invoice Emails')
+				->title_icon('icon-list-alt')
+				->span(6)
+				->body(Table::factory()
+					->data($x)
+					->columns(array(
+						'id'=>'ID',
+						'date_orig'=>'Date',
+						'resolve("subject")'=>'Subject',
+					))
+					->prepend(array(
+						'id'=>array('url'=>URL::link('user','email/view/')),
+					))
+					->postproc(array(
+						'resolve("subject")'=>array('trim'=>55),
+					))
+				);
 	}
 }
 ?>