Work on invoice printing - to clean up

application/classes/company.php

@@ -15,14 +15,57 @@ class Company {
 		return new Company;
 	}
 
+	public static function street() {
+		// @todo Details should be obtained from DB
+		return 'PO Box 149';
+	}
+
+	public static function city() {
+		// @todo Details should be obtained from DB
+		return 'Bendigo';
+	}
+
+	public static function state() {
+		// @todo Details should be obtained from DB
+		return 'VIC';
+	}
+
+	public static function pcode() {
+		// @todo Details should be obtained from DB
+		return '3550';
+	}
+
 	public static function address($ln='<br/>') {
-		// @todo Company address should be calculated
-		return implode($ln,array('PO Box 149','Bendigo, VIC 3550'));
+		return implode($ln,array(static::street(),sprintf('%s, %s %s',static::city(),static::state(),static::pcode())));
+	}
+
+	public static function phone() {
+		// @todo Company phone should be obtained from db
+		return '03 5410 1135';
+	}
+
+	public static function fax() {
+		// @todo Details should be obtained from DB
+		return '03 5410 1145';
 	}
 
 	public static function contacts() {
-		// @todo Company phone should be calculated
-		return 'Tel: 03 5410 1135';
+		return 'Tel: '.static::phone();
+	}
+
+	public static function bsb() {
+		// @todo Details should be obtained from DB
+		return Kohana::config('config.bsb');
+	}
+
+	public static function account() {
+		// @todo Details should be obtained from DB
+		return Kohana::config('config.accnum');
+	}
+
+	public static function taxid() {
+		// @todo Details should be obtained from DB
+		return Kohana::config('config.taxid');
 	}
 
 	public static function render() {