diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index d9ec3a44..3e275663 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -1978,7 +1978,8 @@ class MarhunController extends Controller if($request->jenis == 'keluar') { - $scan=ScanSemak::where('kodcaw','=',$kodcaw) + $scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw) + ->join('users','scan_semak.khazanah_id','=','users.id') ->where([['scan_keluar','>=',$request->datemula],['scan_keluar','<=',$request->datehingga]]) ->get(); @@ -1988,7 +1989,8 @@ class MarhunController extends Controller else if($request->jenis == 'masuk'){ - $scan=ScanSemak::where('kodcaw','=',$kodcaw) + $scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw) + ->join('users','scan_semak.khazanah_id','=','users.id') ->where([['scan_masuk','>=',$request->datemula],['scan_masuk','<=',$request->datehingga]]) ->get(); // dd($scan); @@ -1997,15 +1999,81 @@ class MarhunController extends Controller } - // else{ - // $scan=ScanJual::where('kodcaw','=',$kodcaw) - // ->where([['serah_marhun','>=',$request->datemula],['serah_marhun','<=',$request->datehingga]]) - // ->where('serahkpdpembida','=',1) - // ->get(); + else if($request->jenis == 'pembida'){ + $scan=ScanJual::where('scan_jual.kodcaw','=',$kodcaw) + ->join('users','scan_jual.khazanah_id','=','users.id') + ->where([['serah_marhun','>=',$request->datemula],['serah_marhun','<=',$request->datehingga]]) + ->where('serahkpdpembida','=',1) + ->get(); - // return view('pdf.laporanscanserah', compact('scan','auth_user','tarikh_cetak','cawangan')); + return view('pdf.laporanscanserahpembida', compact('scan','auth_user','tarikh_cetak','cawangan')); - // } + } + + } + + public function senaraiterimaserah(Request $request){ + + $auth_user = Auth::user(); + + $auth_user = ScanSemak::where('kodcaw','=',$auth_user['kodcaw'] ) + ->get(); + + return view('marhun.senaraiterimaserah', compact('auth_user','auth_user')); + + } + + public function cetakterimaserah(Request $request) + { + + $auth_user = Auth::user(); + $current = Carbon::now(); + $current = new Carbon(); + $tarikh_cetak = $current->toDateString(); + + if($request->datemula == null){ + $mula_date = '2017-01-01'; + }else{ + $split_date = explode('-', $request->datemula); + $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + } + + if($request->datehingga == null){ + $hingga_date = $current->toDateString(); + }else{ + $split_date = explode('-', $request->datehingga); + $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + } + + $kodcaw = $auth_user['kodcaw']; + + $cawangan = Cawangan::where('caw_code','=',$kodcaw) + ->first(); + + if($request->jenis == 'terima') + { + $scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw) + ->join('users','scan_semak.penilai_id','=','users.id') + ->where([['terima_marhun','>=',$request->datemula],['terima_marhun','<=',$request->datehingga]]) + ->get(); + + return view('pdf.laporanscanterima', compact('scan','auth_user','tarikh_cetak','cawangan')); + + } + + else if($request->jenis == 'serah'){ + + $scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw) + ->join('users','scan_semak.penilai_id','=','users.id') + ->where([['serah_marhun','>=',$request->datemula],['serah_marhun','<=',$request->datehingga]]) + ->get(); + // dd($scan); + + return view('pdf.laporanscanserah', compact('scan','auth_user','tarikh_cetak','cawangan')); + + } + + } diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 86cda1b0..affade5f 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -77,6 +77,12 @@
  • Semakan Marhun
    • +
  • + Semakan Marhun +
    • +
  • + Laporan Scan Barcode +
    • @endhasrole @hasrole('pengurus-cawangan') diff --git a/resources/views/marhun/senaraiscanbarcode.blade.php b/resources/views/marhun/senaraiscanbarcode.blade.php index fac0e08b..544ba58c 100644 --- a/resources/views/marhun/senaraiscanbarcode.blade.php +++ b/resources/views/marhun/senaraiscanbarcode.blade.php @@ -109,8 +109,8 @@ SAG Masuk - {{-- - SAG Serah --}} + + SAG Serah Kepada Pembida diff --git a/resources/views/marhun/senaraiterimaserah.blade.php b/resources/views/marhun/senaraiterimaserah.blade.php new file mode 100644 index 00000000..68eeb315 --- /dev/null +++ b/resources/views/marhun/senaraiterimaserah.blade.php @@ -0,0 +1,160 @@ +@extends('layouts.app') + + + + + +@section('content') +
    +
    +
    +
    + + +
    +
    +
    +

    Laporan Terima Serah Marhun

    +
    + +
    +
    +
    + +
    +
    +
    +
    + @csrf +
    +
    + Mula +
    + +
    + Hingga +
    + + +
    + +
    +
    +

    +
    + +
    + + + SAG Terima + + + SAG Serah + +
    + +
    + +
    + +
    +
    +
    +
    +
    + + +@endsection \ No newline at end of file diff --git a/resources/views/pdf/laporanscankeluar.blade.php b/resources/views/pdf/laporanscankeluar.blade.php index 0bc73c75..2345a5dc 100644 --- a/resources/views/pdf/laporanscankeluar.blade.php +++ b/resources/views/pdf/laporanscankeluar.blade.php @@ -109,6 +109,7 @@ tr:nth-child(even) { No No Rujukan + Nama Khazanah Tarikh/Masa Scan Keluar @@ -117,7 +118,11 @@ tr:nth-child(even) { {{ $loop->iteration }} {{ $keluar['norujukan'] }} - {{ $keluar['scan_keluar'] }} + {{ $keluar['name'] }} + @php $datekeluar = DateTime::createFromFormat('Y-m-d H:i:s', $keluar['scan_keluar']); + $t_keluar = $datekeluar->format('d-m-Y h:i:s'); + echo($t_keluar); + @endphp diff --git a/resources/views/pdf/laporanscanmasuk.blade.php b/resources/views/pdf/laporanscanmasuk.blade.php index 71565e9d..573ecf6b 100644 --- a/resources/views/pdf/laporanscanmasuk.blade.php +++ b/resources/views/pdf/laporanscanmasuk.blade.php @@ -109,6 +109,7 @@ tr:nth-child(even) { No No Rujukan + Nama Khazanah Tarikh/Masa Scan Masuk @@ -117,7 +118,12 @@ tr:nth-child(even) { {{ $loop->iteration }} {{ $masuk['norujukan'] }} - {{ $masuk['scan_masuk'] }} + {{ $masuk['name']}} + @php $datemasuk = DateTime::createFromFormat('Y-m-d H:i:s', $masuk['scan_masuk']); + $t_masuk = $datemasuk->format('d-m-Y h:i:s'); + echo($t_masuk); + @endphp + diff --git a/resources/views/pdf/laporanscanserah.blade.php b/resources/views/pdf/laporanscanserah.blade.php new file mode 100644 index 00000000..3786b213 --- /dev/null +++ b/resources/views/pdf/laporanscanserah.blade.php @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + +

    PERMODALAN KELANTAN BERHAD

    LAPORAN SCAN SERAH MARHUN
    + + + +
    + + + + + +
    Cawangan : {{$cawangan->caw_name}} + + Tarikh Cetak:@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp
    + +
    + + + + + + + + + + + + + @foreach ($scan as $serah) + + + + + + + + + @endforeach + + +
    NoNo RujukanNama Penilai Tarikh/Masa Scan Serah
    {{ $loop->iteration }}{{ $serah['norujukan'] }}{{ $serah['name']}} @php $dateserah = DateTime::createFromFormat('Y-m-d H:i:s', $serah['serah_marhun']); + $t_serah = $dateserah->format('d-m-Y h:i:s'); + echo($t_serah); + @endphp
    + + + + + + + + + diff --git a/resources/views/pdf/laporanscanserahpembida.blade.php b/resources/views/pdf/laporanscanserahpembida.blade.php new file mode 100644 index 00000000..c82b6ec4 --- /dev/null +++ b/resources/views/pdf/laporanscanserahpembida.blade.php @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + +

    PERMODALAN KELANTAN BERHAD

    LAPORAN SERAH MARHUN KEPADA PEMBIDA
    + + + +
    + + + + + +
    Cawangan : {{$cawangan->caw_name}} + + Tarikh Cetak:@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp
    +
    + + + + + + + + + + + + + @foreach ($scan as $serah) + + + + + + + @if($serah['serahkpdpembida'] == 1) + + @else + + @endif + + + + + @endforeach + + +
    NoNo RujukanNama Khazanah Tarikh/Masa Scan SerahStatus Serah
    {{ $loop->iteration }}{{ $serah['norujukan'] }}{{ $serah['name']}} @php $dateserah = DateTime::createFromFormat('Y-m-d H:i:s', $serah['serah_marhun']); + $t_serah = $dateserah->format('d-m-Y h:i:s'); + echo($t_serah); + @endphpSerah Kepada PembidaBelum Serah
    + + + + + + + + + diff --git a/resources/views/pdf/laporanscanterima.blade.php b/resources/views/pdf/laporanscanterima.blade.php new file mode 100644 index 00000000..29aa4913 --- /dev/null +++ b/resources/views/pdf/laporanscanterima.blade.php @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + +

    PERMODALAN KELANTAN BERHAD

    LAPORAN SCAN TERIMA MARHUN
    + + + +
    + + + + + +
    Cawangan : {{$cawangan->caw_name}} + + Tarikh Cetak:@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp
    + +
    + + + + + + + + + + + + + @foreach ($scan as $terima) + + + + + + + + + @endforeach + + +
    NoNo RujukanNama PenilaiTarikh/Masa Scan Terima
    {{ $loop->iteration }}{{ $terima['norujukan'] }}{{ $terima['name']}} @php $dateterima = DateTime::createFromFormat('Y-m-d H:i:s', $terima['terima_marhun']); + $t_terima = $dateterima->format('d-m-Y h:i:s'); + echo($t_terima); + @endphp
    + + + + + + + + + diff --git a/routes/web.php b/routes/web.php index e6cd603d..6aff15fa 100644 --- a/routes/web.php +++ b/routes/web.php @@ -281,6 +281,9 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim Route::post('/deletephotomarhun',['as'=>'marhun.deletephotomarhun','uses'=>'MarhunController@deletePhotoMarhun']); Route::post('/updatephotomarhun',['as'=>'marhun.updatephotomarhun','uses'=>'MarhunController@updatePhotoMarhun']); Route::get('/cetakterimaserahmarhun/{lelong_id}',['as'=>'marhun.cetakterimaserahmarhun','uses'=>'MarhunController@cetakterimaserahmarhun']); + Route::get('/senaraiterimaserah',['as'=>'marhun.senaraiterimaserah','uses'=>'MarhunController@senaraiterimaserah']); + Route::post('/cetakterimaserah',['as'=>'marhun.cetakterimaserah','uses'=>'MarhunController@cetakterimaserah']); + //khazanah Route::get('/cetakkeluarscanbarcode/{lelong_id}',['as'=>'marhun.cetakkeluarscanbarcode','uses'=>'MarhunController@cetakkeluarscanbarcode']);