X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=d6c27872d92b8272d850df0cb2f0f8a39379882f;hb=f61e0023b975638a8a1c239decbdcc45e87f192d;hp=af5d3ef6c2cc0a15b5f2b95863f5d5f91a5258d8;hpb=40ae01070aee6ab3308617b2fca9a143da60a4c7;p=Pman.Core

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index af5d3ef6..d6c27872 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -82,10 +82,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
             $this->whereAddIn('comptype', explode(',', $q['query']['comptype']), 'string');
             
         }
-        /*if (!empty($q['query']['deleted_by'])) {
-            $deleted_by = $this->escape($q['query']['deleted_by']);
-            $this->whereAdd("deleted_by = '$deleted_by'");
-        }*/
+        
         // depricated - should be moved to module specific (texon afair)
         
          if (!empty($q['query']['province'])) {
@@ -113,6 +110,12 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
                 {$tn}.name LIKE '%$s%'
             ");
         }
+        if(!empty($q['search']['name'])){ 
+            $s = $this->escape($q['search']['name']);
+            $this->whereAdd("
+                {$tn}.name LIKE '%$s%'
+            ");
+        }
         if(!empty($q['search']['name_starts'])){
             $s = $this->escape($q['search']['name_starts']);
             $this->whereAdd("
@@ -251,6 +254,14 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeInsert($q, $roo)
     {
+        // we still use comptype in some old systems...
+        
+        if (!empty($q['comptype_id'])) {
+            $en = DB_DataObject::Factory('core_enum');
+            $en->get($q['comptype_id']);
+            $this->comptype = $en->name;
+        }
+        
         if(!empty($q['_check_name'])){
             if($this->checkName()){
                 $roo->jok('OK');
@@ -262,6 +273,24 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeUpdate($old, $q,$roo)
     {
+        // we still use comptype in some old systems...
+        
+        if (!empty($q['comptype_id'])) {
+            $en = DB_DataObject::Factory('core_enum');
+            $en->get($q['comptype_id']);
+            $this->comptype = $en->name;
+        }
+        
+        
+        if(!empty($q['_flag_delete'])){
+            $this->deleted_dt = $this->sqlValue("NOW()");
+            $this->deleted_by = $roo->getAuthUser()->id;
+        }
+        
+        if(!empty($q['_flag_undelete'])){
+            $this->deleted_dt = "";
+            $this->deleted_by = 0;
+        }
         if(!empty($q['_check_name'])){
             if($this->checkName()){
                 $roo->jok('OK');
@@ -283,22 +312,18 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeDelete($req, $roo)
     {
-        if(!empty($req['_flag_delete']) && $req['_flag_delete'] * 1 == 1){
-            $delete_dt = date('Y-m-d H:i:s');
-            $this->query("UPDATE {$x->tableName()} SET deleted_by = {$this->getAuthUser()} , deleted_dt = {$delete_dt} WHERE id = {$req['_delete']}");
-            //$this->addEvent("UPDATE", false, "update core_company record");
-            $this->jok("Updated");
-        }
+        
         // should check for members....
         if(!empty($this->is_system) && 
             ($old->code != $this->code || $old->name != $this->name)
         ){
             $roo->jerr('This company is not allow to delete');
         }
+        
+        
     }
     function onDelete($req, $roo)
     {   
-         
         $img = DB_DataObject::factory('Images');
         $img->ontable = $this->tableName();
         $img->onid = $this->id;