move Base model to Base directory

core/lib/Thelia/Model/Accessory.php

@@ -2,8 +2,54 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Accessory extends Base
 {
+    protected $id;
+    protected $product_id;
+    protected $accessory;
+    protected $position;
+    
+    protected $properties = array(
+        "id",
+        "product_id",
+        "accessory",
+        "position"
+    );  
+    
+    public function getId() {
+        return $this->id;
+    }
+
+    public function setId($id) {
+        $this->id = $id;
+    }
+
+    public function getProductId() {
+        return $this->product_id;
+    }
+
+    public function setProductId($product_id) {
+        $this->product_id = $product_id;
+    }
+
+    public function getAccessory() {
+        return $this->accessory;
+    }
+
+    public function setAccessory($accessory) {
+        $this->accessory = $accessory;
+    }
+
+    public function getPosition() {
+        return $this->position;
+    }
+
+    public function setPosition($position) {
+        $this->position = $position;
+    }
+
+
+    
 }

core/lib/Thelia/Model/Address.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Address extends Base
 {

core/lib/Thelia/Model/Admin.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Admin extends Base
 {

core/lib/Thelia/Model/AdminGroup.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class AdminGroup extends Base
 {

core/lib/Thelia/Model/AdminLog.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class AdminLog extends Base
 {

core/lib/Thelia/Model/Area.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Area extends Base
 {

core/lib/Thelia/Model/Attribute.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Attribute extends Base
 {

core/lib/Thelia/Model/AttributeAv.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class AttributeAv extends Base
 {

core/lib/Thelia/Model/AttributeAvDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class AttributeAvDesc extends Base
 {

core/lib/Thelia/Model/AttributeCategory.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class AttributeCategory extends Base
 {

core/lib/Thelia/Model/AttributeCombination.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class AttributeCombination extends Base
 {

core/lib/Thelia/Model/AttributeDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class AttributeDesc extends Base
 {

core/lib/Thelia/Model/Base.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-abstract class Base
-{
-    /**
-     *
-     * @var \NotORM
-     */
-    protected $db;
-    
-    /**
-     *
-     * @var string
-     */
-    protected $table;
-
-    /**
-     * 
-     * 
-     * 
-     * @param \NotORM $NotORM
-     */
-    public function __construct(\NotORM $NotORM) {
-        $this->db = $NotORM;
-        $this->table = $this->getTableName();
-    }
-    
-    protected function getTableName()
-    {   
-        return $this->underscore(__CLASS__);
-    }
-    
-    protected function underscore($camel_cased_word)
-    {
-        $tmp = $camel_cased_word;
-        $tmp = str_replace('::', '/', $tmp);
-        $tmp = self::pregtr($tmp, array('/([A-Z]+)([A-Z][a-z])/' => '\\1_\\2',
-                                               '/([a-z\d])([A-Z])/'     => '\\1_\\2'));
-        return strtolower($tmp);
-    }
-    
-    public static function pregtr($search, $replacePairs)
-    {
-        return preg_replace(array_keys($replacePairs), array_values($replacePairs), $search);
-    }
-}

core/lib/Thelia/Model/Base/Base.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace Thelia\Model\Base;
+
+abstract class Base
+{
+    /**
+     *
+     * @var \NotORM
+     */
+    protected $db;
+    
+    /**
+     *
+     * @var string
+     */
+    protected $table;
+    
+    /**
+     *
+     * @var string date when the record had been updated
+     */
+    protected $updated_at;
+    
+
+        /**
+     *
+     * @var string date when the record had been saved
+     */
+    protected $created_at;
+    
+    
+    
+
+    /**
+     * 
+     * 
+     * 
+     * @param \NotORM $NotORM
+     */
+    public function __construct(\NotORM $NotORM) {
+        $this->db = $NotORM;
+        $this->table = $this->getTableName();
+    }
+    
+    public function getUpdatedAt() {
+        return $this->updated_at;
+    }
+
+    public function setUpdatedAt($updated_at) {
+        $this->updated_at = $updated_at;
+    }
+
+    public function getCreatedAt() {
+        return $this->created_at;
+    }
+
+    public function setCreatedAt($created_at) {
+        $this->created_at = $created_at;
+    }
+    
+    /**
+     * 
+     * @return \NotORM
+     */
+    public function getDb() {
+        return $this->db;
+    }
+
+    public function getTable() {
+        return $this->table;
+    }
+
+        
+    public function save()
+    {
+        $this->updated_at = $this->created_at = date('Y-m-d H:i:s');
+    }
+    
+    /**
+     * 
+     * @return string name of the current table
+     */
+    protected function getTableName()
+    {   
+        return $this->underscore(__CLASS__);
+    }
+    
+    /**
+     * 
+     * extract from symfony 1.4
+     * 
+     * change camelized wirnd into underscore word. 
+     * 
+     * ex : AttributeCategory => attribute_category
+     * 
+     * @param string $camel_cased_word
+     * @return string
+     */
+    protected function underscore($camel_cased_word)
+    {
+        $tmp = $camel_cased_word;
+        $tmp = str_replace('::', '/', $tmp);
+        $tmp = self::pregtr($tmp, array('/([A-Z]+)([A-Z][a-z])/' => '\\1_\\2',
+                                               '/([a-z\d])([A-Z])/'     => '\\1_\\2'));
+        return strtolower($tmp);
+    }
+    
+    public static function pregtr($search, $replacePairs)
+    {
+        return preg_replace(array_keys($replacePairs), array_values($replacePairs), $search);
+    }
+}

core/lib/Thelia/Model/Category.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Category extends Base
 {

core/lib/Thelia/Model/CategoryDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class CategoryDesc extends Base
 {

core/lib/Thelia/Model/Combination.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Combination extends Base
 {

core/lib/Thelia/Model/Config.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Config extends Base
 {

core/lib/Thelia/Model/ConfigDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class ConfigDesc extends Base
 {

core/lib/Thelia/Model/Content.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Content extends Base
 {

core/lib/Thelia/Model/ContentAssoc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class ContentAssoc extends Base
 {

core/lib/Thelia/Model/ContentDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class ContentDesc extends Base
 {

core/lib/Thelia/Model/ContentFolder.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class ContentFolder extends Base
 {

core/lib/Thelia/Model/Country.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Country extends Base
 {

core/lib/Thelia/Model/CountryDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class CountryDesc extends Base
 {

core/lib/Thelia/Model/Coupon.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Coupon extends Base
 {

core/lib/Thelia/Model/CouponOrder.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class CouponOrder extends Base
 {

core/lib/Thelia/Model/CouponRule.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class CouponRule extends Base
 {

core/lib/Thelia/Model/Currency.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Currency extends Base
 {

core/lib/Thelia/Model/Customer.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Customer extends Base
 {

core/lib/Thelia/Model/CustomerTitle.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class CustomerTitle extends Base
 {

core/lib/Thelia/Model/CustomerTitleDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class CustomerTitleDesc extends Base
 {

core/lib/Thelia/Model/Delivzone.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Delivzone extends Base
 {

core/lib/Thelia/Model/Document.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Document extends Base
 {

core/lib/Thelia/Model/DocumentDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class DocumentDesc extends Base
 {

core/lib/Thelia/Model/Feature.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Feature extends Base
 {

core/lib/Thelia/Model/FeatureAv.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class FeatureAv extends Base
 {

core/lib/Thelia/Model/FeatureAvDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class FeatureAvDesc extends Base
 {

core/lib/Thelia/Model/FeatureCategory.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class FeatureCategory extends Base
 {

core/lib/Thelia/Model/FeatureDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class FeatureDesc extends Base
 {

core/lib/Thelia/Model/FeatureProd.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class FeatureProd extends Base
 {

core/lib/Thelia/Model/Folder.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Folder extends Base
 {

core/lib/Thelia/Model/FolderDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class FolderDesc extends Base
 {

core/lib/Thelia/Model/Group.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Group extends Base
 {

core/lib/Thelia/Model/GroupDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class GroupDesc extends Base
 {

core/lib/Thelia/Model/GroupModule.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class GroupModule extends Base
 {

core/lib/Thelia/Model/GroupResource.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class GroupResource extends Base
 {

core/lib/Thelia/Model/Image.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Image extends Base
 {

core/lib/Thelia/Model/ImageDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class ImageDesc extends Base
 {

core/lib/Thelia/Model/Lang.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Lang extends Base
 {

core/lib/Thelia/Model/Message.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Message extends Base
 {

core/lib/Thelia/Model/MessageDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class MessageDesc extends Base
 {

core/lib/Thelia/Model/Module.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Module extends Base
 {

core/lib/Thelia/Model/ModuleDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class ModuleDesc extends Base
 {

core/lib/Thelia/Model/Order.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Order extends Base
 {

core/lib/Thelia/Model/OrderAddress.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class OrderAddress extends Base
 {

core/lib/Thelia/Model/OrderFeature.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class OrderFeature extends Base
 {

core/lib/Thelia/Model/OrderProduct.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class OrderProduct extends Base
 {

core/lib/Thelia/Model/OrderStatus.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class OrderStatus extends Base
 {

core/lib/Thelia/Model/OrderStatusDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class OrderStatusDesc extends Base
 {

core/lib/Thelia/Model/Product.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Product extends Base
 {

core/lib/Thelia/Model/ProductCategory.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class ProductCategory extends Base
 {

core/lib/Thelia/Model/ProductDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class ProductDesc extends Base
 {

core/lib/Thelia/Model/Resource.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Resource extends Base
 {

core/lib/Thelia/Model/ResourceDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class ResourceDesc extends Base
 {

core/lib/Thelia/Model/Rewriting.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Rewriting extends Base
 {

core/lib/Thelia/Model/Stock.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Stock extends Base
 {

core/lib/Thelia/Model/Tax.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class Tax extends Base
 {

core/lib/Thelia/Model/TaxDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class TaxDesc extends Base
 {

core/lib/Thelia/Model/TaxQuery.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class TaxQuery extends Base
 {

core/lib/Thelia/Model/TaxRule.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class TaxRule extends Base
 {

core/lib/Thelia/Model/TaxRuleCountry.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class TaxRuleCountry extends Base
 {

core/lib/Thelia/Model/TaxRuleDesc.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Model\Base;
+use Thelia\Model\Base\Base;
 
 class TaxRuleDesc extends Base
 {