diff --git a/app/Http/Controllers/PersetujuanPenawaranController.php b/app/Http/Controllers/PersetujuanPenawaranController.php
index be5896f..ff60d75 100644
--- a/app/Http/Controllers/PersetujuanPenawaranController.php
+++ b/app/Http/Controllers/PersetujuanPenawaranController.php
@@ -6,10 +6,10 @@
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Modules\Lpj\Http\Requests\PersetujuanPenawaranRequest;
-use Modules\Lpj\Models\PenawaranDetailTender;
-use Modules\Lpj\Models\PenawaranDetailTenderLog;
-use Modules\Lpj\Models\PenawaranTender;
-use Modules\Lpj\Models\Permohonan;
+ use Modules\Lpj\Models\PenawaranDetailTender;
+ use Modules\Lpj\Models\PenawaranDetailTenderLog;
+ use Modules\Lpj\Models\PenawaranTender;
+ use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\PersetujuanPenawaran;
class PersetujuanPenawaranController extends Controller
@@ -38,6 +38,7 @@ use Modules\Lpj\Models\Permohonan;
{
$validated = $request->validated();
$validated['created_by'] = Auth::id();
+ $validated['status'] = '0';
$persetujuanPenawaran = PersetujuanPenawaran::updateOrCreate(
['penawaran_id' => $validated['penawaran_id']],
@@ -70,16 +71,16 @@ use Modules\Lpj\Models\Permohonan;
$permohonan = Permohonan::find(request()->get('permohonan_id'));
if ($permohonan) {
$permohonan->status_bayar = request()->get('status_bayar');
- $permohonan->status = 'spk';
+ $permohonan->status = 'noc';
$permohonan->save();
// andy add, update status penawaran.status='spk'
// $penawaran = PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)->first();
- PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)
- ->update(['status'=>'spk',
- 'updated_by' => Auth::id(),
- 'updated_at' => now()
- ]);
+ PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([
+ 'status' => 'spk',
+ 'updated_by' => Auth::id(),
+ 'updated_at' => now(),
+ ]);
// 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.');
}
+ /**
+ * 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.
*/
@@ -101,8 +116,8 @@ use Modules\Lpj\Models\Permohonan;
*/
public function show($id)
{
- $permohonan = Permohonan::find($id);
- $permohonan->status='tender';
+ $permohonan = Permohonan::find($id);
+ $permohonan->status = 'tender';
$dataDetailPenawaranLog = [];
// 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 permohonan => permohonan.status ="tender", permohonan.updated_at, permohonan.updated_by
// 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);
- PenawaranDetailTender::where('penawaran_id', $penawaran->id)
- ->update(['status' => 1,
- 'updated_by' => Auth::id(),
- '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)
- {
+ PenawaranDetailTender::where('penawaran_id', $penawaran->id)->update([
+ 'status' => 1,
+ 'updated_by' => Auth::id(),
+ '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) {
foreach ($detailPenawaran as $model) {
array_push($dataDetailPenawaranLog, [
- 'detail_penawaran_id' =>$model->id,
- 'kjpp_rekanan_id' =>$model->kjpp_rekanan_id,
- 'penawaran_id' =>$model->penawaran_id,
- 'no_proposal' =>$model->no_proposal,
- 'tgl_proposal' =>$model->tgl_proposal,
- 'biaya_penawaran' =>$model->biaya_penawaran,
- 'attachment' =>$model->attachment,
- 'dokumen_persetujuan' =>$model->dokumen_persetujuan,
- 'status' =>$model->status,
- 'authorized_status' =>$model->authorized_status,
- 'authorized_at' =>$model->authorized_at,
- 'authorized_at' =>$model->authorized_at,
- 'created_at' =>$model->created_at,
- 'updated_at' =>$model->updated_at,
- 'deleted_at' =>$model->deleted_at,
- 'created_by' =>$model->created_by,
- 'updated_by' =>$model->updated_by,
- 'deleted_by' =>$model->deleted_by
+ 'detail_penawaran_id' => $model->id,
+ 'kjpp_rekanan_id' => $model->kjpp_rekanan_id,
+ 'penawaran_id' => $model->penawaran_id,
+ 'no_proposal' => $model->no_proposal,
+ 'tgl_proposal' => $model->tgl_proposal,
+ 'biaya_penawaran' => $model->biaya_penawaran,
+ 'attachment' => $model->attachment,
+ 'dokumen_persetujuan' => $model->dokumen_persetujuan,
+ 'status' => $model->status,
+ 'authorized_status' => $model->authorized_status,
+ 'authorized_at' => $model->authorized_at,
+ 'authorized_at' => $model->authorized_at,
+ 'created_at' => $model->created_at,
+ 'updated_at' => $model->updated_at,
+ 'deleted_at' => $model->deleted_at,
+ 'created_by' => $model->created_by,
+ 'updated_by' => $model->updated_by,
+ 'deleted_by' => $model->deleted_by,
]);
-
}
PenawaranDetailTenderLog::insert($dataDetailPenawaranLog);
@@ -174,20 +184,6 @@ use Modules\Lpj\Models\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.
*/
diff --git a/app/Http/Requests/PersetujuanPenawaranRequest.php b/app/Http/Requests/PersetujuanPenawaranRequest.php
index 5f85f6e..cc8a03d 100644
--- a/app/Http/Requests/PersetujuanPenawaranRequest.php
+++ b/app/Http/Requests/PersetujuanPenawaranRequest.php
@@ -23,6 +23,7 @@
'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',
+ 'nominal_bayar' => 'nullable|numeric|min:0',
'status' => 'nullable|boolean',
'authorized_status' => 'boolean',
'authorized_at' => 'nullable|date',
diff --git a/app/Models/PersetujuanPenawaran.php b/app/Models/PersetujuanPenawaran.php
index 6a58bc2..ebaf8af 100644
--- a/app/Models/PersetujuanPenawaran.php
+++ b/app/Models/PersetujuanPenawaran.php
@@ -19,6 +19,7 @@
'file_persetujuan_penawaran',
'surat_representasi',
'bukti_bayar',
+ 'nominal_bayar',
'status',
'authorized_status',
'authorized_at',
diff --git a/database/migrations/2024_12_19_040336_update_persetujuan_penawaran_table.php b/database/migrations/2024_12_19_040336_update_persetujuan_penawaran_table.php
new file mode 100644
index 0000000..1c7fd29
--- /dev/null
+++ b/database/migrations/2024_12_19_040336_update_persetujuan_penawaran_table.php
@@ -0,0 +1,28 @@
+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');
+ });
+ }
+};
diff --git a/resources/views/persetujuan_penawaran/form.blade.php b/resources/views/persetujuan_penawaran/form.blade.php
index 6d56cb2..a85aa07 100644
--- a/resources/views/persetujuan_penawaran/form.blade.php
+++ b/resources/views/persetujuan_penawaran/form.blade.php
@@ -89,6 +89,18 @@
+
+
+
+
+ @error('nominal_bayar')
+ {{ $message }}
+ @enderror
+
+
-