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

Merge branch 'fixkaunter' into 'new-super'

Browse Source 
Fixkaunter

See merge request online-sistem1/kaunter!205
This commit is contained in:
hafifie rahman
2022-08-06 16:35:28 +00:00
parent 6c174353cd b48af8c85e
commit 2a08cac24d
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/customers/info.blade.php
+9 -1
View File
@@ -162,6 +162,7 @@
<th>Margin</th>
<th>Tempoh</th>
<th>Keuntungan</th>
<th>Lelong</th>
</tr>
</thead>
</table>
@@ -766,6 +767,12 @@
taglel,
]).draw();
}else{
if(gadai_detail['taglel'] == 1){
var taglel = 'Akan Dilelong';
}else{
var taglel = '';
}
if(gadai_detail['lelong_tawarruq'] == 0){
var tarikh_matang = gadai_detail['t_matang1'];
}else{
@@ -780,7 +787,8 @@
'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
'RM '+ upahsemasa,
taglel
]).draw();
}
}else if(jenistebus == "sudah_tebus"){
resources/views/khazanah/lelong.blade.php
-2
View File
@@ -48,7 +48,6 @@
<a href="{{ route('lelongan.laporancetak', ['jeniscetakan' => 'cetak','batchno' => $sb['batchno'],'fasa' => 1]) }}" class="btn btn-info text-white">Cetak</a>
<a href="{{ route('lelongan.laporancetak', ['jeniscetakan' => 'excel','batchno' => $sb['batchno'],'fasa' => 1]) }}" target="_blank" class="btn btn-success text-white">Excel</a>
<a href="{{ route('lelongan.laporancetak', ['jeniscetakan' => 'pdf','batchno' => $sb['batchno'],'fasa' => 1]) }}" target="_blank" class="btn btn-danger text-white">PDF</a>
<a href="{{ route('lelongan.laporancetak', ['jeniscetakan' => 'notistuntutbaki','batchno' => $sb['batchno'],'fasa' => 1]) }}" target="_blank" class="btn btn-danger text-white">Notis Tuntut Baki</a>
</td>
</tr>
@endforeach
@@ -63,7 +62,6 @@
<a href="{{ route('lelongan.laporancetak', ['jeniscetakan' => 'cetak','batchno' => $sb['batchno'],'fasa' => 2]) }}" class="btn btn-info text-white">Cetak</a>
<a href="{{ route('lelongan.laporancetak', ['jeniscetakan' => 'excel','batchno' => $sb['batchno'],'fasa' => 2]) }}" target="_blank" class="btn btn-success text-white">Excel</a>
<a href="{{ route('lelongan.laporancetak', ['jeniscetakan' => 'pdf','batchno' => $sb['batchno'],'fasa' => 2]) }}" target="_blank" class="btn btn-danger text-white">PDF</a>
<a href="{{ route('lelongan.laporancetak', ['jeniscetakan' => 'notistuntutbaki','batchno' => $sb['batchno'],'fasa' => 2]) }}" target="_blank" class="btn btn-danger text-white">Notis Tuntut Baki</a>
</td>
</tr>
@endforeach
resources/views/layouts/app.blade.php
+1 -1
View File
@@ -327,7 +327,7 @@
</div>
@elseif(floatval($getVault) < $cawangan[0]['min'])
<div id="notify-minimum" style="z-index: 1" class="alert alert-danger sticky-top text-center" role="alert">
Baki peti besi anda sekarang adalah <b>RM{{ number_format($getVault,2) }}</b> dan melebihi had minimum peti besi. Sila buat permohonan wang segera!
Baki peti besi anda sekarang adalah <b>RM{{ number_format($getVault,2) }}</b> dan kurang dari had minima peti besi. Sila buat permohonan wang segera!
</div>
@else
@endif