Multi enhancements, including auto serialization, product editing

2012-03-30 15:13:01 +11:00
parent d9c3394b0f
commit 6807b6ab52
30 changed files with 445 additions and 115 deletions
--- a/modules/service/classes/controller/admin/service.php
+++ b/modules/service/classes/controller/admin/service.php
@@ -59,7 +59,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
 					'id'=>array('label'=>'ID','url'=>'user/service/view/'),
 					'service_name()'=>array('label'=>'Details'),
 					'recur_schedule'=>array('label'=>'Billing'),
-					'price'=>array('label'=>'Price','class'=>'right'),
+					'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 					'active'=>array('label'=>'Active'),
 					'account->accnum()'=>array('label'=>'Cust ID'),
 					'account->name()'=>array('label'=>'Customer'),
@@ -96,7 +96,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
 						'id'=>array('label'=>'ID','url'=>'user/service/view/'),
 						'service_name()'=>array('label'=>'Details'),
 						'recur_schedule'=>array('label'=>'Billing'),
-						'price'=>array('label'=>'Price','class'=>'right'),
+						'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 						'active'=>array('label'=>'Active'),
 						'account->accnum()'=>array('label'=>'Cust ID'),
 						'account->name()'=>array('label'=>'Customer'),
@@ -128,7 +128,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
 							'id'=>array('label'=>'ID','url'=>'user/service/view/'),
 							'service_name()'=>array('label'=>'Details'),
 							'recur_schedule'=>array('label'=>'Billing'),
-							'price'=>array('label'=>'Price','class'=>'right'),
+							'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 							'active'=>array('label'=>'Active'),
 							'account->accnum()'=>array('label'=>'Cust ID'),
 							'account->name()'=>array('label'=>'Customer'),
@@ -201,10 +201,11 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
 					'plugin()->traffic_thismonth()'=>array('label'=>'This Month'),
 					'plugin()->traffic_lastmonth()'=>array('label'=>'Last Month'),
 					'recur_schedule'=>array('label'=>'Billing'),
-					'price'=>array('label'=>'Price','class'=>'right'),
+					'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 					'account->accnum()'=>array('label'=>'Cust ID'),
 					'account->name()'=>array('label'=>'Customer'),
 					'date_next_invoice'=>array('label'=>'Next Invoice'),
