From 300581041c377879b65348d52db688c7eb85e4c3 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 8 Sep 2022 14:24:58 +0800 Subject: [PATCH] update laporan cawangan khas --- app/Http/Controllers/MarhunController.php | 6 +- .../Controllers/ReportCawanganController.php | 133 +++++++++++++++ database/seeders/RolesSeeder.php | 10 ++ resources/views/includes/sidebar.blade.php | 54 ++---- .../views/lelongkhas/sandarankpkt.blade.php | 80 +++++++++ .../lelongkhas/sandaranpembida.blade.php | 79 +++++++++ .../views/pdfkhas/cetaksandarankpkt.blade.php | 156 ++++++++++++++++++ .../pdfkhas/cetaksandaranpembida.blade.php | 153 +++++++++++++++++ routes/web.php | 26 +++ 9 files changed, 654 insertions(+), 43 deletions(-) create mode 100644 resources/views/lelongkhas/sandarankpkt.blade.php create mode 100644 resources/views/lelongkhas/sandaranpembida.blade.php create mode 100644 resources/views/pdfkhas/cetaksandarankpkt.blade.php create mode 100644 resources/views/pdfkhas/cetaksandaranpembida.blade.php diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 10935f7f..e3a76d05 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -1208,9 +1208,9 @@ class MarhunController extends Controller $scanKeluar->tarikh_scankeluar = $current->toDateString(); $scanKeluar->masa_scankeluar = $current->toTimeString(); $scanKeluar->tag_scankeluar = 1; - $scanKeluar->masa_scanmasuk = $current->toTimeString(); //dummy data - $scanKeluar->tarikh_scanmasuk = $current->toDateString(); //dummy data - $scanKeluar->masa = $current->toTimeString(); //dummy data + // $scanKeluar->masa_scanmasuk = $current->toTimeString(); //dummy data + // $scanKeluar->tarikh_scanmasuk = $current->toDateString(); //dummy data + // $scanKeluar->masa = $current->toTimeString(); //dummy data $scanKeluar->save(); $lelong_id = $lelongbidItem['lelong_id']; diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php index 073e0024..18f8de13 100644 --- a/app/Http/Controllers/ReportCawanganController.php +++ b/app/Http/Controllers/ReportCawanganController.php @@ -423,6 +423,139 @@ class ReportCawanganController extends Controller return $pdf->download('Laporan Barang Lelong Pembida.pdf'); } + + + public function sandarankpkt(request $request) + { + $user = Auth::user(); + + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('cawangan.caw_code','=',$user->kodcaw) + ->get(); + + $cawname = Cawangan::where('caw_code','=',$user->kodcaw) + ->get(); + + + return view('lelongkhas.sandarankpkt',compact('lelongid','cawname')); + } + + public function sandaranpembida(request $request) + { + $user = Auth::user(); + + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('cawangan.caw_code','=',$user->kodcaw) + ->get(); + + $cawname = Cawangan::where('caw_code','=',$user->kodcaw) + ->get(); + + + return view('lelongkhas.sandaranpembida',compact('lelongid','cawname')); + } + public function cetaksandarankpkt(request $request) + { + $lelong_id = $request->lelong_id; + // dd($lelong_id); + $user = Auth::user(); + $caw = Cawangan::where('caw_code','=',$user->kodcaw) + ->first(); + + $brglelongcaw = LelongBid::where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbid.kodcaw','=',$user['kodcaw']) + ->get()->toArray(); + // dd($brglelongcaw); + + $keuntungan=0; + $total_hargaasas = 0; + $total_berat = 0; + $total_pinjaman = 0; + $total_pinj10 = 0; + $total_sumpinj10 = 0; + + foreach($brglelongcaw as $index1=>$upah) + { + $pinj10 = $upah['pinjaman'] * 0.10; + $sumpinj10 = $upah['pinjaman'] + ($upah['pinjaman'] * 0.10); + $total_pinj10 = $total_pinj10 + $pinj10; + $total_sumpinj10 = $total_sumpinj10 + $sumpinj10; + $total_pinjaman = $total_pinjaman + $upah['pinjaman']; + $total_hargaasas = $total_hargaasas + $upah['hargaasas']; + $total_berat = $total_berat + $upah['berat']; + + $upah[$index1]['pinj10']=$pinj10; + } + + $info = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('cawangan_lelong.lelong_id','=',$lelong_id) + ->where('cawangan.caw_code','=',$user['kodcaw']) + ->select('lelong_id','tarikh_lelong','caw_name','lelong.fasa') + ->groupBy('lelong_id','caw_name') + ->get()->toArray(); + + // return view('pdfkhas.cetaksandarankpkt',compact('brglelongcaw','lelong_id','keuntungan','total_hargaasas','total_berat','info','upah','pinj10','total_pinjaman','total_pinj10','total_sumpinj10')); + $pdf = PDF::loadView('pdfkhas.cetaksandarankpkt',compact('brglelongcaw','lelong_id','keuntungan','total_hargaasas','total_berat','info','upah','pinj10','total_pinjaman','total_pinj10','total_sumpinj10')) + ->setPaper('a4', 'potrait'); + + return $pdf->download('Senarai Barang Lelong.pdf'); + + + } + + public function cetaksandaranpembida(request $request) + { + $lelong_id = $request->lelong_id; + // dd($lelong_id); + $user = Auth::user(); + $caw = Cawangan::where('caw_code','=',$user->kodcaw) + ->first(); + + $brglelongcaw = LelongBid::where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbid.kodcaw','=',$user['kodcaw']) + ->get()->toArray(); + // dd($brglelongcaw); + + $keuntungan=0; + $total_hargaasas = 0; + $total_berat = 0; + $total_pinjaman = 0; + $total_pinj10 = 0; + $total_sumpinj10 = 0; + + foreach($brglelongcaw as $index1=>$upah) + { + $pinj10 = $upah['pinjaman'] * 0.10; + $sumpinj10 = $upah['pinjaman'] + ($upah['pinjaman'] * 0.10); + $total_pinj10 = $total_pinj10 + $pinj10; + $total_sumpinj10 = $total_sumpinj10 + $sumpinj10; + $total_pinjaman = $total_pinjaman + $upah['pinjaman']; + $total_hargaasas = $total_hargaasas + $upah['hargaasas']; + $total_berat = $total_berat + $upah['berat']; + + $upah[$index1]['pinj10']=$pinj10; + } + + $info = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('cawangan_lelong.lelong_id','=',$lelong_id) + ->where('cawangan.caw_code','=',$user['kodcaw']) + ->select('lelong_id','tarikh_lelong','caw_name','lelong.fasa') + ->groupBy('lelong_id','caw_name') + ->get()->toArray(); + + // return view('pdfkhas.cetaksandarankpkt',compact('brglelongcaw','lelong_id','keuntungan','total_hargaasas','total_berat','info','upah','pinj10','total_pinjaman','total_pinj10','total_sumpinj10')); + $pdf = PDF::loadView('pdfkhas.cetaksandaranpembida',compact('brglelongcaw','lelong_id','keuntungan','total_hargaasas','total_berat','info','upah','pinj10','total_pinjaman','total_pinj10','total_sumpinj10')) + ->setPaper('a4', 'potrait'); + + return $pdf->download('Senarai Barang Lelong.pdf'); + + + } + diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index f106ffa2..5e795e8d 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -141,6 +141,14 @@ class RolesSeeder extends Seeder 'name' => 'sebelumdaftarbatch', 'description' => 'Janaan Data Outstanding Sebelum Daftar Batch Lelong' ]); + Permission::create([ + 'name' => 'lelonghargajual', + 'description' => 'Tambah Hargajual Lelong KB1' + ]); + Permission::create([ + 'name' => 'reportcawkhas', + 'description' => 'Laporan Lelong Khas' + ]); // create roles and assign existing permissions $role1 = Role::create(['name' => 'admin']); @@ -195,6 +203,8 @@ class RolesSeeder extends Seeder $role9 = Role::create(['name' => 'pengurus-cawangan-khas']); $role9->givePermissionTo('sebelumdaftarbatch'); + $role9->givePermissionTo('lelonghargajual'); + $role9->givePermissionTo('reportcawkhas'); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index c519607e..9ee4e1f7 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -149,17 +149,7 @@ {{-- end laporan cawangan --}} @endhasrole - @hasrole('pengurus-cawangan-khas') - - {{--
  • - - -
    • --}} - + @hasrole('pengurus-cawangan-khas')