diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 2af09c5..69c619e 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -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']; diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php index be307fe..90e1d89 100644 --- a/resources/views/customers/index.blade.php +++ b/resources/views/customers/index.blade.php @@ -10,6 +10,14 @@
+ + +
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index 45c31f6..cd97c5c 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -16,6 +16,7 @@ diff --git a/resources/views/khazanah/laporan/gadaian.blade.php b/resources/views/khazanah/laporan/gadaian.blade.php index 3e36beb..8ec11b6 100644 --- a/resources/views/khazanah/laporan/gadaian.blade.php +++ b/resources/views/khazanah/laporan/gadaian.blade.php @@ -44,19 +44,27 @@ No K/P No Rujukan Pembiayaan (RM) + Keuntungan (RM) Nilai Marhun (RM) Berat (g) + + TOTAL + + + + +
-
+ {{--
Bilangan Surat : 3 Jumlah Pinjaman : RM 3,000.00
-
+
--}}
@@ -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; } }); diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 8aa1a0c..1919a37 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -71,7 +71,7 @@