Fixes from live

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "includes/kohana"]
 	path = includes/kohana
-	url = ssh://10.1.3.20/afs/local/git/lnkohana
+	url = ssh://link.leenooks.net/afs/local/git/lnkohana
 [submodule "modules/lnApp"]
 	path = modules/lnApp
-	url = ssh://10.1.3.20/afs/local/git/lnapp
+	url = ssh://link.leenooks.net/afs/local/git/lnapp
 [submodule "modules/highchart"]
 	path = modules/highchart
-	url = ssh://10.1.3.20/afs/local/git/lnhighchart
+	url = ssh://link.leenooks.net/afs/local/git/lnhighchart

application/classes/Model/Account.php

@@ -13,7 +13,6 @@ class Model_Account extends Model_Auth_UserDefault {
 	// Relationships
 	protected $_has_many = array(
 		'user_tokens'=>array('model'=>'user_token'),
-		'service_billing'=>array('far_key'=>'id'),
 		'email_log'=>array('far_key'=>'id'),
 		'group'=>array('through'=>'account_group'),
 		'invoice'=>array('far_key'=>'id'),

application/classes/Period.php

@@ -70,9 +70,6 @@ class Period {
 
 			// Triennial
 			case 6:
-				if ($strict)
-					throw new Kohana_Exception('Strict not implemented here');
-
 				$inc_months = 36;
 				break;
 

modules/checkout/classes/Checkout/Plugin/Paypal.php

@@ -86,7 +86,6 @@ abstract class Checkout_Plugin_Paypal extends Checkout_Plugin {
 				// Verify that the IPN is for us.
 				// @todo This should be in the DB.
 				if ($cno->data['business'] == ($this->test_mode ? $this->email_test : $this->email_prod)) {
-
 					switch ($cno->data['payment_status']) {
 						case 'Completed':
 							// Our cart items total.

modules/checkout/classes/Model/Checkout.php

@@ -11,8 +11,8 @@
  */
 class Model_Checkout extends ORM_OSB {
 	protected $_has_many = array(
-		'account'=>array('through'=>'account_billing','foreign_key'=>'checkout_id'),
 		'payment'=>array(),
+		'service'=>array('through'=>'account_billing','foreign_key'=>'checkout_id'),
 	);
 
 	protected $_sorting = array('name'=>'ASC');

modules/host/classes/Host/Plugin/Cpanel.php

@@ -40,7 +40,7 @@ echo __METHOD__;die();
 	}
 
 	public function manage_button(Model_Service_Plugin_Host $spho,$t) {
-		return $this->render_button($t,$spho->service_id,$spho->username_value(),substr(md5($spho->password_value()),0,8));
+		return $this->render_button($t,$spho->service_id,$spho->username(),substr(md5($spho->password()),0,8));
 	}
 	public function admin_manage_button(Model_Host_Server $hso,$t) {
 		return $this->render_button($t,$hso->id,substr(md5($hso->manage_username),0,8),substr(md5($hso->manage_password),0,8));

modules/host/classes/Host/Plugin/Plesk.php

@@ -54,7 +54,7 @@ abstract class Host_Plugin_Plesk extends Host_Plugin {
 	}
 
 	public function manage_button(Model_Service_Plugin_Host $spho,$t) {
-		return $this->render_button($t,$spho->service_id,$spho->username_value(),substr(md5($spho->password_value()),0,8));
+		return $this->render_button($t,$spho->service_id,$spho->username(),substr(md5($spho->password()),0,8));
 	}
 	public function admin_manage_button(Model_Host_Server $hso,$t) {
 		return $this->render_button($t,$hso->id,substr(md5($hso->manage_username),0,8),substr(md5($hso->manage_password),0,8));

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

@@ -38,23 +38,25 @@ class Task_Invoice_Email extends Minion_Task {
 			if (++$max_count > $max)
 				break;
 
-			if (Invoice::instance($io)->render('email','all')) {
-				// Log the emailling
-				$imo = $io->invoice_memo;
-				$imo->invoice_id = $io->id;
-				$imo->type = 'email';
-				$imo->memo = 'Invoice Emailed.';
-				$imo->save();
+			// Log the emailling
+			$imo = $io->invoice_memo;
+			$imo->invoice_id = $io->id;
+			$imo->type = 'email';
 
-				$io->print_status = 1;
-				$io->set_remind($key,time(),($params['force']=='again' ? TRUE : FALSE));
-				$io->save();
+			if (Invoice::instance($io)->render('email','all')) {
+				$imo->memo = 'Invoice Emailed.';
 
 				array_push($action,(string)$io);
 
 			} else {
-				throw new Kohana_Exception('Unable to send invoice :io',array(':io'=>$io->id));
+				$imo->memo = 'Invoice Send Failed.';
 			}
+
+			$imo->save();
+
+			$io->print_status = 1;
+			$io->set_remind($key,time(),($params['force']=='again' ? TRUE : FALSE));
+			$io->save();
 		}
 
 		return _('Invoiced emailed: ').join('|',$action);

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

@@ -61,8 +61,8 @@ class Payment_Bulk_Ezypay {
 				$po->checkout_data = array('transid'=>$array[2].':'.$array[3]);
 				$po->date_payment = strtotime(str_replace('/','-',$array[8]));
 
-				$sbo = $po->account->service_billing->where('checkout_data','=',$array[3])->find();
-				if (! $sbo->loaded())
+				$sbo = ORM::factory('Service_Billing')->where('checkout_data','=',$array[3])->find();
+				if (! $sbo->loaded() OR $sbo->service->account_id != $aid)
 					throw HTTP_Exception::factory(501,'No Service Billing Data for :aid (:pd)?',array(':aid'=>$aid,':pd'=>$array[3]));
 
 				$po->checkout_id = $sbo->checkout_id;

modules/product/classes/Model/Product.php

@@ -55,6 +55,8 @@ class Model_Product extends ORM_OSB implements Invoicable {
 			case 0:
 			case 7:
 				return 'Service';
+			case 6:
+				return 'Service Cancellation';
 			default:
 				return 'Product Charge';
 		}

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

@@ -81,10 +81,8 @@ class Controller_Reseller_Service extends Controller_Service {
 		foreach (ORM::factory('Checkout')->find_all() as $co) {
 			$svs = array();
 
-			foreach ($co->account->where('account.id','IN',$this->ao->RTM->customers($this->ao->RTM))->find_all() as $ao)
-				foreach ($ao->service->list_active() as $so)
-					if ($so->service_billing->checkout_id == $co->id)
-						array_push($svs,$so);
+			foreach ($co->service->where('service.account_id','IN',$this->ao->RTM->customers($this->ao->RTM))->find_all() as $so)
+				array_push($svs,$so);
 
 			if ($svs)
 				Block::factory()

modules/service/classes/Model/Service/Billing.php

@@ -15,6 +15,7 @@ class Model_Service_Billing extends ORM_OSB {
 	// Relationships
 	protected $_has_one = array(
 		'checkout'=>array('far_key'=>'checkout_id','foreign_key'=>'id'),
+		'service'=>array('far_key'=>'service_id','foreign_key'=>'id'),
 	);
 
 	protected $_display_filters = array(