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

fix laporan

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-05-04 16:34:47 +08:00
parent 107d7d85dc
commit b46d62e7e9
6 changed files with 67 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+14 -2
View File
@@ -1978,10 +1978,13 @@ class KhazanahController extends Controller
$tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
$tebuspengasingan = Http::get(config('api.url'). '/api/tebus/laporanjenistawarruq/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
$upahlama = Http::get(config('api.url'). '/api/advansurdetails/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
// dd($gadai);
return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','api_url','upahlama'));
}
public function laporanLelongan(){
@@ -2353,6 +2356,15 @@ class KhazanahController extends Controller
return view('print.laporan_marhunterkumpul', compact('marhun','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
}
public function laporanRingkasanHarian(){
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.laporan.ringkasanharian',compact('cawangan_info','api_url'));
}
public function cetakLaporanRingkasanHarian(Request $request){
// dd($request);
@@ -2859,7 +2871,7 @@ class KhazanahController extends Controller
// $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong];
array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]);
array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Keuntungan Sebenar','amaun' => $keuntungansebenar]);
array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]);