ubah wakil dan edit resit

This commit is contained in:
fifi97
2021-04-16 20:52:37 +08:00
parent 95fbd9485e
commit 97a9247f25
9 changed files with 96 additions and 44 deletions
+2 -2
View File
@@ -570,7 +570,7 @@ class GadaianController extends Controller
if($history == $gadai[0][0]['historygadaian'])
$history = 0;
else{
array_push($arrayhist,["pinjaman" => ((isset($tebus[0])) ? $tebus[0]['pinjaman'] : 0),"norujukan" => $history,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
array_push($arrayhist,["hargajualan" => ((isset($gadai[0][0]['hargajualan'])) ? $gadai[0][0]['hargajualan'] : ''), "pinjaman" => ((isset($tebus[0])) ? $tebus[0]['pinjaman'] : 0),"norujukan" => $history,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
$history = $gadai[0][0]['historygadaian'];
}
}
@@ -585,7 +585,7 @@ class GadaianController extends Controller
])->json();
array_push($arrayhist,["pinjaman" => ((isset($tebus[0])) ? $tebus[0]['pinjaman'] : 0),"norujukan" => $norujukan,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
array_push($arrayhist,["hargajualan" => ((isset($gadai[0][0]['hargajualan'])) ? $gadai[0][0]['hargajualan'] : ''),"pinjaman" => ((isset($tebus[0])) ? $tebus[0]['pinjaman'] : 0),"norujukan" => $norujukan,"jenistebus" => ((isset($tebus[0])) ? $tebus[0]['jenistebus'] : 0),"jbg" => ((isset($tebus[0])) ? $tebus[0]['jbg'] : 0),"t_tebus" => ((isset($tebus[0])) ? $tebus[0]['t_tebus'] : 0)]);
break;
}
}
+39 -9
View File
@@ -713,8 +713,6 @@
var counter = 1;
historytebusbayaran.clear().draw();
console.table(data);
$.each(data,function(index,tebusaz){
switch(tebusaz['jenistebus']) {
@@ -723,8 +721,17 @@
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
break;
case 'T':
var urlroute = '{{ route("resit.tebus", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
if(tebusaz['hargajualan'] === '')
{
var urlroute = '{{ route("resit.belumtebus", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
}else{
var urlroute = '{{ route("resit.tebus", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
}
break;
case 'A':
var urlroute = '{{ route("resit.belumansurans", ":id") }}';
@@ -750,7 +757,7 @@
}
function ubahfunc(e){
async function ubahfunc(e){
let ubahid = $('input[name="belum"]:checked').val();
let harini = new Date();harini.setHours(0, 0, 0, 0);
@@ -792,11 +799,34 @@
}
if($("input[name='options']:checked").val() == 'sudah_tebus'){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Ubah Gadai Tidak Dibenarkan'
const { value: amaun } = await Swal.fire({
title: 'Kad Pengenalan Wakil',
input: 'text',
inputPlaceholder: 'Kad Pengenalan',
confirmButtonText: 'Terima',
showCancelButton:true,
cancelButtonText:'Batal',
allowOutsideClick: true,
inputValidator: (value) => {
if (!value) {
return 'Isikan tempat kosong diatas!'
}
if(value <= 0){
return 'Masukkan No Kad Pengenalan yang betul!';
}
if(isNaN(value))
{
return 'Kad Pengenalan hendaklah dalam bentuk nombor!'
}
}
});
if(amaun)
{
}
return false;
}
+9 -6
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['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> <b>Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }}</b> </td>
</tr>
<tr>
@@ -422,6 +422,7 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
<table id="payment">
@@ -435,7 +436,7 @@ hr.new5 {
<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['bakiharga'],2) }} </td>
<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b> </td>
</tr>
@@ -465,7 +466,7 @@ hr.new5 {
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn</td>
<td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
</tr>
@@ -502,7 +503,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['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> <b>Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }}</b> </td>
</tr>
<tr>
@@ -515,6 +516,8 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
<table id="payment">
@@ -528,7 +531,7 @@ hr.new5 {
<td style="width:10px">(-) Bayaran Pelanggan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($transaction['bakiharga'],2) }}</td>
<td style="width:10px"><b>Baki Harga Jualan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b></td>
</tr>
@@ -558,7 +561,7 @@ hr.new5 {
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn</td>
<td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
</tr>
@@ -422,6 +422,7 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
<table id="payment">
@@ -515,6 +516,7 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
<table id="payment">
@@ -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['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td>: <b>Tempoh Simpan</b></td><td> <b>{{ $gadai['tempoh'] }}</b> </td>
</tr>
<tr>
@@ -422,6 +422,7 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">P</h1>
<table id="payment">
@@ -438,7 +439,7 @@ hr.new5 {
<td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['bakipjm'] + $penebusan['addpinjaman'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Bayaran Keuntungan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
<td style="width:10px"><b>Bayaran Keuntungan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($penebusan['bakiupah'],2) }} </b> </td>
</tr>
@@ -468,7 +469,7 @@ hr.new5 {
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn</td>
<td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
</tr>
@@ -505,7 +506,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['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td>: <b>Tempoh Simpan</b></td><td> <b>{{ $gadai['tempoh'] }}</b> </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>
@@ -517,6 +518,8 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">P</h1>
<table id="payment">
@@ -533,7 +536,7 @@ hr.new5 {
<td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['bakipjm'] + $penebusan['addpinjaman'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Bayaran Keuntungan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
<td style="width:10px"><b>Bayaran Keuntungan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($penebusan['bakiupah'],2) }} </b> </td>
</tr>
@@ -563,7 +566,7 @@ hr.new5 {
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn</td>
<td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
</tr>
+8 -6
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['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
</tr>
<tr>
@@ -423,6 +423,7 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
<table id="payment">
@@ -442,7 +443,7 @@ hr.new5 {
<td style="width:10px">(-) Rebate</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['rebate'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}</td>
<td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }} </b></td>
</tr>
@@ -472,7 +473,7 @@ hr.new5 {
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn</td>
<td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
</tr>
@@ -509,7 +510,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['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
</tr>
@@ -525,6 +526,7 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
<table id="payment">
@@ -544,7 +546,7 @@ hr.new5 {
<td style="width:10px">(-) Rebate</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['rebate'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}</td>
<td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']),2) }}</b></td>
</tr>
</table>
@@ -573,7 +575,7 @@ hr.new5 {
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn</td>
<td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
</tr>
@@ -368,6 +368,8 @@ hr.new5 {
color: black;
padding:4px;
}
</style>
@@ -400,6 +402,8 @@ hr.new5 {
<br>
<table id="inside">
<tr>
@@ -410,7 +414,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><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['jbg'] }} </b></td>
</tr>
<tr>
@@ -423,6 +427,7 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
<table id="payment">
@@ -436,7 +441,7 @@ hr.new5 {
<td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</td>
<td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }} </b></td>
</tr>
@@ -466,9 +471,7 @@ hr.new5 {
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn</td>
<td colspan="3"> Ar-Rahn<br><b>{{ Auth::user()->name }}</b></td>
</tr>
</table>
<br>
@@ -503,7 +506,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><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['jbg'] }} </b></td>
</tr>
@@ -519,6 +522,8 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
<table id="payment">
@@ -532,7 +537,7 @@ hr.new5 {
<td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</td>
<td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</b></td>
</tr>
</table>
@@ -561,8 +566,7 @@ hr.new5 {
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn</td>
<td colspan="3"> Ar-Rahn<br><b>{{ Auth::user()->name }}</b></td>
</tr>
</table>
@@ -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['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
</tr>
<tr>
@@ -423,6 +423,8 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">S</h1>
<table id="payment">
<tr>
@@ -444,7 +446,7 @@ hr.new5 {
<td style="width:10px"><b>Jumlah Bayaran</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakipjm'],2) }}</td>
</tr>
<tr>
<td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']-$penebusan['bakipjm']),2) }}</td>
<td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']-$penebusan['bakipjm']),2) }}</b></td>
</tr>
@@ -474,7 +476,7 @@ hr.new5 {
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn</td>
<td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
</tr>
@@ -511,7 +513,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['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
</tr>
@@ -527,6 +529,8 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">S</h1>
<table id="payment">
<tr>
@@ -548,7 +552,7 @@ hr.new5 {
<td style="width:10px"><b>Jumlah Bayaran</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakipjm'],2) }}</td>
</tr>
<tr>
<td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']-$penebusan['bakipjm']),2) }}</td>
<td style="width:10px"><b>Pembiayaan Baru</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['bakihargajualan'] - $penebusan['rebate']-$penebusan['bakipjm']),2) }} </b></td>
</tr>
@@ -578,7 +582,7 @@ hr.new5 {
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td colspan="3"> Ar-Rahn</td>
<td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
</tr>
@@ -423,6 +423,8 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">S</h1>
<table id="payment">
@@ -519,6 +521,8 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">S</h1>
<table id="payment">