diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php index ec60ff87..429764c0 100644 --- a/app/Http/Controllers/NotisController.php +++ b/app/Http/Controllers/NotisController.php @@ -55,9 +55,15 @@ class NotisController extends Controller public function senarainotis($lelong_id){ + $user = Auth::user(); + + $caw = Cawangan::where('caw_code','=',$user->kodcaw) + ->first(); + $lelong_id = $lelong_id; $senarai = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') + ->where('gadai.kodcaw','=',$user->kodcaw) ->where('lelongbid.lelong_id', $lelong_id) ->get()->toArray(); @@ -121,6 +127,7 @@ class NotisController extends Controller $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->join('customer','gadai.nokp','=','customer.kpbaru') + ->where('gadai.kodcaw','=',$user->kodcaw) ->where('lelongbid.lelong_id', $lelong_id) ->get()->toArray(); diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php new file mode 100644 index 00000000..a9686653 --- /dev/null +++ b/app/Http/Controllers/ReportCawanganController.php @@ -0,0 +1,117 @@ +middleware('auth'); + } + + /** + * Show the application dashboard. + * + * @return \Illuminate\Contracts\Support\Renderable + */ + + + + // Laporan by cawangan + public function laporancawindex(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(); + + return view('lelong.laporancawindex',compact('lelongid')); + } + + public function laporanbrglelcaw($lelong_id){ + + $user = Auth::user(); + $caw = Cawangan::where('caw_code','=',$user->kodcaw) + ->first(); + + $brglelongcaw = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') + ->where('lelongbid.lelong_id', $lelong_id) + ->where('gadai.kodcaw','=',$user['kodcaw']) + ->get()->toArray(); + + $keuntungan=0; + $total_hargaasas = 0; + $total_berat = 0; + + foreach($brglelongcaw as $index1=>$upah) + { + + $total_hargaasas = $total_hargaasas + $upah['hargaasas']; + $total_berat = $total_berat + $upah['berat']; + + } + + $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') + ->groupBy('lelong_id','caw_name') + ->get()->toArray(); + + + $pdf = PDF::loadView('pdf.brglelcaw',compact('brglelongcaw','lelong_id','keuntungan','total_hargaasas','total_berat','info')) + ->setPaper('a4', 'potrait'); + + return $pdf->download('Senarai Barang Lelong.pdf'); + + + } + + + + + + + + + +} + \ No newline at end of file diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 04217d3c..6b007d12 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -52,7 +52,7 @@ class ReportController extends Controller - public function lapbrglelongindex (Request $request){ + public function lapbrglelongindex (){ $arraydetails = []; @@ -120,7 +120,7 @@ class ReportController extends Controller return $pdf->download('Senarai Barang Lelong.pdf'); } - public function lapbrglelongdetailsindex (Request $request){ + public function lapbrglelongdetailsindex (){ $arraydetails = []; @@ -193,7 +193,7 @@ class ReportController extends Controller } - public function lapbidaanpembidaindex (Request $request){ + public function lapbidaanpembidaindex (){ $arraydetails = []; @@ -270,7 +270,7 @@ class ReportController extends Controller } - Public function laplelongindex (Request $request){ + Public function laplelongindex (){ $arraydetails =[]; @@ -354,7 +354,7 @@ class ReportController extends Controller - Public function lapbrglelpembidaindex (Request $request){ + Public function lapbrglelpembidaindex (){ $arraydetails = []; @@ -423,6 +423,10 @@ class ReportController extends Controller return $pdf->download('Laporan Barang Lelong Pembida.pdf'); } + + + + diff --git a/public/img/icon_pkb.png b/public/img/icon_pkb.png index 7ff253ff..28a7cd57 100644 Binary files a/public/img/icon_pkb.png and b/public/img/icon_pkb.png differ diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index eea37d40..879ae400 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -98,6 +98,18 @@
  • Pembayaran Pemenang
  • + + {{-- laporan --}} +
  • + + + +
  • + {{-- end laporan --}} @endhasrole @hasrole('jurulelong')
  • @@ -211,6 +223,7 @@
  • + {{-- end laporan --}} @endhasrole diff --git a/resources/views/lelong/lapbrglelpembidaindex.blade.php b/resources/views/lelong/lapbrglelpembidaindex.blade.php index 32d0bd7a..51ef909e 100644 --- a/resources/views/lelong/lapbrglelpembidaindex.blade.php +++ b/resources/views/lelong/lapbrglelpembidaindex.blade.php @@ -19,7 +19,7 @@ Lelong ID Cawangan Tarikh Lelong - Action + Muat Turun diff --git a/resources/views/lelong/laplelongindex.blade.php b/resources/views/lelong/laplelongindex.blade.php index 0cf6e0dd..7691b0ad 100644 --- a/resources/views/lelong/laplelongindex.blade.php +++ b/resources/views/lelong/laplelongindex.blade.php @@ -19,7 +19,7 @@ Lelong ID Cawangan Tarikh Lelong - Action + Muat Turun diff --git a/resources/views/lelong/laporancawindex.blade.php b/resources/views/lelong/laporancawindex.blade.php new file mode 100644 index 00000000..25807814 --- /dev/null +++ b/resources/views/lelong/laporancawindex.blade.php @@ -0,0 +1,72 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + @foreach ($lelongid as $bid) +

    Laporan Barang Lelong: {{$bid->caw_name}}

    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    + + + + + + + + + + + + + + + + + + @endforeach + + +
    BilLelong IDTarikh LelongMuat Turun
    {{$loop->iteration}} + {{ $bid->lelong_id}}{{ $bid->tarikh_lelong }} + +
    +
    +
    + +
    +
    + + +@endsection diff --git a/resources/views/pdf/brglelcaw.blade.php b/resources/views/pdf/brglelcaw.blade.php new file mode 100644 index 00000000..bc055942 --- /dev/null +++ b/resources/views/pdf/brglelcaw.blade.php @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + +

    PERMODALAN KELANTAN BERHAD

    LAPORAN BARANG LELONG
    + + + +
    + + @foreach ($info as $info) + + + +
    Lelong ID : {{$info['lelong_id']}}Tarikh Lelong : {{$info['tarikh_lelong']}} + Nama Cawangan : {{$info['caw_name']}} + @endforeach +
    + +
    + + + + + + + + + + + + + + @foreach($brglelongcaw as $brg) + + + + + + + + + @endforeach + + + + + + + + +
    NoNo RujukanMarhunBerat (gm)Harga Asas
    {{ $loop->iteration }} {{ $brg['norujukan']}}{{ $brg['marhun']}}{{ number_format($brg['berat'], 2, '.', ',') }}{{ number_format($brg['hargaasas'], 2, '.', ',') }}
    JUMLAH KESELURUHAN{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}
    + + + + + + + + + diff --git a/routes/web.php b/routes/web.php index 6725c28f..5cf0fa78 100644 --- a/routes/web.php +++ b/routes/web.php @@ -308,10 +308,17 @@ Route::get('/laplelong/{lelong_id}',['as' =>'report.laplelong','uses'=>'ReportCo Route::get('/lapbrglelpembidaindex',['as'=>'report.lapbrglelpembidaindex','uses'=>'ReportController@lapbrglelpembidaindex']); Route::get('/lapbrglelpembida/{lelong_id}',['as'=>'report.lapbrglelpembida','uses'=>'ReportController@lapbrglelpembida']); - + }); +//Report +Route::group(['middleware' => ['permission:report'],'prefix'=>'reportcaw'], function () { +Route::get('laporancawindex',['as'=>'reportcaw.laporancawindex','uses'=>'ReportCawanganController@laporancawindex']); +Route::get('laporanbrglelcaw/{lelong_id}',['as'=>'reportcaw.laporanbrglelcaw','uses'=>'ReportCawanganController@laporanbrglelcaw']); + +}); +