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

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index af5d3ef6..a5b51696 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'])) {
@@ -262,6 +259,16 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeUpdate($old, $q,$roo)
     {
+         
+        if(!empty($q['_flag_delete']) && $q['_flag_delete'] * 1 == 1){
+            $this->deleted_dt = $this->sqlValue("NOW()");
+            $this->deleted_by = $roo->getAuthUser()->id;
+        }
+        
+        if(!empty($q['_flag_undelete']) && $q['_flag_undelete'] * 1 == 1){
+            $this->deleted_dt = "";
+            $this->deleted_by = 0;
+        }
         if(!empty($q['_check_name'])){
             if($this->checkName()){
                 $roo->jok('OK');
@@ -283,22 +290,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;
@@ -322,7 +325,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
             return true;
         }
         
-        
+        print_r($au->company()->comptype);exit;
         
         if ($au->company()->comptype != 'OWNER') {