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

Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into andydev

Browse Source
This commit is contained in:
Andy Chaerudin
2024-11-21 13:25:52 +07:00
parent 3b616f21ba d4662d413f
commit c08b93aa81
9 changed files with 916 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/Http/Controllers/PersetujuanPenawaranController.php
View File

@@ -12,6 +12,7 @@
class PersetujuanPenawaranController extends Controller
{
public $user;
/**
* Display a listing of the resource.
*/
@@ -21,6 +22,12 @@
return view('lpj::persetujuan_penawaran.index', compact('persetujuanPenawarans'));
}
/**
* Store a newly created resource in storage.
*/
/**
* Store a newly created resource in storage.
*/
/**
* Store a newly created resource in storage.
*/
@@ -29,10 +36,43 @@
$validated = $request->validated();
$validated['created_by'] = Auth::id();
PersetujuanPenawaran::create($validated);
$persetujuanPenawaran = PersetujuanPenawaran::updateOrCreate(
['penawaran_id' => $validated['penawaran_id']],
$validated,
);
$folderPath = 'persetujuan_penawaran/' . $validated['penawaran_id'];
if ($request->hasFile('file_persetujuan_penawaran')) {
$persetujuanPenawaran->file_persetujuan_penawaran = $request->file('file_persetujuan_penawaran')->store(
$folderPath,
'public',
);
}
if ($request->hasFile('surat_representasi')) {
$persetujuanPenawaran->surat_representasi = $request->file('surat_representasi')->store(
$folderPath,
'public',
);
}
if ($request->hasFile('bukti_bayar')) {
$persetujuanPenawaran->bukti_bayar = $request->file('bukti_bayar')->store($folderPath, 'public');
}
$persetujuanPenawaran->save();
// Update the status of the related permohonan to 'spk'
$permohonan = Permohonan::find(request()->get('permohonan_id'));
if ($permohonan) {
$permohonan->status_bayar = request()->get('status_bayar');
$permohonan->status = 'spk';
$permohonan->save();
}
return redirect()
->route('persetujuan-penawaran.index')->with('success', 'Persetujuan Penawaran created successfully.');
->route('persetujuan-penawaran.index')->with('success', 'Persetujuan Penawaran berhasil disimpan.');
}
/**
@@ -46,17 +86,21 @@
/**
* Display the specified resource.
*/
public function show(PersetujuanPenawaran $persetujuanPenawaran)
public function show($id)
{
return view('lpj::persetujuan_penawaran.show', compact('persetujuanPenawaran'));
$permohonan = Permohonan::find($id);
$permohonan->status='tender';
return $permohonan->save();
}
/**
* Show the form for editing the specified resource.
*/
public function edit(PersetujuanPenawaran $persetujuanPenawaran)
public function edit($id)
{
return view('lpj::persetujuan_penawaran.edit', compact('persetujuanPenawaran'));
$permohonan = Permohonan::with(['debiture', 'penawaranTender.detail'])->find($id);
return view('lpj::persetujuan_penawaran.form', compact('permohonan'));
}
/**
@@ -97,8 +141,7 @@
if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search');
$query->where(function ($q) use ($search) {
$q
->where('nomor_registrasi', 'LIKE', "%$search%");
$q->where('nomor_registrasi', 'LIKE', "%$search%");
});
}
@@ -125,7 +168,7 @@
$filteredRecords = $query->count();
// Get the data for the current page
$data = $query->with(['debiture','penawaranTender.detail'])->get();
$data = $query->with(['debiture', 'penawaranTender.detail', 'penawaranTender.persetujuan'])->get();
// Calculate the page count
$pageCount = ceil($totalRecords / $request->get('size'));

44
app/Http/Requests/PersetujuanPenawaranRequest.php
View File

@@ -1,51 +1,37 @@
<?php
namespace Modules\Lpj\app\Http\Requests;
namespace Modules\Lpj\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
class PersetujuanPenawaranRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize()
: bool
{
return true; // Adjust this based on your authorization logic
return true;
}
/**
* Get the validation rules that apply to the request.
*/
/**
* Get the validation rules that apply to the request.
*/
public function rules()
: array
{
return [
'penawaran_id' => 'required|exists:penawaran_tender,id',
'penawaran_id' => 'nullable|exists:penawaran,id',
'nomor_proposal_penawaran' => 'nullable|string|max:255',
'tanggal_proposal_penawaran' => 'nullable|date',
'biaya_final' => 'nullable|numeric|min:0',
'sla_resume' => 'nullable|date',
'sla_final' => 'nullable|date|after_or_equal:sla_resume',
'catatan' => 'nullable|string',
'attachment' => 'nullable|file|mimes:pdf,doc,docx|max:10240', // Max 10MB
'region_id' => 'nullable|exists:regions,id',
'file_persetujuan_penawaran' => 'nullable|file|mimes:pdf,doc,docx|max:10240',
'surat_representasi' => 'nullable|file|mimes:pdf,doc,docx|max:10240',
'bukti_bayar' => 'nullable|file|mimes:pdf,jpg,jpeg,png|max:10240',
'status' => 'nullable|boolean',
'authorized_status' => 'nullable|boolean',
'authorized_status' => 'boolean',
'authorized_at' => 'nullable|date',
'authorized_by' => 'nullable|exists:users,id',
'catatan' => 'nullable|string',
];
}
/**
* Get custom messages for validator errors.
*/
public function messages()
: array
{
return [
'penawaran_id.required' => 'Penawaran ID wajib diisi.',
@@ -61,9 +47,15 @@
'sla_final.required' => 'SLA Final wajib diisi.',
'sla_final.date' => 'SLA Final harus berupa tanggal yang valid.',
'sla_final.after_or_equal' => 'SLA Final harus sama dengan atau setelah SLA Resume.',
'attachment.file' => 'Attachment harus berupa file.',
'attachment.mimes' => 'Attachment harus berupa file PDF, DOC, atau DOCX.',
'attachment.max' => 'Ukuran attachment tidak boleh lebih dari 10MB.',
'file_persetujuan_penawaran.file' => 'File Persetujuan Penawaran harus berupa file.',
'file_persetujuan_penawaran.mimes' => 'File Persetujuan Penawaran harus berupa file PDF, DOC, atau DOCX.',
'file_persetujuan_penawaran.max' => 'Ukuran File Persetujuan Penawaran tidak boleh lebih dari 10MB.',
'surat_representasi.file' => 'Surat Representasi harus berupa file.',
'surat_representasi.mimes' => 'Surat Representasi harus berupa file PDF, DOC, atau DOCX.',
'surat_representasi.max' => 'Ukuran Surat Representasi tidak boleh lebih dari 10MB.',
'bukti_bayar.file' => 'Bukti Bayar harus berupa file.',
'bukti_bayar.mimes' => 'Bukti Bayar harus berupa file PDF, JPG, JPEG, atau PNG.',
'bukti_bayar.max' => 'Ukuran Bukti Bayar tidak boleh lebih dari 10MB.',
'region_id.required' => 'Region ID wajib diisi.',
'region_id.exists' => 'Region ID tidak valid.',
'status.required' => 'Status wajib diisi.',
@@ -71,6 +63,8 @@
'authorized_status.boolean' => 'Status otorisasi harus berupa nilai boolean.',
'authorized_at.date' => 'Tanggal otorisasi harus berupa tanggal yang valid.',
'authorized_by.exists' => 'ID pengguna yang mengotorisasi tidak valid.',
'status_bayar.required' => 'Status bayar wajib diisi.',
'status_bayar.in' => 'Status bayar harus berupa "sudah_bayar" atau "belum_bayar".',
];
}
}

