Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender
This commit is contained in:
@@ -13,7 +13,7 @@ class TenderPenawaranRequest extends FormRequest
|
|||||||
{
|
{
|
||||||
$rules = [
|
$rules = [
|
||||||
'nama_kjpp_sebelumnya' => 'nullable',
|
'nama_kjpp_sebelumnya' => 'nullable',
|
||||||
'biaya_kjpp_sebelumnya' => 'nullable|numeric',
|
'biaya_kjpp_sebelumnya' => 'nullable',
|
||||||
'tanggal_penilaian_sebelumnya' => 'nullable',
|
'tanggal_penilaian_sebelumnya' => 'nullable',
|
||||||
'nomor_registrasi' => 'required',
|
'nomor_registrasi' => 'required',
|
||||||
'kjpp.*' => 'exists:kjpp,id',
|
'kjpp.*' => 'exists:kjpp,id',
|
||||||
|
|||||||
@@ -53,8 +53,9 @@
|
|||||||
Biaya KJPP Sebelumnya
|
Biaya KJPP Sebelumnya
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
|
<input type="hidden" name="biaya_kjpp_sebelumnya"
|
||||||
name="biaya_kjpp_sebelumnya" readonly
|
value="{{ $penawaran->biaya_kjpp_sebelumnya !== null ? $penawaran->biaya_kjpp_sebelumnya : '' }}">
|
||||||
|
<input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text" readonly
|
||||||
value="{{ $penawaran->biaya_kjpp_sebelumnya !== null ? formatRupiah($penawaran->biaya_kjpp_sebelumnya) : '' }}">
|
value="{{ $penawaran->biaya_kjpp_sebelumnya !== null ? formatRupiah($penawaran->biaya_kjpp_sebelumnya) : '' }}">
|
||||||
</div>
|
</div>
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
|
|||||||
@@ -216,7 +216,13 @@
|
|||||||
</a>`;
|
</a>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
return `<div class="flex flex-nowrap justify-center">`+iconDetail+iconProses+`</div>`;
|
|
||||||
|
var iconSendEmail = ` <a href="/tender/penawaran/${data.nomor_registrasi}/showKirimEmail" class="btn btn-sm btn-icon btn-clear btn-success" title="Kirim Email">
|
||||||
|
<i class="ki-filled ki-paper-plane"></i>
|
||||||
|
</a>`;
|
||||||
|
|
||||||
|
|
||||||
|
return `<div class="flex flex-nowrap justify-center">`+iconDetail+iconProses+iconSendEmail+`</div>`;
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user