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

Merge branch 'ujrah_master' of https://bitbucket.org/arrahn-pkb/kaunter into finadev

Browse Source
This commit is contained in:
Afrina Alimi
2024-02-04 08:36:17 +08:00
parent 610a1f5ca7 98be3b9ec6
commit c999b5fb09
3 changed files with 54 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/callcenter/v1/info.blade.php
+24 -33
View File
@@ -721,37 +721,12 @@
var tarikh_matang = gadai_detail['t_matang'];
}
if(gadai_detail["tagbaru"] == 0){
$('#textnavsag').addClass('text-danger');
if(gadai_detail['taglel'] == 1){
var taglel = '<b class="text-danger">Akan Dilelong</b>';
}else{
var taglel = '';
}
let table_norujukan = gadai_detail["norujukan"];
let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
if(gadai_detail["percentpinj"] != 0)
xtawarruq.row.add([
'<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' name="belum"/>',
'<a data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
gadai_detail['t_gadai'],
tarikh_matang,
'RM '+ formatter.format(gadai_detail['bakihargajualan']),
'RM '+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['tempoh'],
'RM '+ upahsemasa,
'<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
]).draw();
}else{
var taglel = '';
if(gadai_detail['taglel'] == 1){
var taglel = '';
if(gadai_detail['taglel'] == 1){
if(tagarrahnbid == 1){
$.ajax({
method:"GET",
async:false,
async:false,
url:api_arrahnbid + 'portalApi?norujukan=' + gadai_detail['norujukan'],
success: function(data){
@@ -774,18 +749,33 @@
}
}
let table_norujukan = gadai_detail["norujukan"];
let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
if(gadai_detail["bakihargajualan"] == null){
xtawarruq.row.add([
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
'<a href="#" onclick="checkserah(this)" data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
gadai_detail['t_gadai'],
gadai_detail['t_matang'],
'RM '+formatter.format(gadai_detail['pinjaman']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['tempoh'],
taglel
]).draw();
}else{
if(gadai_detail['lelong_tawarruq'] == 0){
var tarikh_matang = gadai_detail['t_matang1'];
}else{
var tarikh_matang = gadai_detail['t_matang'];
}
tablegadai.row.add([
'<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' name="belum"/>',
'<a data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
'<a data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
gadai_detail['t_gadai'],
tarikh_matang,
'RM '+ formatter.format(gadai_detail['bakihargajualan']),
'RM '+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['tempoh'],
'RM '+ upahsemasa['pendapatan'],
'RM '+ formatter.format(upahsemasa),
'<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
]).draw();
}
@@ -1266,6 +1256,7 @@
counter,
bayaran['created_at'],
"RM " + bayaran['duit_masuk'],
bayaran['trans_type'],
''
]).draw();
counter = counter + 1;
resources/views/callcenter/v2/info.blade.php
+28 -5
View File
@@ -757,11 +757,33 @@
if(gadai_detail["tagbaru"] == 0){
$('#textnavsag').addClass('text-danger');
var taglel = '';
if(gadai_detail['taglel'] == 1){
var taglel = '<b class="text-danger">Akan Dilelong</b>';
}else{
var taglel = '';
}
if(tagarrahnbid == 1){
$.ajax({
method:"GET",
async:false,
url:api_arrahnbid + 'portalApi?norujukan=' + gadai_detail['norujukan'],
success: function(data){
taglel = data.lelong.t_lelong;
}
});
} else {
$.ajax({
method:"GET",
async:false,
url:api_url + '/api/check/taglelong',
data: {
'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'norujukan': gadai_detail['norujukan'],
},
success: function(v){
taglel = v.t_lelong;
}
});
}
}
let table_norujukan = gadai_detail["norujukan"];
let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
@@ -819,7 +841,7 @@
'RM '+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['tempoh'],
'RM '+ upahsemasa['pendapatan'],
'RM '+ formatter.format(upahsemasa['pendapatan']),
'<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
]).draw();
}
@@ -1301,6 +1323,7 @@
counter,
bayaran['created_at'],
"RM " + bayaran['duit_masuk'],
bayaran['trans_type'],
''
]).draw();
counter = counter + 1;
resources/views/print/resittebusautotawarruq.blade.php
+2 -2
View File
@@ -469,7 +469,7 @@ hr.new5 {
<tr>
<td style="width:10px">Pembiayaan Baru</td>
<td style="width:5px"> </td>
<td style="width:10px">: RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
<td style="width:10px">: RM {{ number_format($gadai['bakipjm']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
</tr>
<tr>
<td></td>
@@ -616,7 +616,7 @@ hr.new5 {
<tr>
<td style="width:10px">Pembiayaan Baru</td>
<td style="width:5px"> </td>
<td style="width:10px">: RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
<td style="width:10px">: RM {{ number_format($gadai['bakipjm']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
</tr>
<tr>
<td></td>