diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php index 14fd073..3b57432 100644 --- a/app/Http/Controllers/AkaunController.php +++ b/app/Http/Controllers/AkaunController.php @@ -1585,5 +1585,25 @@ class AkaunController extends Controller } + public function cetak_akrubulanpecahan(Request $request){ + $auth_user = Auth::user(); + + $year = $request->year; + + $akrubulan = Http::get(config('api.url').'/api/reports/getaccrualincome/all',['kodcaw' => 'KB2','year' => $request->year])->json(); + + if(isset($request->jenis)) + { + if($request->jenis == 'pdf') + { + $pdf = PDF::loadView('akaun.laporan_akrubulan_pecahan',compact('akrubulan','year'))->setPaper('a4', 'potrait'); + return $pdf->download('laporan_akrubulanpecahan' . $year . '.pdf'); + }else{ + return view('akaun.laporan_akrubulan_pecahan',compact('akrubulan','year')); + } + } + + } + } diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue index 987dd8b..bb2eddf 100644 --- a/resources/js/Akaun/Home.vue +++ b/resources/js/Akaun/Home.vue @@ -146,7 +146,7 @@
- +

Akru Bulanan Pecahan

diff --git a/resources/js/ImbangDuga/index.vue b/resources/js/ImbangDuga/index.vue index e39edeb..4a0b5e7 100644 --- a/resources/js/ImbangDuga/index.vue +++ b/resources/js/ImbangDuga/index.vue @@ -1,392 +1,323 @@ diff --git a/resources/js/ImbangDuga/result.vue b/resources/js/ImbangDuga/result.vue new file mode 100644 index 0000000..9a51ba1 --- /dev/null +++ b/resources/js/ImbangDuga/result.vue @@ -0,0 +1,101 @@ + + + + diff --git a/resources/js/components/util/ImbangdugaModal.vue b/resources/js/components/util/ImbangdugaModal.vue index 53edcfc..750cdef 100644 --- a/resources/js/components/util/ImbangdugaModal.vue +++ b/resources/js/components/util/ImbangdugaModal.vue @@ -1,92 +1,229 @@ \ No newline at end of file + }, +}; + + diff --git a/resources/js/routes.js b/resources/js/routes.js index 4677e17..2fa647c 100644 --- a/resources/js/routes.js +++ b/resources/js/routes.js @@ -63,7 +63,6 @@ import UpahSimpanPage from './Audit/UpahSimpan' - Vue.use(VueRouter) export default new VueRouter({ @@ -92,6 +91,7 @@ export default new VueRouter({ { path: '/akaunhome/PetiBesi', component: PetiBesi }, { path: '/akaunhome/prestasi', component: Prestasi }, { path: '/akaunhome/akrubulan', component: AkruBulan }, + { path: '/akaunhome/akrubulanpecahan', component: AkruBulanPecahan }, { path: '/akaunhome/serahgadai', component: SerahGadai }, { path: '/akaunhome/serahtebus', component: SerahTebus }, { path: '/akaunhome/online', component: Online }, diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index ab0daaf..1d3c43b 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -69,7 +69,7 @@ -
  • @@ -83,7 +83,7 @@ Tetapan
  • -
    + --}} diff --git a/routes/web.php b/routes/web.php index 583326d..23f58cc 100644 --- a/routes/web.php +++ b/routes/web.php @@ -111,6 +111,7 @@ Route::get('/akaunhome/cetakaging',['as'=>'cetak.aging','uses'=>'App\Http\Contro Route::get('/akaunhome/cetakpetibesi',['as'=>'cetak.petibesi','uses'=>'App\Http\Controllers\AkaunController@cetakPetiBesi'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']); Route::get('/akaunhome/prestasi',['as'=>'cetak.prestasi','uses'=>'App\Http\Controllers\AkaunController@cetakLaporanPrestasi'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']); Route::get('/akaunhome/cetakakrubulan',['as'=>'cetak.akrubulan','uses'=>'App\Http\Controllers\AkaunController@cetak_akru_bulanan'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']); +Route::get('/akaunhome/cetakakrubulanpecahan',['as'=>'cetak.akrubulan_pecahan','uses'=>'App\Http\Controllers\AkaunController@cetak_akrubulanpecahan'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']); Route::get('/akaunhome/cetakserahgadai',['as'=>'cetak.serahgadai','uses'=>'App\Http\Controllers\AkaunController@cetak_serahgadai'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']); Route::get('/akaunhome/cetakserahtebus',['as'=>'cetak.serahtebus','uses'=>'App\Http\Controllers\AkaunController@cetak_serahtebus'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']); Route::get('/akaunhome/cetakonline',['as'=>'cetak.online','uses'=>'App\Http\Controllers\AkaunController@cetak_laporan_online'])->middleware(['roleChecker:admin,akaun,operasi,kpo,callcenter']);