KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'atie' into 'main'

Browse Source 
update laporan serahan marhun kpd khazanah

See merge request online-sistem1/lelong!213
This commit is contained in:
Nur Izzati Zulkifli
2022-09-27 09:09:41 +00:00
parent f5dfdb62a8 b73ee8f1a9
commit 2f4d40aed1
4 changed files with 150 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+32 -9
View File
@@ -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.');
}
}
}
resources/views/marhun/terimaserahmarhun.blade.php
+1
View File
@@ -94,6 +94,7 @@
</div>
<div class="tab-pane fade" id="sudah-serah" role="tabpanel" aria-labelledby="sudah-serah-tab">
<div style="text-align: left;"> <a href="{{ route('marhun.cetakterimaserahmarhun', $lelong_id) }}" class="btn btn-info">Laporan Serahan Marhun Kepada Khazanah</a><br></div>
<table class="table table-bordered table-hover" id="table-sudah-serah" style="width: 100%;">
<thead class="bg-primary text-white">
<tr>
resources/views/pdf/cetakterimaserahmarhun.blade.php
+115
View File
@@ -0,0 +1,115 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<style>
#sim {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
font-size:10px;
/* border-collapse: collapse; */
width: 100%;
}
#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
border: 0px solid;
padding: 1px;
text-align: left;
}
#sim tr:nth-child(even){}
#sim tr:hover {}
#sim th {
text-align: left;
border: 0px solid;
table-layout:auto;
color: black;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}
* {
box-sizing: border-box;
}
.row {
margin-left:-5px;
margin-right:-5px;
}
.column {
float: left;
width: 100%;
padding: 5px;
}
/* Clearfix (clear floats) */
.row::after {
content: "";
clear: both;
display: table;
}
table {
border-collapse: collapse;
border-spacing: 0;
width: 200%;
/* border: 0px solid #ddd; */
}
th, td {
text-align: left;
padding: 16px;
}
tr:nth-child(even) {
/* background-color: #f2f2f2; */
}
</style>
<body>
<table width="100%" border="0" id="sim">
<tr>
<td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
</tr>
<tr>
<td colspan="2"><u><b>LAPORAN MARHUN KELUAR PETI BESI</b></u></td>
</tr>
<tr>
<td colspan="2"><b>Cawangan: {{$caw['caw_name']}}</b></td>
</tr>
<tr>
<td colspan="2"><b>ID Lelong: {{$lelong_id}}</b></td>
</tr>
</table>
<br>
<table cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
<thead>
<th>Bil</th>
<th>No Rujukan</th>
<th>Tarikh/Masa Scan Keluar</th>
<th>Tarikh/Masa Terima Marhun</th>
<th>Tarikh/Masa Serah Marhun</th>
<th>Status</th>
</thead>
<tbody>
@foreach($sudahSerah as $index)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{$index->norujukan}}</td>
<td>{{$index->scan_keluar}}</td>
<td>{{$index->terima_marhun}}</td>
<td>{{$index->serah_marhun}}</td>
<td><span class="badge badge-pill badge-success">Sudah Serah</span></td>
</tr>
@endforeach
</tbody>
</table>
</tbody>
routes/web.php
+2
View File
@@ -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