+					'product->display("active")'=>array('label'=>'Current'),
 				),
 				array(
 					'type'=>'select',
@@ -238,7 +239,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
 					'plugin()->traffic_thismonth()'=>array('label'=>'This Month'),
 					'plugin()->traffic_lastmonth()'=>array('label'=>'Last Month'),
 					'recur_schedule'=>array('label'=>'Billing'),
-					'price'=>array('label'=>'Price','class'=>'right'),
+					'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 					'account->accnum()'=>array('label'=>'Cust ID'),
 					'account->name()'=>array('label'=>'Customer'),
 					'date_next_invoice'=>array('label'=>'Next Invoice'),
@@ -264,7 +265,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
 					'service_name()'=>array('label'=>'Details'),
 					'plugin()->display("domain_expire")'=>array('label'=>'Expire'),
 					'recur_schedule'=>array('label'=>'Billing'),
-					'price'=>array('label'=>'Price','class'=>'right'),
+					'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 					'account->accnum()'=>array('label'=>'Cust ID'),
 					'account->name()'=>array('label'=>'Customer'),
 					'display("date_next_invoice")'=>array('label'=>'Next Invoice'),
@@ -297,7 +298,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
 						'service_name()'=>array('label'=>'Details'),
 						'plugin()->display("domain_expire")'=>array('label'=>'Expire'),
 						'recur_schedule'=>array('label'=>'Billing'),
-						'price'=>array('label'=>'Price','class'=>'right'),
+						'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 						'account->accnum()'=>array('label'=>'Cust ID'),
 						'account->name()'=>array('label'=>'Customer'),
 						'display("date_next_invoice")'=>array('label'=>'Next Invoice'),
@@ -324,7 +325,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
 					'service_name()'=>array('label'=>'Details'),
 					'plugin()->display("host_expire")'=>array('label'=>'Expire'),
 					'recur_schedule'=>array('label'=>'Billing'),
-					'price'=>array('label'=>'Price','class'=>'right'),
+					'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 					'account->accnum()'=>array('label'=>'Cust ID'),
 					'account->name()'=>array('label'=>'Customer'),
 					'display("date_next_invoice")'=>array('label'=>'Next Invoice'),
@@ -350,7 +351,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
 					'id'=>array('label'=>'ID','url'=>'user/service/view/'),
 					'service_name()'=>array('label'=>'Details'),
 					'recur_schedule'=>array('label'=>'Billing'),
-					'price'=>array('label'=>'Price','class'=>'right'),
+					'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 					'account->accnum()'=>array('label'=>'Cust ID'),
 					'account->name()'=>array('label'=>'Customer'),
 					'display("date_next_invoice")'=>array('label'=>'Next Invoice'),
@@ -533,7 +534,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
 					'service_name()'=>array('label'=>'Details'),
 					'recur_schedule'=>array('label'=>'Billing'),
 					'date_next_invoice'=>array('label'=>'Next Invoice'),
-					'price'=>array('label'=>'Price','class'=>'right'),
+					'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 					'charges_new()'=>array('label'=>'Charges','class'=>'right'),
 					'active'=>array('label'=>'Active'),
 					'account->accnum()'=>array('label'=>'Cust ID'),
@@ -560,7 +561,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
 					throw new Kohana_Exception('Failed to save updates to plugin data for record :record',array(':record'=>$so->id()));

 			if (! $so->values($_POST)->update()->saved())
-				throw new Kohana_Exception('Failed to save updates to plugin data for record :record',array(':record'=>$so->id()));
+				throw new Kohana_Exception('Failed to save updates to service data for record :record',array(':record'=>$so->id()));
 		}

 		Block::add(array(
--- a/modules/service/classes/controller/affiliate/service.php
+++ b/modules/service/classes/controller/affiliate/service.php
@@ -33,7 +33,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
 					'id'=>array('label'=>'ID','url'=>'user/service/view/'),
 					'service_name()'=>array('label'=>'Details'),
 					'recur_schedule'=>array('label'=>'Billing'),
-					'price'=>array('label'=>'Price','class'=>'right'),
+					'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 					'active'=>array('label'=>'Active'),
 					'account->accnum()'=>array('label'=>'Cust ID'),
 					'account->name()'=>array('label'=>'Customer'),
@@ -70,7 +70,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
 						'id'=>array('label'=>'ID','url'=>'user/service/view/'),
 						'service_name()'=>array('label'=>'Details'),
 						'recur_schedule'=>array('label'=>'Billing'),
-						'price'=>array('label'=>'Price','class'=>'right'),
+						'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 						'active'=>array('label'=>'Active'),
 						'account->accnum()'=>array('label'=>'Cust ID'),
 						'account->name()'=>array('label'=>'Customer'),
@@ -107,7 +107,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
 							'id'=>array('label'=>'ID','url'=>'user/service/view/'),
 							'service_name()'=>array('label'=>'Details'),
 							'recur_schedule'=>array('label'=>'Billing'),
-							'price'=>array('label'=>'Price','class'=>'right'),
+							'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 							'active'=>array('label'=>'Active'),
 							'account->accnum()'=>array('label'=>'Cust ID'),
 							'account->name()'=>array('label'=>'Customer'),
@@ -180,7 +180,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
 					'plugin()->traffic_thismonth()'=>array('label'=>'This Month'),
 					'plugin()->traffic_lastmonth()'=>array('label'=>'Last Month'),
 					'recur_schedule'=>array('label'=>'Billing'),
-					'price'=>array('label'=>'Price','class'=>'right'),
+					'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 					'account->accnum()'=>array('label'=>'Cust ID'),
 					'account->name()'=>array('label'=>'Customer'),
 					'date_next_invoice'=>array('label'=>'Next Invoice'),
@@ -217,7 +217,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
 					'plugin()->traffic_thismonth()'=>array('label'=>'This Month'),
 					'plugin()->traffic_lastmonth()'=>array('label'=>'Last Month'),
 					'recur_schedule'=>array('label'=>'Billing'),
-					'price'=>array('label'=>'Price','class'=>'right'),
+					'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 					'account->accnum()'=>array('label'=>'Cust ID'),
 					'account->name()'=>array('label'=>'Customer'),
 					'date_next_invoice'=>array('label'=>'Next Invoice'),
@@ -240,7 +240,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
 					'service_name()'=>array('label'=>'Details'),
 					'plugin()->display("domain_expire")'=>array('label'=>'Expire'),
 					'recur_schedule'=>array('label'=>'Billing'),
-					'price'=>array('label'=>'Price','class'=>'right'),
+					'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 					'account->accnum()'=>array('label'=>'Cust ID'),
 					'account->name()'=>array('label'=>'Customer'),
 					'display("date_next_invoice")'=>array('label'=>'Next Invoice'),
@@ -264,7 +264,7 @@ class Controller_Affiliate_Service extends Controller_TemplateDefault_Affiliate
 					'service_name()'=>array('label'=>'Details'),
 					'plugin()->display("host_expire")'=>array('label'=>'Expire'),
 					'recur_schedule'=>array('label'=>'Billing'),
-					'price'=>array('label'=>'Price','class'=>'right'),
+					'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 					'account->accnum()'=>array('label'=>'Cust ID'),
 					'account->name()'=>array('label'=>'Customer'),
 					'display("date_next_invoice")'=>array('label'=>'Next Invoice'),
--- a/modules/service/classes/controller/user/service.php
+++ b/modules/service/classes/controller/user/service.php
@@ -29,7 +29,7 @@ class Controller_User_Service extends Controller_TemplateDefault_User {
 					'id'=>array('label'=>'ID','url'=>'user/service/view/'),
 					'service_name()'=>array('label'=>'Details'),
 					'recur_schedule'=>array('label'=>'Billing'),
-					'price'=>array('label'=>'Price','class'=>'right'),
+					'price(TRUE,TRUE)'=>array('label'=>'Price','class'=>'right'),
 					'active'=>array('label'=>'Active'),
 				),
 				array(
--- a/modules/service/classes/model/service.php
+++ b/modules/service/classes/model/service.php
@@ -44,10 +44,6 @@ class Model_Service extends ORMOSB {
 		'recur_schedule'=>array(
 			array('StaticList_RecurSchedule::display',array(':value')),
 		),
-		'price'=>array(
-			array('Tax::add',array(':value')),
-			array('Currency::display',array(':value')),
-		),
 	);

 	/**
@@ -77,6 +73,21 @@ class Model_Service extends ORMOSB {
 		return is_null($plugin=$this->plugin()) ? $this->product->name() : $plugin->name();
 	}

+	/**
+	 * Return the service charge
+	 */
+	public function price($tax=FALSE,$format=FALSE) {
+		$x = $this->product->keyget('price_group',$this->recur_schedule);
+
+		// @todo This index shouldnt be hard coded.
+		$p = $this->price ? $this->price : $x[$this->price_group]['price_base'];
+
+		if ($tax)
+			$p = Tax::add($p);
+
+		return $format ? Currency::display($p) : $p;
+	}
+
 	public function service_name() {
 		return is_null($plugin=$this->plugin()) ? $this->name() : $plugin->service_name();
 	}
--- a/modules/service/classes/model/service/billing.php
+++ b/modules/service/classes/model/service/billing.php
@@ -12,5 +12,10 @@
 */
 class Model_Service_Billing extends ORMOSB {
 	protected $_table_name = 'account_billing';
+
+	// Relationships
+	protected $_has_one = array(
+		'checkout'=>array('far_key'=>'checkout_plugin_id','foreign_key'=>'id'),
+	);
 }
 ?>
--- a/modules/service/views/service/admin/update.php
+++ b/modules/service/views/service/admin/update.php
@@ -38,10 +38,6 @@
 					<td>Type</td>
 					<td class="data"><?php echo StaticList_RecurType::display($so->recur_type); ?></td>
 				</tr>
-				<tr>
-					<td>Recur on Weekday</td>
-					<td class="data"><?php echo Form::input('recur_weekday',$so->recur_weekday,array('size'=>4)); ?></td>
-				</tr>
 				<tr>
 					<td>User Can Change Schedule</td>
 					<td class="data"><?php echo StaticList_YesNo::form('recur_schedule_change',$so->recur_schedule_change); ?></td>
--- a/modules/service/views/service/user/view.php
+++ b/modules/service/views/service/user/view.php
@@ -5,8 +5,12 @@
 			<!-- Service Information -->
 			<table class="box-full">
 				<tr>
-					<td style="width: 40%;">Service Active</td>
-					<td style="width: 60%;" class="data"><?php echo $so->display('active'); ?></td>
+					<td style="width: 40%;">Account</td>
+					<td style="width: 60%;" class="data"><?php printf('%s (%s)',$so->account->name(),$so->account->accnum()); ?></td>
+				</tr>
+				<tr>
+					<td>Service Active</td>
+					<td class="data"><?php echo $so->display('active'); ?></td>
 				</tr>
 				<tr>
 					<td>Billing Period</td>
@@ -14,8 +18,14 @@
 				</tr>
 				<tr>
 					<td>Cost</td>
-					<td class="data"><?php echo $so->display('price'); ?></td>
+					<td class="data"><?php echo $so->price(TRUE,TRUE); ?></td>
 				</tr>
+				<?php if (is_null($so->price) OR ($so->price<=$so->product->price($so->price_group,$so->recur_schedule,'price_base'))) { ?>
+				<tr>
+					<td>Service</td>
+					<td class="data"><?php echo HTML::anchor('product/view/'.$so->product_id,$so->product->name()); ?></td>
+				</tr>
+				<?php } ?>
 				<tr>
 					<td>Date Next Invoice</td>
 					<td class="data"><?php echo $so->display('date_next_invoice'); ?></td>
@@ -24,6 +34,12 @@
 					<td>Current Invoices Due</td>
 					<td class="data"><?php echo Currency::display($so->account->invoices_due_total()); ?></td>
 				</tr>
+				<?php if ($so->service_billing->loaded()) { ?>
+				<tr>
+					<td>Direct Debit</td>
+					<td class="data"><?php echo $so->service_billing->checkout->name; ?></td>
+				</tr>
+				<?php } ?>
 			</table>
 			<!-- END Service Information -->
 		</td>