Merge branch 'atie' into 'main'

update marhun dan tangguh lelong controller(isu contstrains)

See merge request online-sistem1/lelong!54
This commit is contained in:
Nur Izzati Zulkifli
2022-06-09 03:11:19 +00:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -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();
@@ -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();