fix dashboard tpi xsiap lagi

This commit is contained in:
fifi97
2021-06-08 10:26:28 +08:00
parent c0b1bfa09e
commit 6132495909
3 changed files with 68 additions and 2 deletions
@@ -193,6 +193,53 @@ class KhazanahController extends Controller
return view('khazanah.dashboard',compact('komuditicheck','cawangan_info','api_url','dashboard','totalmarhun','ringkasanharian','getVault','keseluruhanupahharian','upahsimpan','keuntungan'));
}
public function changedatedashboard(Request $request)
{
$auth_user = Auth::user();
$api_url = config('api.url');
//Hari Ini
$ringkasanharian = Http::get(config('api.url'). '/api/gadai/laporan/ringkasanharian/'. $auth_user['cawangan'],['tarikh' => $request->tarikh])->json();
$ringkasanharian = $ringkasanharian[0];
$keseluruhanupahharian = $ringkasanharian['lelongupahsimpan'] + $ringkasanharian['tebus'][0]['upahsimpan'] + $ringkasanharian['advansur'][0]['upahsimpan'];
//Upah Terkumpul
$upahsimpan = Http::get(config('api.url'). '/api/KeuntunganSebenar/'. $auth_user['cawangan'],['tarikh' => $request->tarikh])->json();
$keuntungan = Http::get(config('api.url'). '/api/UntungRugiCalculation/'. $auth_user['cawangan'],['tarikh' => $request->tarikh])->json();
//Peti Besi Cawangan
$getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
if(sizeof($getVault) == 0)
{
$peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
$getVault = $peti_besi_terkini['bakiakhir'];
}else{
$getVault = $getVault[0]['bakiakhir'];
}
//Check Komuditi
$komuditicheck = Http::get( config('api.url').'/api/komuditi/checkdate',['tarikh' => $request->tarikh])->json();
//Dashboardall
$dashboard=Http::get( config('api.url').'/api/Dashboard_all/'.$auth_user['cawangan'])->json();
//Marhun Terkumpul
$marhun = Http::get(config('api.url'). '/api/marhunterkumpul/laporan/'. $auth_user['cawangan'] .'/'. $request->tarikh)->json();
$totalmarhun = 0;
foreach($marhun as $index=>$m)
{
$totalmarhun += $m['n_marhun'];
}
dd($totalmarhun,$dashboard);
//return view('khazanah.dashboard',compact('komuditicheck','cawangan_info','api_url','dashboard','totalmarhun','ringkasanharian','getVault','keseluruhanupahharian','upahsimpan','keuntungan'));
}
public function alirantunai()
{
$auth_user = Auth::user();
+20 -2
View File
@@ -25,8 +25,9 @@
</div>
</div>
<div class="input-group mb-3">
<input type="text" class="form-control col-3" placeholder="Pilih Tarikh" aria-label="Tarikh" id="dashboarddate" name="dashboarddate" aria-describedby="basic-addon1">
</div>
<div class="row mt-4 col-12 d-flex justify-content-center">
{{-- First Column --}}
@@ -258,6 +259,23 @@
var tablecapaian = $('#table-capaian').DataTable({
"scrollX": true
});
$('#dashboarddate').datepicker({
format: 'dd-mm-yyyy'
});
$('#dashboarddate').change(function(){
$.ajax({
method:'get',
url: "{{ route('khazanah.dashboarddate') }}",
data:{'kodcaw' : kodcaw,'tarikh' : date },
success: function(panjar){
gadaitable(panjar);
}
});
});
</script>
+1
View File
@@ -150,6 +150,7 @@ Route::post('/kemaskinipendahuluan', ['as' =>'khazanah.kemaskiniPendahuluan','us
Route::post('/kemaskiniserahan',['as'=>'khazanah.KemaskiniSerahan','uses'=>'KhazanahController@KemaskiniSerahan'])->middleware('auth','khazanah');
Route::get('/kakitangan',['as'=>'khazanah.kakitangan','uses'=>'KhazanahController@kakitangan'])->middleware('auth','khazanah');
Route::get('/dashboard',['as'=>'khazanah.dashboard','uses'=>'KhazanahController@dashboard'])->middleware('auth','khazanah');
Route::get('/dashboarddate',['as'=>'khazanah.dashboarddate','uses'=>'KhazanahController@changedatedashboard'])->middleware('auth','khazanah');
Route::get('/capaian',['as'=>'khazanah.capaian','uses'=>'KhazanahController@capaian'])->middleware('auth','khazanah');
Route::get('/alirantunai',['as'=>'khazanah.alirantunai','uses'=>'KhazanahController@alirantunai'])->middleware('auth','khazanah');
Route::get('/pelangganan',['as'=>'khazanah.pelangganan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah');