diff --git a/application/classes/Controller/Reseller/Welcome.php b/application/classes/Controller/Reseller/Welcome.php
index 15a5394e..f7899fcb 100644
--- a/application/classes/Controller/Reseller/Welcome.php
+++ b/application/classes/Controller/Reseller/Welcome.php
@@ -94,7 +94,7 @@ class Controller_Reseller_Welcome extends Controller_Welcome {
'date_payment'=>'Pay Date',
'account->accnum()'=>'Num',
'account->name()'=>'Account',
- 'account->status'=>'Active',
+ 'account->display("status")'=>'Active',
'total(TRUE)'=>'Total',
'balance(TRUE)'=>'Balance',
))
diff --git a/modules/adsl/classes/Model/Service/Plugin/Adsl.php b/modules/adsl/classes/Model/Service/Plugin/Adsl.php
index 2a590a8a..91eeb904 100644
--- a/modules/adsl/classes/Model/Service/Plugin/Adsl.php
+++ b/modules/adsl/classes/Model/Service/Plugin/Adsl.php
@@ -32,15 +32,6 @@ class Model_Service_Plugin_Adsl extends Model_Service_Plugin {
);
// Required abstract functions
- public function admin_update() {
- return View::factory('service/admin/adsl/update')
- ->set('mediapath',Route::get('default/media'))
- ->set('so',$this);
- }
-
- /**
- * When does this service expire
- */
public function expire() {
// @todo This should work out if the invoices are currently due, then the expire is the invoice date, otherwise the next invoice date.
return NULL;
@@ -50,6 +41,33 @@ class Model_Service_Plugin_Adsl extends Model_Service_Plugin {
return $this->service_number;
}
+ public function admin_update() {
+ Script::factory()
+ ->type('stdin')
+ ->data('
+$(document).ready(function() {
+ $("#service_connect_date_label").datepicker({
+ autoclose : true,
+ startDate : now,
+ format : "dd-M-yyyy",
+ todayBtn : true,
+ }).on("hide",function(ev) {
+ $("input[id=service_connect_date]").val(ev.date.valueOf()/1000);
+ });
+ $("#service_contract_date_label").datepicker({
+ autoclose : true,
+ startDate : now,
+ format : "dd-M-yyyy",
+ todayBtn : true,
+ }).on("hide",function(ev) {
+ $("input[id=service_contract_date]").val(ev.date.valueOf()/1000);
+ });
+});
+ ');
+
+ return parent::admin_update();
+ }
+
public function product() {
if ($this->provided_adsl_plan_id)
return $this->adsl_plan;
diff --git a/modules/adsl/views/service/admin/adsl/update.php b/modules/adsl/views/service/admin/adsl/update.php
deleted file mode 100644
index 5be29853..00000000
--- a/modules/adsl/views/service/admin/adsl/update.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
Plugin Details
-
-
-
Service Number
-
service_number); ?>
-
-
-
Service Address
-
service_address); ?>
-
-
-
Service Connect Date
-
- service_connect_date,array('id'=>'service_connect_date')); ?>
- uri(array('file'=>'img/calendar.png')),array('alt'=>_('Calendar'),'style'=>'cursor: pointer;')),
- array('title'=>'Click to popup a dialog to select a date graphically','onclick'=>"dateSelector('service_connect_date')")); ?>
-
-
-
-
-
Service Contract Date
-
- service_contract_date,array('id'=>'service_contract_date')); ?>
- uri(array('file'=>'img/calendar.png')),array('alt'=>_('Calendar'),'style'=>'cursor: pointer;')),
- array('title'=>'Click to popup a dialog to select a date graphically','onclick'=>"dateSelector('service_contract_date')")); ?>
-
-
-
-
-
Service Username
-
service_username); ?>
-
-
-
Service Password
-
service_password); ?>
-
-
-
Service IP Address
-
ipaddress); ?>
-
-
diff --git a/modules/adsl/views/service/admin/plugin/adsl/edit.php b/modules/adsl/views/service/admin/plugin/adsl/edit.php
new file mode 100644
index 00000000..a47de888
--- /dev/null
+++ b/modules/adsl/views/service/admin/plugin/adsl/edit.php
@@ -0,0 +1,45 @@
+
- date_next_invoice,array('id'=>'date_next_invoice')); ?>
- uri(array('file'=>'img/calendar.png')),array('alt'=>_('Calendar'),'style'=>'cursor: pointer;')),
- array('title'=>'Click to popup a dialog to select a date graphically','onclick'=>"dateSelector('date_next_invoice')")); ?>
-
-
-
-
-
Taxable
-
taxable); ?>
-
-
-
Suspend Billing
-
suspend_billing); ?>
-
-
- '.$plugin_form; } ?>
-
-
-
-
-'form_button')); ?>
-
diff --git a/modules/ssl/classes/Model/Service/Plugin/Ssl.php b/modules/ssl/classes/Model/Service/Plugin/Ssl.php
index 1c954dad..1db5a578 100644
--- a/modules/ssl/classes/Model/Service/Plugin/Ssl.php
+++ b/modules/ssl/classes/Model/Service/Plugin/Ssl.php
@@ -104,13 +104,6 @@ class Model_Service_Plugin_Ssl extends Model_Service_Plugin {
}
}
- // @todo This needs to be validated for this model
- public function admin_update() {
- return View::factory('service/admin/plugin/ssl/update')
- ->set('mediapath',Route::get('default/media'))
- ->set('o',$this);
- }
-
public function download_button() {
if (! $this->service->status OR ! preg_match('/client/',$this->service->product->plugin()->extensions) OR $this->valid_to() < time())
return '';
diff --git a/modules/ssl/views/service/admin/plugin/ssl/edit.php b/modules/ssl/views/service/admin/plugin/ssl/edit.php
new file mode 100644
index 00000000..e203a691
--- /dev/null
+++ b/modules/ssl/views/service/admin/plugin/ssl/edit.php
@@ -0,0 +1,17 @@
+