Minor fixes from live site.

modules/adsl/views/product/category/list/adslcompare-large.php

@@ -11,7 +11,7 @@
 					<tr class="plan-header">
 					<th class="plan-title">Plan Name</th>
 					<?php $c=0; foreach ($o->products() as $po) : ?>
-						<td class="plan-title"><?php echo $po->title(); ?></td>
+						<td class="plan-title"><?php echo $po->title(); ?> <small>(<?php echo $po->id; ?>)</small></td>
 					<?php endforeach ?>
 					</tr>
 
@@ -26,7 +26,7 @@
 					</tr>
 
 					<tr class="plan-features">
-					<th>Setup</th>
+					<th>Connection</th>
 					<?php $c=0; foreach ($o->products() as $po) : ?>
 						<td><span class="note">$</span><?php echo Currency::display($po->price(0,1,'price_setup',TRUE)); ?></td>
 					<?php endforeach ?>

modules/adsl/views/product/category/list/adslcompare.php

@@ -21,7 +21,7 @@
  							<div class="plan-header">
 
 								<div class="plan-title">
-									<?php echo $po->title(); ?>
+									<?php echo $po->title(); ?> <small>(<?php echo $po->id; ?>)</small>
 								</div> <!-- /plan-title -->
 
 								<div class="plan-price">
@@ -33,7 +33,7 @@
 
 							<div class="plan-features">
 								<ul>
-									<li><span class="note">$</span><strong><?php echo Currency::display($po->price(0,1,'price_setup',TRUE)); ?></strong> setup</li>
+									<li><span class="note">$</span><strong><?php echo Currency::display($po->price(0,1,'price_setup',TRUE)); ?></strong> Connection</li>
 									<li><strong><?php echo $po->plugin()->adsl_supplier_plan->display('speed'); ?></strong> Speed</li>
 									<li><strong><?php echo $po->plugin()->base_down_peak/1000; ?></strong>GB Peak Downloads</li>
 									<?php if ($po->plugin()->base_down_offpeak) : ?>

modules/invoice/classes/Task/Invoice/Reminddue.php

@@ -18,7 +18,7 @@ class Task_Invoice_Reminddue extends Minion_Task {
 		foreach (ORM::factory('Invoice')->list_due(time()+86400*$days) as $io) {
 			// @todo Use another option to supress reminders
 			// If we have already sent a reminder, we'll skip to the next one.
-			if (($io->remind($key) AND (is_null($x=$this->request->param('id')) OR $x != 'again')) OR ($io->account->invoice_delivery != 1))
+			if ($io->remind($key) OR ($io->account->invoice_delivery != 1))
 				continue;
 
 			// Generate a token to view the invoice online

modules/lnApp

@@ -1 +1 @@
-Subproject commit 5064f0899925bc2b866937cc30a671c32fb528e7
+Subproject commit d3627ace8fc427abe493044f387a802dfc7f09d1

modules/payment/classes/Controller/Admin/Payment.php

@@ -91,9 +91,9 @@ class Controller_Admin_Payment extends Controller_Payment {
 				foreach ($_POST['payment_item'] as $k=>$v) {
 					$pio = $po->payment_item;
 					$pio->invoice_id = $k;
-					$pio->alloc_amt = is_numeric($v) ? $v : 0;
+					$pio = $po->add_item($pio);
 
-					$po->add_item($pio);
+					$pio->alloc_amt = is_numeric($v) ? $v : 0;
 				}
 
 			// Entry updated

modules/payment/classes/Payment/Bulk/Ezypay.php

@@ -104,7 +104,7 @@ class Payment_Bulk_Ezypay {
 				'account->name()'=>'Customer',
 			))
 			->prepend(array(
-				'id'=>array('url'=>URL::link('admin','payment/view/')),
+				'id'=>array('url'=>URL::link('admin','payment/edit/')),
 			));
 
 		return View::factory('payment/admin/addbulk/ezypay_processed')

modules/service/classes/Controller/Admin/Service.php

@@ -31,7 +31,10 @@ class Controller_Admin_Service extends Controller_Service {
 		$result += ORM::factory('Service')->list_autocomplete(
 			isset($_REQUEST['term']) ? $_REQUEST['term'] : '',
 			'id',
-			isset($_REQUEST['aid']) ? array(array('account_id','=',$_REQUEST['aid'])) : array());
+			'id',
+			array('SVC %s: %s'=>array('id','service_name(TRUE)')),
+			isset($_REQUEST['aid']) ? array(array('account_id','=',$_REQUEST['aid'])) : array()
+		);
 
 		$this->auto_render = FALSE;
 		$this->response->headers('Content-Type','application/json');
@@ -100,7 +103,7 @@ class Controller_Admin_Service extends Controller_Service {
 			'title'=>_('ADSL Services'),
 			'body'=>Table::display(
 				$svs,
-				NULL,
+				50,
 				array(
 					'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
 					'service_name()'=>array('label'=>'Service'),

modules/ssl/views/service/admin/plugin/ssl/update.php

@@ -1,14 +1,14 @@
 <table border="0">
 	<tr>
 		<td style="width: 40%;">CSR</td>
-		<td style="width: 60%;"><?php echo FORM::textarea('plugin[csr]',$so->service->plugin()->csr,array('cols'=>64,'rows'=>13)); ?></td>
+		<td style="width: 60%;"><?php echo FORM::textarea('plugin[csr]',$so->service->plugin()->csr,array('cols'=>64,'rows'=>13,'nowysihtml'=>TRUE)); ?></td>
 	</td>
 	<tr>
 		<td>PK</td>
-		<td><?php echo FORM::textarea('plugin[pk]',$so->service->plugin()->pk,array('cols'=>64,'rows'=>13)); ?></td>
+		<td><?php echo FORM::textarea('plugin[pk]',$so->service->plugin()->pk,array('cols'=>64,'rows'=>13,'nowysihtml'=>TRUE)); ?></td>
 	</td>
 	<tr>
 		<td>Cert</td>
-		<td><?php echo FORM::textarea('plugin[cert]',$so->service->plugin()->cert,array('cols'=>64,'rows'=>13)); ?></td>
+		<td><?php echo FORM::textarea('plugin[cert]',$so->service->plugin()->cert,array('cols'=>64,'rows'=>13,'nowysihtml'=>TRUE)); ?></td>
 	</td>
 </table>