Fixes for live environment and updates to admin/service/update

modules/service/views/service/admin/adsl/update.php

@@ -1,36 +1,36 @@
 <!-- @todo NEEDS TO BE TRANSLATED -->
 <table width="100%">
 	<tr>
-		<td class="head">Plugin Details</td>
+		<td class="head" colspan="2">Plugin Details</td>
 	</tr>
 	<tr>
-		<td style="width: 50%; vertical-align: top;">
-			<table>
-				<tr>
-					<td style="width: 40%;">Service Number</td>
-					<td style="width: 60%;" class="data"><?php echo Form::input('plugin[service_number]',$so->service_number); ?></td>
-				</tr>
-				<tr>
-					<td>Service Address</td>
-					<td class="data"><?php echo Form::input('plugin[service_address]',$so->service_address); ?></td>
-				</tr>
-				<tr>
-					<td>Service Connect Date</td>
-					<td class="data"><?php echo Form::input('plugin[service_connect_date]',$so->service_connect_date); ?></td>
-				</tr>
-				<tr>
-					<td>Service Username</td>
-					<td class="data"><?php echo Form::input('plugin[service_username]',$so->service_username); ?></td>
-				</tr>
-				<tr>
-					<td>Service Password</td>
-					<td class="data"><?php echo Form::input('plugin[service_password]',$so->service_password); ?></td>
-				</tr>
-				<tr>
-					<td>Service IP Address</td>
-					<td class="data"><?php echo Form::input('plugin[ipaddress]',$so->ipaddress); ?></td>
-				</tr>
-			</table>
+		<td style="width: 40%;">Service Number</td>
+		<td style="width: 60%;" class="data"><?php echo Form::input('plugin[service_number]',$so->service_number); ?></td>
+	</tr>
+	<tr>
+		<td>Service Address</td>
+		<td class="data"><?php echo Form::input('plugin[service_address]',$so->service_address); ?></td>
+	</tr>
+	<tr>
+		<td>Service Connect Date</td>
+		<td class="data">
+			<?php echo Form::input('plugin[service_connect_date]',$so->service_connect_date,array('id'=>'service_connect_date')); ?>
+			<?php echo HTML::anchor('#',
+				HTML::image($mediapath->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')")); ?>
+			<script type="text/javascript">defaults['service_connect_date'] = '%s';</script>
 		</td>
 	</tr>
+	<tr>
+		<td>Service Username</td>
+		<td class="data"><?php echo Form::input('plugin[service_username]',$so->service_username); ?></td>
+	</tr>
+	<tr>
+		<td>Service Password</td>
+		<td class="data"><?php echo Form::input('plugin[service_password]',$so->service_password); ?></td>
+	</tr>
+	<tr>
+		<td>Service IP Address</td>
+		<td class="data"><?php echo Form::input('plugin[ipaddress]',$so->ipaddress); ?></td>
+	</tr>
 </table>

modules/service/views/service/admin/list/adslservices_body.php

@@ -2,7 +2,7 @@
 	<td><?php echo $service->service_adsl->display('service_number'); ?></td>
 	<td><?php echo $service->service_adsl->ipaddress(); ?></td>
 	<td><?php printf('%s (%s)',$service->name(),$service->id); ?></td>
-	<td><?php echo $service->service_adsl->adsl_plan->allowance(); ?></td>
+	<td><?php echo $service->product->prod_plugin_file ? $service->product->plugin()->allowance() : 'No Details'; ?></td>
 	<td><?php echo $service->service_adsl->traffic_thismonth(); ?></td>
 	<td><?php echo $service->service_adsl->traffic_lastmonth(); ?></td>
 	<td><?php echo $service->display('price'); ?></td>

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

@@ -3,7 +3,7 @@
 <table width="100%">
 	<tr>
 		<td style="width: 50%; vertical-align: top;">
-			<table>
+			<table width="100%">
 				<tr>
 					<td style="width: 40%;">Service Active</td>
 					<td style="width: 60%;" class="data"><?php echo StaticList_YesNo::form('active',$so->active); ?></td>
@@ -22,7 +22,13 @@
 				</tr>
 				<tr>
 					<td>Date Next Invoice</td>
-					<td class="data"><?php echo $so->display('date_next_invoice'); ?></td>
+					<td class="data">
+						<?php echo Form::input('date_next_invoice',$so->date_next_invoice,array('id'=>'date_next_invoice')); ?>
+						<?php echo HTML::anchor('#',
+							HTML::image($mediapath->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')")); ?>
+						<script type="text/javascript">defaults['date_next_invoice'] = '%s';</script>
+					</td>
 				</tr>
 				<tr>
 					<td>Taxable</td>

modules/service/views/service/user/adsl/view.php

@@ -67,6 +67,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td colspan="2"><?php echo $so->graph_traffic(isset($_POST['month']) ? $_POST['month'] : ''); ?><td>
+		<td><?php echo $so->graph_traffic(isset($_POST['month']) ? $_POST['month'] : ''); ?><td>
+		<td><?php echo $so->table_traffic(isset($_POST['month']) ? $_POST['month'] : ''); ?><td>
 	</tr>
 </table>

modules/service/views/service/user/list.php

@@ -12,7 +12,7 @@
 		<tr class="<?php echo ++$i%2 ? 'odd' : 'even'; ?>">
 			<td><?php echo HTML::anchor('user/service/view/'.$service->id,$service->id); ?></td>
 			<td><?php echo $service->display('type'); ?></td>
-			<td><?php echo $service->invoice_display(); ?></td>
+			<td><?php echo $service->name(); ?></td>
 			<td><?php echo $service->display('recur_schedule');?></td>
 			<td><?php echo $service->display('price'); ?></td>
 			<td><?php echo $service->display('active'); ?></td>