deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Added invoice reminder details and other misc fixes

Browse Source
This commit is contained in:
Deon George
2013-10-29 10:41:14 +11:00
parent c347032497
commit 1407da5e01
8 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
application/classes/Config.php
View File

@@ -64,17 +64,20 @@ class Config extends Kohana_Config {
return Company::instance()->country();
}
/**
* Show a date using a site configured format
*/
public static function date($date) {
return is_null($date) ? '' : date(Company::instance()->date_format(),$date);
}
/**
* Show a date using a site configured format
* Show a date using a site configured format
* @note We need this function here, since we call static:: methods, which need to resolve to the child class.
*/
public static function datetime($date) {
return sprintf('%s %s',static::date($date),static::time($date));
}
*/
public static function datetime($date) {
return sprintf('%s %s',static::date($date),static::time($date));
}
public static function language() {
return Company::instance()->language();
@@ -138,6 +141,9 @@ class Config extends Kohana_Config {
return array_key_exists(strtolower($module),static::modules()) ? TRUE : FALSE;
}
/**
* Work out our site ID for multiehosting
*/
public static function siteid($format=FALSE) {
return Company::instance()->site($format);
}
@@ -173,6 +179,9 @@ class Config extends Kohana_Config {
return 'theme/'.(URL::admin_url() ? Kohana::$config->load('config')->theme_admin : Kohana::$config->load('config')->theme);
}
/**
* Show a date using a site configured format
*/
public static function time($date) {
return date(Company::instance()->time_format(),($date ? $date : time()));
}

2
application/classes/Controller/TemplateDefault.php
View File

@@ -9,7 +9,7 @@
* @copyright (c) 2009-2013 Open Source Billing
* @license http://dev.osbill.net/license.html
*/
class Controller_TemplateDefault extends lnApp_Controller_TemplateDefault {
abstract class Controller_TemplateDefault extends lnApp_Controller_TemplateDefault {
protected $auth_required = TRUE;
// Our acccount object

8
application/classes/Minion/Task.php
View File

@@ -17,9 +17,9 @@ abstract class Minion_Task extends Kohana_Minion_Task {
/**
* Override our __construct so that we can specify options in each class file
*/
protected function __construct() {
// Populate $_accepted_options based on keys from $_options
$this->_accepted_options = array_keys(Arr::merge($this->_sysoptions,$this->_options));
}
protected function __construct() {
// Populate $_accepted_options based on keys from $_options
$this->_accepted_options = array_keys(Arr::merge($this->_sysoptions,$this->_options));
}
}
?>