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')
-
- {{--
- Serahan
-
- --}}
-
+ @hasrole('pengurus-cawangan-khas')
Notis Lelong
- {{-- laporan cawangan --}}
-
- Laporan
-
+
- {{-- end laporan cawangan --}}
+
+
@endhasrole
@hasrole('jurulelong')
diff --git a/resources/views/lelongkhas/sandarankpkt.blade.php b/resources/views/lelongkhas/sandarankpkt.blade.php
new file mode 100644
index 00000000..3da80893
--- /dev/null
+++ b/resources/views/lelongkhas/sandarankpkt.blade.php
@@ -0,0 +1,80 @@
+@extends('layouts.app')
+
+@section('content')
+
+
+
+ @foreach($cawname as $cawname)
+
Laporan Sandaran KPKT: {{$cawname['caw_name']}}
+ @endforeach
+ @if ($message = Session::get('success'))
+
+ @endif
+
+
+
+
+
+
+
+@endsection
diff --git a/resources/views/lelongkhas/sandaranpembida.blade.php b/resources/views/lelongkhas/sandaranpembida.blade.php
new file mode 100644
index 00000000..f4753b61
--- /dev/null
+++ b/resources/views/lelongkhas/sandaranpembida.blade.php
@@ -0,0 +1,79 @@
+@extends('layouts.app')
+
+@section('content')
+
+
+
+ @foreach($cawname as $cawname)
+
Laporan Sandaran Pembida: {{$cawname['caw_name']}}
+ @endforeach
+ @if ($message = Session::get('success'))
+
+ @endif
+
+
+
+
+
+
+
+@endsection
diff --git a/resources/views/pdfkhas/cetaksandarankpkt.blade.php b/resources/views/pdfkhas/cetaksandarankpkt.blade.php
new file mode 100644
index 00000000..1af35ad4
--- /dev/null
+++ b/resources/views/pdfkhas/cetaksandarankpkt.blade.php
@@ -0,0 +1,156 @@
+
+
+
+
+
+
+
+
+ PERMODALAN KELANTAN BERHAD |
+
+
+
+ | SENARAI SANDARAN YANG AKAN DILELONG |
+
+
+
+
+
+
+
+
+ @foreach ($info as $info)
+ | ID Lelong: {{$info['lelong_id']}} |
+ Tarikh Lelong : @php
+ $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
+ $t_lelong = $myDateTime->format('d-m-Y');
+ echo($t_lelong);
+ @endphp |
+ Fasa: {{$info['fasa']}}
+ | Nama Cawangan : {{$info['caw_name']}}
+ @endforeach
+ |
+
+
+
+
+
+
+
+
+
+ | BIL |
+ NO.RUJUKAN |
+ MARHUN |
+ BERAT (gm) |
+ PEMBIAYAAN(RM) |
+ TAMBAH 10% ATAS PEMBIAYAAN(RM) |
+ HARGA RIZAB(RM) |
+ HARGA TAWARAN(RM) |
+
+
+
+ @foreach($brglelongcaw as $brg)
+
+
+ | {{ $loop->iteration }} |
+ {{ $brg['norujukan']}} |
+ {{ $brg['marhun']}} |
+ {{ number_format($brg['berat'], 2, '.', ',') }} |
+ {{ number_format($brg['pinjaman'], 2, '.', ',') }} |
+ {{ number_format($brg['pinjaman']*0.10, 2, '.', ',') }} |
+ {{ number_format(($brg['pinjaman']*0.10) + $brg['pinjaman'], 2, '.', ',') }} |
+ ________________ |
+
+ @endforeach
+
+
+ | JUMLAH KESELURUHAN |
+ {{ number_format($total_berat, 2, '.', ',') }} |
+ {{ number_format($total_pinjaman, 2, '.', ',') }} |
+ {{ number_format($total_pinj10, 2, '.', ',') }} |
+ {{ number_format($total_sumpinj10, 2, '.', ',') }} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/views/pdfkhas/cetaksandaranpembida.blade.php b/resources/views/pdfkhas/cetaksandaranpembida.blade.php
new file mode 100644
index 00000000..61fc3169
--- /dev/null
+++ b/resources/views/pdfkhas/cetaksandaranpembida.blade.php
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+ PERMODALAN KELANTAN BERHAD |
+
+
+
+ | SENARAI SANDARAN YANG AKAN DILELONG |
+
+
+
+
+
+
+
+
+ @foreach ($info as $info)
+ | ID Lelong: {{$info['lelong_id']}} |
+ Tarikh Lelong : @php
+ $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
+ $t_lelong = $myDateTime->format('d-m-Y');
+ echo($t_lelong);
+ @endphp |
+ Fasa: {{$info['fasa']}}
+ | Nama Cawangan : {{$info['caw_name']}}
+ @endforeach
+ |
+
+
+
+
+
+
+
+
+
+ | BIL |
+ NO.RUJUKAN |
+ MARHUN |
+ BERAT (gm) |
+ PEMBIAYAAN(RM) |
+ HARGA PASARAN(RM) |
+ HARGA TAWARAN(RM) |
+
+
+
+ @foreach($brglelongcaw as $brg)
+
+
+ | {{ $loop->iteration }} |
+ {{ $brg['norujukan']}} |
+ {{ $brg['marhun']}} |
+ {{ number_format($brg['berat'], 2, '.', ',') }} |
+ {{ number_format($brg['pinjaman'], 2, '.', ',') }} |
+ {{ number_format($brg['hargaasas'], 2, '.', ',') }} |
+ ________________ |
+
+ @endforeach
+
+
+ | JUMLAH KESELURUHAN |
+ {{ number_format($total_berat, 2, '.', ',') }} |
+ {{ number_format($total_pinjaman, 2, '.', ',') }} |
+ {{ number_format($total_hargaasas, 2, '.', ',') }} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/routes/web.php b/routes/web.php
index be8ba931..63ff94c8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -469,6 +469,32 @@ Route::get('laporanbrglelpembidacaw/{lelong_id}',['as'=>'reportcaw.laporanbrglel
});
+//Report by cawangan KHAS
+Route::group(['middleware' => ['permission:reportcawkhas'],'prefix'=>'reportcawkhas'], function () {
+
+ Route::get('sandarankpkt',['as'=>'reportcawkhas.sandarankpkt','uses'=>'ReportCawanganController@sandarankpkt']);
+ Route::get('sandaranpembida',['as'=>'reportcawkhas.sandaranpembida','uses'=>'ReportCawanganController@sandaranpembida']);
+ Route::get('cetaksandarankpkt/{lelong_id}',['as'=>'reportcawkhas.cetaksandarankpkt','uses'=>'ReportCawanganController@cetaksandarankpkt']);
+ Route::get('cetaksandaranpembida/{lelong_id}',['as'=>'reportcawkhas.cetaksandaranpembida','uses'=>'ReportCawanganController@cetaksandaranpembida']);
+ // Route::get('laporanbrglelcaw/{lelong_id}',['as'=>'reportcawkhas.laporanbrglelcaw','uses'=>'ReportCawanganController@laporanbrglelcaw']);
+
+ // Route::get('indexbrgleldetailscaw',['as'=>'reportcawkhas.indexbrgleldetailscaw','uses'=>'ReportCawanganController@indexbrgleldetailscaw']);
+ // Route::get('laporanbrgleldetailscaw/{lelong_id}',['as'=>'reportcawkhas.laporanbrgleldetailscaw','uses'=>'ReportCawanganController@laporanbrgleldetailscaw']);
+
+
+ // Route::get('indexnamapembidacaw',['as'=>'reportcawkhas.indexnamapembidacaw','uses'=>'ReportCawanganController@indexnamapembidacaw']);
+ // Route::get('laporannamapembidacaw/{lelong_id}',['as'=>'reportcawkhas.laporannamapembidacaw','uses'=>'ReportCawanganController@laporannamapembidacaw']);
+
+
+ // Route::get('indexlelfullcaw',['as'=>'reportcawkhas.indexlelfullcaw','uses'=>'ReportCawanganController@indexlelfullcaw']);
+ // Route::get('laporanlelfullcaw/{lelong_id}',['as'=>'reportcawkhas.laporanlelfullcaw','uses'=>'ReportCawanganController@laporanlelfullcaw']);
+
+
+ // Route::get('indexbrglelpembidacaw',['as'=>'reportcawkhas.indexbrglelpembidacaw','uses'=>'ReportCawanganController@indexbrglelpembidacaw']);
+ // Route::get('laporanbrglelpembidacaw/{lelong_id}',['as'=>'reportcawkhas.laporanbrglelpembidacaw','uses'=>'ReportCawanganController@laporanbrglelpembidacaw']);
+
+ });
+