diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index a4f7f0d..dc9d85d 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1975,9 +1975,11 @@ class KhazanahController extends Controller //Harta semasa $pinjamandiberi = Http::get(config('api.url').'/api/PinjamanDiberi/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); + $pembiayaantawarruq = Http::get(config('api.url').'/api/PembiayaanDiberiTawarruq/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $tunaiditangan = Http::get(config('api.url').'/api/TunaiDiTangan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $penghutangkaki = Http::get(config('api.url').'/api/PenghutangKakitangan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); - + $untungrugi = Http::get(config('api.url').'/api/UntungRugiCalculation/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); + $bayaranpendahuluan = Http::get(config('api.url').'/api/BayaranPendahuluan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); //Tanggungan Semasa $panjar = Http::get(config('api.url').'/api/CalculationPanjar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); @@ -1994,11 +1996,12 @@ class KhazanahController extends Controller $hartasemasa = []; // $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']]; - array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['bakiakhir']]); + array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan]); + array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]); array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]); array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]); - array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => 0]); + array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]); array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => 0]); array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]); @@ -2035,7 +2038,16 @@ class KhazanahController extends Controller $totaltanggungansemasa += $ts['amaun']; } - return view('print.laporan_imbanduga',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','tanggungansemasa','totalhartasemasa','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail')); + $untungrugifield = []; + $untungrugi = 0; + array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan', 'amaun' => $untungrugi]); + + + $totaluntungrugi = 0; + $totaluntungrugi = $totaltanggungansemasa + $untungrugi; + + + return view('print.laporan_imbanduga',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','untungrugifield','tanggungansemasa','totalhartasemasa','totaluntungrugi','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail')); } diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index 5df17b3..20d15c6 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -526,11 +526,9 @@ class PenebusanController extends Controller $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat'])); $totalnilaimarhun += $nilaimarhun; - } return $totalnilaimarhun; - } } diff --git a/resources/views/homepage/teller/home.blade.php b/resources/views/homepage/teller/home.blade.php index 754ca9d..e89091f 100644 --- a/resources/views/homepage/teller/home.blade.php +++ b/resources/views/homepage/teller/home.blade.php @@ -5,7 +5,7 @@
-
{{ __('Dashboard') }}
+
{{ __('Paparan Utama') }}
PELANGGAN diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index d094457..1b4403a 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -117,18 +117,19 @@ @php $count = 0; @endphp @foreach ($marhun as $index=>$m) - {{ $index+1 }} + @php + $karatbaru = str_replace('.','-',$m['karat']); + $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); + + $hargaemassemasa = floatval($hargabaru['harga']) * floatval($m['berat']); + @endphp + {{ $index+1 }} @php $marhunperibadi = Http::get(config('api.url') .'/api/jemas/nama_marhun/',["marhun" => $m['marhun']])->json(); @endphp {{ $marhunperibadi['descpt'] }} RM {{ number_format($m['n_marhun'],2) }} @php - $karatbaru = str_replace('.','-',$m['karat']); - $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); - - $hargaemassemasa = floatval($hargabaru['harga']) * floatval($m['berat']); - echo "RM " . number_format($hargaemassemasa,2); @endphp {{ $m['berat'] }} @@ -273,6 +274,17 @@
+
+
+
+ PEMBIAYAAN BARU HARGA SEMASA (RM) +
+
+ +
+
+
+
@@ -299,7 +311,6 @@
-
@@ -341,16 +352,19 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); + $('#divpembiayaanseparuhhargasemasa').hide(); var array_recno = []; var array_nm = []; var array_marhun = []; var array_berat = []; + var array_nmhs = []; //max bayaran let jumlahasalmarhun = parseFloat("{{ $gadai['nilaimarhun'] }}"); let totalmarhun = jumlahasalmarhun; + let totalmarhunhargasemasa = jumlahasalmarhun; let bayaranseparuhasal = 0; @@ -501,19 +515,23 @@ var nilaimarhun = $(this).data('nm'); var marhun = $(this).data('marhun'); var berat = $(this).data('berat'); + var nilaimarhunhargasemasa = $(this).data('nmhs'); if ($(this).is(':checked')) { array_recno.push(recno); array_nm.push(nilaimarhun); array_marhun.push(marhun); array_berat.push(berat); + array_nmhs.push(nilaimarhunhargasemasa); totalmarhun = totalmarhun - parseFloat(nilaimarhun); + totalmarhunhargasemasa = totalmarhunhargasemasa - parseFloat(nilaimarhunhargasemasa); }else{ var rm = array_recno.findIndex(x => x === recno); var rmnilai = array_nm.findIndex(y => y == nilaimarhun); + var rmhargasemasa = array_nmhs.findIndex(y => y == nilaimarhunhargasemasa); var rmmarhun = array_marhun.findIndex(z => z == marhun); var rmberat = array_berat.findIndex(a => a == berat); @@ -521,10 +539,10 @@ array_nm.splice(rmnilai,1); array_marhun.splice(rmmarhun,1); array_berat.splice(rmberat,1); + array_nmhs.splice(rmhargasemasa,1); totalmarhun = totalmarhun + parseFloat(nilaimarhun); - - + totalmarhunhargasemasa = totalmarhunhargasemasa + parseFloat(nilaimarhunhargasemasa); } if(numbernotchecked != totalCheckboxes){ $.ajax({ @@ -646,6 +664,8 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); + $('#divpembiayaanseparuhhargasemasa').hide(); + $('#divtelahdibayar').show(); @@ -668,6 +688,7 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); + $('#divpembiayaanseparuhhargasemasa').hide(); $('#divtelahdibayar').show(); @@ -696,6 +717,8 @@ $('#divtelahdibayar').show(); $('#divbayaran').show(); $('#divperludibayar').show(); + $('#divpembiayaanseparuhhargasemasa').show(); + $('#perludibayar').val(formatter.format(jumupah)); @@ -711,6 +734,7 @@ $('#divhargaemassemasa').show(); $('#divtelahdibayar').hide(); + $('#divpembiayaanseparuhhargasemasa').hide(); $('#divbakipinjaman').hide(); $('#divbayaran').hide(); $('#divperludibayar').hide(); diff --git a/resources/views/print/laporan_imbanduga.blade.php b/resources/views/print/laporan_imbanduga.blade.php index 51b727a..5898b6a 100644 --- a/resources/views/print/laporan_imbanduga.blade.php +++ b/resources/views/print/laporan_imbanduga.blade.php @@ -411,16 +411,6 @@ - - - - - - - - - - @@ -442,8 +432,6 @@
-
- @@ -451,7 +439,6 @@
LAPORAN IMBANGAN DUGA CAWANGAN
-
@@ -463,7 +450,6 @@

-
@@ -494,12 +480,10 @@

-
-
- + @@ -518,6 +502,30 @@ +
TANGGUNGAN SEMASA T. SEMASA
{{ number_format($totaltanggungansemasa,2) }}
+
+ + + + + + + + + @foreach($untungrugifield as $index => $untungrugi) + + + + + + @endforeach + + + + + + +
Untung Rugi
{{ $untungrugi['glcode'] }}{{ $untungrugi['descpt'] }}{{ number_format($untungrugi['amaun'],2) }}
JUMLAH {{ number_format($totaluntungrugi,2) }}