Merge branch 'faiqahzaman' into 'main'
update senarai tangguh lelong See merge request online-sistem1/lelong!16
This commit is contained in:
Nur Izzati Zulkifli
@@ -665,6 +665,20 @@ class MarhunController extends Controller
|
||||
{
|
||||
$tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', 'lelong.id')
|
||||
->where('tangguhlelong.lelong_id', $id)
|
||||
->select('tangguhlelong.id as tangguhlelong_id',
|
||||
'tangguhlelong.lelongbid_id',
|
||||
'tangguhlelong.norujukan',
|
||||
'tangguhlelong.tarikhtangguh',
|
||||
'tangguhlelong.ditangguh_pada',
|
||||
'tangguhlelong.ditangguh_oleh',
|
||||
'tangguhlelong.nota',
|
||||
'lelong.id as lelong_id',
|
||||
'lelong.tarikh_lelong',
|
||||
'lelong.harga_emas_asas',
|
||||
'lelong.jbg',
|
||||
'lelong.cajlelong',
|
||||
'lelong.sts_lelong'
|
||||
)
|
||||
->get();
|
||||
|
||||
foreach($tangguhlelong as $index1=>$tanguhlel)
|
||||
@@ -673,22 +687,38 @@ class MarhunController extends Controller
|
||||
->where('lelong_id', $id)
|
||||
->first();
|
||||
|
||||
$tangguhlelong[$index1]['nama_caw'] = $getkodcaw->caw_name;
|
||||
$tangguhlelong[$index1]['details'] = $tanguhlel;
|
||||
$tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
|
||||
}
|
||||
|
||||
return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
|
||||
}
|
||||
|
||||
public function lelbidmarhun($id, $norujukan)
|
||||
public function lelbidmarhun($id, $norujukan, $tangguhlelong_id)
|
||||
{
|
||||
$marhuns = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
|
||||
->join('gadai', 'tangguhlelong.norujukan', '=', 'gadai.norujukan')
|
||||
->where('tangguhlelong.norujukan', $norujukan)
|
||||
$tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
|
||||
->where('gadaimarhun.norujukan', $norujukan)
|
||||
->where('tangguhlelong.id', $tangguhlelong_id)
|
||||
->select('tangguhlelong.id as tangguhlelong_id',
|
||||
'tangguhlelong.lelong_id',
|
||||
'tangguhlelong.lelongbid_id',
|
||||
'tangguhlelong.norujukan',
|
||||
'tangguhlelong.pinjaman',
|
||||
'tangguhlelong.tarikhtangguh',
|
||||
'tangguhlelong.nota as tangguh_nota',
|
||||
'tangguhlelong.pinjaman',
|
||||
'gadaimarhun.id as gadaimarhun_id',
|
||||
'gadaimarhun.bil',
|
||||
'gadaimarhun.marhun',
|
||||
'gadaimarhun.nota as gadai_nota',
|
||||
'gadaimarhun.karat',
|
||||
'gadaimarhun.berat',
|
||||
'gadaimarhun.harga',
|
||||
'gadaimarhun.n_marhun'
|
||||
)
|
||||
->get();
|
||||
|
||||
$status = Pengesahan::where('lelong_id', $id)->where('norujukan', $norujukan)->first();
|
||||
|
||||
return view('pengesahan.lelbidmarhun',compact('marhuns', 'id', 'norujukan', 'status'));
|
||||
|
||||
return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan'));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -10,42 +10,40 @@
|
||||
<p>{{ $message }}</p>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="container">
|
||||
<div class="row mb-2">
|
||||
<div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
|
||||
<p> <b>Norujukan : </b> {{ $tangguhlelong[0]['norujukan'] }}</p>
|
||||
<p> <b>Pembiayaan : </b> {{ $tangguhlelong[0]['pinjaman'] }}</p>
|
||||
<p> <b>Remark : </b> {{ $tangguhlelong[0]['tangguh_nota'] }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<form id="exportform" action="" method="POST">
|
||||
<input type="hidden" name="type" value="User">
|
||||
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
|
||||
<thead class="bg-primary text-white">
|
||||
<tr>
|
||||
<th>Bil</th>
|
||||
<th>No Rujukan</th>
|
||||
<th>Marhun</th>
|
||||
<th>Karat</th>
|
||||
<th>Berat</th>
|
||||
<th>Harga (RM)</th>
|
||||
<th>Nilai Marhun</th>
|
||||
<th>Nota</th>
|
||||
<th>Status</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach ($marhuns as $marhun)
|
||||
@foreach ($tangguhlelong as $index1=>$tangguhlel)
|
||||
<tr>
|
||||
<td>{{ $loop->iteration }}</td>
|
||||
<td>{{ $marhun->norujukan }}</td>
|
||||
<td>{{ $marhun->marhun }}</td>
|
||||
<td>{{ $marhun->karat }}</td>
|
||||
<td>{{ $marhun->berat }}</td>
|
||||
<td>{{ $marhun->harga }}</td>
|
||||
<td>{{ $marhun->n_marhun }}</td>
|
||||
<td>{{ $marhun->nota }}</td>
|
||||
<td>
|
||||
@if($status->status_ubah == 1)
|
||||
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
|
||||
@elseif($status->status_ubah == 2)
|
||||
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENAMBAHAN MARHUN</button>
|
||||
@elseif($status->status_ubah == 3)
|
||||
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGHAPUSAN MARHUN</button>
|
||||
@endif
|
||||
</td>
|
||||
<td>{{ $tangguhlel->marhun }}</td>
|
||||
<td>{{ $tangguhlel->karat }}</td>
|
||||
<td>{{ $tangguhlel->berat }}</td>
|
||||
<td>{{ $tangguhlel->harga }}</td>
|
||||
<td>{{ $tangguhlel->n_marhun }}</td>
|
||||
<td>{{ $tangguhlel->gadai_nota }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
|
||||
@@ -17,23 +17,22 @@
|
||||
<tr>
|
||||
<th>Bil</th>
|
||||
<th>Nama Cawangan</th>
|
||||
<th>Tarikh Lelong Asal</th>
|
||||
<th>Tarikh Lelong</th>
|
||||
<th>Tarikh Tangguh</th>
|
||||
<th>No Rujukan</th>
|
||||
<th class="text-center">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@foreach ($tangguhlelong as $tangguhlel)
|
||||
<tr>
|
||||
<td>{{ $loop->iteration }}</td>
|
||||
<td>{{ $tangguhlel['nama_caw'] }}</td>
|
||||
<td>{{ $tangguhlel['nama_caw']['caw_name'] }}</td>
|
||||
<td>{{ $tangguhlel->tarikh_lelong }}</td>
|
||||
<td>{{ $tangguhlel->tarikhtangguh }}</td>
|
||||
<td>{{ $tangguhlel->norujukan }}</td>
|
||||
<td>
|
||||
<a href="{{ route('pengesahan.lelbidmarhun', [ $id, $tangguhlel->norujukan ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
|
||||
<a href="{{ route('pengesahan.lelbidmarhun', [ $id, $tangguhlel->norujukan, 'tangguhlelong_id'=>$tangguhlel['details']['tangguhlelong_id'] ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
||||
+1
-1
@@ -193,7 +193,7 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'],
|
||||
Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']);
|
||||
Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']);
|
||||
Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
|
||||
Route::get('/lelbidmarhun/{id}/{norujukan}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
|
||||
Route::get('/lelbidmarhun/{id}/{norujukan}/{tangguhlelong_id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
|
||||
});
|
||||
|
||||
Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notistamatkontrak'], function () {
|
||||
|
||||
Reference in New Issue
Block a user