Theme work with focusbusiness and baseadmin

Improvements to NAVBAR, updates to StaticList methods, other minor items
Enable product category rendering and other minor improvements
Added ADSL-large category price plan

modules/product/classes/Model/Product/Category.php

@@ -11,27 +11,30 @@
  */
 class Model_Product_Category extends ORM_OSB {
 	protected $_table_name = 'product_cat';
+	protected $_created_column = FALSE;
+	protected $_updated_column = FALSE;
+
+	protected $_nullifempty = array(
+		'status',
+		'template',
+	);
 
 	protected $_has_many = array(
 		'product_category_translate'=>array('foreign_key'=>'product_cat_id','far_key'=>'id'),
+		'subcategories'=>array('model'=>'product_category','foreign_key'=>'parent_id','far_key'=>'id'),
 	);
 
-	protected $_sorting = array(
-		'name'=>'asc',
-	);
-
+	/**
+	 * Return the translated description for a category.
+	 */
 	public function description() {
-		// If the user is not logged in, show the site default language
-		// @todo This needs to change to the session language.
-		if (! $ao=Auth::instance()->get_user())
-			$ao=Company::instance()->so();
+		$x = $this->translate();
 
-		return ($x=$this->product_category_translate->where('language_id','=',$ao->language_id)->find()->description) ? $x : _('No Description');
+		return $x->loaded() ? $x->display('description') : 'No Description';
 	}
 
 	/**
 	 * List all the products belonging to this cateogry
-	 * @todo Consider if we should cache this
 	 */
 	public function products() {
 		$result = array();
@@ -43,13 +46,68 @@ class Model_Product_Category extends ORM_OSB {
 		return $result;
 	}
 
-	public function list_bylistgroup($cat) {
-		$result = array();
+	public function save(Validation $validation=NULL) {
+		if ($this->changed())
+			if (parent::save($validation))
+				SystemMessage::factory()
+					->title('Record Updated')
+					->type('success')
+					->body(sprintf('Record %s Updated',$this->id));
 
-		foreach ($this->where('list_group','=',$cat)->find_all() as $pco)
-			$result[$pco->id] = $pco;
+		// Save our Translated Message
+		if ($x = array_diff_key($_POST,$this->_object) AND ! empty($_POST['language_id']) AND ! empty($_POST['product_category_translate']) AND is_array($_POST['product_category_translate'])) {
+			$pcto = $this->product_category_translate->where('language_id','=',$_POST['language_id'])->find();
+
+			// For a new entry, we need to set the product_cat_id
+			if (! $pcto->loaded()) {
+				$pcto->product_cat_id = $this->id;
+				$pcto->language_id = $_POST['language_id'];
+			}
+
+			if ($pcto->values($x['product_category_translate'])->save())
+				SystemMessage::factory()
+					->title('Record Updated')
+					->type('success')
+					->body(sprintf('Translation for Record %s Updated',$this->id));
+		}
+	}
+
+	/**
+	 * Return the template that is used to render the product category
+	 */
+	public function template() {
+		if (! $this->template)
+			throw new Kohana_Exception('Product category :category doesnt have a template',array(':category'=>$this->id));
+
+		$o = Kohana::classname('Product_Category_Template_'.$this->template);
+
+		return new $o($this);
+	}
+
+	public function templates() {
+		$template_path = 'classes/Product/Category/Template';
+		$result = array('');
+
+		foreach (Kohana::list_files($template_path) as $file => $path) {
+			$file = strtoupper(preg_replace('/.php$/','',str_replace($template_path.'/','',$file)));
+			$result[$file] = $file;
+		}
 
 		return $result;
 	}
+
+	/**
+	 * Return the translated title for a category
+	 */
+	public function title() {
+		$x = $this->translate();
+
+		return $x->loaded() ? $x->display('name') : 'No Title';
+	}
+
+
+	private function translate() {
+		return $this->product_category_translate->where('language_id','=',Config::language())->find();
+	}
 }
 ?>

modules/product/classes/Model/Product/Category/Translate.php

@@ -11,6 +11,8 @@
  */
 class Model_Product_Category_Translate extends ORM_OSB {
 	protected $_table_name = 'product_cat_translate';
+	protected $_created_column = FALSE;
+	protected $_updated_column = FALSE;
 
 	protected $_belongs_to = array(
 		'product_category'=>array(),