More minor fixes

This commit is contained in:
Deon George
2012-03-31 14:33:13 +11:00
parent 6807b6ab52
commit d2bc1bd451
8 changed files with 103 additions and 36 deletions

View File

@@ -1,41 +1,36 @@
<!-- @todo NEEDS TO BE TRANSLATED -->
<table class="box-left" width="100%">
<tr>
<td class="head" colspan="2">Transactions for this service</td>
<table class="list-box-left">
<tr class="list-head">
<th>ID</th>
<th>Invoice</th>
<th>Product</th>
<th>IT</th>
<th>RS</th>
<th>Start</th>
<th>Stop</th>
<th>Desc</th>
<th>Quantity</th>
<th>Charge</th>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td>ID</td>
<td>Invoice</td>
<td>Product</td>
<td>IT</td>
<td>RS</td>
<td>Start</td>
<td>Stop</td>
<td>Desc</td>
<td>Charge</td>
<td>Quantity</td>
</tr>
<?php $lp=NULL;$i=0; foreach ($so->transactions() as $iio) { ?>
<?php $lp=NULL; foreach ($so->transactions()->find_all() as $iio) { ?>
<?php if (! is_null($iio->product_id) AND $lp != $iio->product_id) {
$lp = $iio->product_id; ?>
<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
<td class="head" colspan="10"><?php echo sprintf('%s: %s',$iio->product_id,$iio->product->name()); ?></td>
<tr class="list-sub-head">
<th class="id"><?php echo $iio->product_id; ?></th>
<th colspan="9"><?php echo $iio->product->name(); ?></th>
</tr>
<?php } ?>
<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
<td class="icon" width="20px"><?php echo $iio->id; ?></td>
<td class="data"><?php echo HTML::anchor('/user/invoice/view/'.$iio->invoice_id,$iio->invoice_id); ?></td>
<td class="data"><?php echo $iio->display('product_id'); ?></td>
<td class="data"><?php echo $iio->display('item_type'); ?></td>
<td class="data"><?php echo $iio->display('recurring_schedule'); ?></td>
<td class="data"><?php echo $iio->display('date_start'); ?></td>
<td class="data"><?php echo $iio->display('date_stop'); ?></td>
<td class="data"><?php echo $iio->display('product_name'); ?></td>
<td class="data"><?php echo $iio->display('price_base'); ?></td>
<td class="data"><?php echo $iio->display('quantity'); ?></td>
<tr class="list-data">
<td class="id"><?php echo $iio->id; ?></td>
<td><?php echo HTML::anchor('/user/invoice/view/'.$iio->invoice_id,$iio->invoice_id); ?></td>
<td><?php echo $iio->display('product_id'); ?></td>
<td><?php echo $iio->display('item_type'); ?></td>
<td><?php echo $iio->display('recurring_schedule'); ?></td>
<td><?php echo $iio->display('date_start'); ?></td>
<td><?php echo $iio->display('date_stop'); ?></td>
<td><?php echo $iio->display('product_name'); ?></td>
<td><?php echo $iio->display('quantity'); ?></td>
<td class="right"><?php echo $iio->display('price_base'); ?></td>
</tr>
<?php } ?>
</table>