fix apa yang patut

This commit is contained in:
MUHD HAFIFIE
2021-04-21 01:33:01 +08:00
parent 835154e563
commit 3b3db8ac42
7 changed files with 40 additions and 15 deletions
+1 -4
View File
@@ -150,7 +150,7 @@ class KhazanahController extends Controller
}
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.dashboard',compact('komuditicheck','cawangan_info','api_url','dashboard','totalmarhun','ringkasanharian','ringkasanterkumpul','getVault','keseluruhanupahharian','upahsimpan','keuntungan'));
return view('khazanah.dashboard',compact('komuditicheck','cawangan_info','api_url','dashboard','totalmarhun','ringkasanharian','getVault','keseluruhanupahharian','upahsimpan','keuntungan'));
}
public function alirantunai()
@@ -443,7 +443,6 @@ class KhazanahController extends Controller
else
{
dd(request()->all());
if($tebus_detail['jenistebus'] == 'P')
{
@@ -696,8 +695,6 @@ class KhazanahController extends Controller
$totalmasuk = $tebus_detail['bakipjm'] + $masuk;
// KIRAAN LEJER AM BERMULA UNYTUK PENEBUSAN JENIS 'T'
dd($totalmasuk);
$get_GLCode_Tunai=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$KOD_tunai])->json();
$keterangan_Tunai=$get_GLCode_Tunai[0]['descpt'];
@@ -10,6 +10,14 @@
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
<li class="breadcrumb-item active" aria-current="page">Pengenalan Diri</li>
</ol>
</nav>
<div class="card">
<div class="card-body">
<div class="text-center">
+1
View File
@@ -16,6 +16,7 @@
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
<li class="breadcrumb-item"><a href="{{ url('/pelanggan') }}">Pengenalan Diri</a></li>
<li class="breadcrumb-item active" aria-current="page">Pelanggan</li>
</ol>
</nav>
@@ -44,19 +44,27 @@
<th>No K/P</th>
<th>No Rujukan</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Nilai Marhun (RM)</th>
<th>Berat (g)</th>
</tr>
</thead>
<tfoot class="thead-dark">
<th colspan="4">TOTAL</th>
<th id="pinjamantotal"></th>
<th id="upah12total"></th>
<th id="nmtotal"></th>
<th id="berattotal"></th>
</tfoot>
</table>
</div>
</div>
<div class="row">
{{-- <div class="row">
<div class="col-md-12 text-right">
Bilangan Surat : <span id="bilangan_surat">3</span>
Jumlah Pinjaman : <span id="jumlah_pinjaman">RM 3,000.00</span>
</div>
</div>
</div> --}}
</div>
</div>
</div>
@@ -107,6 +115,10 @@
function gadaitable(data){
var counter = 1;
var total_pinjaman = 0;
var total_upah12 = 0;
var total_nm = 0;
var total_berat = 0;
tablegadai.clear().draw();
$.each(data,function(index,gadai){
$.ajax({
@@ -114,17 +126,23 @@
url:api_url + '/api/customers/' + gadai['nokp'],
success:function(customer){
total_pinjaman += Number(gadai['pinjaman']);
total_upah12 += Number(gadai['upah12']);
total_nm += Number(gadai['nilaimarhun']);
total_berat += Number(gadai['berat']);
tablegadai.row.add([
counter,
customer[0]['nama'],
gadai['nokp'],
gadai['norujukan'],
gadai['pinjaman'],
gadai['nilaimarhun'],
gadai['berat']
formatter.format(gadai['pinjaman']),
formatter.format(gadai['upah12']),
formatter.format(gadai['nilaimarhun']),
formatter.format(gadai['berat'])
]).draw();
$('#bilangan_surat').text(counter);
$('#jumlah_pinjaman').text('RM '+ formatter.format(total_pinjaman.toFixed(2)));
$('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
$('#upah12total').text(formatter.format(total_upah12.toFixed(2)));
$('#nmtotal').text(formatter.format(total_nm.toFixed(2)));
$('#berattotal').text(formatter.format(total_berat.toFixed(2)));
counter = counter + 1;
}
});
+1 -1
View File
@@ -71,7 +71,7 @@
<div id="app">
<nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="height:100px;">
<div class="container">
<a class="navbar-brand" href="#">
<a class="navbar-brand" href="#" style="cursor:not-allowed;">
<img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
</a>
<div class="col-2">
@@ -71,7 +71,7 @@
<div id="app">
<nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="height:100px;">
<div class="container">
<a class="navbar-brand" href="#">
<a class="navbar-brand" href="#" style="cursor:not-allowed;">
<img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
</a>
+3 -2
View File
@@ -10,8 +10,9 @@
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="#">Home</a></li>
<li class="breadcrumb-item"><a href="#">Pelanggan</a></li>
<li class="breadcrumb-item"><a href="#" style="cursor:not-allowed;">Home</a></li>
<li class="breadcrumb-item"><a href="#" style="cursor:not-allowed;">Pengenalan Diri</a></li>
<li class="breadcrumb-item"><a href="#" style="cursor:not-allowed;">Pelanggan</a></li>
<li class="breadcrumb-item active" aria-current="page">Penebusan</li>
</ol>
</nav>