From 05e30c34fa0afe1e467ad96359ebe95b50eb4d94 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 9 Jun 2022 11:09:39 +0800 Subject: [PATCH] update marhun dan tangguh lelong controller(isu contstrains) --- app/Http/Controllers/MarhunController.php | 2 +- app/Http/Controllers/TangguhLelongController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index ef09509c..1bf4ba43 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -518,7 +518,7 @@ class MarhunController extends Controller $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('sts_lelong', 0) - ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray(); diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index c5742460..f47b76ce 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -211,7 +211,7 @@ class TangguhLelongController extends Controller $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('sts_lelong', 0) - ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray();