Merge branch 'master' of https://git.oslog.id/ibnu/siopas-istw-website

app/Http/Controllers/API/v1/PetiApi/PetiApiController.php

@@ -10,14 +10,27 @@ class PetiApiController extends Controller
 {
     public function index()
     {
-        $petis = \App\Models\Peti::with([
+        // $petis = \App\Models\Peti::get();
-            // 'customer:id,name,code_customer,lot_no,nip,no_hp,tgl_lahir,jenis_kelamin,agama,address',
+        $petis = \App\Models\Peti::select([
-            // 'tipe_peti:id,type,size_peti,description',
+            'id',
-            // 'warehouse:id,name,address',
+            'fix_lot',
-            'customer',
+            'status',
-            'tipe_peti',
+            'customer_id',
-            'warehouse',
+            'warehouse_id',
+            'kondisipeti_id',
+            // 'created_at',
+            // 'updated_at',
+            'deleted_at'
         ])->get();
+        // with([
+        // 'customer:id,name,code_customer,lot_no,nip,no_hp,tgl_lahir,jenis_kelamin,agama,address',
+        // 'tipe_peti:id,type,size_peti,description',
+        // 'warehouse:id,name,address',
+        //     'customer',
+        //     'tipe_peti',
+        //     'warehouse',
+        // ])->
+        // get();
 
         if (!$petis) {
             return ResponseFormatter::error([

app/Http/Controllers/PeminjamanController.php

@@ -27,6 +27,7 @@ class PeminjamanController extends Controller
         $query = asset_status::with(['customer', 'warehouseId', 'warehouse', 'warehouseEnter', 'kondisi_peti'])
             ->where('status', '=', 0)
             ->orderBy('created_at', 'desc');
+
         // Tambahkan logika pencarian
         $search = $request->input('search') ?? '';
         if ($search) {