daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into feature/senior-officer

Browse Source
This commit is contained in:
majid
2025-03-10 10:41:52 +07:00
parent 3dcf833035 de6e7ad732
commit 16a321c27b
13 changed files with 223 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/PenilaiController.php
View File

@@ -305,7 +305,7 @@ class PenilaiController extends Controller
*/
public function show($id)
{
$permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian', 'documents.inspeksi'])->find($id);
$permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian', 'documents.inspeksi','jenisPenilaian','laporanExternal'])->find($id);
// return response()->json(['permohonan' => $permohonan]);

8
app/Http/Controllers/TenderController.php
View File

@@ -815,7 +815,7 @@ class TenderController extends Controller
}
}
return redirect()->route('tender.penawaran.ulang.index')
return redirect()->back()
->with('success', 'Email Penawaran Berhasil Terkirim!');
} catch (\Exception $e) {
// Log email gagal untuk setiap KJPP
@@ -871,7 +871,7 @@ class TenderController extends Controller
}
}
return redirect()->route('tender.penawaran.showKirimEmail', ['noreg' => $noreg])
return redirect()->back()
->with('error', 'Email Penawaran Gagal Terkirim!');
}
}
@@ -1015,7 +1015,7 @@ class TenderController extends Controller
}
}
return redirect()->route('tender.penawaran.ulang.index')->with('success', 'Email Penawaran Berhasil Terkirim!');
return redirect()->back()->with('success', 'Email Penawaran Berhasil Terkirim!');
} catch (\Exception $e) {
// Log email gagal
foreach ($kjpps as $email) {
@@ -1067,7 +1067,7 @@ class TenderController extends Controller
}
}
return redirect()->route('tender.penawaran.showKirimEmail', ['noreg' => $noreg])->with('error', 'Email Penawaran Gagal Terkirim!');
return redirect()->back()->with('error', 'Email Penawaran Gagal Terkirim!');
}
}
}

5
app/Models/Permohonan.php
View File

@@ -235,4 +235,9 @@
{
return $this->hasMany(LampiranDokumen::class);
}
public function laporanExternal()
{
return $this->belongsTo(LaporanExternal::class,'id','permohonan_id');
}
}