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

Merge branch 'pipiv2' into 'master'

Browse Source 
Pipiv2

See merge request online-sistem1/kaunter!113
This commit is contained in:
hafifie rahman
2021-04-21 03:50:29 +00:00
parent 6939904438 bde37da6c3
commit 7b9a740ab8
9 changed files with 135 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+4 -7
View File
@@ -117,11 +117,9 @@ class KhazanahController extends Controller
$keseluruhanupahharian = $ringkasanharian['lelongupahsimpan'] + $ringkasanharian['tebus'][0]['upahsimpan'] + $ringkasanharian['advansur'][0]['upahsimpan']; $keseluruhanupahharian = $ringkasanharian['lelongupahsimpan'] + $ringkasanharian['tebus'][0]['upahsimpan'] + $ringkasanharian['advansur'][0]['upahsimpan'];
//Terkumpul //Upah Terkumpul
$ringkasanterkumpul = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'],['tarikh' => $harini->toDateString()])->json(); $upahsimpan = Http::get(config('api.url'). '/api/KeuntunganSebenar/'. $auth_user['cawangan'],['tarikh' => $harini->toDateString()])->json();
$ringkasanterkumpul = $ringkasanterkumpul[0]; $keuntungan = Http::get(config('api.url'). '/api/UntungRugiCalculation/'. $auth_user['cawangan'],['tarikh' => $harini->toDateString()])->json();
$keseluruhanupahterkumpul = $ringkasanterkumpul['lelongupahsimpan'] + $ringkasanterkumpul['tebus'][0]['upahsimpan'] + $ringkasanterkumpul['advansur'][0]['upahsimpan'];
//Peti Besi Cawangan //Peti Besi Cawangan
$getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json(); $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(); $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','getVault','keseluruhanupahharian','upahsimpan','keuntungan'));
} }
public function alirantunai() public function alirantunai()
@@ -445,7 +443,6 @@ class KhazanahController extends Controller
else else
{ {
// dd(request()->all());
if($tebus_detail['jenistebus'] == 'P') if($tebus_detail['jenistebus'] == 'P')
{ {
resources/views/customers/index.blade.php
+8
View File
@@ -10,6 +10,14 @@
<div class="container"> <div class="container">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-8"> <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">
<div class="card-body"> <div class="card-body">
<div class="text-center"> <div class="text-center">
resources/views/customers/info.blade.php
+1
View File
@@ -16,6 +16,7 @@
<nav aria-label="breadcrumb"> <nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3"> <ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li> <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> <li class="breadcrumb-item active" aria-current="page">Pelanggan</li>
</ol> </ol>
</nav> </nav>
resources/views/khazanah/dashboard.blade.php
+50 -6
View File
@@ -26,6 +26,8 @@
</div> </div>
<div class="row mt-4 col-12 d-flex justify-content-center"> <div class="row mt-4 col-12 d-flex justify-content-center">
{{-- First Column --}} {{-- First Column --}}
@@ -76,7 +78,7 @@
{{-- Second Column --}} {{-- Second Column --}}
<div class="col-lg-6 col-xl-4 col-12"> <div class="col-lg-6 col-xl-4 col-12">
<!-- small box --> <!-- small box -->
<div class="small-box bg-light"> {{-- <div class="small-box bg-light">
<div class="inner"> <div class="inner">
<h3>RM {{ ($dashboard[0]['gadai']) ? number_format((float)$dashboard[0]['gadai'],2) : "0.00" }}</h3> <h3>RM {{ ($dashboard[0]['gadai']) ? number_format((float)$dashboard[0]['gadai'],2) : "0.00" }}</h3>
@@ -84,13 +86,27 @@
</div> </div>
<div class="icon"> <div class="icon">
</div> </div>
{{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}} {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a>
</div> --}}
<div class="card bg-light mb-3" style="max-width: 20rem;">
<div class="card-header font-weight-bold">Gadai Terkumpul</div>
<div class="card-body mx-auto">
<div class="row text-justify">
<h5 class="card-title font-weight-bold">Tawarruq : </h5>
<p class="card-text font-weight-bold">RM {{ ($dashboard[0]['gadaitawarruq']) ? number_format((float)$dashboard[0]['gadaitawarruq'],2) : "0.00" }}</p>
</div>
<div class="row text-justify">
<h5 class="card-title font-weight-bold">Ar-Rahn : </h5>
<p class="card-text font-weight-bold">RM {{ ($dashboard[0]['gadai']) ? number_format((float)$dashboard[0]['gadai'],2) : "0.00" }}</p>
</div>
</div>
</div> </div>
</div> </div>
<div class="col-lg-6 col-xl-4 col-12"> <div class="col-lg-6 col-xl-4 col-12">
<!-- small box --> <!-- small box -->
<div class="small-box bg-light"> {{-- <div class="small-box bg-light">
<div class="inner"> <div class="inner">
<h3>RM {{ ($dashboard[0]['tebus']) ? number_format((float)$dashboard[0]['tebus'],2) : "0.00" }}</h3> <h3>RM {{ ($dashboard[0]['tebus']) ? number_format((float)$dashboard[0]['tebus'],2) : "0.00" }}</h3>
@@ -98,13 +114,27 @@
</div> </div>
<div class="icon"> <div class="icon">
</div> </div>
{{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}} {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a>
</div> --}}
<div class="card bg-light mb-3" style="max-width: 20rem;">
<div class="card-header font-weight-bold">Tebus Terkumpul</div>
<div class="card-body mx-auto">
<div class="row text-justify">
<h5 class="card-title font-weight-bold">Tawarruq : </h5>
<p class="card-text font-weight-bold">RM {{ ($dashboard[0]['tebustawarruq']) ? number_format((float)$dashboard[0]['tebustawarruq'],2) : "0.00" }}</p>
</div>
<div class="row text-justify">
<h5 class="card-title font-weight-bold">Ar-Rahn : </h5>
<p class="card-text font-weight-bold">RM {{ ($dashboard[0]['tebus']) ? number_format((float)$dashboard[0]['tebus'],2) : "0.00" }}</p>
</div>
</div>
</div> </div>
</div> </div>
<div class="col-lg-6 col-xl-4 col-12"> <div class="col-lg-6 col-xl-4 col-12">
<!-- small box --> <!-- small box -->
<div class="small-box bg-light"> {{-- <div class="small-box bg-light">
<div class="inner"> <div class="inner">
<h3>RM {{ number_format($keseluruhanupahterkumpul) }}</h3> <h3>RM {{ number_format($keseluruhanupahterkumpul) }}</h3>
@@ -112,7 +142,21 @@
</div> </div>
<div class="icon"> <div class="icon">
</div> </div>
{{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}} {{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a>
</div> --}}
<div class="card bg-light mb-3" style="max-width: 20rem;">
<div class="card-header font-weight-bold">Keuntungan dan Upah Terkumpul</div>
<div class="card-body mx-auto">
<div class="row text-justify">
<h5 class="card-title font-weight-bold">Keuntungan : </h5>
<p class="card-text font-weight-bold">RM {{ number_format($keuntungan) }}</p>
</div>
<div class="row text-justify">
<h5 class="card-title font-weight-bold">Upah Simpan : </h5>
<p class="card-text font-weight-bold">RM {{ number_format($upahsimpan) }}</p>
</div>
</div>
</div> </div>
</div> </div>
resources/views/khazanah/laporan/gadaian.blade.php
+29 -7
View File
@@ -44,19 +44,27 @@
<th>No K/P</th> <th>No K/P</th>
<th>No Rujukan</th> <th>No Rujukan</th>
<th>Pembiayaan (RM)</th> <th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Nilai Marhun (RM)</th> <th>Nilai Marhun (RM)</th>
<th>Berat (g)</th> <th>Berat (g)</th>
</tr> </tr>
</thead> </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> </table>
</div> </div>
</div> </div>
<div class="row"> {{-- <div class="row">
<div class="col-md-12 text-right"> <div class="col-md-12 text-right">
Bilangan Surat : <span id="bilangan_surat">3</span> Bilangan Surat : <span id="bilangan_surat">3</span>
Jumlah Pinjaman : <span id="jumlah_pinjaman">RM 3,000.00</span> Jumlah Pinjaman : <span id="jumlah_pinjaman">RM 3,000.00</span>
</div> </div>
</div> </div> --}}
</div> </div>
</div> </div>
</div> </div>
@@ -100,9 +108,17 @@
}); });
}); });
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
});
function gadaitable(data){ function gadaitable(data){
var counter = 1; var counter = 1;
var total_pinjaman = 0; var total_pinjaman = 0;
var total_upah12 = 0;
var total_nm = 0;
var total_berat = 0;
tablegadai.clear().draw(); tablegadai.clear().draw();
$.each(data,function(index,gadai){ $.each(data,function(index,gadai){
$.ajax({ $.ajax({
@@ -110,17 +126,23 @@
url:api_url + '/api/customers/' + gadai['nokp'], url:api_url + '/api/customers/' + gadai['nokp'],
success:function(customer){ success:function(customer){
total_pinjaman += Number(gadai['pinjaman']); total_pinjaman += Number(gadai['pinjaman']);
total_upah12 += Number(gadai['upah12']);
total_nm += Number(gadai['nilaimarhun']);
total_berat += Number(gadai['berat']);
tablegadai.row.add([ tablegadai.row.add([
counter, counter,
customer[0]['nama'], customer[0]['nama'],
gadai['nokp'], gadai['nokp'],
gadai['norujukan'], gadai['norujukan'],
gadai['pinjaman'], formatter.format(gadai['pinjaman']),
gadai['nilaimarhun'], formatter.format(gadai['upah12']),
gadai['berat'] formatter.format(gadai['nilaimarhun']),
formatter.format(gadai['berat'])
]).draw(); ]).draw();
$('#bilangan_surat').text(counter); $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
$('#jumlah_pinjaman').text('RM '+total_pinjaman); $('#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; counter = counter + 1;
} }
}); });
resources/views/khazanah/laporan/penebusan.blade.php
+36 -9
View File
@@ -49,15 +49,20 @@
<th>Bayaran (RM)</th> <th>Bayaran (RM)</th>
</tr> </tr>
</thead> </thead>
<tfoot class="thead-dark">
<th colspan="5">TOTAL</th>
<th id="pinjamantotal"></th>
<th id="keuntungantotal"></th>
<th id="bayarantotal"></th>
</tfoot>
</table> </table>
</div> </div>
</div> </div>
<div class="row"> {{-- <div class="row">
<div class="col-md-12 text-right"> <div class="col-md-12 text-right">
Bilangan Surat : <span id="bilangan_surat">3</span> <h5> Jumlah Pinjaman : <span id="jumlah_pinjaman"></span></h5>
Jumlah Pinjaman : <span id="jumlah_pinjaman">RM 3,000.00</span>
</div> </div>
</div> </div> --}}
</div> </div>
</div> </div>
</div> </div>
@@ -68,7 +73,7 @@
var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>"; var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
var tabletebus = $('#myTable').DataTable({ var tabletebus = $('#myTable').DataTable({
"ordering": false "ordering": true
}); });
$(document).ready( function () { $(document).ready( function () {
$('#datetimepicker1').datepicker({ $('#datetimepicker1').datepicker({
@@ -99,11 +104,23 @@
tebustable(tebus); tebustable(tebus);
} }
}); });
$('#pinjamantotal').text('0.00');
$('#keuntungantotal').text('0.00');
$('#bayarantotal').text('0.00');
});
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
}); });
function tebustable(data){ function tebustable(data){
var counter = 1; var counter = 1;
var total_pinjaman = 0; var total_pinjaman = 0;
var total_keuntungan = 0;
var total_bayaran = 0;
tabletebus.clear().draw(); tabletebus.clear().draw();
$.each(data,function(index,tebus){ $.each(data,function(index,tebus){
$.ajax({ $.ajax({
@@ -113,22 +130,32 @@
$.ajax({ $.ajax({
url:api_url + '/api/customers/' + gadai[0][0]['nokp'], url:api_url + '/api/customers/' + gadai[0][0]['nokp'],
method:'get', method:'get',
success: function(customer){ success:function(customer){
total_pinjaman += parseFloat(tebus['pinjaman']);
total_keuntungan += parseFloat(tebus['bakiupah']);
total_bayaran += parseFloat(tebus['bakipjm']);
tabletebus.row.add([ tabletebus.row.add([
counter, counter,
customer[0]['nama'], customer[0]['nama'],
gadai[0][0]['nokp'], gadai[0][0]['nokp'],
tebus['norujukan'], tebus['norujukan'],
tebus['t_tebus'], tebus['t_tebus'],
tebus['pinjaman'], formatter.format(tebus['pinjaman']),
tebus['bakiupah'], formatter.format(tebus['bakiupah']),
tebus['bakipjm'] formatter.format(tebus['bakipjm'])
]).draw(); ]).draw();
counter = counter + 1;
$('#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);
} }
</script> </script>
resources/views/layouts/app.blade.php
+1 -1
View File
@@ -71,7 +71,7 @@
<div id="app"> <div id="app">
<nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="height:100px;"> <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="height:100px;">
<div class="container"> <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" /> <img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
</a> </a>
<div class="col-2"> <div class="col-2">
resources/views/layouts/app_operasi.blade.php
+1 -1
View File
@@ -71,7 +71,7 @@
<div id="app"> <div id="app">
<nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="height:100px;"> <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm" style="height:100px;">
<div class="container"> <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" /> <img src="{{ asset('img/icon_pkb.png') }}" class="logo-arrahn-header" alt="Logo Ar Rahn" />
</a> </a>
resources/views/penebusan/index.blade.php
+3 -2
View File
@@ -10,8 +10,9 @@
<nav aria-label="breadcrumb"> <nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3"> <ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="#">Home</a></li> <li class="breadcrumb-item"><a href="#" style="cursor:not-allowed;">Home</a></li>
<li class="breadcrumb-item"><a href="#">Pelanggan</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> <li class="breadcrumb-item active" aria-current="page">Penebusan</li>
</ol> </ol>
</nav> </nav>