Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-backend into dev-wahyun

app/Http/Controllers/AuthController.php

@@ -8,6 +8,7 @@ use Illuminate\Support\Facades\Hash;
 
 use App\Models\User;
 use App\Models\Role;
+use App\Models\Company;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Password;
 use Illuminate\Validation\ValidationException;
@@ -58,6 +59,10 @@ class AuthController extends Controller
 
 			$dataRole = Role::find($user->role_id);
 			$dataHierarchy = $this->getDataHierarchy($user->divisi_id, $user->id);
+			$configApp = Company::where('id', $user->company_id)->first();
+
+			if ($configApp)
+				$user->configApp = $configApp;
 
 			if ($dataRole)
 				$user->role = $dataRole;

app/Models/Absent.php

@@ -12,6 +12,6 @@ class Absent extends Model
     const UPDATED_AT = 'updated_at';
 
     protected $fillable = [
-        'user_id', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by'
+        'user_id', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id'
     ];
 }

app/Models/Broadcast.php

@@ -12,6 +12,6 @@ class Broadcast extends Model
     const UPDATED_AT = 'updated_at';
 
     protected $fillable = [
-        'title_notif', 'message_notif', 'description', 'send_to_type', 'send_to_id', 'status_send', 'created_at', 'created_by', 'updated_at', 'updated_by'
+        'title_notif', 'message_notif', 'description', 'send_to_type', 'send_to_id', 'status_send', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id'
     ];
 }

app/Models/Company.php

@@ -31,6 +31,7 @@ class Company extends Model
         'created_at',
         'created_by',
         'updated_at',
-        'updated_by'
+        'updated_by',
+        'date_register'
     ];
 }

app/Models/PanicButton.php

@@ -12,6 +12,6 @@ class PanicButton extends Model
     const UPDATED_AT = 'updated_at';
 
     protected $fillable = [
-        'user_id', 'lat', 'lon', 'status_response', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by'
+        'user_id', 'lat', 'lon', 'status_response', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id'
-    ];  
+    ];
 }

app/Models/Presence.php

@@ -13,9 +13,9 @@ class Presence extends Model
     const UPDATED_AT = 'updated_at';
 
     protected $fillable = [
-        'user_id', 'clock_in', 'clock_out', 'date_presence', 
+        'user_id', 'clock_in', 'clock_out', 'date_presence',
         'clock_in_lat', 'clock_in_lng', 'clock_out_lat', 'clock_out_lng',
-        'clock_in_loc', 'clock_out_loc','clock_in_boundary', 'clock_out_boundary',
+        'clock_in_loc', 'clock_out_loc', 'clock_in_boundary', 'clock_out_boundary',
-        'created_at', 'created_by', 'updated_at', 'updated_by'
+        'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id'
     ];
 }

app/Models/ReportK3.php

@@ -12,14 +12,15 @@ class ReportK3 extends Model
     const UPDATED_AT = 'updated_at';
 
     protected $fillable = [
-        'user_id', 
+        'user_id',
         'description',
         'proyek_id',
         'report_date',
         'description',
-        'created_at', 
+        'created_at',
-        'created_by', 
+        'created_by',
-        'updated_at', 
+        'updated_at',
-        'updated_by'
+        'updated_by',
+        'company_id'
     ];
 }