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

fix lelong skit dan tebus skit

Browse Source
This commit is contained in:
hafifierahman
2021-10-11 21:51:54 +08:00
parent 1b266801f1
commit dba582b25f
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+1 -1
View File
@@ -493,7 +493,7 @@ class AliranTunaiController extends Controller
if(number_format($penebusanbarcodescanned,2) !== number_format($masuk,2)) if(number_format($penebusanbarcodescanned,2) !== number_format($masuk,2))
$errorpenebusan = true; $errorpenebusan = true;
if(number_format(round($bakisemasa,1),2) !== number_format(round($baki,1),2)) if(number_format(round($bakisemasa,2),2) !== number_format(round($baki,2),2))
$errorbaki = true; $errorbaki = true;
if(number_format($totalpendahuluan,2) != number_format($pendahuluan,2)) if(number_format($totalpendahuluan,2) != number_format($pendahuluan,2))
resources/views/khazanah/info.blade.php
+22 -8
View File
@@ -540,7 +540,7 @@
var urlroute = '{{ route("lelongan", ":id") }}'; var urlroute = '{{ route("lelongan", ":id") }}';
urlroute = urlroute.replace(':id', gadai_detail["norujukan"]); urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
tablelelong.row.add([ tablelelong.row.add([
counter, '<input type="radio" value='+ gadai_detail["norujukan"] +' name="lelong"/>',
'<a href="#" onclick="checktuntutbaki(this)" data-norujukan=' + gadai_detail['norujukan'] + ' data-tarikhtuntut=' + gadai_detail['trkhtuntut'] + '>' + gadai_detail['norujukan'] + '</a>', '<a href="#" onclick="checktuntutbaki(this)" data-norujukan=' + gadai_detail['norujukan'] + ' data-tarikhtuntut=' + gadai_detail['trkhtuntut'] + '>' + gadai_detail['norujukan'] + '</a>',
gadai_detail['t_lelong'], gadai_detail['t_lelong'],
gadai_detail['trkhtuntut'], gadai_detail['trkhtuntut'],
@@ -697,12 +697,18 @@
var koddaerah = $(e).data('koddaerah'); var koddaerah = $(e).data('koddaerah');
var noruj = $(e).data('histid'); var noruj = $(e).data('histid');
console.log(kodnegeri);
if(kodnegeri !== null && koddaerah !== null && kodnegeri !== '' && koddaerah !== '') if(kodnegeri !== null && koddaerah !== null && kodnegeri !== '' && koddaerah !== '')
{ {
if($("input[name='options']:checked").val() == 'belum_tebus'){ if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){
let histid = $('input[name="belum"]:checked').val();
let histid = '';
if($("input[name='options']:checked").val() == 'belum_tebus'){
histid = $('input[name="belum"]:checked').val();
}
else{
histid = $('input[name="lelong"]:checked').val();
}
if(histid == null){ if(histid == null){
Swal.fire({ Swal.fire({
icon: 'error', icon: 'error',
@@ -728,7 +734,15 @@
function saghilangfunc() function saghilangfunc()
{ {
if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){ if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){
let histid = $('input[name="belum"]:checked').val();
let histid = '';
if($("input[name='options']:checked").val() == 'belum_tebus'){
histid = $('input[name="belum"]:checked').val();
}
else{
histid = $('input[name="lelong"]:checked').val();
}
if(histid == null){ if(histid == null){
Swal.fire({ Swal.fire({
icon: 'error', icon: 'error',
@@ -744,7 +758,7 @@
{ {
var count = Object.keys(data).length; var count = Object.keys(data).length;
console.log(histid);
if(count > 0) if(count > 0)
{ {
Swal.fire({ Swal.fire({
@@ -778,7 +792,7 @@
title: 'Amaran', title: 'Amaran',
text: 'Cetakan Surat Akuan Hilang tidak dibenarkan' text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
}); });
} }
// }else if($("input[name='options']:checked").val() == 'lelong'){ // }else if($("input[name='options']:checked").val() == 'lelong'){