KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'faiqahzaman' into 'main'

Browse Source 
Faiqahzaman

See merge request online-sistem1/lelong!6
This commit is contained in:
Nur Izzati Zulkifli
2022-04-14 06:05:45 +00:00
parent 0c5dbc34a6 baa4077019
commit 8a82cfefc6
5 changed files with 127 additions and 9413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/pengesahan/mutumarhun.blade.php
+51 -5
View File
@@ -100,7 +100,7 @@
@elseif($detail[0]['status_ubah'] == 5)
<button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGURANGAN MUTU & BERAT</button>
@else
@endif
</td>
</tr>
@@ -109,11 +109,40 @@
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pengesahan.perubahanmutumarhun', $id) }}" class="btn btn-primary">Kembali</a>
<button type="button" class="btn btn-danger" onclick="functerima(this)" id="tangguhlelong" >Tangguh Lelong</button>
<button type="button" class="btn btn-danger" onclick="functerima(this)" data-idmarhun="{{ $lelongbid->id }}" data-norujukan="{{ $lelongbid->norujukan }}" id="tangguhlelong" >Tangguh Lelong</button>
<button type="button" class="btn btn-success" onclick="functerima(this)" id="terima" >Teruskan Lelong</button>
</div>
</form>
</div>
<div class="modal fade" data-backdrop="static" tabindex="-1" id="modalremark">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Tangguh Lelong</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<form action="{{ route('pengesahan.terimaperubahan') }}" method="POST" id="formremark">
@csrf
<input type="hidden" name="norujukan" value="{{ $norujukan }}" />
<input type="hidden" name="lelong_id" value="{{ $id }}" />
<input type="hidden" name="lelongbid_id" value="{{ $lelongbid->id }}" />
<input type="hidden" name="jenis_button" value="tangguhlelong" id="jenis_button" />
<div class="form-group">
<label for="message-text" class="col-form-label">Sila Nyatakan Sebab Tangguh Lelong:</label>
<textarea class="form-control" id="nota" name="nota"></textarea>
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" style="width:15%;" data-dismiss="modal">Tutup</button>
<button type="button" class="btn btn-primary" style="width:15%;" onclick="submit(this)">Sahkan</button>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
@@ -131,9 +160,26 @@
else if(jenis == "tangguhlelong")
{
$('#jenis_button').val(jenis);
$("#formmutumarhun").submit();
$('#modalremark').modal('show');
let idmarhun = $(e).data('idmarhun');
let norujukan = $(e).data('norujukan');
$('#idmarhun').val(idmarhun);
$('#norujukan').val(norujukan);
console.log(idmarhun, norujukan);
// $("#formmutumarhun").submit();
}
}
function submit(e)
{
let idmarhun = $(e).data('idmarhun');
let norujukan = $(e).data('norujukan');
$('#idmarhun').val(idmarhun);
$('#norujukan').val(norujukan);
$("#formremark").submit();
}
var tablemutumarhun = $('#tablemutumarhun').DataTable( {
"columnDefs": [
@@ -142,8 +188,8 @@
"orderable": false
},
{
"targets": 8,
"orderable": false
"targets": 9,
"orderable": true
}
],
order: [[1, 'asc']],
resources/views/pengesahan/perubahanmutumarhun.blade.php
+2 -2
View File
@@ -64,11 +64,11 @@
"orderable": false
},
{
"targets": 3,
"targets": 4,
"orderable": false
}
],
order: [[1, 'asc']],
order: [[1, 'desc']],
// "ordering": false,
"info": false,
"lengthChange": false,