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

Merge remote-tracking branch 'composer/feature/senior-officer' into staging

Browse Source
This commit is contained in:
Daeng Deni Mardaeni
2024-12-31 14:19:58 +07:00
parent f84fa70087 0d54a2590f
commit cbf5d8a983
8 changed files with 81 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/ProsesPenawaranController.php
View File

@@ -181,7 +181,7 @@ class ProsesPenawaranController extends Controller
if (request()->ajax()) {
$id = $request->id;
$penawaran = PenawaranTender::find($id);
$penawaran = PenawaranTender::with('permohonan.debiture')->find($id);
$penawrandetails = PenawaranDetailTender::where('penawaran_id','=',$id)
->leftJoin('kjpp', 'kjpp.id', '=', 'detail_penawaran.kjpp_rekanan_id')
->select('detail_penawaran.*', 'kjpp.code AS kjpp_code', 'kjpp.name AS kjpp_name')
@@ -605,7 +605,7 @@ class ProsesPenawaranController extends Controller
if (request()->ajax()) {
$id = $request->id;
$penawaran = PenawaranTender::where('status','=','proposal-tender')->find($id);
$penawaran = PenawaranTender::with('permohonan.debiture')->where('status','=','proposal-tender')->find($id);
if ($penawaran) {
$penawrandetails = PenawaranDetailTender::where('penawaran_id','=',$id)

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

@@ -118,7 +118,7 @@ class ProsesPenawaranUlangController extends Controller
if (request()->ajax()) {
$id = $request->id;
$penawaran = PenawaranTender::where('status','=','proposal-tender')->find($id);
$penawaran = PenawaranTender::with('permohonan.debiture')->where('status','=','proposal-tender')->find($id);
if ($penawaran) {
$penawrandetails = PenawaranDetailTender::where('penawaran_id','=',$id)

10
resources/views/prosespenawaran/edit.blade.php
View File

@@ -26,6 +26,16 @@
</div>
</div>
<div class="card-body grid gap-5">
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
Nama Debitur
</label>
<div class="flex flex-wrap items-baseline w-full">
<label class="card-title" id="namaDebitur">
-
</label>
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">
No. registrasi

10
resources/views/prosespenawaran/editulang.blade.php
View File

@@ -24,6 +24,16 @@
</div>
</div>
<div class="card-body lg:py-7.5 grid grid-cols-3">
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Nama Debitur:
</h3>
<span class="text-2sm text-gray-700">
<label class="card-title" id="namaDebitur">
-
</label>
</span>
</div>
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Nomor Register Permohonan:

5
resources/views/prosespenawaran/js/editjs.blade.php
View File

@@ -33,14 +33,17 @@
// }
},
success: function(response) {
console.log(response);
if ('success' == response.status)
{
$("#namaDebitur").text(response.penawaran.permohonan.debiture.name);
$("#textReg").text(response.penawaran.nomor_registrasi);
$("#textCodePenawaran").text(response.penawaran.code);
setTablesKJPP1(response.penawrandetails);
setKJPPList(response.kjpps);
}
else if('error' == response.status)
{
var message = response.message;

1
resources/views/prosespenawaran/js/editulangjs.blade.php
View File

@@ -38,6 +38,7 @@
if("success"==response.status)
{
var statusText = response.penawaran.status;
$("#namaDebitur").text(response.penawaran.permohonan.debiture.name);
$("#textReg").text(response.penawaran.nomor_registrasi);
$("#textCodePenawaran").text(response.penawaran.code);
$("#textStatusPenawaran").text(statusText);

11
resources/views/prosespenawaranulang/edit.blade.php
View File

@@ -23,6 +23,17 @@
</div>
</div>
<div class="card-body lg:py-7.5 grid grid-cols-3">
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Nama Debiture:
</h3>
<span class="text-2sm text-gray-700">
<label class="card-title" id="namaDebitur">
-
</label>
</span>
</div>
<div class="mb-5">
<h3 class="text-md font-medium text-gray-900">
Nomor Register Permohonan:

1
resources/views/prosespenawaranulang/js/editjs.blade.php
View File

@@ -38,6 +38,7 @@
if("success"==response.status)
{
var statusText = response.penawaran.status;
$("#namaDebitur").text(response.penawaran.permohonan.debiture.name);
$("#textReg").text(response.penawaran.nomor_registrasi);
$("#textCodePenawaran").text(response.penawaran.code);
$("#textStatusPenawaran").text(statusText);