From 2322a802de0c14443620b5f1bab2e13803ae8642 Mon Sep 17 00:00:00 2001 From: Deon George Date: Wed, 5 Jun 2013 13:42:55 +1000 Subject: [PATCH] Minor fixes from live site. --- .../adsl/views/product/category/list/adslcompare-large.php | 4 ++-- modules/adsl/views/product/category/list/adslcompare.php | 4 ++-- modules/invoice/classes/Task/Invoice/Reminddue.php | 2 +- modules/lnApp | 2 +- modules/payment/classes/Controller/Admin/Payment.php | 4 ++-- modules/payment/classes/Payment/Bulk/Ezypay.php | 2 +- modules/service/classes/Controller/Admin/Service.php | 7 +++++-- modules/ssl/views/service/admin/plugin/ssl/update.php | 6 +++--- 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/modules/adsl/views/product/category/list/adslcompare-large.php b/modules/adsl/views/product/category/list/adslcompare-large.php index 9d0ba5d8..45d87e67 100644 --- a/modules/adsl/views/product/category/list/adslcompare-large.php +++ b/modules/adsl/views/product/category/list/adslcompare-large.php @@ -11,7 +11,7 @@ Plan Name products() as $po) : ?> - title(); ?> + title(); ?> (id; ?>) @@ -26,7 +26,7 @@ - Setup + Connection products() as $po) : ?> $price(0,1,'price_setup',TRUE)); ?> diff --git a/modules/adsl/views/product/category/list/adslcompare.php b/modules/adsl/views/product/category/list/adslcompare.php index 4a84d6ca..41081b39 100644 --- a/modules/adsl/views/product/category/list/adslcompare.php +++ b/modules/adsl/views/product/category/list/adslcompare.php @@ -21,7 +21,7 @@
- title(); ?> + title(); ?> (id; ?>)
@@ -33,7 +33,7 @@
    -
  • $price(0,1,'price_setup',TRUE)); ?> setup
    • +
  • $price(0,1,'price_setup',TRUE)); ?> Connection
  • plugin()->adsl_supplier_plan->display('speed'); ?> Speed
  • plugin()->base_down_peak/1000; ?>GB Peak Downloads
    • plugin()->base_down_offpeak) : ?> diff --git a/modules/invoice/classes/Task/Invoice/Reminddue.php b/modules/invoice/classes/Task/Invoice/Reminddue.php index 5fbb8c13..d8ed2237 100644 --- a/modules/invoice/classes/Task/Invoice/Reminddue.php +++ b/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 diff --git a/modules/lnApp b/modules/lnApp index 5064f089..d3627ace 160000 --- a/modules/lnApp +++ b/modules/lnApp @@ -1 +1 @@ -Subproject commit 5064f0899925bc2b866937cc30a671c32fb528e7 +Subproject commit d3627ace8fc427abe493044f387a802dfc7f09d1 diff --git a/modules/payment/classes/Controller/Admin/Payment.php b/modules/payment/classes/Controller/Admin/Payment.php index 3bcb1bf7..f5e59b31 100644 --- a/modules/payment/classes/Controller/Admin/Payment.php +++ b/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 diff --git a/modules/payment/classes/Payment/Bulk/Ezypay.php b/modules/payment/classes/Payment/Bulk/Ezypay.php index f27a1a07..01d80532 100644 --- a/modules/payment/classes/Payment/Bulk/Ezypay.php +++ b/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') diff --git a/modules/service/classes/Controller/Admin/Service.php b/modules/service/classes/Controller/Admin/Service.php index e90cb97a..e005e081 100644 --- a/modules/service/classes/Controller/Admin/Service.php +++ b/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'), diff --git a/modules/ssl/views/service/admin/plugin/ssl/update.php b/modules/ssl/views/service/admin/plugin/ssl/update.php index 0e50472d..fe47ed19 100644 --- a/modules/ssl/views/service/admin/plugin/ssl/update.php +++ b/modules/ssl/views/service/admin/plugin/ssl/update.php @@ -1,14 +1,14 @@ - + - + - +
    CSRservice->plugin()->csr,array('cols'=>64,'rows'=>13)); ?>service->plugin()->csr,array('cols'=>64,'rows'=>13,'nowysihtml'=>TRUE)); ?>
    PKservice->plugin()->pk,array('cols'=>64,'rows'=>13)); ?>service->plugin()->pk,array('cols'=>64,'rows'=>13,'nowysihtml'=>TRUE)); ?>
    Certservice->plugin()->cert,array('cols'=>64,'rows'=>13)); ?>service->plugin()->cert,array('cols'=>64,'rows'=>13,'nowysihtml'=>TRUE)); ?>