X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=3e7a3e5e382965ff319500ca5261e517753d1906;hp=020a10d6b651958e9aace3f0b4358263f08a6ef3;hb=c98ecec2c1a5bef7fc437e26e51e6f6fece615a6;hpb=afb208d7092be59d98c58697ee04954531d169f3

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index 020a10d6..3e7a3e5e 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,18 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeInsert($q, $roo)
     {
+        // we still use comptype in some old systems...
+        
+        if(!empty($q['_merge_id'])){
+            $this->merge($q['_merge_id'], $roo);
+        }
+        
+        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,16 +277,23 @@ 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['_flag_delete']) && $q['_flag_delete'] * 1 == 1){
-            //$delete_dt = date('Y-m-d H:i:s');
-            $this->deleted_dt = date('Y-m-d H:i:s');
-            $this->deleted_by = $roo->getAuthUser();
-            $this->id = $q['_ids'];
-            var_dump($this); die;
-            $this->update();
-            //$roo->query("UPDATE {$old->tableName()} SET deleted_by = {$roo->getAuthUser()} , deleted_dt = {$delete_dt} WHERE id = {$req['_update_id']}");
-            //$this->addEvent("UPDATE", false, "update core_company record");
+        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()){
@@ -281,10 +303,6 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
             $roo->jerr('EXIST');
         }
         
-        if(!empty($q['_merge_id'])){
-            $this->merge($q['_merge_id'], $roo);
-        }
-        
         if(!empty($this->is_system) && 
             ($old->code != $this->code  ) // used to be not allowed to change name..
         ){