fix skit2 tambah lelongan

This commit is contained in:
hafifierahman
2021-03-01 14:41:41 +08:00
parent 1fa1fd3144
commit da466fd828
7 changed files with 47 additions and 29 deletions
+13 -13
View File
@@ -350,13 +350,13 @@
<tr>
<th>Bil</th>
<th>No Rujukan</th>
<th>Tarikh Gadai</th>
<th>Tarikh Matang</th>
<th>Baki Harga Jualan</th>
<th>Baki Pembiayaan</th>
<th>Margin</th>
<th>Tempoh</th>
<th>Tarikh Lelong</th>
<th>Tarikh Tuntut</th>
<th>Pembiayaan</th>
<th>Harga Jual</th>
<th>Jum Tuntut/Bayar</th>
<th>Keuntungan</th>
<th>Caj Lelong</th>
</tr>
</thead>
</table>
@@ -468,13 +468,13 @@
tablelelong.row.add([
counter,
'<a href=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
gadai_detail['t_gadai'],
gadai_detail['t_matang1'],
'RM '+ formatter.format(gadai_detail['bakihargajualan']),
'RM '+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['jbg'],
'RM '+ formatter.format(upahsemasa)
gadai_detail['t_lelong'],
gadai_detail['trkhtuntut'],
'RM '+ formatter.format(gadai_detail['pinjaman']),
'RM '+formatter.format(gadai_detail['hargajual']),
'RM '+formatter.format(gadai_detail['baki']),
'RM '+formatter.format(gadai_detail['bakiupah']),
'RM '+formatter.format(gadai_detail['cajlelong'])
]).draw();
}
counter = counter + 1;
+22 -4
View File
@@ -85,6 +85,15 @@
<div class="col-12 form-group row">
<div class="col-6" id="divbakihargajualan">
<div class="form-group row">
<div class="col-4">
TARIKH
</div>
<div class="col-8">
<input type="text" value="{{ $lelong['sirilel'] }}" class="form-control" readonly/>
</div>
</div>
<div class="form-group row">
<div class="col-4">
@@ -97,7 +106,7 @@
<div class="form-group row">
<div class="col-4">
HARGA JUAL
HARGA JUAL (RM)
</div>
<div class="col-8">
<input type="text" value="{{ number_format($lelong['hargajual'],2) }}" class="form-control" readonly/>
@@ -106,7 +115,7 @@
<div class="form-group row">
<div class="col-4">
PEMBIAYAAN
PEMBIAYAAN (RM)
</div>
<div class="col-8">
<input type="text" value="{{ number_format($lelong['pinjaman'],2) }}" class="form-control" readonly/>
@@ -117,6 +126,15 @@
<div class="col-6">
<div class="form-group row">
<div class="col-4">
BATCH LELONG
</div>
<div class="col-8">
<input type="text" value="{{ $lelong['batchno'] }}" class="form-control" readonly/>
</div>
</div>
<div class="form-group row">
<div class="col-4">
KEUNTUNGAN (RM)
@@ -140,7 +158,7 @@
JUMLAH (RM)
</div>
<div class="col-8">
<input type="text" value="" class="form-control" readonly/>
<input type="text" value="{{ number_format($lelong['baki'],2) }}" class="form-control" readonly/>
</div>
</div>
@@ -149,7 +167,7 @@
</div>
<div class="col-12 mt-3">
<input type="button" class="float-right btn btn-danger mr-2" value="BATAL" onclick="window.location.replace('{{ url()->previous() }}')">
<input type="button" class="float-right btn btn-danger mr-2" value="BATAL" onclick="window.location.replace('{{ route('customer_info') }}')">
<input type="button" id="terima_transaksi" class="float-right btn btn-primary mr-2" value="TERIMA">
</div>
+4 -4
View File
@@ -825,7 +825,7 @@
text: 'Penebusan Berjaya',
}).then(function() {
window.open(urlroute, '_blank');
window.location.replace("{{ url()->previous() }}");
window.location.replace("{{ route('customer_info') }}");
})
}
});
@@ -878,7 +878,7 @@
'success'
).then(function() {
window.open(urlroute, '_blank');
window.location.replace("{{ url()->previous() }}");
window.location.replace("{{ route('customer_info') }}");
})
}
});
@@ -1158,7 +1158,7 @@
'success'
) .then(function() {
window.open(urlroute, '_blank');
window.location.replace("{{ url()->previous() }}");
window.location.replace("{{ route('customer_info') }}");
})
},error: function (request, status, error) {
console.log(request.responseText);
@@ -1515,7 +1515,7 @@
'success'
).then(function() {
window.open(urlroute, '_blank');
window.location.replace("{{ url()->previous() }}");
window.location.replace("{{ route('customer_info') }}");
})
},error: function (request, status, error) {
console.log(request.responseText);
+2 -2
View File
@@ -409,7 +409,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
</tr>
<tr>
@@ -502,7 +502,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
</tr>
<tr>
@@ -409,7 +409,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['jbg'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
</tr>
<tr>
@@ -505,7 +505,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['jbg'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
</tr>
<tr>
<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
+2 -2
View File
@@ -410,7 +410,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
</tr>
<tr>
@@ -509,7 +509,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
</tr>
@@ -410,7 +410,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
</tr>
<tr>
@@ -511,7 +511,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
</tr>