diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index e4b6a67..2af09c5 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -117,11 +117,9 @@ class KhazanahController extends Controller $keseluruhanupahharian = $ringkasanharian['lelongupahsimpan'] + $ringkasanharian['tebus'][0]['upahsimpan'] + $ringkasanharian['advansur'][0]['upahsimpan']; - //Terkumpul - $ringkasanterkumpul = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'],['tarikh' => $harini->toDateString()])->json(); - $ringkasanterkumpul = $ringkasanterkumpul[0]; - - $keseluruhanupahterkumpul = $ringkasanterkumpul['lelongupahsimpan'] + $ringkasanterkumpul['tebus'][0]['upahsimpan'] + $ringkasanterkumpul['advansur'][0]['upahsimpan']; + //Upah Terkumpul + $upahsimpan = Http::get(config('api.url'). '/api/KeuntunganSebenar/'. $auth_user['cawangan'],['tarikh' => $harini->toDateString()])->json(); + $keuntungan = Http::get(config('api.url'). '/api/UntungRugiCalculation/'. $auth_user['cawangan'],['tarikh' => $harini->toDateString()])->json(); //Peti Besi Cawangan $getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json(); @@ -152,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','keseluruhanupahterkumpul')); + return view('khazanah.dashboard',compact('komuditicheck','cawangan_info','api_url','dashboard','totalmarhun','ringkasanharian','ringkasanterkumpul','getVault','keseluruhanupahharian','upahsimpan','keuntungan')); } public function alirantunai() diff --git a/resources/views/khazanah/dashboard.blade.php b/resources/views/khazanah/dashboard.blade.php index 5582405..4d34971 100644 --- a/resources/views/khazanah/dashboard.blade.php +++ b/resources/views/khazanah/dashboard.blade.php @@ -25,6 +25,8 @@ + +
{{-- First Column --}} @@ -76,7 +78,7 @@ {{-- Second Column --}}
-
+ {{--

RM {{ ($dashboard[0]['gadai']) ? number_format((float)$dashboard[0]['gadai'],2) : "0.00" }}

@@ -84,13 +86,27 @@
- {{-- More info --}} + {{-- More info +
--}} + +
+
Gadai Terkumpul
+
+
+
Tawarruq :
+

RM {{ ($dashboard[0]['gadaitawarruq']) ? number_format((float)$dashboard[0]['gadaitawarruq'],2) : "0.00" }}

+
+
+
Ar-Rahn :
+

RM {{ ($dashboard[0]['gadai']) ? number_format((float)$dashboard[0]['gadai'],2) : "0.00" }}

+
+
-
+ {{--

RM {{ ($dashboard[0]['tebus']) ? number_format((float)$dashboard[0]['tebus'],2) : "0.00" }}

@@ -98,13 +114,27 @@
- {{-- More info --}} + {{-- More info +
--}} + +
+
Tebus Terkumpul
+
+
+
Tawarruq :
+

RM {{ ($dashboard[0]['tebustawarruq']) ? number_format((float)$dashboard[0]['tebustawarruq'],2) : "0.00" }}

+
+
+
Ar-Rahn :
+

RM {{ ($dashboard[0]['tebus']) ? number_format((float)$dashboard[0]['tebus'],2) : "0.00" }}

+
+
-
+ {{--

RM {{ number_format($keseluruhanupahterkumpul) }}

@@ -112,7 +142,21 @@
- {{-- More info --}} + {{-- More info +
--}} + +
+
Keuntungan dan Upah Terkumpul
+
+
+
Keuntungan :
+

RM {{ number_format($keuntungan) }}

+
+
+
Upah Simpan :
+

RM {{ number_format($upahsimpan) }}

+
+
diff --git a/resources/views/khazanah/laporan/gadaian.blade.php b/resources/views/khazanah/laporan/gadaian.blade.php index dc0b4cb..3e36beb 100644 --- a/resources/views/khazanah/laporan/gadaian.blade.php +++ b/resources/views/khazanah/laporan/gadaian.blade.php @@ -99,6 +99,10 @@ } }); }); + + const formatter = new Intl.NumberFormat('en-US', { + minimumFractionDigits: 2 + }); function gadaitable(data){ var counter = 1; @@ -120,7 +124,7 @@ gadai['berat'] ]).draw(); $('#bilangan_surat').text(counter); - $('#jumlah_pinjaman').text('RM '+total_pinjaman); + $('#jumlah_pinjaman').text('RM '+ formatter.format(total_pinjaman.toFixed(2))); counter = counter + 1; } }); diff --git a/resources/views/khazanah/laporan/penebusan.blade.php b/resources/views/khazanah/laporan/penebusan.blade.php index a806e4d..5e3534a 100644 --- a/resources/views/khazanah/laporan/penebusan.blade.php +++ b/resources/views/khazanah/laporan/penebusan.blade.php @@ -49,15 +49,20 @@ Bayaran (RM) + + TOTAL + + + +
-
+ {{--
- Bilangan Surat : 3 - Jumlah Pinjaman : RM 3,000.00 +
Jumlah Pinjaman :
-
+
--}}
@@ -68,7 +73,7 @@ var kodcaw = ""; var tabletebus = $('#myTable').DataTable({ - "ordering": false + "ordering": true }); $(document).ready( function () { $('#datetimepicker1').datepicker({ @@ -99,41 +104,59 @@ tebustable(tebus); } }); + $('#pinjamantotal').text('0.00'); + $('#keuntungantotal').text('0.00'); + $('#bayarantotal').text('0.00'); + }); - async function tebustable(data){ + + + const formatter = new Intl.NumberFormat('en-US', { + minimumFractionDigits: 2 + }); + + function tebustable(data){ var counter = 1; var total_pinjaman = 0; + var total_keuntungan = 0; + var total_bayaran = 0; tabletebus.clear().draw(); $.each(data,function(index,tebus){ $.ajax({ url:api_url + '/api/gadai/norujukan/' + tebus['norujukan'], method:'get', - async:false, success:function(gadai){ $.ajax({ url:api_url + '/api/customers/' + gadai[0][0]['nokp'], method:'get', - success: function(customer){ - total_pinjaman += parseFloat(tebus['bakipjm']); - console.log(total_pinjaman); + success:function(customer){ + total_pinjaman += parseFloat(tebus['pinjaman']); + total_keuntungan += parseFloat(tebus['bakiupah']); + total_bayaran += parseFloat(tebus['bakipjm']); tabletebus.row.add([ counter, customer[0]['nama'], gadai[0][0]['nokp'], tebus['norujukan'], tebus['t_tebus'], - tebus['pinjaman'], - tebus['bakiupah'], - tebus['bakipjm'] + formatter.format(tebus['pinjaman']), + formatter.format(tebus['bakiupah']), + formatter.format(tebus['bakipjm']) ]).draw(); counter = counter + 1; - $('#jumlah_pinjaman').text('RM '+ total_pinjaman); + $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2))); + $('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2))); + $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2))); + } }); } }); }); + // console.log('Total Pinjam : ' + total_pinjaman); + // $('#jumlah_pinjaman').text('RM '+ total_pinjaman); + } @endsection