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

Merge branch 'main' into amir_dev_2

Browse Source
This commit is contained in:
Amir
2023-01-25 14:32:56 +08:00
parent ee7cc5e5ef e6c388c340
commit 60517c584a
6 changed files with 302 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ReportCawanganController.php
+38 -1
View File
@@ -903,9 +903,46 @@ class ReportCawanganController extends Controller
return $pdf->download('Laporan Tuntut/Belum Baki Lelong.pdf');
}
public function indexubahmarhun (){
$arraydetails = [];
$user = Auth::user();
$caw = Cawangan::where('caw_code','=',$user->kodcaw)
->first();
// dd($caw);
$laporan= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->join('pengesahan','lelong.id','=','pengesahan.lelong_id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('cawangan.caw_code','=',$user['kodcaw'])
->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa')
->distinct()
->orderBy('cawangan_lelong.lelong_id')
->get()
->toArray();
// dd($laporan);
foreach($laporan as $brg)
{
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id', $brg['lelong_id'])
->where('cawangan.caw_code','=',$user['kodcaw'])
->distinct()
->orderBy('lelong_id')
->get()
->toArray();
array_push($arraydetails,['brg' => $brg, 'detailsbrg' => $details ]);
}
return view('marhun.ubahmarhuncaw', compact('arraydetails'));
}
app/Http/Controllers/ReportController.php
+47
View File
@@ -144,6 +144,8 @@ class ReportController extends Controller
return view('lelong.brgleldetails', compact('arraydetails'));
}
public function senaraibrglelongdetails ($lelong_id, $kodcaw){
$lelongs= LelongBid::where('lelong_id','=',$lelong_id)
@@ -1011,6 +1013,51 @@ class ReportController extends Controller
return view('marhun.ubahmarhun', compact('cawangan','lelong_id','getpengesahan'));
}
public function lapubahmarhunlelongindexpdf ($lelong_id, $kodcaw, $t_lelong){
$cawangan = Pengesahan::where('pengesahan.lelong_id', $lelong_id)
->where('pengesahan.status', 1)
->where('pengesahan.norujukan', 'LIKE', '%'.$kodcaw.'%')
->whereNotNull('pengesahan.disahkan_oleh')
->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id')
->orderBy('pengesahan.lelongbid_id')
->distinct()
->get();
foreach($cawangan as $index1=>$caw)
{
$getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
$getdisahkanoleh = User::where('id', $caw['disahkan_oleh'])->first();
$getdimintaoleh = User::where('id', $caw['diminta_oleh'])->first();
$status = Pengesahan::where('lelongbid_id', $caw['lelongbid_id'])
->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun')
->get();
$marhuns = LelongBidMarhun::where('lelongbid_id', $caw['lelongbid_id'])
->get()
->toArray();
$cawangan[$index1]['namacaw'] = $getpengesahan['caw_name'];
$cawangan[$index1]['disahkan_oleh'] = $getdisahkanoleh['name'];
$cawangan[$index1]['diminta_oleh'] = $getdimintaoleh['name'];
$cawangan[$index1]['detailmarhun']=$status;
$cawangan[$index1]['detail']=$marhuns;
}
$getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
// return view('pdf.laporanubahmarhun', compact('cawangan','lelong_id','getpengesahan','t_lelong'));
$pdf = PDF::loadView('pdf.laporanubahmarhun',compact('cawangan','lelong_id','getpengesahan','t_lelong'))
->setPaper('a4', 'potrait');
return $pdf->download('Senarai Ubah Marhun.pdf');
}
public function exportubahmarhun (){
$arraydetails = [];