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

Tambahkan field nominal_bayar untuk persetujuan penawaran

Browse Source 
- Menambahkan validasi dan atribut 'nominal_bayar' pada request dan model.
- Menampilkan input 'nominal_bayar' di form persetujuan penawaran.
- Memperbarui tampilan dan data tabel untuk mendukung kolom 'nominal_bayar'.
This commit is contained in:
Daeng Deni Mardaeni
2024-12-19 11:25:05 +07:00
parent a416dfcf9c
commit a51900d82a
6 changed files with 110 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,10 +6,10 @@
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Modules\Lpj\Http\Requests\PersetujuanPenawaranRequest; use Modules\Lpj\Http\Requests\PersetujuanPenawaranRequest;
use Modules\Lpj\Models\PenawaranDetailTender; use Modules\Lpj\Models\PenawaranDetailTender;
use Modules\Lpj\Models\PenawaranDetailTenderLog; use Modules\Lpj\Models\PenawaranDetailTenderLog;
use Modules\Lpj\Models\PenawaranTender; use Modules\Lpj\Models\PenawaranTender;
use Modules\Lpj\Models\Permohonan; use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\PersetujuanPenawaran; use Modules\Lpj\Models\PersetujuanPenawaran;
class PersetujuanPenawaranController extends Controller class PersetujuanPenawaranController extends Controller
@@ -38,6 +38,7 @@ use Modules\Lpj\Models\Permohonan;
{ {
$validated = $request->validated(); $validated = $request->validated();
$validated['created_by'] = Auth::id(); $validated['created_by'] = Auth::id();
$validated['status'] = '0';
$persetujuanPenawaran = PersetujuanPenawaran::updateOrCreate( $persetujuanPenawaran = PersetujuanPenawaran::updateOrCreate(
['penawaran_id' => $validated['penawaran_id']], ['penawaran_id' => $validated['penawaran_id']],
@@ -70,16 +71,16 @@ use Modules\Lpj\Models\Permohonan;
$permohonan = Permohonan::find(request()->get('permohonan_id')); $permohonan = Permohonan::find(request()->get('permohonan_id'));
if ($permohonan) { if ($permohonan) {
$permohonan->status_bayar = request()->get('status_bayar'); $permohonan->status_bayar = request()->get('status_bayar');
$permohonan->status = 'spk'; $permohonan->status = 'noc';
$permohonan->save(); $permohonan->save();
// andy add, update status penawaran.status='spk' // andy add, update status penawaran.status='spk'
// $penawaran = PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)->first(); // $penawaran = PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)->first();
PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi) PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([
->update(['status'=>'spk', 'status' => 'spk',
'updated_by' => Auth::id(), 'updated_by' => Auth::id(),
'updated_at' => now() 'updated_at' => now(),
]); ]);
// andy add, update status penawaran.status='spk' // andy add, update status penawaran.status='spk'
} }
@@ -88,6 +89,20 @@ use Modules\Lpj\Models\Permohonan;
->route('persetujuan-penawaran.index')->with('success', 'Persetujuan Penawaran berhasil disimpan.'); ->route('persetujuan-penawaran.index')->with('success', 'Persetujuan Penawaran berhasil disimpan.');
} }
/**
* Update the specified resource in storage.
*/
public function update(PersetujuanPenawaranRequest $request, PersetujuanPenawaran $persetujuanPenawaran)
{
$validated = $request->validated();
$validated['updated_by'] = Auth::id();
$persetujuanPenawaran->update($validated);
return redirect()
->route('persetujuan-penawaran.index')->with('success', 'Persetujuan Penawaran updated successfully');
}
/** /**
* Show the form for creating a new resource. * Show the form for creating a new resource.
*/ */
@@ -101,8 +116,8 @@ use Modules\Lpj\Models\Permohonan;
*/ */
public function show($id) public function show($id)
{ {
$permohonan = Permohonan::find($id); $permohonan = Permohonan::find($id);
$permohonan->status='tender'; $permohonan->status = 'tender';
$dataDetailPenawaranLog = []; $dataDetailPenawaranLog = [];
// andy add update status penawaran // andy add update status penawaran
@@ -110,50 +125,45 @@ use Modules\Lpj\Models\Permohonan;
// update penawaran => penawaran.status ="tender", penawaran.updated_at, penawaran.updated_by // update penawaran => penawaran.status ="tender", penawaran.updated_at, penawaran.updated_by
// update permohonan => permohonan.status ="tender", permohonan.updated_at, permohonan.updated_by // update permohonan => permohonan.status ="tender", permohonan.updated_at, permohonan.updated_by
// insert detail_permohonan_log // insert detail_permohonan_log
$penawaran = PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)->first(); $penawaran = PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->first();
// dd($penawaran->id); // dd($penawaran->id);
PenawaranDetailTender::where('penawaran_id', $penawaran->id) PenawaranDetailTender::where('penawaran_id', $penawaran->id)->update([
->update(['status' => 1, 'status' => 1,
'updated_by' => Auth::id(), 'updated_by' => Auth::id(),
'updated_at' => now() 'updated_at' => now(),
]); ]);
PenawaranTender::where('id', $penawaran->id)
->update(['status'=>'tender',
'updated_by' => Auth::id(),
'updated_at' => now()
]);
$detailPenawaran = PenawaranDetailTender::where('penawaran_id', $penawaran->id)
->distinct()
->get();
// log
if(sizeof($detailPenawaran)>0)
{
PenawaranTender::where('id', $penawaran->id)->update([
'status' => 'tender',
'updated_by' => Auth::id(),
'updated_at' => now(),
]);
$detailPenawaran = PenawaranDetailTender::where('penawaran_id', $penawaran->id)->distinct()->get();
// log
if (sizeof($detailPenawaran) > 0) {
foreach ($detailPenawaran as $model) { foreach ($detailPenawaran as $model) {
array_push($dataDetailPenawaranLog, [ array_push($dataDetailPenawaranLog, [
'detail_penawaran_id' =>$model->id, 'detail_penawaran_id' => $model->id,
'kjpp_rekanan_id' =>$model->kjpp_rekanan_id, 'kjpp_rekanan_id' => $model->kjpp_rekanan_id,
'penawaran_id' =>$model->penawaran_id, 'penawaran_id' => $model->penawaran_id,
'no_proposal' =>$model->no_proposal, 'no_proposal' => $model->no_proposal,
'tgl_proposal' =>$model->tgl_proposal, 'tgl_proposal' => $model->tgl_proposal,
'biaya_penawaran' =>$model->biaya_penawaran, 'biaya_penawaran' => $model->biaya_penawaran,
'attachment' =>$model->attachment, 'attachment' => $model->attachment,
'dokumen_persetujuan' =>$model->dokumen_persetujuan, 'dokumen_persetujuan' => $model->dokumen_persetujuan,
'status' =>$model->status, 'status' => $model->status,
'authorized_status' =>$model->authorized_status, 'authorized_status' => $model->authorized_status,
'authorized_at' =>$model->authorized_at, 'authorized_at' => $model->authorized_at,
'authorized_at' =>$model->authorized_at, 'authorized_at' => $model->authorized_at,
'created_at' =>$model->created_at, 'created_at' => $model->created_at,
'updated_at' =>$model->updated_at, 'updated_at' => $model->updated_at,
'deleted_at' =>$model->deleted_at, 'deleted_at' => $model->deleted_at,
'created_by' =>$model->created_by, 'created_by' => $model->created_by,
'updated_by' =>$model->updated_by, 'updated_by' => $model->updated_by,
'deleted_by' =>$model->deleted_by 'deleted_by' => $model->deleted_by,
]); ]);
} }
PenawaranDetailTenderLog::insert($dataDetailPenawaranLog); PenawaranDetailTenderLog::insert($dataDetailPenawaranLog);
@@ -174,20 +184,6 @@ use Modules\Lpj\Models\Permohonan;
return view('lpj::persetujuan_penawaran.form', compact('permohonan')); return view('lpj::persetujuan_penawaran.form', compact('permohonan'));
} }
/**
* Update the specified resource in storage.
*/
public function update(PersetujuanPenawaranRequest $request, PersetujuanPenawaran $persetujuanPenawaran)
{
$validated = $request->validated();
$validated['updated_by'] = Auth::id();
$persetujuanPenawaran->update($validated);
return redirect()
->route('persetujuan-penawaran.index')->with('success', 'Persetujuan Penawaran updated successfully');
}
/** /**
* Remove the specified resource from storage. * Remove the specified resource from storage.
*/ */

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

@@ -23,6 +23,7 @@
'file_persetujuan_penawaran' => 'nullable|file|mimes:pdf,doc,docx|max:10240', 'file_persetujuan_penawaran' => 'nullable|file|mimes:pdf,doc,docx|max:10240',
'surat_representasi' => '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', 'bukti_bayar' => 'nullable|file|mimes:pdf,jpg,jpeg,png|max:10240',
'nominal_bayar' => 'nullable|numeric|min:0',
'status' => 'nullable|boolean', 'status' => 'nullable|boolean',
'authorized_status' => 'boolean', 'authorized_status' => 'boolean',
'authorized_at' => 'nullable|date', 'authorized_at' => 'nullable|date',

1
app/Models/PersetujuanPenawaran.php
View File

@@ -19,6 +19,7 @@
'file_persetujuan_penawaran', 'file_persetujuan_penawaran',
'surat_representasi', 'surat_representasi',
'bukti_bayar', 'bukti_bayar',
'nominal_bayar',
'status', 'status',
'authorized_status', 'authorized_status',
'authorized_at', 'authorized_at',

28
database/migrations/2024_12_19_040336_update_persetujuan_penawaran_table.php Normal file
View File

@@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('persetujuan_penawaran', function (Blueprint $table) {
$table->double('nominal_bayar')->nullable()->after('bukti_bayar');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('persetujuan_penawaran', function (Blueprint $table) {
$table->dropColumn('nominal_bayar');
});
}
};

13
resources/views/persetujuan_penawaran/form.blade.php
View File

@@ -89,6 +89,18 @@
</div> </div>
</div> </div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Nominal Bayar
</label>
<div class="flex flex-wrap items-baseline w-full">
<input type="number" name="nominal_bayar" id="nominal_bayar" class="input w-full @error('nominal_bayar') border-danger bg-danger-light @enderror" value="{{ old('nominal_bayar', $persetujuanPenawaran->nominal_bayar ?? '') }}" placeholder="Masukkan nominal bayar">
@error('nominal_bayar')
<em class="alert text-danger text-sm">{{ $message }}</em>
@enderror
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56"> <label class="form-label max-w-56">
Bukti Bayar Bukti Bayar
@@ -101,7 +113,6 @@
</div> </div>
</div> </div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56"> <label class="form-label max-w-56">
Catatan Catatan

7
resources/views/persetujuan_penawaran/index.blade.php
View File

@@ -57,6 +57,10 @@
<span class="sort"> <span class="sort-label"> Biaya Final </span> <span class="sort"> <span class="sort-label"> Biaya Final </span>
<span class="sort-icon"> </span> </span> <span class="sort-icon"> </span> </span>
</th> </th>
<th class="min-w-[150px]" data-datatable-column="nominal_bayar">
<span class="sort"> <span class="sort-label"> Nominal Bayar </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="sla_resume"> <th class="min-w-[150px]" data-datatable-column="sla_resume">
<span class="sort"> <span class="sort-label"> SLA Resume </span> <span class="sort"> <span class="sort-label"> SLA Resume </span>
<span class="sort-icon"> </span> </span> <span class="sort-icon"> </span> </span>
@@ -175,6 +179,9 @@
return window.formatRupiah(`${data.penawaran_tender.detail.biaya_penawaran}`); return window.formatRupiah(`${data.penawaran_tender.detail.biaya_penawaran}`);
}, },
}, },
nominal_bayar: {
title: 'Nominal Bayar'
},
sla_resume: { sla_resume: {
title: 'SLA Resume' title: 'SLA Resume'
}, },