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

Merge branch 'pipi' into 'master'

Browse Source 
rekod la

See merge request online-sistem1/kaunter!67
This commit is contained in:
hafifie rahman
2021-02-27 04:39:00 +00:00
parent c1553704f8 39582925a3
commit d3cf86726b
4 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+8 -1
View File
@@ -7,6 +7,8 @@ use App\Services\CustomerService;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Auth;
use Carbon\Carbon;
class AliranTunaiController extends Controller
{
@@ -16,6 +18,9 @@ class AliranTunaiController extends Controller
}
public function index(){
$harini = Carbon::now();
$harini = new Carbon;
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$alirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $auth_user['name']])->json();
@@ -96,6 +101,8 @@ class AliranTunaiController extends Controller
$api_url = config('api.url');
return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi'));
$gadai_tebus = Http::get(config('api.url').'/api/gadaitebus/listharini/'.$auth_user['cawangan'],['tarikh' => $harini->toDateString()])->json();
return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus'));
}
}
app/Http/Controllers/KhazanahController.php
+5 -4
View File
@@ -103,13 +103,13 @@ class KhazanahController extends Controller
$harini = new Carbon;
//Hari Ini
$ringkasanharian = Http::get(config('api.url'). '/api/gadai/laporan/ringkasanharian/'. $auth_user['cawangan'] .'/'. $harini->toDateString())->json();
$ringkasanharian = Http::get(config('api.url'). '/api/gadai/laporan/ringkasanharian/'. $auth_user['cawangan'],['tarikh' => $harini->toDateString()])->json();
$ringkasanharian = $ringkasanharian[0];
$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'] .'/'. $harini->toDateString())->json();
$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'];
@@ -126,7 +126,8 @@ class KhazanahController extends Controller
$getVault = $getVault[0]['bakiakhir'];
}
//Check Komuditi
$komuditicheck = Http::get( config('api.url').'/api/komuditi/check')->json();
//Dashboardall
$dashboard=Http::get( config('api.url').'/api/Dashboard_all/'.$auth_user['cawangan'])->json();
@@ -142,7 +143,7 @@ class KhazanahController extends Controller
}
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.dashboard',compact('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','keseluruhanupahterkumpul'));
}
public function alirantunai()
resources/views/aliran_tunai/index.blade.php
+26 -11
View File
@@ -129,7 +129,7 @@
<div class="tab-content" id="nav-tabContent">
<div class="tab-pane fade show active" id="nav-home" role="tabpanel" aria-labelledby="nav-home-tab">
<table class="table" id="tableaddtunai">
<table class="table text-center" id="tableaddtunai">
<thead>
<tr>
<th>Bil</th>
@@ -143,23 +143,39 @@
</div>
<div class="tab-pane fade" id="nav-profile" role="tabpanel" aria-labelledby="nav-profile-tab">
<table class="table" id="tablegadaitebus">
<table class="table text-center" id="tablegadaitebus">
<thead>
<tr>
<th>Bil</th>
<th>Masa</th>
<th>Debit</th>
<th>Kredit</th>
<th>Nota</th>
<th>No Rujukan</th>
<th>Pinjaman</th>
<th>Nilai Marhun</th>
<th>Jenis Transaksi</th>
</tr>
</thead>
<tbody>
<tr>
@foreach($gadai_tebus as $gt)
<td> {{ $loop->iteration }} </td>
<td> {{ $gt['norujukan'] }} </td>
<td> {{ $gt['pinjaman'] }} </td>
<td> {{ $gt['nilaimarhun'] }} </td>
<td> @php if($gt['jenistebus'] == ''){
echo '<h4><span class="badge badge-success">Gadai</span></h4>';
}else{
echo '<h4><span class="badge badge-danger">Tebus</span></h4>';
}
@endphp </td>
</tr>
@endforeach
</tbody>
</table>
</div>
<div class="tab-pane fade" id="nav-contact" role="tabpanel" aria-labelledby="nav-contact-tab">
<table class="table" id="tabletuntutbaki">
<table class="table text-center" id="tabletuntutbaki">
<thead>
<tr>
<th>Bil</th>
@@ -186,11 +202,11 @@
// "scrollX": true
});
var tableaddtunai = $('#tablegadaitebus').DataTable({
var tablegadaitebus = $('#tablegadaitebus').DataTable({
// "scrollX": true
});
var tableaddtunai = $('#tabletuntutbaki').DataTable({
var tabletuntutbaki = $('#tabletuntutbaki').DataTable({
// "scrollX": true
});
@@ -210,7 +226,6 @@
});
}
getData();
setInterval(function () {
getData();
resources/views/khazanah/dashboard.blade.php
+14
View File
@@ -177,6 +177,20 @@
</div>
</div>
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h3>RM {{ number_format($komuditicheck['unit_komuditi'],2) }}</h3>
<p>Baki Komuditi</p>
</div>
<div class="icon">
</div>
{{-- <a href="{{ route('home.gadaian6bulan') }}" class="small-box-footer">More info <i class="fas fa-arrow-circle-right"></i></a> --}}
</div>
</div>
{{-- End Fourth Column --}}
</div>