diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 1831aca7..6d9d10c4 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -1256,7 +1256,7 @@ class MarhunController extends Controller
->get();
if ($senaraiScanKeluar || $sedangDinilai || $sudahSerah) {
- return view('marhun.terimaserahmarhun', compact('senaraiScanKeluar', 'sedangDinilai', 'sudahSerah'));
+ return view('marhun.terimaserahmarhun', compact('senaraiScanKeluar', 'sedangDinilai', 'sudahSerah','lelong_id'));
} else {
return redirect()->route('marhun.senarailelongterimaserah')->with('failed', 'Tiada Surat Untuk Dilelong Pada Tarikh Ini.');
}
@@ -1430,9 +1430,6 @@ class MarhunController extends Controller
public function cetakkeluarscanbarcode($lelong_id)
{
-
-
-
$user = Auth::user();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
@@ -1458,15 +1455,10 @@ class MarhunController extends Controller
))->setPaper('a4', 'potrait');
return $pdf->download('Senarai Keluar Peti Besi.pdf');
-
-
}
public function cetakmasukscanbarcode($lelong_id)
{
-
-
-
$user = Auth::user();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
@@ -1492,8 +1484,39 @@ class MarhunController extends Controller
))->setPaper('a4', 'potrait');
return $pdf->download('Senarai Masuk Peti Besi.pdf');
+ }
+ public function cetakterimaserahmarhun($lelong_id)
+ {
+ $user = Auth::user();
+ $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
+ $senaraiScanKeluar = ScanSemak::where('kodcaw', '=', $caw->caw_code)
+ ->where('lelong_id', $lelong_id)
+ ->whereNull('terima_marhun')
+ ->orderBy('id', 'desc')
+ ->get();
+ $sedangDinilai = ScanSemak::where('kodcaw', '=', $caw->caw_code)
+ ->whereNotNull('terima_marhun')
+ ->whereNull('serah_marhun')
+ ->where('lelong_id', $lelong_id)
+ ->orderBy('id', 'desc')
+ ->get();
+
+ $sudahSerah = ScanSemak::where('kodcaw', '=', $caw->caw_code)
+ ->whereNotNull('serah_marhun')
+ ->where('lelong_id', $lelong_id)
+ ->orderBy('id', 'desc')
+ ->get();
+
+ if ($senaraiScanKeluar || $sedangDinilai || $sudahSerah) {
+ // return view('pdf.cetakterimaserahmarhun', compact('senaraiScanKeluar', 'sedangDinilai', 'sudahSerah','lelong_id','caw'));
+ $pdf = PDF::loadView('pdf.cetakterimaserahmarhun',compact('senaraiScanKeluar', 'sedangDinilai', 'sudahSerah','lelong_id','caw'
+ ))->setPaper('a4', 'potrait');
+ return $pdf->download('Laporan Serahan Marhun.pdf');
+ } else {
+ return redirect()->route('marhun.senarailelongterimaserah')->with('failed', 'Tiada Surat Untuk Dilelong Pada Tarikh Ini.');
+ }
}
}
diff --git a/resources/views/marhun/terimaserahmarhun.blade.php b/resources/views/marhun/terimaserahmarhun.blade.php
index 483d260f..ad60caed 100644
--- a/resources/views/marhun/terimaserahmarhun.blade.php
+++ b/resources/views/marhun/terimaserahmarhun.blade.php
@@ -94,6 +94,7 @@
+
diff --git a/resources/views/pdf/cetakterimaserahmarhun.blade.php b/resources/views/pdf/cetakterimaserahmarhun.blade.php
new file mode 100644
index 00000000..f1b6c5b0
--- /dev/null
+++ b/resources/views/pdf/cetakterimaserahmarhun.blade.php
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+ PERMODALAN KELANTAN BERHAD |
+
+
+
+ | LAPORAN MARHUN KELUAR PETI BESI |
+
+
+ | Cawangan: {{$caw['caw_name']}} |
+
+
+ | ID Lelong: {{$lelong_id}} |
+
+
+
+
+
+
+ | Bil |
+ No Rujukan |
+ Tarikh/Masa Scan Keluar |
+ Tarikh/Masa Terima Marhun |
+ Tarikh/Masa Serah Marhun |
+ Status |
+
+
+
+ @foreach($sudahSerah as $index)
+
+ | {{$loop->iteration}} |
+ {{$index->norujukan}} |
+ {{$index->scan_keluar}} |
+ {{$index->terima_marhun}} |
+ {{$index->serah_marhun}} |
+ Sudah Serah |
+
+ @endforeach
+
+
+
+
+
+
diff --git a/routes/web.php b/routes/web.php
index f7898f8c..16444476 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -264,10 +264,12 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim
Route::post('/addphotomarhun',['as'=>'marhun.addphotomarhun','uses'=>'MarhunController@addPhotoMarhun']);
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']);
//khazanah
Route::get('/cetakkeluarscanbarcode/{lelong_id}',['as'=>'marhun.cetakkeluarscanbarcode','uses'=>'MarhunController@cetakkeluarscanbarcode']);
Route::get('/cetakmasukscanbarcode/{lelong_id}',['as'=>'marhun.cetakmasukscanbarcode','uses'=>'MarhunController@cetakmasukscanbarcode']);
+
});
//Khazanah