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

Merged in new-onepercent (pull request #56)

Browse Source 
fix rekod gadaian
This commit is contained in:
Muhd hafifie
2023-12-31 09:53:09 +00:00
parent 4a249b056a b278a17062
commit 9f1d0a3f49
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+8 -3
View File
@@ -382,7 +382,12 @@ class GadaianController extends Controller
if(sizeof($wakil) != 0) if(sizeof($wakil) != 0)
$wakil = $wakil[0]; $wakil = $wakil[0];
return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil')); if($gadai['tagbaru'] == 1) {
return view('print.resitansuran_ujrah',compact('transaction','gadai','customers_info','wakil'));
} else {
return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil'));
// return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
}
} }
public function resitansurans($id) public function resitansurans($id)
@@ -729,7 +734,7 @@ class GadaianController extends Controller
if($history == $gadai[0][0]['historygadaian']) if($history == $gadai[0][0]['historygadaian'])
$history = 0; $history = 0;
else{ else{
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)]); array_push($arrayhist,["tagbaru" => ((isset($gadai[0][0]['tagbaru'])) ? $gadai[0][0]['tagbaru'] : 0),"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']; $history = $gadai[0][0]['historygadaian'];
} }
} }
@@ -744,7 +749,7 @@ class GadaianController extends Controller
])->json(); ])->json();
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)]); array_push($arrayhist,["tagbaru" => ((isset($gadai[0][0]['tagbaru'])) ? $gadai[0][0]['tagbaru'] : 0), "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; break;
} }
} }
resources/views/customers/v2/info.blade.php
+17 -5
View File
@@ -1417,14 +1417,26 @@
urlroute = urlroute.replace(':id', tebusaz['norujukan']); urlroute = urlroute.replace(':id', tebusaz['norujukan']);
}else{ }else{
var urlroute = '{{ route("resit.tebus", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']); if(tebusaz['historygadaian'] != '' || tebusaz['historygadaian'] != 0 || tebusaz['historygadaian'] != null){
var urlroute = '{{ route("resit.autotawarruq", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
}else{
var urlroute = '{{ route("resit.tebus", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
}
} }
break; break;
case 'A': case 'A':
var urlroute = '{{ route("resit.belumansurans", ":id") }}'; if(tebusaz['tagbaru'] == 1){
urlroute = urlroute.replace(':id', tebusaz['norujukan']); var urlroute = '{{ route("resit.ansuran", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
}else{
var urlroute = '{{ route("resit.belumansurans", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
}
break; break;
case 'S': case 'S':
var urlroute = '{{ route("resit.tebusseparuh", ":id") }}'; var urlroute = '{{ route("resit.tebusseparuh", ":id") }}';
@@ -1435,7 +1447,7 @@
historytebusbayaran.row.add([ historytebusbayaran.row.add([
counter, counter,
tebusaz['norujukan'], tebusaz['norujukan'],
tebusaz['jenistebus'], (tebusaz['historygadaian'] != '' || tebusaz['historygadaian'] != 0 || tebusaz['historygadaian'] != null) ? 'PS' : tebusaz['jenistebus'],
tebusaz['pinjaman'], tebusaz['pinjaman'],
tebusaz['jbg'], tebusaz['jbg'],
tebusaz['t_tebus'], tebusaz['t_tebus'],
resources/views/khazanah/v2/info.blade.php
+9 -2
View File
@@ -1051,8 +1051,15 @@ $.each(data,function(index,gadai_detail){
urlroute = urlroute.replace(':id', tebusaz['norujukan']); urlroute = urlroute.replace(':id', tebusaz['norujukan']);
}else{ }else{
var urlroute = '{{ route("resit.khazanah.tebus", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']); if(tebusaz['historygadaian'] != '' || tebusaz['historygadaian'] != 0 || tebusaz['historygadaian'] != null){
var urlroute = '{{ route("resit.autotawarruq", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
}else{
var urlroute = '{{ route("resit.khazanah.tebus", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
}
} }
break; break;