diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 7ffe9ca1..9642b25c 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -770,33 +770,71 @@ class ReportController extends Controller
// return view('lelong.senaraimarhun',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo'));
}
+ public function lapubahmarhunlelong (){
- public function lapubahmarhunlelongindex (){
-
- $arraydetails = [];
-
- $laporan= Pengesahan::join('lelongbidmarhun','pengesahan.lelongbidmarhun_id','=','lelongbidmarhun.id')
- ->join('lelongbid','lelongbid.norujukan','=','pengesahan.norujukan')
- ->select('pengesahan.norujukan','pengesahan.lelong_id','lelongbid.caw_id','pengesahan.diminta_pada','pengesahan.disahkan_oleh','pengesahan.disahkan_pada','pengesahan.diminta_oleh','pengesahan.status','pengesahan.status_ubah','lelongbidmarhun.old_karat','lelongbidmarhun.karat','lelongbidmarhun.old_berat','lelongbidmarhun.berat','lelongbid.kodcaw','lelongbid.norujukan','lelongbid.lelong_id')
- ->whereNotNull('pengesahan.disahkan_oleh')
- ->orderBy('pengesahan.id')
+ $arraydetails = [];
+
+ $laporan= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+ ->join('pengesahan','lelong.id','=','pengesahan.lelong_id')
+ ->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa')
+ ->distinct()
+ ->orderBy('cawangan_lelong.lelong_id')
->get()
->toArray();
+ // dd($laporan);
- foreach($laporan as $lap) //stop here 01.09.2022
- {
- $details = CawanganLelong ::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
- ->where('lelong_id',$lap['lelong_id'])
- ->where('caw_id',$lap['caw_id'])
+
+ foreach($laporan as $brg)
+ {
+ $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+ ->where('lelong_id', $brg['lelong_id'])
->distinct()
->orderBy('lelong_id')
->get()
->toArray();
- array_push($arraydetails, ['lap' =>$lap,'details' =>$details]);
-
- }
+ array_push($arraydetails,['brg' => $brg, 'detailsbrg' => $details ]);
+ }
- return view('marhun.ubahmarhun', compact('laporan','arraydetails'));
+
+ return view('marhun.ubahmarhuncaw', compact('arraydetails'));
+
+ }
+
+
+ public function lapubahmarhunlelongindex ($lelong_id, $kodcaw){
+
+ $cawangan = Pengesahan::where('pengesahan.lelong_id', $lelong_id)
+ ->where('pengesahan.status', 1)
+ ->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;
+ }
+
+ return view('marhun.ubahmarhun', compact('cawangan','lelong_id','getpengesahan'));
}
public function exportubahmarhun (){
diff --git a/app/Models/Lelong.php b/app/Models/Lelong.php
index 63cf76b2..8f12511d 100644
--- a/app/Models/Lelong.php
+++ b/app/Models/Lelong.php
@@ -40,4 +40,9 @@ class Lelong extends Model
{
return $this->hasMany(LelKarat::class, 'lelong_id', 'id');
}
+
+ public function pengesahan()
+ {
+ return $this->hasMany(Pengesahan::class,'lelong_id','id');
+ }
}
diff --git a/app/Models/Pengesahan.php b/app/Models/Pengesahan.php
index a3814af1..c8855205 100644
--- a/app/Models/Pengesahan.php
+++ b/app/Models/Pengesahan.php
@@ -23,7 +23,13 @@ class Pengesahan extends Model
'status_ubah'
];
- public function lelongbidmarhun(){
+ public function lelongbidmarhun()
+ {
return $this->belongsTo(LelongBidMarhun::class, 'lelongbidmarhun_id' , 'id');
}
+
+ public function lelong()
+ {
+ return $this->belongsTo(Lelong::class,'lelong_id','id');
+ }
}
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 1cdcde72..3bdea217 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -163,7 +163,7 @@