diff --git a/application/classes/Controller/Reseller/Account.php b/application/classes/Controller/Reseller/Account.php index 2fb1b48c..07a2638e 100644 --- a/application/classes/Controller/Reseller/Account.php +++ b/application/classes/Controller/Reseller/Account.php @@ -117,7 +117,7 @@ class Controller_Reseller_Account extends Controller_Account { $i = Invoice::instance(); foreach ($ao->service->list_active() as $io) - if (! $io->suspend_billing) + if (! $io->suspend_billing AND ! $io->external_billing) $i->add_service($io); Block::factory() diff --git a/application/classes/Model/Account.php b/application/classes/Model/Account.php index b102640b..ce81b72c 100644 --- a/application/classes/Model/Account.php +++ b/application/classes/Model/Account.php @@ -40,6 +40,8 @@ class Model_Account extends Model_Auth_UserDefault { ), ); + protected $_form = array('id'=>'id','value'=>'name(TRUE)'); + protected $_save_message = TRUE; /** diff --git a/application/classes/ORM.php b/application/classes/ORM.php index 42bfd483..36a0b8f5 100644 --- a/application/classes/ORM.php +++ b/application/classes/ORM.php @@ -209,6 +209,23 @@ abstract class ORM extends Kohana_ORM { return $result; } + /** + * Return an array of data that can be used in a SELECT statement. + * The ID and VALUE is defined in the model for the select. + */ + public function list_select($blank=FALSE) { + $result = array(); + + if ($blank) + $result[] = ''; + + if ($this->_form AND array_intersect(array('id','value'),$this->_form)) + foreach ($this->find_all() as $o) + $result[$o->{$this->_form['id']}] = $o->resolve($this->_form['value']); + + return $result; + } + /** * This function is used so that methods can be called via variables */ diff --git a/application/classes/ORM/OSB.php b/application/classes/ORM/OSB.php index 1043951a..9e94ce45 100644 --- a/application/classes/ORM/OSB.php +++ b/application/classes/ORM/OSB.php @@ -283,22 +283,5 @@ abstract class ORM_OSB extends ORM { return $x->find_all()->count(); } - - /** - * Return an array of data that can be used in a SELECT statement. - * The ID and VALUE is defined in the model for the select. - */ - public function list_select($blank=FALSE) { - $result = array(); - - if ($blank) - $result[] = ''; - - if ($this->_form AND array_intersect(array('id','value'),$this->_form)) - foreach ($this->find_all() as $o) - $result[$o->{$this->_form['id']}] = $o->resolve($this->_form['value']); - - return $result; - } } ?> diff --git a/application/views/userguide/template.php b/application/views/userguide/template.php index 454a31a7..ea27ba48 100644 --- a/application/views/userguide/template.php +++ b/application/views/userguide/template.php @@ -1,9 +1,9 @@ - +
-Date | -Type | -Amt | -Total | -