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

updated server 21/12/2022

Browse Source
This commit is contained in:
e.arrahn
2022-12-21 16:27:06 +08:00
parent c1a714a25a
commit c744e23288
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/ImbangdugaServices.php
+8
View File
@@ -285,10 +285,18 @@ class ImbangdugaServices
} }
} }
uasort($array_harta, array($this,'glcode_compare'));
uasort($array_tanggungan, array($this,'glcode_compare'));
$array_all = ['array_harta' => $array_harta,'array_tanggungan' => $array_tanggungan,'sum_harta' => $response['totalharta'],'sum_tanggungan' => $response['totaltanggungan']]; $array_all = ['array_harta' => $array_harta,'array_tanggungan' => $array_tanggungan,'sum_harta' => $response['totalharta'],'sum_tanggungan' => $response['totaltanggungan']];
return response($array_all); return response($array_all);
} }
} }
private static function glcode_compare($a, $b) {
return strcmp($a['glcode'], $b['glcode']);
}
} }
resources/views/khazanah/info.blade.php
+11 -2
View File
@@ -155,6 +155,7 @@
<th>Margin</th> <th>Margin</th>
<th>Tempoh</th> <th>Tempoh</th>
<th>Keuntungan</th> <th>Keuntungan</th>
<th>Lelong</th>
</tr> </tr>
</thead> </thead>
</table> </table>
@@ -170,6 +171,7 @@
<th>Pembiayaan</th> <th>Pembiayaan</th>
<th>Margin</th> <th>Margin</th>
<th>Tempoh</th> <th>Tempoh</th>
<th>Lelong</th>
</tr> </tr>
</thead> </thead>
</table> </table>
@@ -507,6 +509,11 @@
if(jenistebus == "belum_tebus"){ if(jenistebus == "belum_tebus"){
var urlroute = '{{ route("penebusan.khazanah", ":id") }}'; var urlroute = '{{ route("penebusan.khazanah", ":id") }}';
urlroute = urlroute.replace(':id', gadai_detail["norujukan"]); urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
if(gadai_detail['taglel'] == 1){
var taglel = 'Akan Dilelong';
}else{
var taglel = '';
}
if(gadai_detail["bakihargajualan"] == null){ if(gadai_detail["bakihargajualan"] == null){
xtawarruq.row.add([ xtawarruq.row.add([
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>', '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
@@ -515,7 +522,8 @@
gadai_detail['t_matang'], gadai_detail['t_matang'],
'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['tempoh'] gadai_detail['tempoh'],
taglel
]).draw(); ]).draw();
}else{ }else{
if(gadai_detail['lelong_tawarruq'] == 0){ if(gadai_detail['lelong_tawarruq'] == 0){
@@ -532,7 +540,8 @@
'RM '+formatter.format(gadai_detail['bakipjm']), 'RM '+formatter.format(gadai_detail['bakipjm']),
(((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['tempoh'], gadai_detail['tempoh'],
'RM '+ upahsemasa 'RM '+ upahsemasa,
taglel
]).draw(); ]).draw();
} }
}else if(jenistebus == "sudah_tebus"){ }else if(jenistebus == "sudah_tebus"){
resources/views/lelongan/index.blade.php
+1 -1
View File
@@ -550,7 +550,7 @@ function ubahwakil(e)
} }
let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val(); let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val().replace(/[^0-9.-]+/g,"");
let cajlain = 0.00; let cajlelong = $('#cajlelong').val(); let cajlain = 0.00; let cajlelong = $('#cajlelong').val();
let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,""); let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,"");