fix bug
This commit is contained in:
afiq
@@ -360,7 +360,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<script>
|
<script>
|
||||||
var api_url = "<?php echo $api_url ?>";
|
var api_url = "<?php echo $api_url ?>";
|
||||||
|
var kodcaw = "{{ $cawangan_info['kodcaw'] }}";
|
||||||
$('#daftar_gadai').on('click',function(){
|
$('#daftar_gadai').on('click',function(){
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
@@ -417,56 +417,53 @@
|
|||||||
tabledahtebus.clear().draw();
|
tabledahtebus.clear().draw();
|
||||||
tablelelong.clear().draw();
|
tablelelong.clear().draw();
|
||||||
|
|
||||||
$.each(data,function(index,gadai){
|
$.each(data,function(index,gadai_detail){
|
||||||
$.each(gadai, function(index,gadai_detail){
|
if(jenistebus == "belum_tebus"){
|
||||||
if(jenistebus == "belum_tebus"){
|
var urlroute = '{{ route("penebusan", ":id") }}';
|
||||||
|
urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
|
||||||
var urlroute = '{{ route("penebusan", ":id") }}';
|
|
||||||
urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
|
|
||||||
|
|
||||||
tablegadai.row.add([
|
tablegadai.row.add([
|
||||||
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
|
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
|
||||||
'<a href=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
|
'<a href=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
|
||||||
gadai_detail['t_gadai'],
|
gadai_detail['t_gadai'],
|
||||||
gadai_detail['t_matang'],
|
gadai_detail['t_matang'],
|
||||||
'RM '+ formatter.format(gadai_detail['nilaimarhun']),
|
'RM '+ formatter.format(gadai_detail['nilaimarhun']),
|
||||||
'RM '+formatter.format(gadai_detail['pinjaman']),
|
'RM '+formatter.format(gadai_detail['pinjaman']),
|
||||||
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
|
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
|
||||||
gadai_detail['jbg'],
|
gadai_detail['jbg'],
|
||||||
'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg'])),
|
'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg'])),
|
||||||
'RM ' + formatter.format(((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['pinjaman'])).toFixed(2))
|
'RM ' + formatter.format(((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['pinjaman'])).toFixed(2))
|
||||||
]).draw();
|
]).draw();
|
||||||
}else if(jenistebus == "sudah_tebus"){
|
}else if(jenistebus == "sudah_tebus"){
|
||||||
|
|
||||||
tabledahtebus.row.add([
|
tabledahtebus.row.add([
|
||||||
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="sudahtebus"/>',
|
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="sudahtebus"/>',
|
||||||
gadai_detail['norujukan'],
|
gadai_detail['norujukan'],
|
||||||
gadai_detail['t_gadai'],
|
gadai_detail['t_gadai'],
|
||||||
gadai_detail['t_matang'],
|
gadai_detail['t_matang'],
|
||||||
'RM '+ formatter.format(gadai_detail['nilaimarhun']),
|
'RM '+ formatter.format(gadai_detail['nilaimarhun']),
|
||||||
'RM '+formatter.format(gadai_detail['pinjaman']),
|
'RM '+formatter.format(gadai_detail['pinjaman']),
|
||||||
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
|
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
|
||||||
gadai_detail['jbg'],
|
gadai_detail['jbg'],
|
||||||
'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg'])),
|
'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg'])),
|
||||||
'RM ' + formatter.format(((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['pinjaman'])).toFixed(2))
|
'RM ' + formatter.format(((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['pinjaman'])).toFixed(2))
|
||||||
]).draw();
|
]).draw();
|
||||||
}else if(jenistebus == "lelong"){
|
}else if(jenistebus == "lelong"){
|
||||||
|
|
||||||
tablelelong.row.add([
|
tablelelong.row.add([
|
||||||
counter,
|
counter,
|
||||||
gadai_detail['norujukan'],
|
gadai_detail['norujukan'],
|
||||||
gadai_detail['t_gadai'],
|
gadai_detail['t_gadai'],
|
||||||
gadai_detail['t_matang'],
|
gadai_detail['t_matang'],
|
||||||
'RM '+ formatter.format(gadai_detail['nilaimarhun']),
|
'RM '+ formatter.format(gadai_detail['nilaimarhun']),
|
||||||
'RM '+formatter.format(gadai_detail['pinjaman']),
|
'RM '+formatter.format(gadai_detail['pinjaman']),
|
||||||
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
|
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
|
||||||
gadai_detail['jbg'],
|
gadai_detail['jbg'],
|
||||||
'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg'])),
|
'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg'])),
|
||||||
'RM ' + formatter.format(((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['pinjaman'])).toFixed(2))
|
'RM ' + formatter.format(((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['pinjaman'])).toFixed(2))
|
||||||
]).draw();
|
]).draw();
|
||||||
}
|
}
|
||||||
counter = counter + 1;
|
counter = counter + 1;
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
@@ -481,11 +478,12 @@
|
|||||||
$('#btnsave').css('display','none');
|
$('#btnsave').css('display','none');
|
||||||
|
|
||||||
var noic = $("#noic").val();
|
var noic = $("#noic").val();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
method:"GET",
|
method:"GET",
|
||||||
url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus",
|
url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus/"+kodcaw,
|
||||||
success: function(data){
|
success: function(data){
|
||||||
|
console.log(data);
|
||||||
$('#myTable').parents('div.dataTables_wrapper').first().show();
|
$('#myTable').parents('div.dataTables_wrapper').first().show();
|
||||||
gadaiTable(data,"belum_tebus");
|
gadaiTable(data,"belum_tebus");
|
||||||
}
|
}
|
||||||
@@ -920,7 +918,7 @@
|
|||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
method:"GET",
|
method:"GET",
|
||||||
url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus",
|
url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus/"+kodcaw,
|
||||||
success: function(data){
|
success: function(data){
|
||||||
gadaiTable(data,"belum_tebus");
|
gadaiTable(data,"belum_tebus");
|
||||||
}
|
}
|
||||||
@@ -934,7 +932,7 @@
|
|||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
method:"GET",
|
method:"GET",
|
||||||
url: api_url + "/api/customers/"+noic+"/gadai/sudah_tebus",
|
url: api_url + "/api/customers/"+noic+"/gadai/sudah_tebus/"+kodcaw,
|
||||||
success: function(data){
|
success: function(data){
|
||||||
gadaiTable(data,"sudah_tebus");
|
gadaiTable(data,"sudah_tebus");
|
||||||
}
|
}
|
||||||
@@ -948,7 +946,7 @@
|
|||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
method:"GET",
|
method:"GET",
|
||||||
url: api_url + "/api/customers/"+noic+"/gadai/lelong",
|
url: api_url + "/api/customers/"+noic+"/gadai/lelong/"+kodcaw,
|
||||||
success: function(data){
|
success: function(data){
|
||||||
gadaiTable(data,"lelong");
|
gadaiTable(data,"lelong");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -392,7 +392,7 @@
|
|||||||
<td>TARIKH MATANG</td>
|
<td>TARIKH MATANG</td>
|
||||||
<td>
|
<td>
|
||||||
@php
|
@php
|
||||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang']);
|
$myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang1']);
|
||||||
$formattedweddingdate = $myDateTime->format('d-m-Y');
|
$formattedweddingdate = $myDateTime->format('d-m-Y');
|
||||||
echo($formattedweddingdate)
|
echo($formattedweddingdate)
|
||||||
@endphp
|
@endphp
|
||||||
@@ -798,7 +798,7 @@
|
|||||||
<td>TARIKH MATANG</td>
|
<td>TARIKH MATANG</td>
|
||||||
<td>
|
<td>
|
||||||
@php
|
@php
|
||||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang']);
|
$myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang1']);
|
||||||
$formattedweddingdate = $myDateTime->format('d-m-Y');
|
$formattedweddingdate = $myDateTime->format('d-m-Y');
|
||||||
echo($formattedweddingdate)
|
echo($formattedweddingdate)
|
||||||
@endphp
|
@endphp
|
||||||
|
|||||||
Reference in New Issue
Block a user