Fix Download Data Jaminan

- Fix Download File Data Jaminan tidak sama dengan file yang di pilih
- Recompile web route

app/Http/Controllers/DokumenJaminanController.php

@@ -217,16 +217,14 @@
                         'success',
                         'Dokumen Jaminan berhasil diubah',
                     );
-                } catch
+                } catch (Exception $e) {
-                (Exception $e) {
                     DB::rollBack();
                     return redirect()->route('debitur.jaminan.index', $id)->with('error', $e->getMessage());
                 }
             }
         }
 
-        public
+        public function edit(
-        function edit(
             $id,
             $jaminan,
         ) {
@@ -258,16 +256,15 @@
             );
         }
 
-        public
+        public function destroy(
-        function destroy(
             $id,
             $jaminan_id,
         ) {
             try {
                 $jaminan = DokumenJaminan::find($jaminan_id);
-                $details = DetailDokumenJaminan::where('dokumen_jaminan_id',$jaminan->id)->get();
+                $details = DetailDokumenJaminan::where('dokumen_jaminan_id', $jaminan->id)->get();
-                foreach ($details as $detail){
+                foreach ($details as $detail) {
-                    Storage::delete('public/'. $detail->dokumen_jaminan);
+                    Storage::delete('public/' . $detail->dokumen_jaminan);
                     $detail->delete();
                 }
                 $jaminan->delete();
@@ -277,11 +274,19 @@
             }
         }
 
-        public
+        public function download()
-        function download(
+        {
-            $id,
+            $dokumen  = request()->get('dokumen');
-        ) {
+            $document = DetailDokumenJaminan::find($dokumen);
-            $document = DetailDokumenJaminan::find($id);
             return response()->download(storage_path('app/public/' . $document->dokumen_jaminan));
         }
+
+        public function legalitasJaminan($id, $jaminan)
+        {
+            $jenisJaminan     = JenisJaminan::find($id);
+            $legalitasJaminan = $jenisJaminan->jenis_legalitas_jaminan_id;
+
+            $legalitas = JenisLegalitasJaminan::whereIn('code', json_decode($legalitasJaminan, true))->get();
+            echo json_encode($legalitas);
+        }
     }

app/Http/Library/LpjHelpers.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Http\Library;
-
-use Modules\Lpj\Models\JenisFasilitasKredit;
-use Illuminate\Support\Facades\DB;
-
-trait LpjHelpers
-{
-
-    public static function onLastCodeJFK(): string
-    {
-        // max(code)
-        $noUrutAkhir2 = JenisFasilitasKredit::withTrashed()->max('code');
-        
-        $noUrutAkhir=sprintf("%06s", 1);
-        $noUrutAwal = 'JFK';
-        $noUrutAkhirString = $noUrutAkhir;
-        if($noUrutAkhir2){
-            $noUrutAkhir = substr($noUrutAkhir2, 3, 6);
-            // $noUrutAwal = substr($noUrutAkhir2, 0, 3);
-            $noUrutAkhirString = sprintf("%06s", abs($noUrutAkhir + 1));
-        }
-        
-        return $noUrutAwal . $noUrutAkhirString;
-    }
-}

app/Http/Requests/PermohonanRequest.php

@@ -20,7 +20,7 @@
                 'branch_id'                 => 'required|exists:branches,id',
                 'tujuan_penilaian_id'       => 'required|exists:tujuan_penilaian,id',
                 'debiture_id'               => 'required|exists:debitures,id',
-                'status'                    => 'required|string',
+                'status'                    => 'required|string|default:order',
                 'jenis_fasilitas_kredit_id' => 'required|exists:jenis_fasilitas_kredit,id',
                 'nilai_plafond_id'          => 'required|exists:nilai_plafond,id',
                 'status_bayar'              => 'required|string',

resources/views/debitur/components/dokumen.blade.php

@@ -261,7 +261,6 @@
                     return response.json();
                 })
                 .then(data => {
-                    console.log(data);
                     var doctainer = document.getElementById('doctainer');
                     doctainer.innerHTML = '';
                     data.forEach((item, index) => {

routes/web.php

@@ -99,34 +99,6 @@ Route::middleware(['auth'])->group(function () {
             Route::get('export', [CurrencyController::class, 'export'])->name('export');
         });
 
-        Route::name('debitur.')->prefix('debitur')->group(function () {
-            Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore');
-            Route::get('datatables', [DebitureController::class, 'dataForDatatables'])->name('datatables');
-            Route::get('export', [DebitureController::class, 'export'])->name('export');
-
-
-            Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () {
-                Route::get('download/{dokumen}', [DokumenJaminanController::class, 'download'])->name('download');
-                Route::get('/', [DokumenJaminanController::class, 'index'])->name('index');
-                Route::get('create', [DokumenJaminanController::class, 'create'])->name('create');
-                Route::get('{jaminan}/edit', [DokumenJaminanController::class, 'edit'])->name('edit');
-                Route::put('{jaminan}', [DokumenJaminanController::class, 'update'])->name('update');
-                Route::post('store', [DokumenJaminanController::class, 'store'])->name('store');
-                Route::delete('{jaminan}', [DokumenJaminanController::class, 'destroy'])->name('destroy');
-            });
-
-            Route::name('pemilik.')->prefix('{id}/pemilik')->group(function () {
-                Route::get('/', [PemilikJaminanController::class, 'index'])->name('index');
-                Route::get('create', [PemilikJaminanController::class, 'create'])->name('create');
-                Route::get('{pemilik}/edit', [PemilikJaminanController::class, 'edit'])->name('edit');
-                Route::put('{pemilik}', [PemilikJaminanController::class, 'update'])->name('update');
-                Route::post('store', [PemilikJaminanController::class, 'store'])->name('store');
-                Route::delete('{pemilik}', [PemilikJaminanController::class, 'destroy'])->name('destroy');
-            });
-        });
-
-        Route::resource('debitur', DebitureController::class);
-
         Route::name('branch.')->prefix('cabang')->group(function () {
             Route::get('restore/{id}', [BranchController::class, 'restore'])->name('restore');
             Route::get('datatables', [BranchController::class, 'dataForDatatables'])->name('datatables');
@@ -304,25 +276,7 @@ Route::middleware(['auth'])->group(function () {
             Route::get('export', [ArahMataAnginController::class, 'export'])->name('export');
         });
         Route::resource('arah-mata-angin', ArahMataAnginController::class);
-
+        Route::resource('arah-mata-angin', ArahMataAnginController::class);
-        Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () {
-            Route::get('download/{dokumen}', [DokumenJaminanController::class, 'download'])->name('download');
-            Route::get('/', [DokumenJaminanController::class, 'index'])->name('index');
-            Route::get('create', [DokumenJaminanController::class, 'create'])->name('create');
-            Route::get('{jaminan}/edit', [DokumenJaminanController::class, 'edit'])->name('edit');
-            Route::put('{jaminan}', [DokumenJaminanController::class, 'update'])->name('update');
-            Route::post('store', [DokumenJaminanController::class, 'store'])->name('store');
-            Route::delete('{jaminan}', [DokumenJaminanController::class, 'destroy'])->name('destroy');
-        });
-
-        Route::name('pemilik.')->prefix('{id}/pemilik')->group(function () {
-            Route::get('/', [PemilikJaminanController::class, 'index'])->name('index');
-            Route::get('create', [PemilikJaminanController::class, 'create'])->name('create');
-            Route::get('{pemilik}/edit', [PemilikJaminanController::class, 'edit'])->name('edit');
-            Route::put('{pemilik}', [PemilikJaminanController::class, 'update'])->name('update');
-            Route::post('store', [PemilikJaminanController::class, 'store'])->name('store');
-            Route::delete('{pemilik}', [PemilikJaminanController::class, 'destroy'])->name('destroy');
-        });
 
         Route::name('status-permohonan.')->prefix('status-permohonan')->group(function () {
             Route::get('restore/{id}', [StatusPermohonanController::class, 'restore'])->name('restore');
@@ -387,9 +341,36 @@ Route::middleware(['auth'])->group(function () {
         }
     });
 
+    Route::name('debitur.')->prefix('debitur')->group(function () {
+        Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore');
+        Route::get('datatables', [DebitureController::class, 'dataForDatatables'])->name('datatables');
+        Route::get('export', [DebitureController::class, 'export'])->name('export');
+
+
+        Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () {
+            Route::get('download', [DokumenJaminanController::class, 'download'])->name('download');
+            Route::get('/', [DokumenJaminanController::class, 'index'])->name('index');
+            Route::get('create', [DokumenJaminanController::class, 'create'])->name('create');
+            Route::get('{jaminan}/edit', [DokumenJaminanController::class, 'edit'])->name('edit');
+            Route::put('{jaminan}', [DokumenJaminanController::class, 'update'])->name('update');
+            Route::post('store', [DokumenJaminanController::class, 'store'])->name('store');
+            Route::delete('{jaminan}', [DokumenJaminanController::class, 'destroy'])->name('destroy');
+        });
+
+        Route::name('pemilik.')->prefix('{id}/pemilik')->group(function () {
+            Route::get('/', [PemilikJaminanController::class, 'index'])->name('index');
+            Route::get('create', [PemilikJaminanController::class, 'create'])->name('create');
+            Route::get('{pemilik}/edit', [PemilikJaminanController::class, 'edit'])->name('edit');
+            Route::put('{pemilik}', [PemilikJaminanController::class, 'update'])->name('update');
+            Route::post('store', [PemilikJaminanController::class, 'store'])->name('store');
+            Route::delete('{pemilik}', [PemilikJaminanController::class, 'destroy'])->name('destroy');
+        });
+    });
+
+    Route::resource('debitur', DebitureController::class);
+
     Route::name('permohonan.')->prefix('permohonan')->group(function () {
         Route::get('{id}/create', [PermohonanController::class, 'createPermohonan'])->name('create.debitur');
-        Route::get('download/{id}', [PermohonanController::class, 'download'])->name('download');
         Route::get('restore/{id}', [PermohonanController::class, 'restore'])->name('restore');
         Route::get('datatables', [PermohonanController::class, 'dataForDatatables'])->name('datatables');
         Route::get('export', [PermohonanController::class, 'export'])->name('export');
@@ -422,34 +403,6 @@ Route::middleware(['auth'])->group(function () {
         'authorization.update',
     );
 
-    Route::name('debitur.')->prefix('debitur')->group(function () {
-        Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore');
-        Route::get('datatables', [DebitureController::class, 'dataForDatatables'])->name('datatables');
-        Route::get('export', [DebitureController::class, 'export'])->name('export');
-
-
-        Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () {
-            Route::get('download/{dokumen}', [DokumenJaminanController::class, 'download'])->name('download');
-            Route::get('/', [DokumenJaminanController::class, 'index'])->name('index');
-            Route::get('create', [DokumenJaminanController::class, 'create'])->name('create');
-            Route::get('{jaminan}/edit', [DokumenJaminanController::class, 'edit'])->name('edit');
-            Route::put('{jaminan}', [DokumenJaminanController::class, 'update'])->name('update');
-            Route::post('store', [DokumenJaminanController::class, 'store'])->name('store');
-            Route::delete('{jaminan}', [DokumenJaminanController::class, 'destroy'])->name('destroy');
-        });
-
-        Route::name('pemilik.')->prefix('{id}/pemilik')->group(function () {
-            Route::get('/', [PemilikJaminanController::class, 'index'])->name('index');
-            Route::get('create', [PemilikJaminanController::class, 'create'])->name('create');
-            Route::get('{pemilik}/edit', [PemilikJaminanController::class, 'edit'])->name('edit');
-            Route::put('{pemilik}', [PemilikJaminanController::class, 'update'])->name('update');
-            Route::post('store', [PemilikJaminanController::class, 'store'])->name('store');
-            Route::delete('{pemilik}', [PemilikJaminanController::class, 'destroy'])->name('destroy');
-        });
-    });
-
-    Route::resource('debitur', DebitureController::class);
-
     Route::name('tender.')->prefix('tender')->group(function () {
         // Penawaran
         Route::get('penawaran', [TenderController::class, 'penawaran_index'])->name('penawaran.index');