4
app/Models/PenawaranTender.php
View File

@@ -55,4 +55,8 @@ class PenawaranTender extends Model
{
return $this->belongsTo(JenisLaporan::class, 'jenis_laporan_id', 'id');
}
public function persetujuan(){
return $this->belongsTo(PersetujuanPenawaran::class, 'id', 'penawaran_id');
}
}

17
app/Models/PersetujuanPenawaran.php
View File

@@ -2,9 +2,6 @@
namespace Modules\Lpj\Models;
use Modules\Lpj\Models\Base;
use Modules\Lpj\Models\PenawaranTender;
use Modules\Lpj\Models\Region;
use Modules\Usermanagemenet\Models\User;
class PersetujuanPenawaran extends Base
@@ -19,20 +16,24 @@
'biaya_final',
'sla_resume',
'sla_final',
'catatan',
'attachment',
'region_id',
'file_persetujuan_penawaran',
'surat_representasi',
'bukti_bayar',
'status',
'authorized_status',
'authorized_at',
'authorized_by',
'status',
'catatan',
];
protected $casts = [
'tanggal_proposal_penawaran' => 'date',
'sla_resume' => 'datetime',
'sla_final' => 'datetime',
'sla_resume' => 'date',
'sla_final' => 'date',
'biaya_final' => 'decimal:2',
'status' => 'boolean',
'authorized_status' => 'boolean',
'authorized_at' => 'datetime',
];