diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 73153f9d..cbf26af0 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -147,7 +147,7 @@ class ReportController extends Controller $pdf = PDF::loadView('pdf.listlelong',compact('arrayinfo','marhuns','lelong_id','keuntungan','total_hargaasas', 'total_berat','datasimulasi')) - ->setPaper('a4', 'landscape'); + ->setPaper('a4', 'potrait'); return $pdf->download('Senarai Barang Lelong.pdf'); } @@ -255,11 +255,14 @@ class ReportController extends Controller $arraydetails = []; $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->select('lelong_id','tarikh_lelong','lelong.fasa') + ->join('lelongbid','lelong.id','=','lelongbid.lelong_id') + ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') + ->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa') ->distinct() - ->orderBy('lelong_id') + ->orderBy('cawangan_lelong.lelong_id') ->get() ->toArray(); + // dd($lelongid); foreach($lelongid as $laporan){ @@ -347,9 +350,11 @@ class ReportController extends Controller $arraydetails =[]; $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->select('lelong_id','tarikh_lelong','lelong.fasa') + ->join('lelongbid','lelong.id','=','lelongbid.lelong_id') + ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') + ->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa') ->distinct() - ->orderBy('lelong_id') + ->orderBy('cawangan_lelong.lelong_id') ->get() ->toArray(); @@ -929,6 +934,12 @@ class ReportController extends Controller // return view('lelong.senaraimarhun',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo')); } + + public function bdbrglelong (){ + + return view('laporan.bdbrglelong'); + } + diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index 5e795e8d..47e48d9e 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -122,6 +122,16 @@ class RolesSeeder extends Seeder 'description' => 'Tetapan Parameter' ]); + Permission::create([ + 'name' => 'backdate', + 'description' => 'Laporan Back Date' + ]); + + Permission::create([ + 'name' => 'reportkali', + 'description' => 'Laporan By Batch Lelong' + ]); + //account Permission::create([ 'name' => 'pengesahanbayaran', @@ -192,6 +202,10 @@ class RolesSeeder extends Seeder $role6->givePermissionTo('importdata'); $role6->givePermissionTo('tetapan'); $role6->givePermissionTo('jananotis'); + $role6->givePermissionTo('backdate'); + $role6->givePermissionTo('reportkali'); + + $role7 = Role::create(['name' => 'account']); $role7->givePermissionTo('pengesahanbayaran'); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index affade5f..cc0edf6f 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -2,6 +2,15 @@ // $name = Route::currentRouteName(); @endphp + +