Some updates to invoice

application/classes/Auth/OSB.php

@@ -44,10 +44,13 @@ class Auth_OSB extends Auth_ORM {
 		if ($mmto->loaded()) {
 			// Check that the token is for this URI
 			$mo = ORM::factory('Module',array('name'=>Request::current()->controller()));
-			$mmo = ORM::factory('Module_Method',array(
-				'module_id'=>$mo->id,
-				'name'=>strtolower(Request::current()->directory() ? sprintf('%s:%s',Request::current()->directory(),Request::current()->action()) : Request::current()->action())
-			));
+			$mmo = $mo->module_method
+				->where_open()
+				->where('name','=',strtolower(Request::current()->directory() ? sprintf('%s:%s',Request::current()->directory(),Request::current()->action()) : Request::current()->action()))
+				// @todo No longer required after all method names have been colon delimited
+				->or_where('name','=',strtolower(Request::current()->directory() ? sprintf('%s_%s',Request::current()->directory(),Request::current()->action()) : Request::current()->action()))
+				->where_close()
+				->find();
 
 			// Ignore the token if this is not the right method.
 			if ($mmo->id == $mmto->method_id) {

modules/invoice/classes/Controller/Invoice.php

@@ -10,129 +10,5 @@
  * @license    http://dev.osbill.net/license.html
  */
 class Controller_Invoice extends Controller_TemplateDefault {
-	protected $secure_actions = array(
-		'download'=>TRUE,
-		'list'=>TRUE,
-		'view'=>TRUE,
-	);
-
-	/**
-	 * Show a list of invoices
-	 */
-	public function action_list() {
-		Block::add(array(
-			'title'=>sprintf('%s: %s - %s',_('Invoices For'),$this->ao->accnum(),$this->ao->name(TRUE)),
-			'body'=>Table::display(
-				$this->ao->invoice->find_all(),
-				25,
-				array(
-					'id'=>array('label'=>'ID','url'=>URL::link('user','invoice/view/')),
-					'date_orig'=>array('label'=>'Date Issued'),
-					'due_date'=>array('label'=>'Date Due'),
-					'total(TRUE)'=>array('label'=>'Total','class'=>'right'),
-					'total_credits(TRUE)'=>array('label'=>'Credits','class'=>'right'),
-					'payments_total(TRUE)'=>array('label'=>'Payments','class'=>'right'),
-					'due(TRUE)'=>array('label'=>'Still Due','class'=>'right'),
-				),
-				array(
-					'page'=>TRUE,
-					'type'=>'select',
-					'form'=>URL::link('user','invoice/view'),
-				)),
-			));
-	}
-
-	/**
-	 * View an Invoice
-	 */
-	public function action_view() {
-		list($id,$output) = Table::page(__METHOD__);
-
-		$io = ORM::factory('Invoice',$id);
-
-		if (! $io->loaded() OR ! Auth::instance()->authorised($io->account)) {
-			$this->template->content = 'Unauthorised or doesnt exist?';
-
-			return FALSE;
-		}
-
-		$output .= View::factory($this->viewpath())
-			->set('mediapath',Route::get('default/media'))
-			->set('io',$io);
-
-		if ($io->due() AND ! $io->cart_exists()) {
-			$output .= View::factory($this->viewpath().'/pay')
-				->set('mid',$io->mid())
-				->set('o',$io);
-		}
-
-		if (! $io->status) {
-			// Add a gribber popup
-			// @todo Make a gribber popup a class on its own.
-			Style::add(array(
-				'type'=>'file',
-				'data'=>'css/jquery.gritter.css',
-				'media'=>'screen',
-			));
-			Script::add(array(
-				'type'=>'file',
-				'data'=>'js/jquery.gritter-1.5.js',
-			));
-			Script::add(array(
-				'type'=>'stdin',
-				'data'=>sprintf(
-'$(document).ready(function() {
-	$.extend($.gritter.options, {
-		fade_in_speed: "medium",
-		fade_out_speed: 2000,
-		time: "3000",
-		sticky: false,
-	});
-	$.gritter.add({
-	title: "%s",
-	text: "%s",
-	image: "%s",
-});});',
-					'Cancelled','Invoice CANCELLED',URL::site().SystemMessage::image('info',true)
-				)
-			));
-
-			Style::add(array(
-				'type'=>'stdin',
-				'data'=>'
-#watermark {
-  color: #800000;
-  font-size: 4em;
-  -webkit-transform: rotate(-45deg);
-  -moz-transform: rotate(-45deg);
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  margin: 0;
-  z-index: 1;
-  left:250px;
-  top:-20px;
-}
-			'));
-
-			$output .= '<div id="watermark"><p>Invoice CANCELLED.</p></div>';
-		}
-
-		Block::add(array(
-			'title'=>sprintf('%s: %s - %s',_('Invoice'),$io->refnum(),$io->account->name()),
-			'body'=>$output,
-			));
-	}
-
-	/**
-	 * Download an invoice
-	 */
-	public function action_download() {
-		$io = ORM::factory('Invoice',$this->request->param('id'));
-
-		$this->response->body(Invoice::instance($io)->pdf()->Output(sprintf('%s.pdf',$io->refnum()),'D'));
-		$this->response->headers(array('Content-Type' => 'application/pdf'));
-		$this->auto_render = FALSE;
-	}
 }
 ?>

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

@@ -10,5 +10,80 @@
  * @license    http://dev.osbill.net/license.html
  */
 class Controller_User_Invoice extends Controller_Invoice {
+	protected $secure_actions = array(
+		'download'=>TRUE,
+		'list'=>TRUE,
+		'view'=>TRUE,
+	);
+
+	/**
+	 * Download an invoice
+	 */
+	public function action_download() {
+		$io = ORM::factory('Invoice',$this->request->param('id'));
+
+		$this->response->body(Invoice::instance($io)->pdf()->Output(sprintf('%s.pdf',$io->refnum()),'D'));
+		$this->response->headers(array('Content-Type' => 'application/pdf'));
+		$this->auto_render = FALSE;
+	}
+
+	/**
+	 * Show a list of invoices
+	 */
+	public function action_list() {
+		Block::factory()
+			->title(sprintf('Invoices for Account: %s',$this->ao->accnum()))
+			->title_icon('icon-th-list')
+			->body(Table::factory()
+				->jssort('invoices')
+				->data($this->ao->invoice->find_all())
+					->columns(array(
+						'id'=>'ID',
+						'date_orig'=>'Date Issued',
+						'due_date'=>'Date Due',
+						'total(TRUE)'=>'Total',
+						'total_credits(TRUE)'=>'Credits',
+						'payments_total(TRUE)'=>'Payments',
+						'due(TRUE)'=>'Still Due',
+					))
+					->prepend(array(
+						'id'=>array('url'=>URL::link('user','invoice/view/')),
+					))
+			);
+	}
+
+	/**
+	 * View an Invoice
+	 */
+	public function action_view() {
+		list($id,$output) = Table::page(__METHOD__);
+
+		$io = ORM::factory('Invoice',$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');
+
+		$output .= View::factory('invoice/user/view')
+			->set('mediapath',Route::get('default/media'))
+			->set('o',$io);
+
+		if ($io->due() AND ! $io->cart_exists())
+			$output .= View::factory('/invoice/user/view/pay')
+				->set('mid',$io->mid())
+				->set('o',$io);
+
+		if (! $io->status) {
+			Style::factory()
+				->type('file')
+				->data('media/css/pages/invoice.css');
+
+			$output .= '<div id="watermark">Invoice CANCELLED.</div>';
+		}
+
+		Block::factory()
+			->title(sprintf('%s: %s - %s',_('Invoice'),$io->refnum(),$io->account->name()))
+			->title_icon('icon-list-alt')
+			->body($output);
+	}
 }
 ?>

modules/invoice/media/css/pages/invoice.css

@@ -0,0 +1,13 @@
+#watermark {
+	color: #800000;
+	font-size: 4em;
+	-webkit-transform: rotate(-45deg);
+	-moz-transform: rotate(-45deg);
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	margin: 0;
+	z-index: 1;
+	left:350px;
+	top:-50px;
+}

modules/invoice/views/invoice/user/view.php

@@ -1,12 +1,12 @@
-<!-- @todo NEED to translate this -->
-<table class="box-left" border="0">
+<div class="row">
+	<div class="span11">
+		<div class="span5">
+			<div class="row">
+				<table>
 					<tr>
-		<td style="vertical-align: top">
-			<table class="company_details" border="0">
-				<tr>
-					<td class="logo"><?php echo Company::instance()->logo(); ?></td>
-					<td class="address">
-						<span class="company_name"><?php echo Company::instance()->name(); ?></span><br/>
+						<td style="vertical-align: top"><?php echo HTML::image('http://www.gth.bgo.co/logo-blue'); ?></td>
+						<td style="text-align: right; font-weight: bold">
+							<?php echo Company::instance()->name(); ?><br/>
 							<?php echo Company::instance()->taxid(); ?><br/>
 							<br/>
 							<?php echo Company::instance()->address(); ?><br/>
@@ -15,70 +15,61 @@
 						</td>
 					</tr>
 				</table>
-		</td>
-		<td>&nbsp;</td>
-		<td>
-			<table class="invoice_summary" border="0">
-				<tr>
-					<td>TAX INVOICE</td>
-					<td class="bold-right"><?php echo $io->id(); ?></td>
-				</tr>
-				<tr>
-					<td>Issue Date</td>
-					<td class="bold-right"><?php echo $io->display('date_orig'); ?></td>
-				</tr>
-				<tr>
-					<td>Due Date</td>
-					<td class="bold-right"><?php echo $io->display('due_date'); ?></td>
-				</tr>
-				<tr>
-					<td>Current Charges</td>
-					<td class="bold-right"><?php echo $io->total_charges(TRUE); ?></td>
-				</tr>
-				<tr>
-					<td>Payments Received to Date</td>
-					<td class="bold-right"><?php echo $io->payments_total(TRUE); ?></td>
-				</tr>
-				<tr>
-					<td>Credits Applied to Date</td>
-					<td class="bold-right"><?php echo $io->total_credits(TRUE); ?></td>
-				</tr>
-				<tr>
-					<td>Total Charges Due This Invoice</td>
-					<td class="bold-right"><?php echo $io->due(TRUE); ?></td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-	<tr><td class="spacer" colspan="3">&nbsp;</td></tr>
-	<tr>
-		<td colspan="3">
-			<table border="0">
-				<tr>
-					<td class="head" colspan="4">Charges Detail:</td>
-				</tr>
-				<?php foreach ($io->items_index('period') as $rs => $items) { ?>
-					<tr>
-						<td><div id="toggle_<?php echo $rs; ?>"><?php echo HTML::image($mediapath->uri(array('file'=>'img/toggle-closed.png')),array('alt'=>'+')); ?></div><script type="text/javascript">$("#toggle_<?php echo $rs; ?>").click(function() {$('#detail_toggle_<?php echo $rs; ?>').toggle();});</script></td>
-					<?php if ($rs) { ?>
-						<td><?php echo StaticList_RecurSchedule::get($rs); ?></td>
-						<td><?php printf('%s Service(s)',count($items)); ?></td>
-						<td>&nbsp;</td>
-					<?php } else { ?>
-						<td colspan="3">Other Items</td>
-					<?php } ?>
-					</tr>
-					<tr>
-						<td>&nbsp;</td>
-						<td colspan="2">
-							<div id="detail_toggle_<?php echo $rs; ?>">
-								<table class="box-full" border="0">
-								<?php if ($items) {
-									foreach ($items as $k=>$service_id) {
+			</div> <!-- /row -->
+		</div> <!-- /span -->
+
+		<div class="span5">
+			<div class="row">
+				<div class="dl-horizontal">
+					<dt>Tax Invoice</dt>
+					<dd><?php echo $o->id(); ?></dd>
+					<dt>Issue Date</dt>
+					<dd><?php echo $o->display('date_orig'); ?></dd>
+					<dt>Due Date</dt>
+					<dd><?php echo $o->display('due_date'); ?></dd>
+					<dt>Current Charges</dt>
+					<dd><?php echo $o->total_charges(TRUE); ?></dd>
+					<dt>Payments Recieved</dt>
+					<dd><?php echo $o->payments_total(TRUE); ?></dd>
+					<dt>Credits Applied</dt>
+					<dd><?php echo $o->total_credits(TRUE); ?></dd>
+					<dt>Still Due</dt>
+					<dd><?php echo $o->due(TRUE); ?></dd>
+				</div>
+			</div> <!-- /row -->
+		</div> <!-- /span -->
+	</div> <!-- /span -->
+</div>
+
+<div class="row">
+	<div class="span11">
+		<h4>Charge Details</h4>
+
+		<div class="accordion" id="charges">
+			<div class="accordion-group">
+
+				<?php foreach ($o->items_index('period') as $rs => $items) : ?>
+					<div class="accordion-heading">
+						<a class="accordion-toggle" data-toggle="collapse" data-parent="#charges" data-target="#collapse_<?php echo $rs; ?>">
+							<?php if ($rs) :
+							printf('%s - %s service(s)',StaticList_RecurSchedule::get($rs),count($items));
+							else :
+							echo 'Other Items';
+							endif ?>
+						</a>
+					</div>
+
+					<?php if ($items) : ?>
+						<div id="collapse_<?php echo $rs; ?>" class="accordion-body collapse in">
+							<table>
+
+								<?php
+								foreach ($items as $k=>$service_id) :
 									$i = 0;
 									$lp = NULL;
 									$ito_tax = NULL;
-										foreach ($io->items_service($service_id) as $ito) {
+
+									foreach ($o->items_service($service_id) as $ito) {
 											$ito_tax = $ito;
 											// Our first line we show the Service Details
 											if ($ito->item_type == 0 AND $ito->product_id != $lp) {
@@ -87,7 +78,7 @@
 												<tr class="head">
 													<td><?php echo HTML::anchor(URL::link('user','service/view/'.$ito->service_id),$ito->service->id()); ?></td>
 													<td colspan="5"><?php printf('%s - %s',$ito->product->title(),$ito->service->name()); ?> (<?php echo $ito->product_id; ?>)</td>
-													<td class="right"><?php echo ($i++==0 ? Currency::display($io->items_service_total($ito->service_id)) : '&nbsp;');?></td>
+													<td class="right"><?php echo ($i++==0 ? Currency::display($o->items_service_total($ito->service_id)) : '&nbsp;');?></td>
 												</tr>
 												<!-- END Product Information -->
 											<?php } ?>
@@ -106,40 +97,37 @@
 												<tr>
 													<td colspan="4">&nbsp;</td>
 													<td><?php echo _('Discounts'); ?></td>
-													<td class="right">(<?php echo Currency::display($io->items_service_discount($ito->service_id));?>)</td>
+													<td class="right">(<?php echo Currency::display($o->items_service_discount($ito->service_id));?>)</td>
 												</tr>
 											<?php } ?>
 										<!-- END Service Discount Information -->
 								<?php } ?>
+
 								<?php if ($ito_tax) { ?>
 											<!-- Product Sub Items Tax -->
 											<tr>
 												<td colspan="4">&nbsp;</td>
 												<td><?php echo _('Taxes'); ?></td>
-												<td class="right"><?php echo Currency::display($io->items_service_tax($ito->service_id));?>&nbsp;</td>
+												<td class="right"><?php echo Currency::display($o->items_service_tax($ito->service_id));?>&nbsp;</td>
 											</tr>
 											<!-- END Product Sub Items Tax -->
 									<?php } ?>
-									<?php } ?>
-								<?php } ?>
+								<?php endforeach ?>
+							<?php endif ?>
+
 						</table>
 					</div>
-						</td>
-						<td>&nbsp;</td>
-					</tr>
-				<?php } ?>
-				<?php if ($io->items_index('account')) { ?>
-					<tr>
-						<td><?php echo HTML::image($mediapath->uri(array('file'=>'img/toggle-closed.png')),array('alt'=>'+')); ?></td>
-						<td colspan="2">Other Invoice Items</td>
-						<td>&nbsp;</td>
-					</tr>
-					<tr>
-						<td>&nbsp;</td>
-						<td colspan="2">
-							<div id="detail_toggle_other">
-								<table class="box-full" border="0">
-									<?php foreach ($io->items_index('account') as $id => $ito) { ?>
+				<?php endforeach ?>
+
+				<?php if ($o->items_index('account')) : ?>
+						<div class="accordion-heading">
+							<a class="accordion-toggle" data-toggle="collapse" data-parent="#charges" data-target="#collapse_other">Other Items</a>
+						</div>
+
+						<div id="collapse_<?php echo $rs; ?>" class="accordion-body collapse">
+							<table>
+
+								<?php foreach ($o->items_index('account') as $id => $ito) : ?>
 										<tr>
 											<td>&nbsp;</td>
 											<td><?php echo $ito->trannum();?></td>
@@ -152,67 +140,69 @@
 										<tr>
 											<td colspan="4">&nbsp;</td>
 											<td><?php echo _('Taxes'); ?></td>
-											<td class="right"><?php echo Currency::display($io->items_service_tax($ito->service_id));?>&nbsp;</td>
+											<td class="right"><?php echo Currency::display($o->items_service_tax($ito->service_id));?>&nbsp;</td>
 										</tr>
 										<!-- Product End Sub Items Tax -->
-									<?php } ?>
+								<?php endforeach ?>
+
 							</table>
 						</div>
-						</td>
-						<td>&nbsp;</td>
-					</tr>
-				<?php } ?>
-				<!-- Invoice Sub Total -->
-				<tr>
-					<td class="head" colspan="2">Sub Total of Items:</td>
-					<td class="bold-right" colspan="2"><?php echo $io->subtotal(TRUE); ?></td>
-				</tr>
+				<?php endif ?>
+
+			</div>
+		</div>
+
+	</div> <!-- /span -->
+</div>
+
+<div class="row">
+	<div class="span11">
+		<div class="span5">
+		</div> <!-- /span -->
+
+		<div class="span5">
+			<div class="row">
+				<div class="dl-horizontal">
+					<!-- Sub Total -->
+					<dt>Sub Total</dt>
+					<dd><?php echo $o->subtotal(TRUE); ?></dd>
 					<!-- END Invoice Sub Total -->
-				<?php if ($io->total_credits()) { ?>
+
 					<!-- Invoice Credits -->
-				<tr>
-					<td class="head" colspan="2">Credits Received:</td>
-					<td class="bold-right" colspan="2"><?php echo $io->total_credits(TRUE); ?></td>
-				</tr>
+					<?php if ($o->total_credits()) : ?>
+						<dt>Credits</dt>
+						<dd><?php echo $o->total_credits(TRUE); ?></dd>
+					<?php endif ?>
 					<!-- END Invoice Credits -->
-				<?php } ?>
-				<?php if ($io->total_discounts()) { ?>
+
 					<!-- Invoice Discounts Total -->
-				<tr>
-					<td class="head" colspan="2">Discounts:</td>
-					<td class="bold-right" colspan="2">(<?php echo $io->total_discounts(TRUE); ?>)</td>
-				</tr>
+					<?php if ($o->total_discounts()) : ?>
+						<dt>Discounts</dt>
+						<dd><?php echo $o->total_discounts(TRUE); ?></dd>
+					<?php endif ?>
 					<!-- END Invoice Discounts Total -->
-				<?php } ?>
+
 					<!-- Invoice Taxes Total -->
-				<tr>
-					<td class="head" colspan="4">Taxes Included:</td>
-				</tr>
-				<?php foreach ($io->tax_summary() as $tid => $amount) {
+					<dt>Taxes Included:</dt>
+					<?php foreach ($o->tax_summary() as $tid => $amount) :
 						$m = ORM::factory('Tax',$tid); ?>
-				<tr>
-					<td>&nbsp;</td>
-					<td><?php echo $m->description; ?></td>
-					<td class="bold-right" colspan="2"><?php echo Currency::display($amount); ?></td>
-				</tr>
-				<?php }?>
+						<dd><?php printf('%s (%s)',Currency::display($amount),$m->description); ?><dd>
+					<?php endforeach ?>
 					<!-- END Invoice Taxes Total -->
+
 					<!-- Invoice Total -->
-				<tr>
-					<td class="head" colspan="2">Total This Invoice:</td>
-					<td class="bold-right" colspan="2"><?php echo $io->total(TRUE); ?></td>
-				</tr>
+					<dt>Total This Invoice:</dt>
+					<dd><?php echo $o->total(TRUE); ?></dd>
 					<!-- END Invoice Total -->
 					<!-- Account Total Due -->
-				<tr>
-					<td class="head" colspan="2">Total Outstanding This Account:</td>
-					<td class="bold-right" colspan="2"><?php echo $io->account->invoices_due_total(NULL,TRUE); ?></td>
-				</tr>
+					<dt>Total Outstanding This Account:</dt>
+					<dd><?php echo $o->account->invoices_due_total(NULL,TRUE); ?></dd>
 					<!-- END Account Total Due -->
-			</table>
-		</td>
-	</tr>
-	<tr>
-		<td><?php echo HTML::anchor(URL::link('user','invoice/download/'.$io->id),'Download detailed invoice'); ?></td>
-	</tr>
-</table>
+
+				</div>
+			</div> <!-- /row -->
+		</div> <!-- /span -->
+	</div> <!-- /span -->
+</div>
+
+<?php echo Form::button(URL::link('user','invoice/download/'.$o->id),'Download detailed invoice',array('class'=>'btn btn-primary pull-right')); ?></td>