diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index b0fa1029..6336708a 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -46,9 +46,14 @@ class HomeController extends Controller
$semakCountArray = [];
$lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+ ->join('lelongbid', function($join){
+ $join->on('cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id')
+ ->on('cawangan_lelong.caw_id', '=', 'lelongbid.caw_id');
+ })
+ ->where('lelong.tarikh_lelong', $dateTime)
+ ->where('lelongbid.status_semak',1)
->select('lelong.fasa','cawangan_lelong.lelong_id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','lelong.sts_lelong')
- ->where('tarikh_lelong', $dateTime)
- ->groupBy('lelong_id')
+ ->groupBy('cawangan_lelong.lelong_id','cawangan_lelong.caw_id')
->get()
->toArray();
diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php
index fdae5804..0f9aa1fe 100644
--- a/app/Http/Controllers/TangguhLelongController.php
+++ b/app/Http/Controllers/TangguhLelongController.php
@@ -249,7 +249,7 @@ class TangguhLelongController extends Controller
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.berat',
- 'lelongbid.marhun',
+ 'lelongbid.marhun'
)
->get()->toArray();
@@ -398,7 +398,7 @@ class TangguhLelongController extends Controller
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.berat',
- 'lelongbid.marhun',
+ 'lelongbid.marhun'
)
->get()->toArray();
// dd($lelongbidmarhun);
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 1ca920f9..90f3d964 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -85,6 +85,7 @@
LELONGAN HARI INI
@foreach ($arrayinfo as $lel)
+