Merge branch 'main' of https://git.probindo.com/Probindo/database-pertani-web

app/Http/Controllers/Api/TanamanController.php

@@ -25,16 +25,17 @@ class TanamanController extends Controller
         if (!Gate::any(['petani', 'fasilitator'])) {
             abort(403);
         }
-
-        $profile = Auth::user()->profile;
+        $user = Auth::user();
+        $profile = $user->profile;
+        $profileId = $user->role === 'petani' ? $profile->id : $request->profile_id;
 
         $size = $request->integer('size') ?: 10;
 
-        $tanamanList = Tanaman::where('profile_id', $profile->id)
-            ->when($request->search, function ($q, $search) {
+        $tanamanList = Tanaman::when($request->search, function ($q, $search) {
                 $search = strtolower($search);
                 $q->whereRaw('lower(nama) like ?', ["%{$search}%"]);
             })
+            ->when($profileId, fn($q,$v) => $q->where('profile_id',$v))
             ->when($request->status_kepemilikan, fn($q,$v) => $q->where('status_kepemilikan',$v))
             ->when($request->lahan_id, fn($q,$v) => $q->where('lahan_id',$v))
             ->when($request->komoditas_id, fn($q,$v) => $q->where('komoditas_id',$v))

app/Http/Controllers/Web/Master/KeluargaController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Web\Ekosistem;
+namespace App\Http\Controllers\Web\Master;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;

app/Http/Controllers/Web/Master/KomoditasController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Web\Ekosistem;
+namespace App\Http\Controllers\Web\Master;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;

app/Http/Controllers/Web/Produktivitas/LahanController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Web\Ekosistem;
+namespace App\Http\Controllers\Web\Produktivitas;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;

app/Http/Controllers/Web/Produktivitas/ProfileController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Web\Ekosistem;
+namespace App\Http\Controllers\Web\Produktivitas;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;

app/Http/Controllers/Web/Produktivitas/TanamanController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Web\Ekosistem;
+namespace App\Http\Controllers\Web\Produktivitas;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;

app/Http/Controllers/Web/Program/PelatihanController.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Http\Controllers\Web\Program;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class PelatihanController extends Controller
+{
+    //
+}